diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Address.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Address.java index bc2727b2db..5624499129 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Address.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Address.java @@ -51,6 +51,15 @@ public Address(XAD xad) { super(xad); } + /** + * Parses an HL7v2 string into an Address object. + * + * @param hl7String HL7v2 representation of an Address object. + * @return parsed Address object. + */ + public static Address parse(String hl7String) { + return Hl7v2Based.parse(hl7String, Address.class); + } /** * @return the street address (XAD.1). diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/AssigningAuthority.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/AssigningAuthority.java index 54c7bce89d..3785906fb1 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/AssigningAuthority.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/AssigningAuthority.java @@ -33,7 +33,7 @@ *

* This class is based on the HL7 HD data type. *

- * Note that most assigning authorities used in XSD only allow the definition of the + * Note that most assigning authorities used in XDS only allow the definition of the * universal ID. The ID type must be {@code ISO} and the namespace ID has to be empty. * The constructor {@link #AssigningAuthority(String)} can be used to create such * authorities. @@ -99,6 +99,16 @@ public AssigningAuthority(Oid universalId) { setUniversalIdType(UNIVERSAL_ID_TYPE_OID); } + /** + * Parses an HL7v2 string into an AssigningAuthority object. + * + * @param hl7String HL7v2 representation of an AssigningAuthority object. + * @return parsed AssigningAuthority object. + */ + public static AssigningAuthority parse(String hl7String) { + return Hl7v2Based.parse(hl7String, AssigningAuthority.class); + } + /** * @return the universal ID (HD.2). */ diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/CXiAssigningAuthority.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/CXiAssigningAuthority.java index 626c9d5748..6e8ae96d25 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/CXiAssigningAuthority.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/CXiAssigningAuthority.java @@ -68,6 +68,16 @@ public CXiAssigningAuthority(String namespaceId, String universalId, String univ setNamespaceId(namespaceId); } + /** + * Parses an HL7v2 string into a CXiAssigningAuthority object. + * + * @param hl7String HL7v2 representation of a CXiAssigningAuthority object. + * @return parsed CXiAssigningAuthority object. + */ + public static CXiAssigningAuthority parse(String hl7String) { + return Hl7v2Based.parse(hl7String, CXiAssigningAuthority.class); + } + /** * @return the namespace ID (HD.1). */ diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Code.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Code.java index 4e66cc4b78..e75f71f904 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Code.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Code.java @@ -73,6 +73,16 @@ public Code(String code, LocalizedString displayName, String schemeName) { setSchemeName(schemeName); } + /** + * Parses an HL7v2 string into a Code object. + * + * @param hl7String HL7v2 representation of a Code object. + * @return parsed Code object. + */ + public static Code parse(String hl7String) { + return Hl7v2Based.parse(hl7String, Code.class); + } + /** * @return the value of this code. */ diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Hl7v2Based.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Hl7v2Based.java index c6de1e2e47..e5307086a9 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Hl7v2Based.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Hl7v2Based.java @@ -127,7 +127,7 @@ protected String render() { * HL7 v2 representation of the given object, or null * when the given object is null or empty. */ - public static String render(Hl7v2Based xdsModelObject) { + public static String render(Hl7v2Based xdsModelObject) { return (xdsModelObject != null) ? StringUtils.trimToNull(xdsModelObject.render()) : null; } @@ -142,7 +142,7 @@ public static String render(Hl7v2Based xdsModelObject) { * HL7 v2 representation of the given object, or an empty string * when the given object is null or empty. */ - public static String rawRender(Hl7v2Based xdsModelObject) { + public static String rawRender(Hl7v2Based xdsModelObject) { return (xdsModelObject != null) ? PipeParser.encode(xdsModelObject.getHapiObject(), XdsHl7v2Renderer.ENCODING_CHARACTERS) : ""; diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Identifiable.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Identifiable.java index 243a18e88d..2d62acedd1 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Identifiable.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Identifiable.java @@ -87,7 +87,17 @@ public Identifiable(String id, AssigningAuthority assigningAuthority) { public Identifiable(String id, Oid assigningAuthorityOid) { this(id, new AssigningAuthority(assigningAuthorityOid)); } - + + /** + * Parses an HL7v2 string into an Identifiable object. + * + * @param hl7String HL7v2 representation of an Identifiable object. + * @return parsed Identifiable object. + */ + public static Identifiable parse(String hl7String) { + return Hl7v2Based.parse(hl7String, Identifiable.class); + } + /** * @return person ID (CX.1) / Code. */ diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Organization.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Organization.java index f8c763e719..8fba355b7d 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Organization.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Organization.java @@ -83,6 +83,16 @@ public Organization(String organizationName, String idNumber, AssigningAuthority setAssigningAuthority(assigningAuthority); } + /** + * Parses an HL7v2 string into an Organization object. + * + * @param hl7String HL7v2 representation of an Organization object. + * @return parsed Organization object. + */ + public static Organization parse(String hl7String) { + return Hl7v2Based.parse(hl7String, Organization.class); + } + /** * @return the assigning authority (XON.6). */ diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/PatientInfo.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/PatientInfo.java index 31fecb6a12..ad4e654a2f 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/PatientInfo.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/PatientInfo.java @@ -125,16 +125,16 @@ public void set(String s) { getIterator().set(s); switch (fieldId) { case "PID-3": - getOtherIterator().set(Hl7v2Based.parse(s, Identifiable.class)); + getOtherIterator().set(Identifiable.parse(s)); break; case "PID-5": - getOtherIterator().set(Hl7v2Based.parse(s, XpnName.class)); + getOtherIterator().set(XpnName.parse(s)); break; case "PID-7": case "PID-8": break; case "PID-11": - getOtherIterator().set(Hl7v2Based.parse(s, Address.class)); + getOtherIterator().set(Address.parse(s)); break; default: throw new IllegalStateException("This line shall be not reachable, please report a bug"); @@ -147,16 +147,16 @@ public void add(String s) { getIterator().add(s); switch (fieldId) { case "PID-3": - getOtherIterator().add(Hl7v2Based.parse(s, Identifiable.class)); + getOtherIterator().add(Identifiable.parse(s)); break; case "PID-5": - getOtherIterator().add(Hl7v2Based.parse(s, XpnName.class)); + getOtherIterator().add(XpnName.parse(s)); break; case "PID-7": case "PID-8": break; case "PID-11": - getOtherIterator().add(Hl7v2Based.parse(s, Address.class)); + getOtherIterator().add(Address.parse(s)); break; default: throw new IllegalStateException("This line shall be not reachable, please report a bug"); diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Person.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Person.java index 0777ad3403..d1f0eef451 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Person.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Person.java @@ -71,6 +71,16 @@ public Person(Identifiable id, Name name) { setName(name); } + /** + * Parses an HL7v2 string into a Person object. + * + * @param hl7String HL7v2 representation of a Person object. + * @return parsed Person object. + */ + public static Person parse(String hl7String) { + return Hl7v2Based.parse(hl7String, Person.class); + } + /** * @return the id of the person (XCN.1 and XCN.9). */ diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/ReferenceId.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/ReferenceId.java index 845dfaf205..67a43a1c74 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/ReferenceId.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/ReferenceId.java @@ -82,6 +82,16 @@ public ReferenceId(String id, CXiAssigningAuthority assigningAuthority, String i setIdTypeCode(idTypeCode); } + /** + * Parses an HL7v2 string into a ReferenceId object. + * + * @param hl7String HL7v2 representation of a ReferenceId object. + * @return parsed ReferenceId object. + */ + public static ReferenceId parse(String hl7String) { + return Hl7v2Based.parse(hl7String, ReferenceId.class); + } + /** * @return the value of the id (CX.1). */ diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Telecom.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Telecom.java index a9a699b93a..6ebbeb74fe 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Telecom.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/Telecom.java @@ -80,6 +80,16 @@ public Telecom(Long countryCode, Long areaCityCode, Long localNumber, Long exten setExtension(extension); } + /** + * Parses an HL7v2 string into a Telecom object. + * + * @param hl7String HL7v2 representation of a Telecom object. + * @return parsed Telecom object. + */ + public static Telecom parse(String hl7String) { + return Hl7v2Based.parse(hl7String, Telecom.class); + } + /** * @return telecom use code (XTN-2) according to HL7 v.2.5 Table 0201. */ diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/XcnName.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/XcnName.java index 52a39c5e36..3987d63d07 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/XcnName.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/XcnName.java @@ -69,6 +69,15 @@ public XcnName(String familyName, String givenName, String secondAndFurtherGiven setDegree(degree); } + /** + * Parses an HL7v2 string into an XcnName object. + * + * @param hl7String HL7v2 representation of an XcnName object. + * @return parsed XcnName object. + */ + public static XcnName parse(String hl7String) { + return Hl7v2Based.parse(hl7String, XcnName.class); + } @Override public String getFamilyName() { diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/XpnName.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/XpnName.java index f63e5afa92..cf135ba007 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/XpnName.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/metadata/XpnName.java @@ -69,6 +69,15 @@ public XpnName(String familyName, String givenName, String secondAndFurtherGiven setDegree(degree); } + /** + * Parses an HL7v2 string into an XpnName object. + * + * @param hl7String HL7v2 representation of an XpnName object. + * @return parsed XpnName object. + */ + public static XpnName parse(String hl7String) { + return Hl7v2Based.parse(hl7String, XpnName.class); + } @Override public String getFamilyName() { diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/FindSubmissionSetsQuery.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/FindSubmissionSetsQuery.java index 70d5736428..5d24ac60d9 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/FindSubmissionSetsQuery.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/FindSubmissionSetsQuery.java @@ -81,7 +81,7 @@ public void setTypedAuthorPerson(Person authorPerson) { * @return a {@link Person} object. */ public Person getTypedAuthorPerson() { - return Hl7v2Based.parse(this.authorPerson, Person.class); + return Person.parse(this.authorPerson); } } diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/AuthorTransformer.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/AuthorTransformer.java index 34917da68e..82d4d745b3 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/AuthorTransformer.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/AuthorTransformer.java @@ -91,7 +91,7 @@ public Author fromEbXML(EbXMLClassification classification) { var persons = classification.getSlotValues(SLOT_NAME_AUTHOR_PERSON); if (!persons.isEmpty()) { - var person = Hl7v2Based.parse(persons.get(0), Person.class); + var person = Person.parse(persons.get(0)); author.setAuthorPerson(person); } diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/DocumentEntryTransformer.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/DocumentEntryTransformer.java index efcb556220..745d96451b 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/DocumentEntryTransformer.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/DocumentEntryTransformer.java @@ -98,16 +98,16 @@ protected void addSlotsFromEbXML(DocumentEntry docEntry, EbXMLExtrinsicObject ex docEntry.setSize(size != null ? Long.parseLong(size) : null); var hl7LegalAuthenticator = extrinsic.getSingleSlotValue(SLOT_NAME_LEGAL_AUTHENTICATOR); - docEntry.setLegalAuthenticator(Hl7v2Based.parse(hl7LegalAuthenticator, Person.class)); + docEntry.setLegalAuthenticator(Person.parse(hl7LegalAuthenticator)); var sourcePatient = extrinsic.getSingleSlotValue(SLOT_NAME_SOURCE_PATIENT_ID); - docEntry.setSourcePatientId(Hl7v2Based.parse(sourcePatient, Identifiable.class)); + docEntry.setSourcePatientId(Identifiable.parse(sourcePatient)); var slotValues = extrinsic.getSlotValues(SLOT_NAME_SOURCE_PATIENT_INFO); docEntry.setSourcePatientInfo(patientInfoTransformer.fromHL7(slotValues)); for (var referenceIdValue : extrinsic.getSlotValues(SLOT_NAME_REFERENCE_ID_LIST)) { - docEntry.getReferenceIdList().add(Hl7v2Based.parse(referenceIdValue, ReferenceId.class)); + docEntry.getReferenceIdList().add(ReferenceId.parse(referenceIdValue)); } } diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/RecipientTransformer.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/RecipientTransformer.java index 6121b767e0..0a4b33c2ab 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/RecipientTransformer.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/RecipientTransformer.java @@ -76,12 +76,12 @@ public Recipient fromEbXML(String slotValue) { var recipient = new Recipient(); var parts = slotValue.split("\\|"); - recipient.setOrganization(Hl7v2Based.parse(parts[0], Organization.class)); + recipient.setOrganization(Organization.parse(parts[0])); if (parts.length > 1) { - recipient.setPerson(Hl7v2Based.parse(parts[1], Person.class)); + recipient.setPerson(Person.parse(parts[1])); } if (parts.length > 2) { - recipient.setTelecom(Hl7v2Based.parse(parts[2], Telecom.class)); + recipient.setTelecom(Telecom.parse(parts[2])); } return recipient; diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/XDSMetaClassTransformer.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/XDSMetaClassTransformer.java index 9284ab3605..b1250ebd33 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/XDSMetaClassTransformer.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/XDSMetaClassTransformer.java @@ -264,7 +264,7 @@ protected void addExternalIdentifiers(C metaData, E ebXML, EbXMLObjectLibrary ob */ protected void addExternalIdentifiersFromEbXML(C metaData, E ebXML) { var patientID = ebXML.getExternalIdentifierValue(patientIdExternalId); - metaData.setPatientId(Hl7v2Based.parse(patientID, Identifiable.class)); + metaData.setPatientId(Identifiable.parse(patientID)); metaData.setUniqueId(ebXML.getExternalIdentifierValue(uniqueIdExternalId)); } } diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/AbstractFindDocumentsQueryTransformer.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/AbstractFindDocumentsQueryTransformer.java index 304719f46f..83a2cc0cda 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/AbstractFindDocumentsQueryTransformer.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/AbstractFindDocumentsQueryTransformer.java @@ -43,7 +43,7 @@ protected void toEbXML(T query, QuerySlotHelper slots) { protected void fromEbXML(T query, QuerySlotHelper slots) { super.fromEbXML(query, slots); var patientId = slots.toString(DOC_ENTRY_PATIENT_ID); - query.setPatientId(Hl7v2Based.parse(patientId, Identifiable.class)); + query.setPatientId(Identifiable.parse(patientId)); query.setDocumentEntryTypes(slots.toDocumentEntryType(DOC_ENTRY_TYPE)); query.setStatus(slots.toStatus(DOC_ENTRY_STATUS)); query.setDocumentAvailability(slots.toDocumentAvailability(DOC_ENTRY_DOCUMENT_AVAILABILITY)); diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/FetchQueryTransformer.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/FetchQueryTransformer.java index d716d37472..0bfbb17695 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/FetchQueryTransformer.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/FetchQueryTransformer.java @@ -45,7 +45,7 @@ protected void toEbXML(FetchQuery query, QuerySlotHelper slots) { protected void fromEbXML(FetchQuery query, QuerySlotHelper slots) { super.fromEbXML(query, slots); var patientId = slots.toString(DOC_ENTRY_PATIENT_ID); - query.setPatientId(Hl7v2Based.parse(patientId, Identifiable.class)); + query.setPatientId(Identifiable.parse(patientId)); } diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/FindFoldersQueryTransformer.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/FindFoldersQueryTransformer.java index fe33ff8a86..397a1d8f91 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/FindFoldersQueryTransformer.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/FindFoldersQueryTransformer.java @@ -50,7 +50,7 @@ protected void toEbXML(FindFoldersQuery query, QuerySlotHelper slots) { protected void fromEbXML(FindFoldersQuery query, QuerySlotHelper slots) { super.fromEbXML(query, slots); var patientId = slots.toString(FOLDER_PATIENT_ID); - query.setPatientId(Hl7v2Based.parse(patientId, Identifiable.class)); + query.setPatientId(Identifiable.parse(patientId)); query.setCodes(slots.toCodeQueryList(FOLDER_CODES, FOLDER_CODES_SCHEME)); query.getLastUpdateTime().setFrom(slots.toTimestamp(FOLDER_LAST_UPDATE_TIME_FROM)); query.getLastUpdateTime().setTo(slots.toTimestamp(FOLDER_LAST_UPDATE_TIME_TO)); diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/FindSubmissionSetsQueryTransformer.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/FindSubmissionSetsQueryTransformer.java index b3cdba1f30..d805e64f86 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/FindSubmissionSetsQueryTransformer.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/FindSubmissionSetsQueryTransformer.java @@ -51,7 +51,7 @@ protected void toEbXML(FindSubmissionSetsQuery query, QuerySlotHelper slots) { protected void fromEbXML(FindSubmissionSetsQuery query, QuerySlotHelper slots) { super.fromEbXML(query, slots); var patientId = slots.toString(SUBMISSION_SET_PATIENT_ID); - query.setPatientId(Hl7v2Based.parse(patientId, Identifiable.class)); + query.setPatientId(Identifiable.parse(patientId)); query.setSourceIds(slots.toStringList(SUBMISSION_SET_SOURCE_ID)); query.getSubmissionTime().setFrom(slots.toTimestamp(SUBMISSION_SET_SUBMISSION_TIME_FROM)); query.getSubmissionTime().setTo(slots.toTimestamp(SUBMISSION_SET_SUBMISSION_TIME_TO)); diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/GetAllQueryTransformer.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/GetAllQueryTransformer.java index f60370ea8d..d4750a1614 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/GetAllQueryTransformer.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/GetAllQueryTransformer.java @@ -53,7 +53,7 @@ protected void toEbXML(GetAllQuery query, QuerySlotHelper slots) { protected void fromEbXML(GetAllQuery query, QuerySlotHelper slots) { super.fromEbXML(query, slots); var patientId = slots.toString(PATIENT_ID); - query.setPatientId(Hl7v2Based.parse(patientId, Identifiable.class)); + query.setPatientId(Identifiable.parse(patientId)); query.setStatusDocuments(slots.toStatus(DOC_ENTRY_STATUS)); query.setStatusFolders(slots.toStatus(FOLDER_STATUS)); query.setStatusSubmissionSets(slots.toStatus(SUBMISSION_SET_STATUS)); diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/PharmacyDocumentsQueryTransformer.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/PharmacyDocumentsQueryTransformer.java index eb35d24240..5dd5075ac1 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/PharmacyDocumentsQueryTransformer.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/PharmacyDocumentsQueryTransformer.java @@ -40,7 +40,7 @@ protected void toEbXML(T query, QuerySlotHelper slots) { protected void fromEbXML(T query, QuerySlotHelper slots) { super.fromEbXML(query, slots); query.setMetadataLevel(slots.toInteger(METADATA_LEVEL)); - query.setPatientId(Hl7v2Based.parse(slots.toString(DOC_ENTRY_PATIENT_ID), Identifiable.class)); + query.setPatientId(Identifiable.parse(slots.toString(DOC_ENTRY_PATIENT_ID))); query.setStatus(slots.toStatus(DOC_ENTRY_STATUS)); } } diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/QuerySlotHelper.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/QuerySlotHelper.java index 1670360590..6c38ffb1bb 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/QuerySlotHelper.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/QuerySlotHelper.java @@ -263,7 +263,7 @@ public List toPatientIdList(QueryParameter param) { return null; } return values.stream() - .map(value -> Hl7v2Based.parse(value, Identifiable.class)) + .map(Identifiable::parse) .toList(); } @@ -419,7 +419,7 @@ public static List toCode(List slotValues) { var codes = new ArrayList(); slotValues.forEach(slotValue -> decodeStringList(slotValue).forEach(hl7CE -> { - var code = Hl7v2Based.parse(hl7CE, Code.class); + var code = Code.parse(hl7CE); if (code == null || isEmpty(code.getCode()) || isEmpty(code.getSchemeName())) { throw new XDSMetaDataException(ValidationMessage.INVALID_QUERY_PARAMETER_VALUE, hl7CE); } diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/SubscriptionForDocumentEntryQueryTransformer.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/SubscriptionForDocumentEntryQueryTransformer.java index 6497ae5f4e..df1951973b 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/SubscriptionForDocumentEntryQueryTransformer.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/SubscriptionForDocumentEntryQueryTransformer.java @@ -47,7 +47,7 @@ protected void toEbXML(SubscriptionForDocumentEntryQuery query, QuerySlotHelper protected void fromEbXML(SubscriptionForDocumentEntryQuery query, QuerySlotHelper slots) { super.fromEbXML(query, slots); var patientId = slots.toString(DOC_ENTRY_PATIENT_ID); - query.setPatientId(Hl7v2Based.parse(patientId, Identifiable.class)); + query.setPatientId(Identifiable.parse(patientId)); query.setReferenceIds(slots.toStringQueryList(DOC_ENTRY_REFERENCE_IDS)); } } diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/SubscriptionForFolderQueryTransformer.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/SubscriptionForFolderQueryTransformer.java index f65e8121b6..ca218b7160 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/SubscriptionForFolderQueryTransformer.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/SubscriptionForFolderQueryTransformer.java @@ -48,7 +48,7 @@ protected void toEbXML(SubscriptionForFolderQuery query, QuerySlotHelper slots) protected void fromEbXML(SubscriptionForFolderQuery query, QuerySlotHelper slots) { super.fromEbXML(query, slots); var patientId = slots.toString(FOLDER_PATIENT_ID); - query.setPatientId(Hl7v2Based.parse(patientId, Identifiable.class)); + query.setPatientId(Identifiable.parse(patientId)); query.setCodes(slots.toCodeQueryList(FOLDER_CODES, FOLDER_CODES_SCHEME)); query.setLogicalUuid(slots.toStringList(FOLDER_LOGICAL_ID)); } diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/SubscriptionForSubmissionSetQueryTransformer.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/SubscriptionForSubmissionSetQueryTransformer.java index dace611393..2b9adaa272 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/SubscriptionForSubmissionSetQueryTransformer.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/transform/requests/query/SubscriptionForSubmissionSetQueryTransformer.java @@ -49,7 +49,7 @@ protected void toEbXML(SubscriptionForSubmissionSetQuery query, QuerySlotHelper protected void fromEbXML(SubscriptionForSubmissionSetQuery query, QuerySlotHelper slots) { super.fromEbXML(query, slots); var patientId = slots.toString(SUBMISSION_SET_PATIENT_ID); - query.setPatientId(Hl7v2Based.parse(patientId, Identifiable.class)); + query.setPatientId(Identifiable.parse(patientId)); query.setSourceIds(slots.toStringList(SUBMISSION_SET_SOURCE_ID)); query.setAuthorPersons(slots.toStringList(SUBMISSION_SET_AUTHOR_PERSON)); query.setIntendedRecipients(slots.toStringList(SUBMISSION_SET_INTENDED_RECIPIENT)); diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/CXValidator.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/CXValidator.java index a903b7f75a..f5c78a7581 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/CXValidator.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/CXValidator.java @@ -40,7 +40,7 @@ public CXValidator(boolean assigningAuthorityRequired) { @Override public void validate(String hl7CX) throws XDSMetaDataException { - var identifiable = Hl7v2Based.parse(hl7CX, Identifiable.class); + var identifiable = Identifiable.parse(hl7CX); metaDataAssert(identifiable != null, CX_NEEDS_ID); var cx = identifiable.getHapiObject(); diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/CXiValidator.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/CXiValidator.java index 0a7eb7dde7..f3c858e939 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/CXiValidator.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/CXiValidator.java @@ -40,7 +40,7 @@ public class CXiValidator implements ValueValidator { @Override public void validate(String hl7CX) throws XDSMetaDataException { - var referenceId = Hl7v2Based.parse(hl7CX, ReferenceId.class); + var referenceId = ReferenceId.parse(hl7CX); metaDataAssert(referenceId != null, CX_NEEDS_ID); var cx = referenceId.getHapiObject(); diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/XCNValidator.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/XCNValidator.java index 2037cb165c..09ec439fab 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/XCNValidator.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/XCNValidator.java @@ -33,7 +33,7 @@ public class XCNValidator implements ValueValidator { @Override public void validate(String hl7xcn) throws XDSMetaDataException { - var person = Hl7v2Based.parse(hl7xcn, Person.class); + var person = Person.parse(hl7xcn); metaDataAssert(person != null, PERSON_MISSING_NAME_AND_ID, hl7xcn); var xcn = person.getHapiObject(); diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/XONValidator.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/XONValidator.java index 7ce4669294..c24ab320ca 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/XONValidator.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/XONValidator.java @@ -33,7 +33,7 @@ public class XONValidator implements ValueValidator { @Override public void validate(String hl7XON) throws XDSMetaDataException { - var organization = Hl7v2Based.parse(hl7XON, Organization.class); + var organization = Organization.parse(hl7XON); metaDataAssert(organization != null, ORGANIZATION_NAME_MISSING, hl7XON); var xon = organization.getHapiObject(); diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/XTNValidator.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/XTNValidator.java index b55de2665c..ee86a65d02 100644 --- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/XTNValidator.java +++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/validate/XTNValidator.java @@ -31,7 +31,7 @@ public class XTNValidator implements ValueValidator { @Override public void validate(String hl7XTN) throws XDSMetaDataException { - var telecom = Hl7v2Based.parse(hl7XTN, Telecom.class); + var telecom = Telecom.parse(hl7XTN); metaDataAssert(telecom != null, MISSING_TELECOM_PARAM, hl7XTN); if ("Internet".equals(telecom.getType())) { diff --git a/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/IdentifiableTransformerTest.java b/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/IdentifiableTransformerTest.java index c2122a2d11..212f58c4f1 100644 --- a/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/IdentifiableTransformerTest.java +++ b/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/ebxml/IdentifiableTransformerTest.java @@ -63,7 +63,7 @@ public void testToEbXML21SourcePatientEmpty() { @Test public void testFromEbXML21SourcePatient() { var ebXML = Hl7v2Based.render(identifiable); - var result = Hl7v2Based.parse(ebXML, Identifiable.class); + var result = Identifiable.parse(ebXML); assertNotNull(result); assertEquals("21&3", result.getId()); @@ -75,12 +75,12 @@ public void testFromEbXML21SourcePatient() { @Test public void testFromEbXML21SourcePatientNull() { - assertNull(Hl7v2Based.parse(null, Identifiable.class)); + assertNull(Identifiable.parse(null)); } @Test public void testFromEbXML21SourcePatientEmpty() { - var result = Hl7v2Based.parse("", Identifiable.class); + var result = Identifiable.parse(""); assertNull(result); } } diff --git a/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/AddressTransformerTest.java b/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/AddressTransformerTest.java index 6de5d930f3..b984dfe0af 100644 --- a/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/AddressTransformerTest.java +++ b/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/AddressTransformerTest.java @@ -55,9 +55,8 @@ public void testToHL7WithNullParam() { @Test public void testFromHL7() { - var address = Hl7v2Based.parse( - "Laliluna Str. 2\\T\\3^Licht\\T\\Lampen^Sonn\\S\\hofen^Lamp\\F\\ing^123\\T\\WARM^ECU^^^STRAHL\\F\\EMANN", - Address.class); + var address = Address.parse( + "Laliluna Str. 2\\T\\3^Licht\\T\\Lampen^Sonn\\S\\hofen^Lamp\\F\\ing^123\\T\\WARM^ECU^^^STRAHL\\F\\EMANN"); assertEquals("Laliluna Str. 2&3", address.getStreetAddress()); assertEquals("Sonn^hofen", address.getCity()); assertEquals("ECU", address.getCountry()); @@ -69,9 +68,8 @@ public void testFromHL7() { @Test public void testFromHL7UsingSAD() { - var address = Hl7v2Based.parse( - "Laliluna Str. 2\\T\\3&whatever^Licht\\T\\Lampen^Sonn\\S\\hofen^Lamp\\F\\ing^123\\T\\WARM^ECU^^^STRAHL\\F\\EMANN", - Address.class); + var address = Address.parse( + "Laliluna Str. 2\\T\\3&whatever^Licht\\T\\Lampen^Sonn\\S\\hofen^Lamp\\F\\ing^123\\T\\WARM^ECU^^^STRAHL\\F\\EMANN"); assertEquals("Laliluna Str. 2&3", address.getStreetAddress()); assertEquals("Sonn^hofen", address.getCity()); assertEquals("ECU", address.getCountry()); @@ -83,11 +81,11 @@ public void testFromHL7UsingSAD() { @Test public void testFromHL7Nothing() { - assertNull(Hl7v2Based.parse("", Address.class)); + assertNull(Address.parse("")); } @Test public void testFromHL7WithNullParam() { - assertNull(Hl7v2Based.parse(null, Address.class)); + assertNull(Address.parse(null)); } } diff --git a/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/AssigningAuthorityTransformerTest.java b/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/AssigningAuthorityTransformerTest.java index dae087224d..c603b6e67f 100644 --- a/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/AssigningAuthorityTransformerTest.java +++ b/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/AssigningAuthorityTransformerTest.java @@ -57,30 +57,30 @@ public void testToHL7Null() { @Test public void testFromHL7() { var assigningAuthority = - Hl7v2Based.parse("nam\\T\\ID&ui\\S\\ID&type\\F\\ID", AssigningAuthority.class); + AssigningAuthority.parse("nam\\T\\ID&ui\\S\\ID&type\\F\\ID"); assertEquals("ui^ID", assigningAuthority.getUniversalId()); assertEquals("type|ID", assigningAuthority.getUniversalIdType()); } @Test public void testFromHL7NoParams() { - assertNull(Hl7v2Based.parse("", AssigningAuthority.class)); + assertNull(AssigningAuthority.parse("")); } @Test public void testFromHL7OptionalParams() { - var assigningAuthority = Hl7v2Based.parse("nam\\T\\ID&&type\\F\\ID", AssigningAuthority.class); + var assigningAuthority = AssigningAuthority.parse("nam\\T\\ID&&type\\F\\ID"); assertNull(assigningAuthority.getUniversalId()); assertEquals("type|ID", assigningAuthority.getUniversalIdType()); } @Test public void testFromHL7Null() { - assertNull(Hl7v2Based.parse(null, AssigningAuthority.class)); + assertNull(AssigningAuthority.parse(null)); } @Test public void testFromHL7Nothing() { - assertNull(Hl7v2Based.parse("", AssigningAuthority.class)); + assertNull(AssigningAuthority.parse("")); } } diff --git a/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/OrganizationTransformerTest.java b/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/OrganizationTransformerTest.java index 25c23e9cba..58c3321fc2 100644 --- a/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/OrganizationTransformerTest.java +++ b/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/OrganizationTransformerTest.java @@ -51,9 +51,8 @@ public void testToHL7Empty() { @Test public void testFromHL7() { - var organization = Hl7v2Based.parse( - "Untere\\T\\Klinik^^^^^he\\T\\llo&1.2\\T\\.3.4&WU\\T\\RZ^^^^a\\F\\number", - Organization.class); + var organization = Organization.parse( + "Untere\\T\\Klinik^^^^^he\\T\\llo&1.2\\T\\.3.4&WU\\T\\RZ^^^^a\\F\\number"); assertEquals("Untere&Klinik", organization.getOrganizationName()); assertEquals("a|number", organization.getIdNumber()); @@ -63,11 +62,11 @@ public void testFromHL7() { @Test public void testFromHL7WithNullParam() { - assertNull(Hl7v2Based.parse(null, Organization.class)); + assertNull(Organization.parse(null)); } @Test public void testFromHL7WithEmptyParam() { - assertNull(Hl7v2Based.parse("", Organization.class)); + assertNull(Organization.parse("")); } } diff --git a/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/PersonTransformerTest.java b/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/PersonTransformerTest.java index 34fc0b2e3e..bbe0d3a089 100644 --- a/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/PersonTransformerTest.java +++ b/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/PersonTransformerTest.java @@ -69,16 +69,15 @@ public void testToHL7WithNullParam() { @Test public void testFromHL7() { - var result = Hl7v2Based.parse( - "u\\S\\fz^Seu\\T\\fzer^Em\\T\\il^Ant\\F\\on^der\\T\\7.^D\\T\\r.^^^&1.2\\T\\.3.4&he\\T\\llo_WU\\T\\RZ", - Person.class); + var result = Person.parse( + "u\\S\\fz^Seu\\T\\fzer^Em\\T\\il^Ant\\F\\on^der\\T\\7.^D\\T\\r.^^^&1.2\\T\\.3.4&he\\T\\llo_WU\\T\\RZ"); assertEquals(person, result); } @Test public void testFromHL7NoIDNumber() { - var result = Hl7v2Based.parse("^Seu\\T\\fzer^Em\\T\\il^Ant\\F\\on^der\\T\\7.^D\\T\\r.", Person.class); + var result = Person.parse("^Seu\\T\\fzer^Em\\T\\il^Ant\\F\\on^der\\T\\7.^D\\T\\r."); person.setId(null); assertEquals(person, result); @@ -86,7 +85,7 @@ public void testFromHL7NoIDNumber() { @Test public void testFromHL7NoName() { - var result = Hl7v2Based.parse("u\\S\\fz^^^^^^^^&1.2\\T\\.3.4&he\\T\\llo_WU\\T\\RZ", Person.class); + var result = Person.parse("u\\S\\fz^^^^^^^^&1.2\\T\\.3.4&he\\T\\llo_WU\\T\\RZ"); person.setName(null); assertEquals(person, result); @@ -94,11 +93,11 @@ public void testFromHL7NoName() { @Test public void testFromHL7Empty() { - assertNull(Hl7v2Based.parse("", Person.class)); + assertNull(Person.parse("")); } @Test public void testFromHL7WithNullParam() { - assertNull(Hl7v2Based.parse(null, Person.class)); + assertNull(Person.parse(null)); } } diff --git a/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/XdsHl7v2RenderingTest.java b/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/XdsHl7v2RenderingTest.java index a8b78258dc..4a42a1dfda 100644 --- a/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/XdsHl7v2RenderingTest.java +++ b/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/core/transform/hl7/XdsHl7v2RenderingTest.java @@ -63,7 +63,7 @@ private static void doCheckCodeRendering(String id, String displayName, String s @Test public void testTelecomRendering() { var xtn = "1^2^3^4^5^6^7^8^9^10^11^12^13^14^^^"; - var telecom = Hl7v2Based.parse(xtn, Telecom.class); + var telecom = Telecom.parse(xtn); assertEquals("^2^3^4^5^6^7^8^^^^12", Hl7v2Based.render(telecom)); assertEquals("1^2^3^4^5^6^7^8^9^10^11^12^13^14", Hl7v2Based.rawRender(telecom)); } @@ -71,7 +71,7 @@ public void testTelecomRendering() { @Test public void testIdentifiableRendering() { var cx = "1^2^3^41&42&43&44&45&46^51&52^6^^&&^^"; - var identifiable = Hl7v2Based.parse(cx, Identifiable.class); + var identifiable = Identifiable.parse(cx); assertEquals("1^^^&42&43", Hl7v2Based.render(identifiable)); assertEquals("1^2^3^41&42&43&44&45&46^51&52^6", Hl7v2Based.rawRender(identifiable)); } @@ -80,10 +80,10 @@ public void testIdentifiableRendering() { public void testReferenceIdRendering() { try { var cx1 = "1^2^3^41&42&43&44&45&46^51&52^^^&&^^"; - var referenceId1 = Hl7v2Based.parse(cx1, ReferenceId.class); + var referenceId1 = ReferenceId.parse(cx1); assertEquals("1^^^41&42&43^51", Hl7v2Based.render(referenceId1)); var cx2 = "1^2^3^41&42&43&44&45&46^51&52^&1.2.40.0.34.3.1.2.99.1000001&ISO^2015^&&^^"; - var referenceId2 = Hl7v2Based.parse(cx2, ReferenceId.class); + var referenceId2 = ReferenceId.parse(cx2); String cx2Rendered = Hl7v2Based.render(referenceId2); // some other tests classes may have already initialized the Hl7Rendering static rules based on non-existing // 'XDS_VALIDATION_CP_1292' property therefore this 'or' check @@ -100,10 +100,10 @@ public void testReferenceIdRendering() { @Test public void testEmptyAssignignAuthority() { var cx = "1^^^ABCD^^^^"; - var identifiable = Hl7v2Based.parse(cx, Identifiable.class); + var identifiable = Identifiable.parse(cx); assertNotNull(identifiable); assertNull(identifiable.getAssigningAuthority()); - var referenceId = Hl7v2Based.parse(cx, ReferenceId.class); + var referenceId = ReferenceId.parse(cx); assertNotNull(referenceId); assertNotNull(referenceId.getAssigningAuthority()); } @@ -111,10 +111,10 @@ public void testEmptyAssignignAuthority() { @Test public void testNonEmptyAssignignAuthority() { var cx = "1^^^ABCD&1.2.3&ISO^^^"; - var identifiable = Hl7v2Based.parse(cx, Identifiable.class); + var identifiable = Identifiable.parse(cx); assertNotNull(identifiable); assertNotNull(identifiable.getAssigningAuthority()); - var referenceId = Hl7v2Based.parse(cx, ReferenceId.class); + var referenceId = Identifiable.parse(cx); assertNotNull(referenceId); assertNotNull(referenceId.getAssigningAuthority()); } diff --git a/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/iti18/Iti18AuditStrategyTest.java b/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/iti18/Iti18AuditStrategyTest.java index ae7d982182..da64c11ad4 100644 --- a/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/iti18/Iti18AuditStrategyTest.java +++ b/commons/ihe/xds/src/test/java/org/openehealth/ipf/commons/ihe/xds/iti18/Iti18AuditStrategyTest.java @@ -44,7 +44,7 @@ public void testClientSideForFindDocuments() { private void testRequest(boolean serverSide, StoredQuery query) { if (query instanceof PatientIdBasedStoredQuery patientQuery) { - patientQuery.setPatientId(Hl7v2Based.parse(AuditorTestBase.PATIENT_IDS[0], Identifiable.class)); + patientQuery.setPatientId(Identifiable.parse(AuditorTestBase.PATIENT_IDS[0])); } var strategy = new Iti18AuditStrategy(serverSide); var auditDataset = getXdsAuditDataset(strategy);