From 42a7d657e575729f6d9c2fd63da8e22bf76dd9b7 Mon Sep 17 00:00:00 2001 From: Gematik Date: Thu, 14 Nov 2024 15:25:51 +0100 Subject: [PATCH] Release-2.0.1 --- README.md | 14 ++ ReleaseNotes.md | 14 ++ pom.xml | 46 ++-- .../ihe/iti/rmd/_2017/ObjectFactory.java | 4 +- .../ihe/iti/xds_b/_2007/ObjectFactory.java | 18 +- ...videAndRegisterDocumentSetRequestType.java | 30 +-- .../_2007/RetrieveDocumentSetRequestType.java | 28 +-- .../RetrieveDocumentSetResponseType.java | 40 +-- .../xsd/lcm/_3/ApproveObjectsRequest.java | 8 +- .../xsd/lcm/_3/DeprecateObjectsRequest.java | 8 +- .../xsd/lcm/_3/ObjectFactory.java | 14 +- .../xsd/lcm/_3/RelocateObjectsRequest.java | 20 +- .../xsd/lcm/_3/RemoveObjectsRequest.java | 8 +- .../xsd/lcm/_3/SubmitObjectsRequest.java | 4 +- .../xsd/lcm/_3/UndeprecateObjectsRequest.java | 8 +- .../xsd/lcm/_3/UpdateObjectsRequest.java | 4 +- .../xsd/query/_3/AdhocQueryQueryType.java | 4 +- .../xsd/query/_3/AdhocQueryRequest.java | 12 +- .../xsd/query/_3/AdhocQueryResponse.java | 12 +- .../xsd/query/_3/AssociationQueryType.java | 12 +- .../xsd/query/_3/AuditableEventQueryType.java | 6 +- .../xsd/query/_3/ClassificationQueryType.java | 12 +- .../xsd/query/_3/DateTimeFilterType.java | 4 +- .../query/_3/ExternalIdentifierQueryType.java | 4 +- .../xsd/query/_3/IntegerFilterType.java | 4 +- .../xsd/query/_3/NotificationQueryType.java | 4 +- .../xsd/query/_3/ObjectFactory.java | 178 +++++++------- .../query/_3/QueryExpressionBranchType.java | 4 +- .../xsd/query/_3/RegistryObjectQueryType.java | 18 +- .../xsd/query/_3/RegistryQueryType.java | 4 +- .../xsd/query/_3/ServiceBindingQueryType.java | 2 +- .../xsd/query/_3/ServiceQueryType.java | 2 +- .../query/_3/SpecificationLinkQueryType.java | 4 +- .../xsd/rim/_3/AdhocQueryType.java | 4 +- .../xsd/rim/_3/AuditableEventType.java | 4 +- .../xsd/rim/_3/FederationType.java | 4 +- .../xsd/rim/_3/NotificationType.java | 4 +- .../xsd/rim/_3/ObjectFactory.java | 230 +++++++++--------- .../xsd/rim/_3/OrganizationType.java | 4 +- .../ebxml_regrep/xsd/rim/_3/PersonType.java | 10 +- .../xsd/rim/_3/QueryExpressionType.java | 2 +- .../xsd/rim/_3/RegistryObjectListType.java | 44 ++-- .../xsd/rim/_3/RegistryObjectType.java | 10 +- .../xsd/rim/_3/RegistryPackageType.java | 4 +- .../ebxml_regrep/xsd/rim/_3/RegistryType.java | 8 +- .../xsd/rim/_3/ServiceBindingType.java | 2 +- .../ebxml_regrep/xsd/rim/_3/ServiceType.java | 2 +- .../tc/ebxml_regrep/xsd/rim/_3/SlotType1.java | 4 +- .../xsd/rim/_3/SpecificationLinkType.java | 4 +- .../xsd/rim/_3/SubscriptionType.java | 16 +- .../ebxml_regrep/xsd/rs/_3/ObjectFactory.java | 14 +- .../xsd/rs/_3/RegistryRequestType.java | 4 +- .../xsd/rs/_3/RegistryResponseType.java | 4 +- .../java/de/gematik/epa/LibIheXdsMain.java | 51 ++-- .../epa/conversion/AdhocQueryUtils.java | 56 +++-- .../conversion/ProvideAndRegisterUtils.java | 42 ++-- .../gematik/epa/conversion/ResponseUtils.java | 1 + .../RestrictedUpdateDocumentUtils.java | 84 +++++++ .../conversion/RetrieveDocumentsUtils.java | 3 +- .../internal/AssociationGenerator.java | 51 ++-- .../internal/requests/DocumentGenerator.java | 45 ++-- .../requests/ExtrinsicObjectGenerator.java | 26 +- .../requests/RegistryPackageGenerator.java | 21 +- .../requests/factories/slot/SlotName.java | 5 +- .../document/RestrictedUpdateDocument.java | 29 +++ .../de/gematik/epa/ihe/model/query/Query.java | 20 +- .../gematik/epa/ihe/model/query/QueryKey.java | 4 +- .../model/request/DocumentReplaceRequest.java | 4 +- .../request/DocumentSubmissionRequest.java | 6 +- .../epa/ihe/model/request/FindRequest.java | 4 +- .../RestrictedUpdateDocumentRequest.java | 58 +++++ .../request/RetrieveDocumentsRequest.java | 2 +- .../request/SubmissionRequestInterface.java | 4 +- .../response/RetrieveDocumentElement.java | 7 +- .../AbstractRegistryObjectTest.java | 14 +- .../epa/conversion/AdhocQueryUtilsTest.java | 105 +++++++- ...egisterUtilsCreateExtrinsicObjectTest.java | 4 +- ...ovideAndRegisterUtilsCreateFolderTest.java | 4 +- ...dRegisterUtilsCreateSubmissionSetTest.java | 2 - .../ProvideAndRegisterUtilsTest.java | 12 +- .../epa/conversion/ResponseUtilsTest.java | 9 + .../RestrictedUpdateDocumentUtilsTest.java | 51 ++++ .../RetrieveDocumentsUtilsTest.java | 21 +- .../internal/AssociationGeneratorTest.java | 27 +- .../internal/enumerated/QueryTest.java | 55 ++++- .../requests/DocumentGeneratorTest.java | 52 ++-- .../RestrictedUpdateDocumentTest.java | 64 +++++ .../RestrictedUpdateDocumentRequestTest.java | 63 +++++ .../util/ExternalIdentifierTestUtils.java | 2 +- .../gematik/epa/unit/util/MessageUtils.java | 65 +++-- .../epa/unit/util/MetadataTestUtils.java | 134 ++++++++++ .../gematik/epa/unit/util/ResourceLoader.java | 46 ++-- .../resources/documentReplaceRequest.json | 10 +- .../resources/documentSubmissionRequest.json | 10 +- ...entSubmissionRequestWithoutAttributes.json | 10 +- .../resources/retrieveDocumentsRequest.json | 2 +- .../resources/updateDocumentListRequest.json | 109 +++++++++ src/test/resources/updateDocumentRequest.json | 68 ++++++ 98 files changed, 1625 insertions(+), 769 deletions(-) create mode 100644 src/main/java/de/gematik/epa/conversion/RestrictedUpdateDocumentUtils.java create mode 100644 src/main/java/de/gematik/epa/ihe/model/document/RestrictedUpdateDocument.java create mode 100644 src/main/java/de/gematik/epa/ihe/model/request/RestrictedUpdateDocumentRequest.java create mode 100644 src/test/java/de/gematik/epa/conversion/RestrictedUpdateDocumentUtilsTest.java create mode 100644 src/test/java/de/gematik/epa/ihe/model/document/RestrictedUpdateDocumentTest.java create mode 100644 src/test/java/de/gematik/epa/ihe/model/request/RestrictedUpdateDocumentRequestTest.java create mode 100644 src/test/java/de/gematik/epa/unit/util/MetadataTestUtils.java create mode 100644 src/test/resources/updateDocumentListRequest.json create mode 100644 src/test/resources/updateDocumentRequest.json diff --git a/README.md b/README.md index ccf38c3..c70976e 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,20 @@ IHE profiles for exchange of medical documents are used in more and more projects worldwide. They represent a modern, international basis for the electronic exchange of medical data in the healthcare sector. As the profiles are quite complex and the objects are difficult to understand, we provide a library that converts human-readable Document-Request and Responses to IHE conform Objects. Hereby, the mapping contains no validation, it maps exactly what is given. +It supports the following IHE operations: +- Provide and Register Document Set-b [ITI-41] +- Registry Stored Query [ITI-18] with the following query names: + - FindDocuments + - FindDocumentsByTitle + - FindDocumentsByComment + - FindDocumentsByReferenceId + - FindFolders + - GetAll + - GetFolderAndContents +- Retrieve Document Set [ITI-43] +- Remove Metadata [ITI-62] +- Restricted Update Document Set (ITI-92) + ### Release Notes The Release-Notes can be found in the file [ReleaseNotes.md](./ReleaseNotes.md) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 3ceb145..1b7314e 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -2,6 +2,20 @@ # Release notes lib-ihe-xds +## Release 2.0.0 + +### added +- Adapted implementation to comply with EPA 3 specification +- The datatype RecordIdentifier was replaced with InsurantId +- Update some classes ExtrinsicObjectGenerator, AssociationGenerator, etc. +- Update some test classes +- Added support for new operation RestrictedUpdateDocumentRequest +- Added Support IHE Query FindDocumentxByComment +- Added Support RestrictedUpdateDocuementSet +- Added Support for FindDocumentByReferenceId query +- Added Support for FindDocumentsByComment query + + ## Release 1.0.5 ### fixed diff --git a/pom.xml b/pom.xml index 5fcff98..bbfbf59 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.gematik.epa lib-ihe-xds jar - 1.0.8 + 2.0.1 lib-ihe-xds A lib to create and process IHE requests from/to more descriptive Java records https://github.com/gematik/lib-ihe-xds @@ -27,23 +27,23 @@ java ${generated.sources.path}/*,${generated.sources.path}/**/* - 9.3 - 0.8.8 - 5.9.0 - 1.9.0 - 6.46.0 + 9.7.1 + 0.8.12 + 7.7.0 + 5.11.3 + 1.11.3 - 3.8.1 - 2.19 - 3.21.0 - 3.0.0-M7 - 3.0.0 - 3.4.0 - 3.2.1 - 3.4.1 - 4.0.0 + 3.13.0 + 2.25 + 3.26.0 + 3.5.2 + 3.5.0 + 3.6.0 + 3.3.1 + 3.11.1 + 4.0.2 2.3.1 - 2.15.2 + 2.18.1 @@ -51,7 +51,7 @@ jakarta.xml.bind jakarta.xml.bind-api - 4.0.0 + 4.0.2 org.apache.cxf.xjc-utils @@ -66,7 +66,7 @@ commons-io commons-io - 2.11.0 + 2.17.0 org.junit.jupiter @@ -101,7 +101,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.34 provided @@ -112,7 +112,7 @@ org.apache.commons commons-text - 1.10.0 + 1.12.0 @@ -354,7 +354,7 @@ cxf-xjc-plugin ${cxf-xjc.version} - -Djavax.xml.accessExternalDTD=file + -Djavax.xml.accessExternalDTD=file -Duser.language=en org.apache.cxf.xjcplugins:cxf-xjc-ts:${cxf-xjc.version} org.jvnet.jaxb2_commons:jaxb2-fluent-api:3.0 @@ -397,7 +397,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.2.7 sign-artifacts @@ -418,7 +418,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + 1.7.0 true ossrh diff --git a/src/main/generated-java/ihe/iti/rmd/_2017/ObjectFactory.java b/src/main/generated-java/ihe/iti/rmd/_2017/ObjectFactory.java index 6bde684..c44c02f 100644 --- a/src/main/generated-java/ihe/iti/rmd/_2017/ObjectFactory.java +++ b/src/main/generated-java/ihe/iti/rmd/_2017/ObjectFactory.java @@ -58,12 +58,12 @@ public ObjectFactory() { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RetrieveDocumentSetRequestType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ihe.iti.xds_b._2007.RetrieveDocumentSetRequestType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link RetrieveDocumentSetRequestType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ihe.iti.xds_b._2007.RetrieveDocumentSetRequestType }{@code >} */ @XmlElementDecl(namespace = "urn:ihe:iti:rmd:2017", name = "RemoveDocumentsRequest") public JAXBElement createRemoveDocumentsRequest(RetrieveDocumentSetRequestType value) { diff --git a/src/main/generated-java/ihe/iti/xds_b/_2007/ObjectFactory.java b/src/main/generated-java/ihe/iti/xds_b/_2007/ObjectFactory.java index 8d69130..4664d7a 100644 --- a/src/main/generated-java/ihe/iti/xds_b/_2007/ObjectFactory.java +++ b/src/main/generated-java/ihe/iti/xds_b/_2007/ObjectFactory.java @@ -83,7 +83,7 @@ public RetrieveDocumentSetRequestType createRetrieveDocumentSetRequestType() { } /** - * Create an instance of {@link ProvideAndRegisterDocumentSetRequestType.Document } + * Create an instance of {@link ihe.iti.xds_b._2007.ProvideAndRegisterDocumentSetRequestType.Document } * */ public ProvideAndRegisterDocumentSetRequestType.Document createProvideAndRegisterDocumentSetRequestTypeDocument() { @@ -91,7 +91,7 @@ public ProvideAndRegisterDocumentSetRequestType.Document createProvideAndRegiste } /** - * Create an instance of {@link RetrieveDocumentSetResponseType.DocumentResponse } + * Create an instance of {@link ihe.iti.xds_b._2007.RetrieveDocumentSetResponseType.DocumentResponse } * */ public RetrieveDocumentSetResponseType.DocumentResponse createRetrieveDocumentSetResponseTypeDocumentResponse() { @@ -99,7 +99,7 @@ public RetrieveDocumentSetResponseType.DocumentResponse createRetrieveDocumentSe } /** - * Create an instance of {@link RetrieveDocumentSetRequestType.DocumentRequest } + * Create an instance of {@link ihe.iti.xds_b._2007.RetrieveDocumentSetRequestType.DocumentRequest } * */ public RetrieveDocumentSetRequestType.DocumentRequest createRetrieveDocumentSetRequestTypeDocumentRequest() { @@ -107,12 +107,12 @@ public RetrieveDocumentSetRequestType.DocumentRequest createRetrieveDocumentSetR } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RetrieveDocumentSetRequestType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link RetrieveDocumentSetRequestType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link RetrieveDocumentSetRequestType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link RetrieveDocumentSetRequestType }{@code >} */ @XmlElementDecl(namespace = "urn:ihe:iti:xds-b:2007", name = "RetrieveDocumentSetRequest") public JAXBElement createRetrieveDocumentSetRequest(RetrieveDocumentSetRequestType value) { @@ -120,12 +120,12 @@ public JAXBElement createRetrieveDocumentSetRequ } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RetrieveDocumentSetResponseType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link RetrieveDocumentSetResponseType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link RetrieveDocumentSetResponseType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link RetrieveDocumentSetResponseType }{@code >} */ @XmlElementDecl(namespace = "urn:ihe:iti:xds-b:2007", name = "RetrieveDocumentSetResponse") public JAXBElement createRetrieveDocumentSetResponse(RetrieveDocumentSetResponseType value) { @@ -133,12 +133,12 @@ public JAXBElement createRetrieveDocumentSetRes } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ProvideAndRegisterDocumentSetRequestType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ProvideAndRegisterDocumentSetRequestType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ProvideAndRegisterDocumentSetRequestType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ProvideAndRegisterDocumentSetRequestType }{@code >} */ @XmlElementDecl(namespace = "urn:ihe:iti:xds-b:2007", name = "ProvideAndRegisterDocumentSetRequest") public JAXBElement createProvideAndRegisterDocumentSetRequest(ProvideAndRegisterDocumentSetRequestType value) { diff --git a/src/main/generated-java/ihe/iti/xds_b/_2007/ProvideAndRegisterDocumentSetRequestType.java b/src/main/generated-java/ihe/iti/xds_b/_2007/ProvideAndRegisterDocumentSetRequestType.java index ede9c11..028d941 100644 --- a/src/main/generated-java/ihe/iti/xds_b/_2007/ProvideAndRegisterDocumentSetRequestType.java +++ b/src/main/generated-java/ihe/iti/xds_b/_2007/ProvideAndRegisterDocumentSetRequestType.java @@ -80,14 +80,14 @@ public class ProvideAndRegisterDocumentSetRequestType { @XmlElement(name = "SubmitObjectsRequest", namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:lcm:3.0", required = true) protected SubmitObjectsRequest submitObjectsRequest; @XmlElement(name = "Document") - protected List document; + protected List document; /** * Gets the value of the submitObjectsRequest property. * * @return * possible object is - * {@link SubmitObjectsRequest } + * {@link oasis.names.tc.ebxml_regrep.xsd.lcm._3.SubmitObjectsRequest } * */ public SubmitObjectsRequest getSubmitObjectsRequest() { @@ -99,7 +99,7 @@ public SubmitObjectsRequest getSubmitObjectsRequest() { * * @param value * allowed object is - * {@link SubmitObjectsRequest } + * {@link oasis.names.tc.ebxml_regrep.xsd.lcm._3.SubmitObjectsRequest } * */ public void setSubmitObjectsRequest(SubmitObjectsRequest value) { @@ -124,13 +124,13 @@ public void setSubmitObjectsRequest(SubmitObjectsRequest value) { * *

* Objects of the following type(s) are allowed in the list - * {@link ProvideAndRegisterDocumentSetRequestType.Document } + * {@link ihe.iti.xds_b._2007.ProvideAndRegisterDocumentSetRequestType.Document } * * */ - public List getDocument() { + public List getDocument() { if (document == null) { - document = new ArrayList(); + document = new ArrayList(); } return this.document; } @@ -140,16 +140,16 @@ public ProvideAndRegisterDocumentSetRequestType withSubmitObjectsRequest(SubmitO return this; } - public ProvideAndRegisterDocumentSetRequestType withDocument(ProvideAndRegisterDocumentSetRequestType.Document... values) { + public ProvideAndRegisterDocumentSetRequestType withDocument(Document... values) { if (values!= null) { - for (ProvideAndRegisterDocumentSetRequestType.Document value: values) { + for (Document value: values) { getDocument().add(value); } } return this; } - public ProvideAndRegisterDocumentSetRequestType withDocument(Collection values) { + public ProvideAndRegisterDocumentSetRequestType withDocument(Collection values) { if (values!= null) { getDocument().addAll(values); } @@ -185,9 +185,9 @@ public boolean equals(Object object) { } } { - List leftDocument; + List leftDocument; leftDocument = (((this.document!= null)&&(!this.document.isEmpty()))?this.getDocument():null); - List rightDocument; + List rightDocument; rightDocument = (((that.document!= null)&&(!that.document.isEmpty()))?that.getDocument():null); if ((this.document!= null)&&(!this.document.isEmpty())) { if ((that.document!= null)&&(!that.document.isEmpty())) { @@ -219,7 +219,7 @@ public int hashCode() { } { currentHashCode = (currentHashCode* 31); - List theDocument; + List theDocument; theDocument = (((this.document!= null)&&(!this.document.isEmpty()))?this.getDocument():null); if ((this.document!= null)&&(!this.document.isEmpty())) { currentHashCode += theDocument.hashCode(); @@ -314,12 +314,12 @@ public void setId(String value) { this.id = value; } - public ProvideAndRegisterDocumentSetRequestType.Document withValue(byte[] value) { + public Document withValue(byte[] value) { setValue(value); return this; } - public ProvideAndRegisterDocumentSetRequestType.Document withId(String value) { + public Document withId(String value) { setId(value); return this; } @@ -332,7 +332,7 @@ public boolean equals(Object object) { if (this == object) { return true; } - final ProvideAndRegisterDocumentSetRequestType.Document that = ((ProvideAndRegisterDocumentSetRequestType.Document) object); + final Document that = ((Document) object); { byte[] leftValue; leftValue = this.getValue(); diff --git a/src/main/generated-java/ihe/iti/xds_b/_2007/RetrieveDocumentSetRequestType.java b/src/main/generated-java/ihe/iti/xds_b/_2007/RetrieveDocumentSetRequestType.java index a4264b5..bed32df 100644 --- a/src/main/generated-java/ihe/iti/xds_b/_2007/RetrieveDocumentSetRequestType.java +++ b/src/main/generated-java/ihe/iti/xds_b/_2007/RetrieveDocumentSetRequestType.java @@ -73,7 +73,7 @@ public class RetrieveDocumentSetRequestType { @XmlElement(name = "DocumentRequest", required = true) - protected List documentRequest; + protected List documentRequest; /** * Gets the value of the documentRequest property. @@ -93,27 +93,27 @@ public class RetrieveDocumentSetRequestType { * *

* Objects of the following type(s) are allowed in the list - * {@link RetrieveDocumentSetRequestType.DocumentRequest } + * {@link ihe.iti.xds_b._2007.RetrieveDocumentSetRequestType.DocumentRequest } * * */ - public List getDocumentRequest() { + public List getDocumentRequest() { if (documentRequest == null) { - documentRequest = new ArrayList(); + documentRequest = new ArrayList(); } return this.documentRequest; } - public RetrieveDocumentSetRequestType withDocumentRequest(RetrieveDocumentSetRequestType.DocumentRequest... values) { + public RetrieveDocumentSetRequestType withDocumentRequest(DocumentRequest... values) { if (values!= null) { - for (RetrieveDocumentSetRequestType.DocumentRequest value: values) { + for (DocumentRequest value: values) { getDocumentRequest().add(value); } } return this; } - public RetrieveDocumentSetRequestType withDocumentRequest(Collection values) { + public RetrieveDocumentSetRequestType withDocumentRequest(Collection values) { if (values!= null) { getDocumentRequest().addAll(values); } @@ -130,9 +130,9 @@ public boolean equals(Object object) { } final RetrieveDocumentSetRequestType that = ((RetrieveDocumentSetRequestType) object); { - List leftDocumentRequest; + List leftDocumentRequest; leftDocumentRequest = (((this.documentRequest!= null)&&(!this.documentRequest.isEmpty()))?this.getDocumentRequest():null); - List rightDocumentRequest; + List rightDocumentRequest; rightDocumentRequest = (((that.documentRequest!= null)&&(!that.documentRequest.isEmpty()))?that.getDocumentRequest():null); if ((this.documentRequest!= null)&&(!this.documentRequest.isEmpty())) { if ((that.documentRequest!= null)&&(!that.documentRequest.isEmpty())) { @@ -156,7 +156,7 @@ public int hashCode() { int currentHashCode = 1; { currentHashCode = (currentHashCode* 31); - List theDocumentRequest; + List theDocumentRequest; theDocumentRequest = (((this.documentRequest!= null)&&(!this.documentRequest.isEmpty()))?this.getDocumentRequest():null); if ((this.documentRequest!= null)&&(!this.documentRequest.isEmpty())) { currentHashCode += theDocumentRequest.hashCode(); @@ -284,17 +284,17 @@ public void setDocumentUniqueId(String value) { this.documentUniqueId = value; } - public RetrieveDocumentSetRequestType.DocumentRequest withHomeCommunityId(String value) { + public DocumentRequest withHomeCommunityId(String value) { setHomeCommunityId(value); return this; } - public RetrieveDocumentSetRequestType.DocumentRequest withRepositoryUniqueId(String value) { + public DocumentRequest withRepositoryUniqueId(String value) { setRepositoryUniqueId(value); return this; } - public RetrieveDocumentSetRequestType.DocumentRequest withDocumentUniqueId(String value) { + public DocumentRequest withDocumentUniqueId(String value) { setDocumentUniqueId(value); return this; } @@ -307,7 +307,7 @@ public boolean equals(Object object) { if (this == object) { return true; } - final RetrieveDocumentSetRequestType.DocumentRequest that = ((RetrieveDocumentSetRequestType.DocumentRequest) object); + final DocumentRequest that = ((DocumentRequest) object); { String leftHomeCommunityId; leftHomeCommunityId = this.getHomeCommunityId(); diff --git a/src/main/generated-java/ihe/iti/xds_b/_2007/RetrieveDocumentSetResponseType.java b/src/main/generated-java/ihe/iti/xds_b/_2007/RetrieveDocumentSetResponseType.java index dccc94e..ccbebb1 100644 --- a/src/main/generated-java/ihe/iti/xds_b/_2007/RetrieveDocumentSetResponseType.java +++ b/src/main/generated-java/ihe/iti/xds_b/_2007/RetrieveDocumentSetResponseType.java @@ -85,14 +85,14 @@ public class RetrieveDocumentSetResponseType { @XmlElement(name = "RegistryResponse", namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rs:3.0", required = true) protected RegistryResponseType registryResponse; @XmlElement(name = "DocumentResponse") - protected List documentResponse; + protected List documentResponse; /** * Gets the value of the registryResponse property. * * @return * possible object is - * {@link RegistryResponseType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rs._3.RegistryResponseType } * */ public RegistryResponseType getRegistryResponse() { @@ -104,7 +104,7 @@ public RegistryResponseType getRegistryResponse() { * * @param value * allowed object is - * {@link RegistryResponseType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rs._3.RegistryResponseType } * */ public void setRegistryResponse(RegistryResponseType value) { @@ -129,13 +129,13 @@ public void setRegistryResponse(RegistryResponseType value) { * *

* Objects of the following type(s) are allowed in the list - * {@link RetrieveDocumentSetResponseType.DocumentResponse } + * {@link ihe.iti.xds_b._2007.RetrieveDocumentSetResponseType.DocumentResponse } * * */ - public List getDocumentResponse() { + public List getDocumentResponse() { if (documentResponse == null) { - documentResponse = new ArrayList(); + documentResponse = new ArrayList(); } return this.documentResponse; } @@ -145,16 +145,16 @@ public RetrieveDocumentSetResponseType withRegistryResponse(RegistryResponseType return this; } - public RetrieveDocumentSetResponseType withDocumentResponse(RetrieveDocumentSetResponseType.DocumentResponse... values) { + public RetrieveDocumentSetResponseType withDocumentResponse(DocumentResponse... values) { if (values!= null) { - for (RetrieveDocumentSetResponseType.DocumentResponse value: values) { + for (DocumentResponse value: values) { getDocumentResponse().add(value); } } return this; } - public RetrieveDocumentSetResponseType withDocumentResponse(Collection values) { + public RetrieveDocumentSetResponseType withDocumentResponse(Collection values) { if (values!= null) { getDocumentResponse().addAll(values); } @@ -190,9 +190,9 @@ public boolean equals(Object object) { } } { - List leftDocumentResponse; + List leftDocumentResponse; leftDocumentResponse = (((this.documentResponse!= null)&&(!this.documentResponse.isEmpty()))?this.getDocumentResponse():null); - List rightDocumentResponse; + List rightDocumentResponse; rightDocumentResponse = (((that.documentResponse!= null)&&(!that.documentResponse.isEmpty()))?that.getDocumentResponse():null); if ((this.documentResponse!= null)&&(!this.documentResponse.isEmpty())) { if ((that.documentResponse!= null)&&(!that.documentResponse.isEmpty())) { @@ -224,7 +224,7 @@ public int hashCode() { } { currentHashCode = (currentHashCode* 31); - List theDocumentResponse; + List theDocumentResponse; theDocumentResponse = (((this.documentResponse!= null)&&(!this.documentResponse.isEmpty()))?this.getDocumentResponse():null); if ((this.documentResponse!= null)&&(!this.documentResponse.isEmpty())) { currentHashCode += theDocumentResponse.hashCode(); @@ -462,37 +462,37 @@ public void setDocument(byte[] value) { this.document = value; } - public RetrieveDocumentSetResponseType.DocumentResponse withHomeCommunityId(String value) { + public DocumentResponse withHomeCommunityId(String value) { setHomeCommunityId(value); return this; } - public RetrieveDocumentSetResponseType.DocumentResponse withRepositoryUniqueId(String value) { + public DocumentResponse withRepositoryUniqueId(String value) { setRepositoryUniqueId(value); return this; } - public RetrieveDocumentSetResponseType.DocumentResponse withDocumentUniqueId(String value) { + public DocumentResponse withDocumentUniqueId(String value) { setDocumentUniqueId(value); return this; } - public RetrieveDocumentSetResponseType.DocumentResponse withNewRepositoryUniqueId(String value) { + public DocumentResponse withNewRepositoryUniqueId(String value) { setNewRepositoryUniqueId(value); return this; } - public RetrieveDocumentSetResponseType.DocumentResponse withNewDocumentUniqueId(String value) { + public DocumentResponse withNewDocumentUniqueId(String value) { setNewDocumentUniqueId(value); return this; } - public RetrieveDocumentSetResponseType.DocumentResponse withMimeType(String value) { + public DocumentResponse withMimeType(String value) { setMimeType(value); return this; } - public RetrieveDocumentSetResponseType.DocumentResponse withDocument(byte[] value) { + public DocumentResponse withDocument(byte[] value) { setDocument(value); return this; } @@ -505,7 +505,7 @@ public boolean equals(Object object) { if (this == object) { return true; } - final RetrieveDocumentSetResponseType.DocumentResponse that = ((RetrieveDocumentSetResponseType.DocumentResponse) object); + final DocumentResponse that = ((DocumentResponse) object); { String leftHomeCommunityId; leftHomeCommunityId = this.getHomeCommunityId(); diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/ApproveObjectsRequest.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/ApproveObjectsRequest.java index 8ff96d4..001b364 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/ApproveObjectsRequest.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/ApproveObjectsRequest.java @@ -77,7 +77,7 @@ public class ApproveObjectsRequest * * @return * possible object is - * {@link AdhocQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AdhocQueryType } * */ public AdhocQueryType getAdhocQuery() { @@ -89,7 +89,7 @@ public AdhocQueryType getAdhocQuery() { * * @param value * allowed object is - * {@link AdhocQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AdhocQueryType } * */ public void setAdhocQuery(AdhocQueryType value) { @@ -101,7 +101,7 @@ public void setAdhocQuery(AdhocQueryType value) { * * @return * possible object is - * {@link ObjectRefListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefListType } * */ public ObjectRefListType getObjectRefList() { @@ -113,7 +113,7 @@ public ObjectRefListType getObjectRefList() { * * @param value * allowed object is - * {@link ObjectRefListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefListType } * */ public void setObjectRefList(ObjectRefListType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/DeprecateObjectsRequest.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/DeprecateObjectsRequest.java index 04a3ca2..25b2159 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/DeprecateObjectsRequest.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/DeprecateObjectsRequest.java @@ -77,7 +77,7 @@ public class DeprecateObjectsRequest * * @return * possible object is - * {@link AdhocQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AdhocQueryType } * */ public AdhocQueryType getAdhocQuery() { @@ -89,7 +89,7 @@ public AdhocQueryType getAdhocQuery() { * * @param value * allowed object is - * {@link AdhocQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AdhocQueryType } * */ public void setAdhocQuery(AdhocQueryType value) { @@ -101,7 +101,7 @@ public void setAdhocQuery(AdhocQueryType value) { * * @return * possible object is - * {@link ObjectRefListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefListType } * */ public ObjectRefListType getObjectRefList() { @@ -113,7 +113,7 @@ public ObjectRefListType getObjectRefList() { * * @param value * allowed object is - * {@link ObjectRefListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefListType } * */ public void setObjectRefList(ObjectRefListType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/ObjectFactory.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/ObjectFactory.java index d429d36..9ef09ad 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/ObjectFactory.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/ObjectFactory.java @@ -61,7 +61,7 @@ public SubmitObjectsRequest createSubmitObjectsRequest() { } /** - * Create an instance of {@link UpdateObjectsRequest } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.lcm._3.UpdateObjectsRequest } * */ public UpdateObjectsRequest createUpdateObjectsRequest() { @@ -69,7 +69,7 @@ public UpdateObjectsRequest createUpdateObjectsRequest() { } /** - * Create an instance of {@link ApproveObjectsRequest } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.lcm._3.ApproveObjectsRequest } * */ public ApproveObjectsRequest createApproveObjectsRequest() { @@ -77,7 +77,7 @@ public ApproveObjectsRequest createApproveObjectsRequest() { } /** - * Create an instance of {@link DeprecateObjectsRequest } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.lcm._3.DeprecateObjectsRequest } * */ public DeprecateObjectsRequest createDeprecateObjectsRequest() { @@ -85,7 +85,7 @@ public DeprecateObjectsRequest createDeprecateObjectsRequest() { } /** - * Create an instance of {@link UndeprecateObjectsRequest } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.lcm._3.UndeprecateObjectsRequest } * */ public UndeprecateObjectsRequest createUndeprecateObjectsRequest() { @@ -93,7 +93,7 @@ public UndeprecateObjectsRequest createUndeprecateObjectsRequest() { } /** - * Create an instance of {@link RemoveObjectsRequest } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.lcm._3.RemoveObjectsRequest } * */ public RemoveObjectsRequest createRemoveObjectsRequest() { @@ -101,7 +101,7 @@ public RemoveObjectsRequest createRemoveObjectsRequest() { } /** - * Create an instance of {@link RelocateObjectsRequest } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.lcm._3.RelocateObjectsRequest } * */ public RelocateObjectsRequest createRelocateObjectsRequest() { @@ -109,7 +109,7 @@ public RelocateObjectsRequest createRelocateObjectsRequest() { } /** - * Create an instance of {@link AcceptObjectsRequest } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.lcm._3.AcceptObjectsRequest } * */ public AcceptObjectsRequest createAcceptObjectsRequest() { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/RelocateObjectsRequest.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/RelocateObjectsRequest.java index 2bdcf8a..23bb904 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/RelocateObjectsRequest.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/RelocateObjectsRequest.java @@ -89,7 +89,7 @@ public class RelocateObjectsRequest * * @return * possible object is - * {@link AdhocQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AdhocQueryType } * */ public AdhocQueryType getAdhocQuery() { @@ -101,7 +101,7 @@ public AdhocQueryType getAdhocQuery() { * * @param value * allowed object is - * {@link AdhocQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AdhocQueryType } * */ public void setAdhocQuery(AdhocQueryType value) { @@ -113,7 +113,7 @@ public void setAdhocQuery(AdhocQueryType value) { * * @return * possible object is - * {@link ObjectRefType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefType } * */ public ObjectRefType getSourceRegistry() { @@ -125,7 +125,7 @@ public ObjectRefType getSourceRegistry() { * * @param value * allowed object is - * {@link ObjectRefType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefType } * */ public void setSourceRegistry(ObjectRefType value) { @@ -137,7 +137,7 @@ public void setSourceRegistry(ObjectRefType value) { * * @return * possible object is - * {@link ObjectRefType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefType } * */ public ObjectRefType getDestinationRegistry() { @@ -149,7 +149,7 @@ public ObjectRefType getDestinationRegistry() { * * @param value * allowed object is - * {@link ObjectRefType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefType } * */ public void setDestinationRegistry(ObjectRefType value) { @@ -161,7 +161,7 @@ public void setDestinationRegistry(ObjectRefType value) { * * @return * possible object is - * {@link ObjectRefType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefType } * */ public ObjectRefType getOwnerAtSource() { @@ -173,7 +173,7 @@ public ObjectRefType getOwnerAtSource() { * * @param value * allowed object is - * {@link ObjectRefType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefType } * */ public void setOwnerAtSource(ObjectRefType value) { @@ -185,7 +185,7 @@ public void setOwnerAtSource(ObjectRefType value) { * * @return * possible object is - * {@link ObjectRefType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefType } * */ public ObjectRefType getOwnerAtDestination() { @@ -197,7 +197,7 @@ public ObjectRefType getOwnerAtDestination() { * * @param value * allowed object is - * {@link ObjectRefType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefType } * */ public void setOwnerAtDestination(ObjectRefType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/RemoveObjectsRequest.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/RemoveObjectsRequest.java index 086c447..a862927 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/RemoveObjectsRequest.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/RemoveObjectsRequest.java @@ -81,7 +81,7 @@ public class RemoveObjectsRequest * * @return * possible object is - * {@link AdhocQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AdhocQueryType } * */ public AdhocQueryType getAdhocQuery() { @@ -93,7 +93,7 @@ public AdhocQueryType getAdhocQuery() { * * @param value * allowed object is - * {@link AdhocQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AdhocQueryType } * */ public void setAdhocQuery(AdhocQueryType value) { @@ -105,7 +105,7 @@ public void setAdhocQuery(AdhocQueryType value) { * * @return * possible object is - * {@link ObjectRefListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefListType } * */ public ObjectRefListType getObjectRefList() { @@ -117,7 +117,7 @@ public ObjectRefListType getObjectRefList() { * * @param value * allowed object is - * {@link ObjectRefListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefListType } * */ public void setObjectRefList(ObjectRefListType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/SubmitObjectsRequest.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/SubmitObjectsRequest.java index b0d4984..e163cf8 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/SubmitObjectsRequest.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/SubmitObjectsRequest.java @@ -72,7 +72,7 @@ public class SubmitObjectsRequest * * @return * possible object is - * {@link RegistryObjectListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectListType } * */ public RegistryObjectListType getRegistryObjectList() { @@ -84,7 +84,7 @@ public RegistryObjectListType getRegistryObjectList() { * * @param value * allowed object is - * {@link RegistryObjectListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectListType } * */ public void setRegistryObjectList(RegistryObjectListType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/UndeprecateObjectsRequest.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/UndeprecateObjectsRequest.java index 4062b7e..c31b919 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/UndeprecateObjectsRequest.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/UndeprecateObjectsRequest.java @@ -77,7 +77,7 @@ public class UndeprecateObjectsRequest * * @return * possible object is - * {@link AdhocQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AdhocQueryType } * */ public AdhocQueryType getAdhocQuery() { @@ -89,7 +89,7 @@ public AdhocQueryType getAdhocQuery() { * * @param value * allowed object is - * {@link AdhocQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AdhocQueryType } * */ public void setAdhocQuery(AdhocQueryType value) { @@ -101,7 +101,7 @@ public void setAdhocQuery(AdhocQueryType value) { * * @return * possible object is - * {@link ObjectRefListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefListType } * */ public ObjectRefListType getObjectRefList() { @@ -113,7 +113,7 @@ public ObjectRefListType getObjectRefList() { * * @param value * allowed object is - * {@link ObjectRefListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefListType } * */ public void setObjectRefList(ObjectRefListType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/UpdateObjectsRequest.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/UpdateObjectsRequest.java index 3777bfa..f68f8e4 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/UpdateObjectsRequest.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/lcm/_3/UpdateObjectsRequest.java @@ -72,7 +72,7 @@ public class UpdateObjectsRequest * * @return * possible object is - * {@link RegistryObjectListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectListType } * */ public RegistryObjectListType getRegistryObjectList() { @@ -84,7 +84,7 @@ public RegistryObjectListType getRegistryObjectList() { * * @param value * allowed object is - * {@link RegistryObjectListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectListType } * */ public void setRegistryObjectList(RegistryObjectListType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AdhocQueryQueryType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AdhocQueryQueryType.java index 1e68c66..1506b0f 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AdhocQueryQueryType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AdhocQueryQueryType.java @@ -68,7 +68,7 @@ public class AdhocQueryQueryType * * @return * possible object is - * {@link QueryExpressionBranchType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.QueryExpressionBranchType } * */ public QueryExpressionBranchType getQueryExpressionBranch() { @@ -80,7 +80,7 @@ public QueryExpressionBranchType getQueryExpressionBranch() { * * @param value * allowed object is - * {@link QueryExpressionBranchType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.QueryExpressionBranchType } * */ public void setQueryExpressionBranch(QueryExpressionBranchType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AdhocQueryRequest.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AdhocQueryRequest.java index a3891ee..793a091 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AdhocQueryRequest.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AdhocQueryRequest.java @@ -116,7 +116,7 @@ public void setResponseOption(ResponseOptionType value) { * * @return * possible object is - * {@link AdhocQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AdhocQueryType } * */ public AdhocQueryType getAdhocQuery() { @@ -128,7 +128,7 @@ public AdhocQueryType getAdhocQuery() { * * @param value * allowed object is - * {@link AdhocQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AdhocQueryType } * */ public void setAdhocQuery(AdhocQueryType value) { @@ -192,7 +192,7 @@ public void setFederation(String value) { * * @return * possible object is - * {@link BigInteger } + * {@link java.math.BigInteger } * */ public BigInteger getStartIndex() { @@ -208,7 +208,7 @@ public BigInteger getStartIndex() { * * @param value * allowed object is - * {@link BigInteger } + * {@link java.math.BigInteger } * */ public void setStartIndex(BigInteger value) { @@ -220,7 +220,7 @@ public void setStartIndex(BigInteger value) { * * @return * possible object is - * {@link BigInteger } + * {@link java.math.BigInteger } * */ public BigInteger getMaxResults() { @@ -236,7 +236,7 @@ public BigInteger getMaxResults() { * * @param value * allowed object is - * {@link BigInteger } + * {@link java.math.BigInteger } * */ public void setMaxResults(BigInteger value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AdhocQueryResponse.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AdhocQueryResponse.java index efba9ed..97def61 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AdhocQueryResponse.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AdhocQueryResponse.java @@ -81,7 +81,7 @@ public class AdhocQueryResponse * * @return * possible object is - * {@link RegistryObjectListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectListType } * */ public RegistryObjectListType getRegistryObjectList() { @@ -93,7 +93,7 @@ public RegistryObjectListType getRegistryObjectList() { * * @param value * allowed object is - * {@link RegistryObjectListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectListType } * */ public void setRegistryObjectList(RegistryObjectListType value) { @@ -105,7 +105,7 @@ public void setRegistryObjectList(RegistryObjectListType value) { * * @return * possible object is - * {@link BigInteger } + * {@link java.math.BigInteger } * */ public BigInteger getStartIndex() { @@ -121,7 +121,7 @@ public BigInteger getStartIndex() { * * @param value * allowed object is - * {@link BigInteger } + * {@link java.math.BigInteger } * */ public void setStartIndex(BigInteger value) { @@ -133,7 +133,7 @@ public void setStartIndex(BigInteger value) { * * @return * possible object is - * {@link BigInteger } + * {@link java.math.BigInteger } * */ public BigInteger getTotalResultCount() { @@ -145,7 +145,7 @@ public BigInteger getTotalResultCount() { * * @param value * allowed object is - * {@link BigInteger } + * {@link java.math.BigInteger } * */ public void setTotalResultCount(BigInteger value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AssociationQueryType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AssociationQueryType.java index 7fb7d54..d490efa 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AssociationQueryType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AssociationQueryType.java @@ -76,7 +76,7 @@ public class AssociationQueryType * * @return * possible object is - * {@link ClassificationNodeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationNodeQueryType } * */ public ClassificationNodeQueryType getAssociationTypeQuery() { @@ -88,7 +88,7 @@ public ClassificationNodeQueryType getAssociationTypeQuery() { * * @param value * allowed object is - * {@link ClassificationNodeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationNodeQueryType } * */ public void setAssociationTypeQuery(ClassificationNodeQueryType value) { @@ -100,7 +100,7 @@ public void setAssociationTypeQuery(ClassificationNodeQueryType value) { * * @return * possible object is - * {@link RegistryObjectQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryObjectQueryType } * */ public RegistryObjectQueryType getSourceObjectQuery() { @@ -112,7 +112,7 @@ public RegistryObjectQueryType getSourceObjectQuery() { * * @param value * allowed object is - * {@link RegistryObjectQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryObjectQueryType } * */ public void setSourceObjectQuery(RegistryObjectQueryType value) { @@ -124,7 +124,7 @@ public void setSourceObjectQuery(RegistryObjectQueryType value) { * * @return * possible object is - * {@link RegistryObjectQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryObjectQueryType } * */ public RegistryObjectQueryType getTargetObjectQuery() { @@ -136,7 +136,7 @@ public RegistryObjectQueryType getTargetObjectQuery() { * * @param value * allowed object is - * {@link RegistryObjectQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryObjectQueryType } * */ public void setTargetObjectQuery(RegistryObjectQueryType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AuditableEventQueryType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AuditableEventQueryType.java index cc0f16e..abad835 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AuditableEventQueryType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/AuditableEventQueryType.java @@ -91,7 +91,7 @@ public class AuditableEventQueryType * *

* Objects of the following type(s) are allowed in the list - * {@link RegistryObjectQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryObjectQueryType } * * */ @@ -107,7 +107,7 @@ public List getAffectedObjectQuery() { * * @return * possible object is - * {@link ClassificationNodeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationNodeQueryType } * */ public ClassificationNodeQueryType getEventTypeQuery() { @@ -119,7 +119,7 @@ public ClassificationNodeQueryType getEventTypeQuery() { * * @param value * allowed object is - * {@link ClassificationNodeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationNodeQueryType } * */ public void setEventTypeQuery(ClassificationNodeQueryType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ClassificationQueryType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ClassificationQueryType.java index d5cd163..ec47199 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ClassificationQueryType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ClassificationQueryType.java @@ -76,7 +76,7 @@ public class ClassificationQueryType * * @return * possible object is - * {@link ClassificationSchemeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationSchemeQueryType } * */ public ClassificationSchemeQueryType getClassificationSchemeQuery() { @@ -88,7 +88,7 @@ public ClassificationSchemeQueryType getClassificationSchemeQuery() { * * @param value * allowed object is - * {@link ClassificationSchemeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationSchemeQueryType } * */ public void setClassificationSchemeQuery(ClassificationSchemeQueryType value) { @@ -100,7 +100,7 @@ public void setClassificationSchemeQuery(ClassificationSchemeQueryType value) { * * @return * possible object is - * {@link RegistryObjectQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryObjectQueryType } * */ public RegistryObjectQueryType getClassifiedObjectQuery() { @@ -112,7 +112,7 @@ public RegistryObjectQueryType getClassifiedObjectQuery() { * * @param value * allowed object is - * {@link RegistryObjectQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryObjectQueryType } * */ public void setClassifiedObjectQuery(RegistryObjectQueryType value) { @@ -124,7 +124,7 @@ public void setClassifiedObjectQuery(RegistryObjectQueryType value) { * * @return * possible object is - * {@link ClassificationNodeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationNodeQueryType } * */ public ClassificationNodeQueryType getClassificationNodeQuery() { @@ -136,7 +136,7 @@ public ClassificationNodeQueryType getClassificationNodeQuery() { * * @param value * allowed object is - * {@link ClassificationNodeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationNodeQueryType } * */ public void setClassificationNodeQuery(ClassificationNodeQueryType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/DateTimeFilterType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/DateTimeFilterType.java index a6f5487..b179d27 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/DateTimeFilterType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/DateTimeFilterType.java @@ -66,7 +66,7 @@ public class DateTimeFilterType * * @return * possible object is - * {@link XMLGregorianCalendar } + * {@link javax.xml.datatype.XMLGregorianCalendar } * */ public XMLGregorianCalendar getValue() { @@ -78,7 +78,7 @@ public XMLGregorianCalendar getValue() { * * @param value * allowed object is - * {@link XMLGregorianCalendar } + * {@link javax.xml.datatype.XMLGregorianCalendar } * */ public void setValue(XMLGregorianCalendar value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ExternalIdentifierQueryType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ExternalIdentifierQueryType.java index 4c2e5cb..b0382c5 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ExternalIdentifierQueryType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ExternalIdentifierQueryType.java @@ -96,7 +96,7 @@ public void setRegistryObjectQuery(RegistryObjectQueryType value) { * * @return * possible object is - * {@link ClassificationSchemeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationSchemeQueryType } * */ public ClassificationSchemeQueryType getIdentificationSchemeQuery() { @@ -108,7 +108,7 @@ public ClassificationSchemeQueryType getIdentificationSchemeQuery() { * * @param value * allowed object is - * {@link ClassificationSchemeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationSchemeQueryType } * */ public void setIdentificationSchemeQuery(ClassificationSchemeQueryType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/IntegerFilterType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/IntegerFilterType.java index 53ca165..debcb51 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/IntegerFilterType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/IntegerFilterType.java @@ -64,7 +64,7 @@ public class IntegerFilterType * * @return * possible object is - * {@link BigInteger } + * {@link java.math.BigInteger } * */ public BigInteger getValue() { @@ -76,7 +76,7 @@ public BigInteger getValue() { * * @param value * allowed object is - * {@link BigInteger } + * {@link java.math.BigInteger } * */ public void setValue(BigInteger value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/NotificationQueryType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/NotificationQueryType.java index 547b376..3d5be4b 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/NotificationQueryType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/NotificationQueryType.java @@ -68,7 +68,7 @@ public class NotificationQueryType * * @return * possible object is - * {@link RegistryObjectQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryObjectQueryType } * */ public RegistryObjectQueryType getRegistryObjectQuery() { @@ -80,7 +80,7 @@ public RegistryObjectQueryType getRegistryObjectQuery() { * * @param value * allowed object is - * {@link RegistryObjectQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryObjectQueryType } * */ public void setRegistryObjectQuery(RegistryObjectQueryType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ObjectFactory.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ObjectFactory.java index f9d1bd6..ec1132f 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ObjectFactory.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ObjectFactory.java @@ -101,7 +101,7 @@ public AdhocQueryRequest createAdhocQueryRequest() { } /** - * Create an instance of {@link AdhocQueryResponse } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.AdhocQueryResponse } * */ public AdhocQueryResponse createAdhocQueryResponse() { @@ -109,7 +109,7 @@ public AdhocQueryResponse createAdhocQueryResponse() { } /** - * Create an instance of {@link RegistryObjectQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryObjectQueryType } * */ public RegistryObjectQueryType createRegistryObjectQueryType() { @@ -117,7 +117,7 @@ public RegistryObjectQueryType createRegistryObjectQueryType() { } /** - * Create an instance of {@link AssociationQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.AssociationQueryType } * */ public AssociationQueryType createAssociationQueryType() { @@ -125,7 +125,7 @@ public AssociationQueryType createAssociationQueryType() { } /** - * Create an instance of {@link AuditableEventQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.AuditableEventQueryType } * */ public AuditableEventQueryType createAuditableEventQueryType() { @@ -133,7 +133,7 @@ public AuditableEventQueryType createAuditableEventQueryType() { } /** - * Create an instance of {@link ClassificationQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationQueryType } * */ public ClassificationQueryType createClassificationQueryType() { @@ -141,7 +141,7 @@ public ClassificationQueryType createClassificationQueryType() { } /** - * Create an instance of {@link ClassificationNodeQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationNodeQueryType } * */ public ClassificationNodeQueryType createClassificationNodeQueryType() { @@ -149,7 +149,7 @@ public ClassificationNodeQueryType createClassificationNodeQueryType() { } /** - * Create an instance of {@link ClassificationSchemeQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationSchemeQueryType } * */ public ClassificationSchemeQueryType createClassificationSchemeQueryType() { @@ -157,7 +157,7 @@ public ClassificationSchemeQueryType createClassificationSchemeQueryType() { } /** - * Create an instance of {@link ExternalIdentifierQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ExternalIdentifierQueryType } * */ public ExternalIdentifierQueryType createExternalIdentifierQueryType() { @@ -165,7 +165,7 @@ public ExternalIdentifierQueryType createExternalIdentifierQueryType() { } /** - * Create an instance of {@link ExternalLinkQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ExternalLinkQueryType } * */ public ExternalLinkQueryType createExternalLinkQueryType() { @@ -173,7 +173,7 @@ public ExternalLinkQueryType createExternalLinkQueryType() { } /** - * Create an instance of {@link ExtrinsicObjectQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ExtrinsicObjectQueryType } * */ public ExtrinsicObjectQueryType createExtrinsicObjectQueryType() { @@ -181,7 +181,7 @@ public ExtrinsicObjectQueryType createExtrinsicObjectQueryType() { } /** - * Create an instance of {@link OrganizationQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.OrganizationQueryType } * */ public OrganizationQueryType createOrganizationQueryType() { @@ -189,7 +189,7 @@ public OrganizationQueryType createOrganizationQueryType() { } /** - * Create an instance of {@link RegistryPackageQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryPackageQueryType } * */ public RegistryPackageQueryType createRegistryPackageQueryType() { @@ -197,7 +197,7 @@ public RegistryPackageQueryType createRegistryPackageQueryType() { } /** - * Create an instance of {@link ServiceQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ServiceQueryType } * */ public ServiceQueryType createServiceQueryType() { @@ -205,7 +205,7 @@ public ServiceQueryType createServiceQueryType() { } /** - * Create an instance of {@link ServiceBindingQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ServiceBindingQueryType } * */ public ServiceBindingQueryType createServiceBindingQueryType() { @@ -213,7 +213,7 @@ public ServiceBindingQueryType createServiceBindingQueryType() { } /** - * Create an instance of {@link SpecificationLinkQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.SpecificationLinkQueryType } * */ public SpecificationLinkQueryType createSpecificationLinkQueryType() { @@ -221,7 +221,7 @@ public SpecificationLinkQueryType createSpecificationLinkQueryType() { } /** - * Create an instance of {@link PersonQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.PersonQueryType } * */ public PersonQueryType createPersonQueryType() { @@ -229,7 +229,7 @@ public PersonQueryType createPersonQueryType() { } /** - * Create an instance of {@link UserQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.UserQueryType } * */ public UserQueryType createUserQueryType() { @@ -237,7 +237,7 @@ public UserQueryType createUserQueryType() { } /** - * Create an instance of {@link RegistryQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryQueryType } * */ public RegistryQueryType createRegistryQueryType() { @@ -245,7 +245,7 @@ public RegistryQueryType createRegistryQueryType() { } /** - * Create an instance of {@link FederationQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.FederationQueryType } * */ public FederationQueryType createFederationQueryType() { @@ -253,7 +253,7 @@ public FederationQueryType createFederationQueryType() { } /** - * Create an instance of {@link AdhocQueryQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.AdhocQueryQueryType } * */ public AdhocQueryQueryType createAdhocQueryQueryType() { @@ -261,7 +261,7 @@ public AdhocQueryQueryType createAdhocQueryQueryType() { } /** - * Create an instance of {@link NotificationQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.NotificationQueryType } * */ public NotificationQueryType createNotificationQueryType() { @@ -269,7 +269,7 @@ public NotificationQueryType createNotificationQueryType() { } /** - * Create an instance of {@link SubscriptionQueryType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.SubscriptionQueryType } * */ public SubscriptionQueryType createSubscriptionQueryType() { @@ -285,7 +285,7 @@ public FilterType createFilterType() { } /** - * Create an instance of {@link CompoundFilterType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.CompoundFilterType } * */ public CompoundFilterType createCompoundFilterType() { @@ -293,7 +293,7 @@ public CompoundFilterType createCompoundFilterType() { } /** - * Create an instance of {@link BooleanFilterType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.BooleanFilterType } * */ public BooleanFilterType createBooleanFilterType() { @@ -301,7 +301,7 @@ public BooleanFilterType createBooleanFilterType() { } /** - * Create an instance of {@link IntegerFilterType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.IntegerFilterType } * */ public IntegerFilterType createIntegerFilterType() { @@ -309,7 +309,7 @@ public IntegerFilterType createIntegerFilterType() { } /** - * Create an instance of {@link FloatFilterType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.FloatFilterType } * */ public FloatFilterType createFloatFilterType() { @@ -317,7 +317,7 @@ public FloatFilterType createFloatFilterType() { } /** - * Create an instance of {@link DateTimeFilterType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.DateTimeFilterType } * */ public DateTimeFilterType createDateTimeFilterType() { @@ -325,7 +325,7 @@ public DateTimeFilterType createDateTimeFilterType() { } /** - * Create an instance of {@link StringFilterType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.StringFilterType } * */ public StringFilterType createStringFilterType() { @@ -333,7 +333,7 @@ public StringFilterType createStringFilterType() { } /** - * Create an instance of {@link InternationalStringBranchType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.InternationalStringBranchType } * */ public InternationalStringBranchType createInternationalStringBranchType() { @@ -341,7 +341,7 @@ public InternationalStringBranchType createInternationalStringBranchType() { } /** - * Create an instance of {@link SlotBranchType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.SlotBranchType } * */ public SlotBranchType createSlotBranchType() { @@ -349,7 +349,7 @@ public SlotBranchType createSlotBranchType() { } /** - * Create an instance of {@link QueryExpressionBranchType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.query._3.QueryExpressionBranchType } * */ public QueryExpressionBranchType createQueryExpressionBranchType() { @@ -357,12 +357,12 @@ public QueryExpressionBranchType createQueryExpressionBranchType() { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ResponseOptionType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ResponseOptionType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ResponseOptionType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ResponseOptionType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "ResponseOption") public JAXBElement createResponseOption(ResponseOptionType value) { @@ -370,12 +370,12 @@ public JAXBElement createResponseOption(ResponseOptionType v } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RegistryObjectQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryObjectQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link RegistryObjectQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryObjectQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "RegistryObjectQuery") public JAXBElement createRegistryObjectQuery(RegistryObjectQueryType value) { @@ -383,12 +383,12 @@ public JAXBElement createRegistryObjectQuery(RegistryOb } /** - * Create an instance of {@link JAXBElement }{@code <}{@link AssociationQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.AssociationQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link AssociationQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.AssociationQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "AssociationQuery") public JAXBElement createAssociationQuery(AssociationQueryType value) { @@ -396,12 +396,12 @@ public JAXBElement createAssociationQuery(AssociationQuery } /** - * Create an instance of {@link JAXBElement }{@code <}{@link AuditableEventQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.AuditableEventQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link AuditableEventQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.AuditableEventQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "AuditableEventQuery") public JAXBElement createAuditableEventQuery(AuditableEventQueryType value) { @@ -409,12 +409,12 @@ public JAXBElement createAuditableEventQuery(AuditableE } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ClassificationQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ClassificationQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "ClassificationQuery") public JAXBElement createClassificationQuery(ClassificationQueryType value) { @@ -422,12 +422,12 @@ public JAXBElement createClassificationQuery(Classifica } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ClassificationNodeQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationNodeQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ClassificationNodeQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationNodeQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "ClassificationNodeQuery") public JAXBElement createClassificationNodeQuery(ClassificationNodeQueryType value) { @@ -435,12 +435,12 @@ public JAXBElement createClassificationNodeQuery(Cl } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ClassificationSchemeQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationSchemeQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ClassificationSchemeQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationSchemeQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "ClassificationSchemeQuery") public JAXBElement createClassificationSchemeQuery(ClassificationSchemeQueryType value) { @@ -448,12 +448,12 @@ public JAXBElement createClassificationSchemeQuer } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExternalIdentifierQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ExternalIdentifierQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ExternalIdentifierQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ExternalIdentifierQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "ExternalIdentifierQuery") public JAXBElement createExternalIdentifierQuery(ExternalIdentifierQueryType value) { @@ -461,12 +461,12 @@ public JAXBElement createExternalIdentifierQuery(Ex } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExternalLinkQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ExternalLinkQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ExternalLinkQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ExternalLinkQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "ExternalLinkQuery") public JAXBElement createExternalLinkQuery(ExternalLinkQueryType value) { @@ -474,12 +474,12 @@ public JAXBElement createExternalLinkQuery(ExternalLinkQu } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtrinsicObjectQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ExtrinsicObjectQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ExtrinsicObjectQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ExtrinsicObjectQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "ExtrinsicObjectQuery") public JAXBElement createExtrinsicObjectQuery(ExtrinsicObjectQueryType value) { @@ -487,12 +487,12 @@ public JAXBElement createExtrinsicObjectQuery(Extrinsi } /** - * Create an instance of {@link JAXBElement }{@code <}{@link OrganizationQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.OrganizationQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link OrganizationQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.OrganizationQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "OrganizationQuery") public JAXBElement createOrganizationQuery(OrganizationQueryType value) { @@ -500,12 +500,12 @@ public JAXBElement createOrganizationQuery(OrganizationQu } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RegistryPackageQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryPackageQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link RegistryPackageQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryPackageQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "RegistryPackageQuery") public JAXBElement createRegistryPackageQuery(RegistryPackageQueryType value) { @@ -513,12 +513,12 @@ public JAXBElement createRegistryPackageQuery(Registry } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ServiceQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ServiceQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ServiceQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ServiceQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "ServiceQuery") public JAXBElement createServiceQuery(ServiceQueryType value) { @@ -526,12 +526,12 @@ public JAXBElement createServiceQuery(ServiceQueryType value) } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ServiceBindingQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ServiceBindingQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ServiceBindingQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.ServiceBindingQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "ServiceBindingQuery") public JAXBElement createServiceBindingQuery(ServiceBindingQueryType value) { @@ -539,12 +539,12 @@ public JAXBElement createServiceBindingQuery(ServiceBin } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SpecificationLinkQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.SpecificationLinkQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link SpecificationLinkQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.SpecificationLinkQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "SpecificationLinkQuery") public JAXBElement createSpecificationLinkQuery(SpecificationLinkQueryType value) { @@ -552,12 +552,12 @@ public JAXBElement createSpecificationLinkQuery(Spec } /** - * Create an instance of {@link JAXBElement }{@code <}{@link PersonQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.PersonQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link PersonQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.PersonQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "PersonQuery") public JAXBElement createPersonQuery(PersonQueryType value) { @@ -565,12 +565,12 @@ public JAXBElement createPersonQuery(PersonQueryType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link UserQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.UserQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link UserQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.UserQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "UserQuery") public JAXBElement createUserQuery(UserQueryType value) { @@ -578,12 +578,12 @@ public JAXBElement createUserQuery(UserQueryType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RegistryQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link RegistryQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.RegistryQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "RegistryQuery") public JAXBElement createRegistryQuery(RegistryQueryType value) { @@ -591,12 +591,12 @@ public JAXBElement createRegistryQuery(RegistryQueryType valu } /** - * Create an instance of {@link JAXBElement }{@code <}{@link FederationQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.FederationQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link FederationQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.FederationQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "FederationQuery") public JAXBElement createFederationQuery(FederationQueryType value) { @@ -604,12 +604,12 @@ public JAXBElement createFederationQuery(FederationQueryTyp } /** - * Create an instance of {@link JAXBElement }{@code <}{@link AdhocQueryQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.AdhocQueryQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link AdhocQueryQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.AdhocQueryQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "AdhocQueryQuery") public JAXBElement createAdhocQueryQuery(AdhocQueryQueryType value) { @@ -617,12 +617,12 @@ public JAXBElement createAdhocQueryQuery(AdhocQueryQueryTyp } /** - * Create an instance of {@link JAXBElement }{@code <}{@link NotificationQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.NotificationQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link NotificationQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.NotificationQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "NotificationQuery") public JAXBElement createNotificationQuery(NotificationQueryType value) { @@ -630,12 +630,12 @@ public JAXBElement createNotificationQuery(NotificationQu } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SubscriptionQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.SubscriptionQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link SubscriptionQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.SubscriptionQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "SubscriptionQuery") public JAXBElement createSubscriptionQuery(SubscriptionQueryType value) { @@ -643,12 +643,12 @@ public JAXBElement createSubscriptionQuery(SubscriptionQu } /** - * Create an instance of {@link JAXBElement }{@code <}{@link FilterType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link FilterType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link FilterType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link FilterType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "Filter") public JAXBElement createFilter(FilterType value) { @@ -656,12 +656,12 @@ public JAXBElement createFilter(FilterType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link CompoundFilterType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.CompoundFilterType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link CompoundFilterType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.CompoundFilterType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "CompoundFilter") public JAXBElement createCompoundFilter(CompoundFilterType value) { @@ -669,12 +669,12 @@ public JAXBElement createCompoundFilter(CompoundFilterType v } /** - * Create an instance of {@link JAXBElement }{@code <}{@link BooleanFilterType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.BooleanFilterType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link BooleanFilterType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.BooleanFilterType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "BooleanFilter") public JAXBElement createBooleanFilter(BooleanFilterType value) { @@ -682,12 +682,12 @@ public JAXBElement createBooleanFilter(BooleanFilterType valu } /** - * Create an instance of {@link JAXBElement }{@code <}{@link IntegerFilterType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.IntegerFilterType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link IntegerFilterType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.IntegerFilterType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "IntegerFilter") public JAXBElement createIntegerFilter(IntegerFilterType value) { @@ -695,12 +695,12 @@ public JAXBElement createIntegerFilter(IntegerFilterType valu } /** - * Create an instance of {@link JAXBElement }{@code <}{@link FloatFilterType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.FloatFilterType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link FloatFilterType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.FloatFilterType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "FloatFilter") public JAXBElement createFloatFilter(FloatFilterType value) { @@ -708,12 +708,12 @@ public JAXBElement createFloatFilter(FloatFilterType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link DateTimeFilterType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.DateTimeFilterType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link DateTimeFilterType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.DateTimeFilterType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "DateTimeFilter") public JAXBElement createDateTimeFilter(DateTimeFilterType value) { @@ -721,12 +721,12 @@ public JAXBElement createDateTimeFilter(DateTimeFilterType v } /** - * Create an instance of {@link JAXBElement }{@code <}{@link StringFilterType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.StringFilterType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link StringFilterType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.query._3.StringFilterType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0", name = "StringFilter") public JAXBElement createStringFilter(StringFilterType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/QueryExpressionBranchType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/QueryExpressionBranchType.java index c909045..f1e346d 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/QueryExpressionBranchType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/QueryExpressionBranchType.java @@ -67,7 +67,7 @@ public class QueryExpressionBranchType * * @return * possible object is - * {@link ClassificationNodeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationNodeQueryType } * */ public ClassificationNodeQueryType getQueryLanguageQuery() { @@ -79,7 +79,7 @@ public ClassificationNodeQueryType getQueryLanguageQuery() { * * @param value * allowed object is - * {@link ClassificationNodeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationNodeQueryType } * */ public void setQueryLanguageQuery(ClassificationNodeQueryType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/RegistryObjectQueryType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/RegistryObjectQueryType.java index 4201a6f..be9014c 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/RegistryObjectQueryType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/RegistryObjectQueryType.java @@ -157,7 +157,7 @@ public List getSlotBranch() { * * @return * possible object is - * {@link InternationalStringBranchType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.InternationalStringBranchType } * */ public InternationalStringBranchType getNameBranch() { @@ -169,7 +169,7 @@ public InternationalStringBranchType getNameBranch() { * * @param value * allowed object is - * {@link InternationalStringBranchType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.InternationalStringBranchType } * */ public void setNameBranch(InternationalStringBranchType value) { @@ -181,7 +181,7 @@ public void setNameBranch(InternationalStringBranchType value) { * * @return * possible object is - * {@link InternationalStringBranchType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.InternationalStringBranchType } * */ public InternationalStringBranchType getDescriptionBranch() { @@ -193,7 +193,7 @@ public InternationalStringBranchType getDescriptionBranch() { * * @param value * allowed object is - * {@link InternationalStringBranchType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.InternationalStringBranchType } * */ public void setDescriptionBranch(InternationalStringBranchType value) { @@ -271,7 +271,7 @@ public List getClassificationQuery() { * *

* Objects of the following type(s) are allowed in the list - * {@link ExternalIdentifierQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ExternalIdentifierQueryType } * * */ @@ -287,7 +287,7 @@ public List getExternalIdentifierQuery() { * * @return * possible object is - * {@link ClassificationNodeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationNodeQueryType } * */ public ClassificationNodeQueryType getObjectTypeQuery() { @@ -299,7 +299,7 @@ public ClassificationNodeQueryType getObjectTypeQuery() { * * @param value * allowed object is - * {@link ClassificationNodeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationNodeQueryType } * */ public void setObjectTypeQuery(ClassificationNodeQueryType value) { @@ -311,7 +311,7 @@ public void setObjectTypeQuery(ClassificationNodeQueryType value) { * * @return * possible object is - * {@link ClassificationNodeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationNodeQueryType } * */ public ClassificationNodeQueryType getStatusQuery() { @@ -323,7 +323,7 @@ public ClassificationNodeQueryType getStatusQuery() { * * @param value * allowed object is - * {@link ClassificationNodeQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ClassificationNodeQueryType } * */ public void setStatusQuery(ClassificationNodeQueryType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/RegistryQueryType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/RegistryQueryType.java index 84bcec2..175e38c 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/RegistryQueryType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/RegistryQueryType.java @@ -68,7 +68,7 @@ public class RegistryQueryType * * @return * possible object is - * {@link OrganizationQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.OrganizationQueryType } * */ public OrganizationQueryType getOperatorQuery() { @@ -80,7 +80,7 @@ public OrganizationQueryType getOperatorQuery() { * * @param value * allowed object is - * {@link OrganizationQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.OrganizationQueryType } * */ public void setOperatorQuery(OrganizationQueryType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ServiceBindingQueryType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ServiceBindingQueryType.java index c5c9a34..f7aac0c 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ServiceBindingQueryType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ServiceBindingQueryType.java @@ -115,7 +115,7 @@ public void setServiceQuery(ServiceQueryType value) { * *

* Objects of the following type(s) are allowed in the list - * {@link SpecificationLinkQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.SpecificationLinkQueryType } * * */ diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ServiceQueryType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ServiceQueryType.java index 8b59161..0a28482 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ServiceQueryType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/ServiceQueryType.java @@ -83,7 +83,7 @@ public class ServiceQueryType * *

* Objects of the following type(s) are allowed in the list - * {@link ServiceBindingQueryType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.ServiceBindingQueryType } * * */ diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/SpecificationLinkQueryType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/SpecificationLinkQueryType.java index d351746..0add184 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/SpecificationLinkQueryType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/query/_3/SpecificationLinkQueryType.java @@ -76,7 +76,7 @@ public class SpecificationLinkQueryType * * @return * possible object is - * {@link InternationalStringBranchType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.InternationalStringBranchType } * */ public InternationalStringBranchType getUsageDescriptionBranch() { @@ -88,7 +88,7 @@ public InternationalStringBranchType getUsageDescriptionBranch() { * * @param value * allowed object is - * {@link InternationalStringBranchType } + * {@link oasis.names.tc.ebxml_regrep.xsd.query._3.InternationalStringBranchType } * */ public void setUsageDescriptionBranch(InternationalStringBranchType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/AdhocQueryType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/AdhocQueryType.java index f5104a1..10cbac9 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/AdhocQueryType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/AdhocQueryType.java @@ -73,7 +73,7 @@ public class AdhocQueryType * * @return * possible object is - * {@link QueryExpressionType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.QueryExpressionType } * */ public QueryExpressionType getQueryExpression() { @@ -85,7 +85,7 @@ public QueryExpressionType getQueryExpression() { * * @param value * allowed object is - * {@link QueryExpressionType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.QueryExpressionType } * */ public void setQueryExpression(QueryExpressionType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/AuditableEventType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/AuditableEventType.java index 4851c0e..4e1685d 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/AuditableEventType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/AuditableEventType.java @@ -134,7 +134,7 @@ public void setEventType(String value) { * * @return * possible object is - * {@link XMLGregorianCalendar } + * {@link javax.xml.datatype.XMLGregorianCalendar } * */ public XMLGregorianCalendar getTimestamp() { @@ -146,7 +146,7 @@ public XMLGregorianCalendar getTimestamp() { * * @param value * allowed object is - * {@link XMLGregorianCalendar } + * {@link javax.xml.datatype.XMLGregorianCalendar } * */ public void setTimestamp(XMLGregorianCalendar value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/FederationType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/FederationType.java index 8ee8e98..6191573 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/FederationType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/FederationType.java @@ -67,7 +67,7 @@ public class FederationType * * @return * possible object is - * {@link Duration } + * {@link javax.xml.datatype.Duration } * */ public Duration getReplicationSyncLatency() { @@ -79,7 +79,7 @@ public Duration getReplicationSyncLatency() { * * @param value * allowed object is - * {@link Duration } + * {@link javax.xml.datatype.Duration } * */ public void setReplicationSyncLatency(Duration value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/NotificationType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/NotificationType.java index c5ce8b8..40e283a 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/NotificationType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/NotificationType.java @@ -74,7 +74,7 @@ public class NotificationType * * @return * possible object is - * {@link RegistryObjectListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectListType } * */ public RegistryObjectListType getRegistryObjectList() { @@ -86,7 +86,7 @@ public RegistryObjectListType getRegistryObjectList() { * * @param value * allowed object is - * {@link RegistryObjectListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectListType } * */ public void setRegistryObjectList(RegistryObjectListType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/ObjectFactory.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/ObjectFactory.java index 305d024..afea38d 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/ObjectFactory.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/ObjectFactory.java @@ -99,7 +99,7 @@ public ObjectFactory() { } /** - * Create an instance of {@link InternationalStringType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.InternationalStringType } * */ public InternationalStringType createInternationalStringType() { @@ -107,7 +107,7 @@ public InternationalStringType createInternationalStringType() { } /** - * Create an instance of {@link LocalizedStringType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.LocalizedStringType } * */ public LocalizedStringType createLocalizedStringType() { @@ -123,7 +123,7 @@ public SlotType1 createSlotType1() { } /** - * Create an instance of {@link ValueListType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ValueListType } * */ public ValueListType createValueListType() { @@ -147,7 +147,7 @@ public IdentifiableType createIdentifiableType() { } /** - * Create an instance of {@link ObjectRefListType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefListType } * */ public ObjectRefListType createObjectRefListType() { @@ -155,7 +155,7 @@ public ObjectRefListType createObjectRefListType() { } /** - * Create an instance of {@link ObjectRefType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefType } * */ public ObjectRefType createObjectRefType() { @@ -171,7 +171,7 @@ public RegistryObjectType createRegistryObjectType() { } /** - * Create an instance of {@link RegistryObjectListType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectListType } * */ public RegistryObjectListType createRegistryObjectListType() { @@ -179,7 +179,7 @@ public RegistryObjectListType createRegistryObjectListType() { } /** - * Create an instance of {@link AssociationType1 } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AssociationType1 } * */ public AssociationType1 createAssociationType1() { @@ -187,7 +187,7 @@ public AssociationType1 createAssociationType1() { } /** - * Create an instance of {@link AuditableEventType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AuditableEventType } * */ public AuditableEventType createAuditableEventType() { @@ -195,7 +195,7 @@ public AuditableEventType createAuditableEventType() { } /** - * Create an instance of {@link ClassificationType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ClassificationType } * */ public ClassificationType createClassificationType() { @@ -203,7 +203,7 @@ public ClassificationType createClassificationType() { } /** - * Create an instance of {@link ClassificationNodeType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ClassificationNodeType } * */ public ClassificationNodeType createClassificationNodeType() { @@ -211,7 +211,7 @@ public ClassificationNodeType createClassificationNodeType() { } /** - * Create an instance of {@link ClassificationSchemeType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ClassificationSchemeType } * */ public ClassificationSchemeType createClassificationSchemeType() { @@ -219,7 +219,7 @@ public ClassificationSchemeType createClassificationSchemeType() { } /** - * Create an instance of {@link ExternalIdentifierType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ExternalIdentifierType } * */ public ExternalIdentifierType createExternalIdentifierType() { @@ -227,7 +227,7 @@ public ExternalIdentifierType createExternalIdentifierType() { } /** - * Create an instance of {@link ExternalLinkType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ExternalLinkType } * */ public ExternalLinkType createExternalLinkType() { @@ -235,7 +235,7 @@ public ExternalLinkType createExternalLinkType() { } /** - * Create an instance of {@link ExtrinsicObjectType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ExtrinsicObjectType } * */ public ExtrinsicObjectType createExtrinsicObjectType() { @@ -243,7 +243,7 @@ public ExtrinsicObjectType createExtrinsicObjectType() { } /** - * Create an instance of {@link PostalAddressType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.PostalAddressType } * */ public PostalAddressType createPostalAddressType() { @@ -251,7 +251,7 @@ public PostalAddressType createPostalAddressType() { } /** - * Create an instance of {@link OrganizationType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.OrganizationType } * */ public OrganizationType createOrganizationType() { @@ -259,7 +259,7 @@ public OrganizationType createOrganizationType() { } /** - * Create an instance of {@link PersonNameType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.PersonNameType } * */ public PersonNameType createPersonNameType() { @@ -267,7 +267,7 @@ public PersonNameType createPersonNameType() { } /** - * Create an instance of {@link EmailAddressType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.EmailAddressType } * */ public EmailAddressType createEmailAddressType() { @@ -275,7 +275,7 @@ public EmailAddressType createEmailAddressType() { } /** - * Create an instance of {@link RegistryPackageType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryPackageType } * */ public RegistryPackageType createRegistryPackageType() { @@ -291,7 +291,7 @@ public ServiceType createServiceType() { } /** - * Create an instance of {@link ServiceBindingType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ServiceBindingType } * */ public ServiceBindingType createServiceBindingType() { @@ -299,7 +299,7 @@ public ServiceBindingType createServiceBindingType() { } /** - * Create an instance of {@link SpecificationLinkType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.SpecificationLinkType } * */ public SpecificationLinkType createSpecificationLinkType() { @@ -307,7 +307,7 @@ public SpecificationLinkType createSpecificationLinkType() { } /** - * Create an instance of {@link TelephoneNumberType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.TelephoneNumberType } * */ public TelephoneNumberType createTelephoneNumberType() { @@ -339,7 +339,7 @@ public RegistryType createRegistryType() { } /** - * Create an instance of {@link FederationType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.FederationType } * */ public FederationType createFederationType() { @@ -355,7 +355,7 @@ public AdhocQueryType createAdhocQueryType() { } /** - * Create an instance of {@link QueryExpressionType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.QueryExpressionType } * */ public QueryExpressionType createQueryExpressionType() { @@ -363,7 +363,7 @@ public QueryExpressionType createQueryExpressionType() { } /** - * Create an instance of {@link NotificationType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.NotificationType } * */ public NotificationType createNotificationType() { @@ -371,7 +371,7 @@ public NotificationType createNotificationType() { } /** - * Create an instance of {@link SubscriptionType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.SubscriptionType } * */ public SubscriptionType createSubscriptionType() { @@ -379,7 +379,7 @@ public SubscriptionType createSubscriptionType() { } /** - * Create an instance of {@link NotifyActionType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.NotifyActionType } * */ public NotifyActionType createNotifyActionType() { @@ -387,7 +387,7 @@ public NotifyActionType createNotifyActionType() { } /** - * Create an instance of {@link VersionInfoType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.VersionInfoType } * */ public VersionInfoType createVersionInfoType() { @@ -395,7 +395,7 @@ public VersionInfoType createVersionInfoType() { } /** - * Create an instance of {@link TelephoneNumberListType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.TelephoneNumberListType } * */ public TelephoneNumberListType createTelephoneNumberListType() { @@ -403,12 +403,12 @@ public TelephoneNumberListType createTelephoneNumberListType() { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link InternationalStringType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.InternationalStringType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link InternationalStringType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.InternationalStringType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "InternationalString") public JAXBElement createInternationalString(InternationalStringType value) { @@ -416,12 +416,12 @@ public JAXBElement createInternationalString(Internatio } /** - * Create an instance of {@link JAXBElement }{@code <}{@link InternationalStringType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.InternationalStringType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link InternationalStringType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.InternationalStringType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Name") public JAXBElement createName(InternationalStringType value) { @@ -429,12 +429,12 @@ public JAXBElement createName(InternationalStringType v } /** - * Create an instance of {@link JAXBElement }{@code <}{@link InternationalStringType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.InternationalStringType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link InternationalStringType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.InternationalStringType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Description") public JAXBElement createDescription(InternationalStringType value) { @@ -442,12 +442,12 @@ public JAXBElement createDescription(InternationalStrin } /** - * Create an instance of {@link JAXBElement }{@code <}{@link LocalizedStringType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.LocalizedStringType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link LocalizedStringType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.LocalizedStringType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "LocalizedString") public JAXBElement createLocalizedString(LocalizedStringType value) { @@ -455,12 +455,12 @@ public JAXBElement createLocalizedString(LocalizedStringTyp } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SlotType1 }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link SlotType1 }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link SlotType1 }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link SlotType1 }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Slot") public JAXBElement createSlot(SlotType1 value) { @@ -468,12 +468,12 @@ public JAXBElement createSlot(SlotType1 value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ValueListType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ValueListType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ValueListType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ValueListType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "ValueList") public JAXBElement createValueList(ValueListType value) { @@ -481,12 +481,12 @@ public JAXBElement createValueList(ValueListType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link String }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link String }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Value") public JAXBElement createValue(String value) { @@ -494,12 +494,12 @@ public JAXBElement createValue(String value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SlotListType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link SlotListType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link SlotListType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link SlotListType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "SlotList") public JAXBElement createSlotList(SlotListType value) { @@ -507,12 +507,12 @@ public JAXBElement createSlotList(SlotListType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link IdentifiableType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link IdentifiableType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link IdentifiableType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link IdentifiableType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Identifiable") public JAXBElement createIdentifiable(IdentifiableType value) { @@ -520,12 +520,12 @@ public JAXBElement createIdentifiable(IdentifiableType value) } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ObjectRefListType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefListType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ObjectRefListType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefListType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "ObjectRefList") public JAXBElement createObjectRefList(ObjectRefListType value) { @@ -533,12 +533,12 @@ public JAXBElement createObjectRefList(ObjectRefListType valu } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ObjectRefType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ObjectRefType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ObjectRefType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "ObjectRef", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createObjectRef(ObjectRefType value) { @@ -546,12 +546,12 @@ public JAXBElement createObjectRef(ObjectRefType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RegistryObjectType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link RegistryObjectType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link RegistryObjectType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link RegistryObjectType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "RegistryObject", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createRegistryObject(RegistryObjectType value) { @@ -559,12 +559,12 @@ public JAXBElement createRegistryObject(RegistryObjectType v } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RegistryObjectListType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectListType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link RegistryObjectListType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectListType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "RegistryObjectList") public JAXBElement createRegistryObjectList(RegistryObjectListType value) { @@ -572,12 +572,12 @@ public JAXBElement createRegistryObjectList(RegistryObje } /** - * Create an instance of {@link JAXBElement }{@code <}{@link AssociationType1 }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AssociationType1 }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link AssociationType1 }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AssociationType1 }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Association", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createAssociation(AssociationType1 value) { @@ -585,12 +585,12 @@ public JAXBElement createAssociation(AssociationType1 value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link AuditableEventType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AuditableEventType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link AuditableEventType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.AuditableEventType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "AuditableEvent", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createAuditableEvent(AuditableEventType value) { @@ -598,12 +598,12 @@ public JAXBElement createAuditableEvent(AuditableEventType v } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ClassificationType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ClassificationType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ClassificationType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ClassificationType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Classification", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createClassification(ClassificationType value) { @@ -611,12 +611,12 @@ public JAXBElement createClassification(ClassificationType v } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ClassificationNodeType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ClassificationNodeType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ClassificationNodeType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ClassificationNodeType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "ClassificationNode", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createClassificationNode(ClassificationNodeType value) { @@ -624,12 +624,12 @@ public JAXBElement createClassificationNode(Classificati } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ClassificationSchemeType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ClassificationSchemeType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ClassificationSchemeType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ClassificationSchemeType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "ClassificationScheme", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createClassificationScheme(ClassificationSchemeType value) { @@ -637,12 +637,12 @@ public JAXBElement createClassificationScheme(Classifi } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExternalIdentifierType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ExternalIdentifierType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ExternalIdentifierType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ExternalIdentifierType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "ExternalIdentifier", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createExternalIdentifier(ExternalIdentifierType value) { @@ -650,12 +650,12 @@ public JAXBElement createExternalIdentifier(ExternalIden } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExternalLinkType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ExternalLinkType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ExternalLinkType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ExternalLinkType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "ExternalLink", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createExternalLink(ExternalLinkType value) { @@ -663,12 +663,12 @@ public JAXBElement createExternalLink(ExternalLinkType value) } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtrinsicObjectType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ExtrinsicObjectType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ExtrinsicObjectType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ExtrinsicObjectType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "ExtrinsicObject", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createExtrinsicObject(ExtrinsicObjectType value) { @@ -676,12 +676,12 @@ public JAXBElement createExtrinsicObject(ExtrinsicObjectTyp } /** - * Create an instance of {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.PostalAddressType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.PostalAddressType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Address") public JAXBElement createAddress(PostalAddressType value) { @@ -689,12 +689,12 @@ public JAXBElement createAddress(PostalAddressType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link OrganizationType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.OrganizationType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link OrganizationType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.OrganizationType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Organization", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createOrganization(OrganizationType value) { @@ -702,12 +702,12 @@ public JAXBElement createOrganization(OrganizationType value) } /** - * Create an instance of {@link JAXBElement }{@code <}{@link PersonNameType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.PersonNameType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link PersonNameType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.PersonNameType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "PersonName") public JAXBElement createPersonName(PersonNameType value) { @@ -715,12 +715,12 @@ public JAXBElement createPersonName(PersonNameType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link EmailAddressType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.EmailAddressType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link EmailAddressType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.EmailAddressType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "EmailAddress") public JAXBElement createEmailAddress(EmailAddressType value) { @@ -728,12 +728,12 @@ public JAXBElement createEmailAddress(EmailAddressType value) } /** - * Create an instance of {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.PostalAddressType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.PostalAddressType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "PostalAddress") public JAXBElement createPostalAddress(PostalAddressType value) { @@ -741,12 +741,12 @@ public JAXBElement createPostalAddress(PostalAddressType valu } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RegistryPackageType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryPackageType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link RegistryPackageType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryPackageType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "RegistryPackage", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createRegistryPackage(RegistryPackageType value) { @@ -754,12 +754,12 @@ public JAXBElement createRegistryPackage(RegistryPackageTyp } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ServiceType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ServiceType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ServiceType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ServiceType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Service", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createService(ServiceType value) { @@ -767,12 +767,12 @@ public JAXBElement createService(ServiceType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ServiceBindingType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ServiceBindingType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ServiceBindingType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ServiceBindingType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "ServiceBinding", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createServiceBinding(ServiceBindingType value) { @@ -780,12 +780,12 @@ public JAXBElement createServiceBinding(ServiceBindingType v } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SpecificationLinkType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.SpecificationLinkType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link SpecificationLinkType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.SpecificationLinkType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "SpecificationLink", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createSpecificationLink(SpecificationLinkType value) { @@ -793,12 +793,12 @@ public JAXBElement createSpecificationLink(SpecificationL } /** - * Create an instance of {@link JAXBElement }{@code <}{@link InternationalStringType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.InternationalStringType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link InternationalStringType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.InternationalStringType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "UsageDescription") public JAXBElement createUsageDescription(InternationalStringType value) { @@ -806,12 +806,12 @@ public JAXBElement createUsageDescription(International } /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link String }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link String }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link String }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "UsageParameter") public JAXBElement createUsageParameter(String value) { @@ -819,12 +819,12 @@ public JAXBElement createUsageParameter(String value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link TelephoneNumberType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.TelephoneNumberType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link TelephoneNumberType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.TelephoneNumberType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "TelephoneNumber") public JAXBElement createTelephoneNumber(TelephoneNumberType value) { @@ -832,12 +832,12 @@ public JAXBElement createTelephoneNumber(TelephoneNumberTyp } /** - * Create an instance of {@link JAXBElement }{@code <}{@link PersonType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link PersonType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link PersonType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link PersonType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Person", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createPerson(PersonType value) { @@ -845,12 +845,12 @@ public JAXBElement createPerson(PersonType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link UserType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link UserType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link UserType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link UserType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "User", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createUser(UserType value) { @@ -858,12 +858,12 @@ public JAXBElement createUser(UserType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RegistryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link RegistryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link RegistryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link RegistryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Registry", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createRegistry(RegistryType value) { @@ -871,12 +871,12 @@ public JAXBElement createRegistry(RegistryType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link FederationType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.FederationType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link FederationType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.FederationType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Federation", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createFederation(FederationType value) { @@ -884,12 +884,12 @@ public JAXBElement createFederation(FederationType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link AdhocQueryType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link AdhocQueryType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link AdhocQueryType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link AdhocQueryType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "AdhocQuery", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "RegistryObject") public JAXBElement createAdhocQuery(AdhocQueryType value) { @@ -897,12 +897,12 @@ public JAXBElement createAdhocQuery(AdhocQueryType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link QueryExpressionType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.QueryExpressionType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link QueryExpressionType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.QueryExpressionType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "QueryExpression") public JAXBElement createQueryExpression(QueryExpressionType value) { @@ -910,12 +910,12 @@ public JAXBElement createQueryExpression(QueryExpressionTyp } /** - * Create an instance of {@link JAXBElement }{@code <}{@link NotificationType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.NotificationType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link NotificationType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.NotificationType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Notification") public JAXBElement createNotification(NotificationType value) { @@ -923,12 +923,12 @@ public JAXBElement createNotification(NotificationType value) } /** - * Create an instance of {@link JAXBElement }{@code <}{@link ActionType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ActionType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link ActionType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ActionType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Action") public JAXBElement createAction(ActionType value) { @@ -936,12 +936,12 @@ public JAXBElement createAction(ActionType value) { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link SubscriptionType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.SubscriptionType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link SubscriptionType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.SubscriptionType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "Subscription", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Identifiable") public JAXBElement createSubscription(SubscriptionType value) { @@ -949,12 +949,12 @@ public JAXBElement createSubscription(SubscriptionType value) } /** - * Create an instance of {@link JAXBElement }{@code <}{@link NotifyActionType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.NotifyActionType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link NotifyActionType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.NotifyActionType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", name = "NotifyAction", substitutionHeadNamespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rim:3.0", substitutionHeadName = "Action") public JAXBElement createNotifyAction(NotifyActionType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/OrganizationType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/OrganizationType.java index b7e989e..6db4b28 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/OrganizationType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/OrganizationType.java @@ -100,7 +100,7 @@ public class OrganizationType * *

* Objects of the following type(s) are allowed in the list - * {@link PostalAddressType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.PostalAddressType } * * */ @@ -129,7 +129,7 @@ public List getAddress() { * *

* Objects of the following type(s) are allowed in the list - * {@link TelephoneNumberType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.TelephoneNumberType } * * */ diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/PersonType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/PersonType.java index 0fe5e88..c85d3f8 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/PersonType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/PersonType.java @@ -101,7 +101,7 @@ public class PersonType * *

* Objects of the following type(s) are allowed in the list - * {@link PostalAddressType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.PostalAddressType } * * */ @@ -117,7 +117,7 @@ public List getAddress() { * * @return * possible object is - * {@link PersonNameType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.PersonNameType } * */ public PersonNameType getPersonName() { @@ -129,7 +129,7 @@ public PersonNameType getPersonName() { * * @param value * allowed object is - * {@link PersonNameType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.PersonNameType } * */ public void setPersonName(PersonNameType value) { @@ -154,7 +154,7 @@ public void setPersonName(PersonNameType value) { * *

* Objects of the following type(s) are allowed in the list - * {@link TelephoneNumberType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.TelephoneNumberType } * * */ @@ -183,7 +183,7 @@ public List getTelephoneNumber() { * *

* Objects of the following type(s) are allowed in the list - * {@link EmailAddressType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.EmailAddressType } * * */ diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/QueryExpressionType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/QueryExpressionType.java index 5845a79..53ad946 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/QueryExpressionType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/QueryExpressionType.java @@ -90,7 +90,7 @@ public class QueryExpressionType { * Objects of the following type(s) are allowed in the list * {@link Object } * {@link String } - * {@link Element } + * {@link org.w3c.dom.Element } * * */ diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryObjectListType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryObjectListType.java index 34d5bb8..5a92416 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryObjectListType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryObjectListType.java @@ -82,28 +82,28 @@ public class RegistryObjectListType { * *

* Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link AdhocQueryType }{@code >} - * {@link JAXBElement }{@code <}{@link AssociationType1 }{@code >} - * {@link JAXBElement }{@code <}{@link AuditableEventType }{@code >} - * {@link JAXBElement }{@code <}{@link ClassificationNodeType }{@code >} - * {@link JAXBElement }{@code <}{@link ClassificationSchemeType }{@code >} - * {@link JAXBElement }{@code <}{@link ClassificationType }{@code >} - * {@link JAXBElement }{@code <}{@link ExternalIdentifierType }{@code >} - * {@link JAXBElement }{@code <}{@link ExternalLinkType }{@code >} - * {@link JAXBElement }{@code <}{@link ExtrinsicObjectType }{@code >} - * {@link JAXBElement }{@code <}{@link FederationType }{@code >} - * {@link JAXBElement }{@code <}{@link IdentifiableType }{@code >} - * {@link JAXBElement }{@code <}{@link ObjectRefType }{@code >} - * {@link JAXBElement }{@code <}{@link OrganizationType }{@code >} - * {@link JAXBElement }{@code <}{@link PersonType }{@code >} - * {@link JAXBElement }{@code <}{@link RegistryObjectType }{@code >} - * {@link JAXBElement }{@code <}{@link RegistryPackageType }{@code >} - * {@link JAXBElement }{@code <}{@link RegistryType }{@code >} - * {@link JAXBElement }{@code <}{@link ServiceBindingType }{@code >} - * {@link JAXBElement }{@code <}{@link ServiceType }{@code >} - * {@link JAXBElement }{@code <}{@link SpecificationLinkType }{@code >} - * {@link JAXBElement }{@code <}{@link SubscriptionType }{@code >} - * {@link JAXBElement }{@code <}{@link UserType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link AdhocQueryType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link AssociationType1 }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link AuditableEventType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ClassificationNodeType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ClassificationSchemeType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ClassificationType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ExternalIdentifierType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ExternalLinkType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ExtrinsicObjectType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link FederationType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link IdentifiableType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ObjectRefType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link OrganizationType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link PersonType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link RegistryObjectType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link RegistryPackageType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link RegistryType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ServiceBindingType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ServiceType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link SpecificationLinkType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link SubscriptionType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link UserType }{@code >} * * */ diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryObjectType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryObjectType.java index efaa8a1..8a261b8 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryObjectType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryObjectType.java @@ -120,7 +120,7 @@ public class RegistryObjectType * * @return * possible object is - * {@link InternationalStringType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.InternationalStringType } * */ public InternationalStringType getName() { @@ -132,7 +132,7 @@ public InternationalStringType getName() { * * @param value * allowed object is - * {@link InternationalStringType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.InternationalStringType } * */ public void setName(InternationalStringType value) { @@ -144,7 +144,7 @@ public void setName(InternationalStringType value) { * * @return * possible object is - * {@link InternationalStringType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.InternationalStringType } * */ public InternationalStringType getDescription() { @@ -156,7 +156,7 @@ public InternationalStringType getDescription() { * * @param value * allowed object is - * {@link InternationalStringType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.InternationalStringType } * */ public void setDescription(InternationalStringType value) { @@ -234,7 +234,7 @@ public List getClassification() { * *

* Objects of the following type(s) are allowed in the list - * {@link ExternalIdentifierType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ExternalIdentifierType } * * */ diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryPackageType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryPackageType.java index 6aee4b0..1d2cc62 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryPackageType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryPackageType.java @@ -74,7 +74,7 @@ public class RegistryPackageType * * @return * possible object is - * {@link RegistryObjectListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectListType } * */ public RegistryObjectListType getRegistryObjectList() { @@ -86,7 +86,7 @@ public RegistryObjectListType getRegistryObjectList() { * * @param value * allowed object is - * {@link RegistryObjectListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectListType } * */ public void setRegistryObjectList(RegistryObjectListType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryType.java index c7635a6..24dd364 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/RegistryType.java @@ -137,7 +137,7 @@ public void setSpecificationVersion(String value) { * * @return * possible object is - * {@link Duration } + * {@link javax.xml.datatype.Duration } * */ public Duration getReplicationSyncLatency() { @@ -149,7 +149,7 @@ public Duration getReplicationSyncLatency() { * * @param value * allowed object is - * {@link Duration } + * {@link javax.xml.datatype.Duration } * */ public void setReplicationSyncLatency(Duration value) { @@ -161,7 +161,7 @@ public void setReplicationSyncLatency(Duration value) { * * @return * possible object is - * {@link Duration } + * {@link javax.xml.datatype.Duration } * */ public Duration getCatalogingLatency() { @@ -173,7 +173,7 @@ public Duration getCatalogingLatency() { * * @param value * allowed object is - * {@link Duration } + * {@link javax.xml.datatype.Duration } * */ public void setCatalogingLatency(Duration value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/ServiceBindingType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/ServiceBindingType.java index 88f98d7..e16f884 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/ServiceBindingType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/ServiceBindingType.java @@ -95,7 +95,7 @@ public class ServiceBindingType * *

* Objects of the following type(s) are allowed in the list - * {@link SpecificationLinkType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.SpecificationLinkType } * * */ diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/ServiceType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/ServiceType.java index 574da3e..3c24644 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/ServiceType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/ServiceType.java @@ -83,7 +83,7 @@ public class ServiceType * *

* Objects of the following type(s) are allowed in the list - * {@link ServiceBindingType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ServiceBindingType } * * */ diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/SlotType1.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/SlotType1.java index 2c98a2a..514abca 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/SlotType1.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/SlotType1.java @@ -72,7 +72,7 @@ public class SlotType1 { * * @return * possible object is - * {@link ValueListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ValueListType } * */ public ValueListType getValueList() { @@ -84,7 +84,7 @@ public ValueListType getValueList() { * * @param value * allowed object is - * {@link ValueListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ValueListType } * */ public void setValueList(ValueListType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/SpecificationLinkType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/SpecificationLinkType.java index 664c201..a958041 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/SpecificationLinkType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/SpecificationLinkType.java @@ -81,7 +81,7 @@ public class SpecificationLinkType * * @return * possible object is - * {@link InternationalStringType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.InternationalStringType } * */ public InternationalStringType getUsageDescription() { @@ -93,7 +93,7 @@ public InternationalStringType getUsageDescription() { * * @param value * allowed object is - * {@link InternationalStringType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.InternationalStringType } * */ public void setUsageDescription(InternationalStringType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/SubscriptionType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/SubscriptionType.java index 267e0f4..d0c0327 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/SubscriptionType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rim/_3/SubscriptionType.java @@ -104,8 +104,8 @@ public class SubscriptionType * *

* Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link ActionType }{@code >} - * {@link JAXBElement }{@code <}{@link NotifyActionType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link ActionType }{@code >} + * {@link jakarta.xml.bind.JAXBElement }{@code <}{@link NotifyActionType }{@code >} * * */ @@ -145,7 +145,7 @@ public void setSelector(String value) { * * @return * possible object is - * {@link XMLGregorianCalendar } + * {@link javax.xml.datatype.XMLGregorianCalendar } * */ public XMLGregorianCalendar getStartTime() { @@ -157,7 +157,7 @@ public XMLGregorianCalendar getStartTime() { * * @param value * allowed object is - * {@link XMLGregorianCalendar } + * {@link javax.xml.datatype.XMLGregorianCalendar } * */ public void setStartTime(XMLGregorianCalendar value) { @@ -169,7 +169,7 @@ public void setStartTime(XMLGregorianCalendar value) { * * @return * possible object is - * {@link XMLGregorianCalendar } + * {@link javax.xml.datatype.XMLGregorianCalendar } * */ public XMLGregorianCalendar getEndTime() { @@ -181,7 +181,7 @@ public XMLGregorianCalendar getEndTime() { * * @param value * allowed object is - * {@link XMLGregorianCalendar } + * {@link javax.xml.datatype.XMLGregorianCalendar } * */ public void setEndTime(XMLGregorianCalendar value) { @@ -193,7 +193,7 @@ public void setEndTime(XMLGregorianCalendar value) { * * @return * possible object is - * {@link Duration } + * {@link javax.xml.datatype.Duration } * */ public Duration getNotificationInterval() { @@ -205,7 +205,7 @@ public Duration getNotificationInterval() { * * @param value * allowed object is - * {@link Duration } + * {@link javax.xml.datatype.Duration } * */ public void setNotificationInterval(Duration value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/ObjectFactory.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/ObjectFactory.java index e062b1f..2599b01 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/ObjectFactory.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/ObjectFactory.java @@ -66,7 +66,7 @@ public RegistryRequestType createRegistryRequestType() { } /** - * Create an instance of {@link RegistryErrorList } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rs._3.RegistryErrorList } * */ public RegistryErrorList createRegistryErrorList() { @@ -74,7 +74,7 @@ public RegistryErrorList createRegistryErrorList() { } /** - * Create an instance of {@link RegistryError } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rs._3.RegistryError } * */ public RegistryError createRegistryError() { @@ -82,7 +82,7 @@ public RegistryError createRegistryError() { } /** - * Create an instance of {@link RegistryResponseType } + * Create an instance of {@link oasis.names.tc.ebxml_regrep.xsd.rs._3.RegistryResponseType } * */ public RegistryResponseType createRegistryResponseType() { @@ -90,12 +90,12 @@ public RegistryResponseType createRegistryResponseType() { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RegistryRequestType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link RegistryRequestType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link RegistryRequestType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link RegistryRequestType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rs:3.0", name = "RegistryRequest") public JAXBElement createRegistryRequest(RegistryRequestType value) { @@ -103,12 +103,12 @@ public JAXBElement createRegistryRequest(RegistryRequestTyp } /** - * Create an instance of {@link JAXBElement }{@code <}{@link RegistryResponseType }{@code >} + * Create an instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rs._3.RegistryResponseType }{@code >} * * @param value * Java instance representing xml element's value. * @return - * the new instance of {@link JAXBElement }{@code <}{@link RegistryResponseType }{@code >} + * the new instance of {@link jakarta.xml.bind.JAXBElement }{@code <}{@link oasis.names.tc.ebxml_regrep.xsd.rs._3.RegistryResponseType }{@code >} */ @XmlElementDecl(namespace = "urn:oasis:names:tc:ebxml-regrep:xsd:rs:3.0", name = "RegistryResponse") public JAXBElement createRegistryResponse(RegistryResponseType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/RegistryRequestType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/RegistryRequestType.java index 48cb71d..9fd48c6 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/RegistryRequestType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/RegistryRequestType.java @@ -98,7 +98,7 @@ public class RegistryRequestType { * * @return * possible object is - * {@link SlotListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.SlotListType } * */ public SlotListType getRequestSlotList() { @@ -110,7 +110,7 @@ public SlotListType getRequestSlotList() { * * @param value * allowed object is - * {@link SlotListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.SlotListType } * */ public void setRequestSlotList(SlotListType value) { diff --git a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/RegistryResponseType.java b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/RegistryResponseType.java index 6c85be9..1f54847 100644 --- a/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/RegistryResponseType.java +++ b/src/main/generated-java/oasis/names/tc/ebxml_regrep/xsd/rs/_3/RegistryResponseType.java @@ -86,7 +86,7 @@ public class RegistryResponseType { * * @return * possible object is - * {@link SlotListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.SlotListType } * */ public SlotListType getResponseSlotList() { @@ -98,7 +98,7 @@ public SlotListType getResponseSlotList() { * * @param value * allowed object is - * {@link SlotListType } + * {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.SlotListType } * */ public void setResponseSlotList(SlotListType value) { diff --git a/src/main/java/de/gematik/epa/LibIheXdsMain.java b/src/main/java/de/gematik/epa/LibIheXdsMain.java index 6f5537f..a4b90d5 100644 --- a/src/main/java/de/gematik/epa/LibIheXdsMain.java +++ b/src/main/java/de/gematik/epa/LibIheXdsMain.java @@ -16,16 +16,11 @@ package de.gematik.epa; -import de.gematik.epa.conversion.AdhocQueryUtils; import de.gematik.epa.conversion.DeleteObjectsUtils; -import de.gematik.epa.conversion.ProvideAndRegisterUtils; import de.gematik.epa.conversion.ResponseUtils; -import de.gematik.epa.conversion.RetrieveDocumentsUtils; +import de.gematik.epa.conversion.RestrictedUpdateDocumentUtils; import de.gematik.epa.ihe.model.request.DeleteObjectsRequest; -import de.gematik.epa.ihe.model.request.DocumentReplaceRequest; -import de.gematik.epa.ihe.model.request.DocumentSubmissionRequest; -import de.gematik.epa.ihe.model.request.FindRequest; -import de.gematik.epa.ihe.model.request.RetrieveDocumentsRequest; +import de.gematik.epa.ihe.model.request.RestrictedUpdateDocumentRequest; import de.gematik.epa.ihe.model.response.ProxyFindResponse; import de.gematik.epa.ihe.model.response.ProxyResponse; import de.gematik.epa.ihe.model.response.RetrieveDocumentsResponse; @@ -34,6 +29,7 @@ import ihe.iti.xds_b._2007.RetrieveDocumentSetResponseType; import lombok.experimental.UtilityClass; import oasis.names.tc.ebxml_regrep.xsd.lcm._3.RemoveObjectsRequest; +import oasis.names.tc.ebxml_regrep.xsd.lcm._3.SubmitObjectsRequest; import oasis.names.tc.ebxml_regrep.xsd.query._3.AdhocQueryRequest; import oasis.names.tc.ebxml_regrep.xsd.query._3.AdhocQueryResponse; import oasis.names.tc.ebxml_regrep.xsd.rs._3.RegistryResponseType; @@ -44,34 +40,35 @@ public class LibIheXdsMain { /** * Create a {@code urn:ihe:iti:xds-b:2007:ProvideAndRegisterDocumentSetRequestType} from a {@link - * DocumentSubmissionRequest}.
+ * de.gematik.epa.ihe.model.request.DocumentSubmissionRequest}.
* The request created can provide and register documents as well as folders. * * @param documentSubmissionRequest input data * @return {@link ProvideAndRegisterDocumentSetRequestType} */ public static ProvideAndRegisterDocumentSetRequestType convertDocumentSubmissionRequest( - DocumentSubmissionRequest documentSubmissionRequest) { - return ProvideAndRegisterUtils.toProvideAndRegisterDocumentSetRequest( + de.gematik.epa.ihe.model.request.DocumentSubmissionRequest documentSubmissionRequest) { + return de.gematik.epa.conversion.ProvideAndRegisterUtils.toProvideAndRegisterDocumentSetRequest( documentSubmissionRequest); } /** * Create a {@code urn:ihe:iti:xds-b:2007:ProvideAndRegisterDocumentSetRequestType} from a {@link - * DocumentReplaceRequest}
+ * de.gematik.epa.ihe.model.request.DocumentReplaceRequest}
* The request created is meant to replace documents already registered with newer versions. * * @param documentReplaceRequest input data * @return {@link ProvideAndRegisterDocumentSetRequestType} */ public static ProvideAndRegisterDocumentSetRequestType convertDocumentReplaceRequest( - DocumentReplaceRequest documentReplaceRequest) { - return ProvideAndRegisterUtils.toProvideAndRegisterDocumentSetRequest(documentReplaceRequest); + de.gematik.epa.ihe.model.request.DocumentReplaceRequest documentReplaceRequest) { + return de.gematik.epa.conversion.ProvideAndRegisterUtils.toProvideAndRegisterDocumentSetRequest( + documentReplaceRequest); } /** * Create a {@code urn:oasis:names:tc:ebxml-regrep:xsd:query:3.0:AdhocQueryRequest} from a {@link - * FindRequest}
+ * de.gematik.epa.ihe.model.request.FindRequest}
* The created request is meant to query an IHE registry for documents and folders. Supported * query types are FindDocuments, FindDocumentsByTitle, FindFolders, GetAll, GetFolderAndContents * & GetRelatedApprovedDocuments @@ -79,21 +76,23 @@ public static ProvideAndRegisterDocumentSetRequestType convertDocumentReplaceReq * @param findRequest input data * @return {@link AdhocQueryRequest} */ - public static AdhocQueryRequest convertFindRequest(FindRequest findRequest) { - return AdhocQueryUtils.generateFindRequestBody(findRequest); + public static AdhocQueryRequest convertFindRequest( + de.gematik.epa.ihe.model.request.FindRequest findRequest) { + return de.gematik.epa.conversion.AdhocQueryUtils.generateFindRequestBody(findRequest); } /** * Create a {@code urn:ihe:iti:xds-b:2007:RetrieveDocumentSetRequestType} from a {@link - * RetrieveDocumentsRequest}.
+ * de.gematik.epa.ihe.model.request.RetrieveDocumentsRequest}.
* The created request is meant to retrieve documents from an IHE repository * * @param retrieveDocumentsRequest input data * @return {@link RetrieveDocumentSetResponseType} */ public static RetrieveDocumentSetRequestType convertRetrieveDocumentsRequest( - RetrieveDocumentsRequest retrieveDocumentsRequest) { - return RetrieveDocumentsUtils.toRetrieveDocumentSetRequest(retrieveDocumentsRequest); + de.gematik.epa.ihe.model.request.RetrieveDocumentsRequest retrieveDocumentsRequest) { + return de.gematik.epa.conversion.RetrieveDocumentsUtils.toRetrieveDocumentSetRequest( + retrieveDocumentsRequest); } /** @@ -148,4 +147,18 @@ public static RetrieveDocumentsResponse convertRetrieveDocumentSetResponse( RetrieveDocumentSetResponseType retrieveDocumentSetResponse) { return ResponseUtils.toRetrieveDocumentResponse(retrieveDocumentSetResponse); } + + /** + * Create a {@code urn:oasis:names:tc:ebxml-regrep:xsd:lcm:3.0:SubmitObjectsRequest} from a {@link + * RestrictedUpdateDocumentRequest}.
+ * The request created can update documents metadata + * + * @param restrictedUpdateDocumentRequest input data + * @return {@link SubmitObjectsRequest} + */ + public static SubmitObjectsRequest convertRestrictedUpdateDocumentSetRequest( + RestrictedUpdateDocumentRequest restrictedUpdateDocumentRequest) { + return RestrictedUpdateDocumentUtils.toUpdateDocumentSetRequest( + restrictedUpdateDocumentRequest); + } } diff --git a/src/main/java/de/gematik/epa/conversion/AdhocQueryUtils.java b/src/main/java/de/gematik/epa/conversion/AdhocQueryUtils.java index 77f0fdf..b4ed13d 100644 --- a/src/main/java/de/gematik/epa/conversion/AdhocQueryUtils.java +++ b/src/main/java/de/gematik/epa/conversion/AdhocQueryUtils.java @@ -16,6 +16,8 @@ package de.gematik.epa.conversion; +import de.gematik.epa.ihe.model.query.QueryKey; +import de.gematik.epa.ihe.model.query.ReturnType; import de.gematik.epa.ihe.model.request.FindRequest; import java.math.BigInteger; import java.util.List; @@ -32,46 +34,56 @@ public class AdhocQueryUtils { private AdhocQueryUtils() {} public static AdhocQueryRequest generateFindRequestBody(FindRequest request) { - var result = new AdhocQueryRequest(); - result.setFederated(false); - result.setStartIndex(BigInteger.ZERO); - result.setMaxResults(BigInteger.valueOf(-1)); - result.setResponseOption(addResponseOptions(request)); + var adhocQueryRequest = createAdhocQueryRequest(request.returnType()); + adhocQueryRequest.setResponseOption(addResponseOptions(request.returnType())); var adhocQuery = createAdhocQuery(request); - result.setAdhocQuery(adhocQuery); + adhocQueryRequest.setAdhocQuery(adhocQuery); request .queryMetadata() .forEach( (key, value) -> { - var slot = new SlotType1(); - var valueListType = new ValueListType(); - slot.setName(key.getKeyword()); - valueListType.getValue().addAll(getFormattedValues(value)); - slot.setValueList(valueListType); + var slot = createSlotType(key, value); adhocQuery.getSlot().add(slot); }); - adhocQuery.getSlot().addAll(request.query().fillPatientIdSlot(request)); + adhocQuery.getSlot().addAll(request.query().fillPatientIdSlot(request.insurantId())); + return adhocQueryRequest; + } + + private static AdhocQueryType createAdhocQuery(FindRequest request) { + var adhocQuery = new AdhocQueryType(); + adhocQuery.setId(request.query().getUrn()); + return adhocQuery; + } + + public static SlotType1 createSlotType(QueryKey key, List value) { + var slot = new SlotType1(); + var valueListType = new ValueListType(); + slot.setName(key.getKeyword()); + valueListType.getValue().addAll(getFormattedValues(value)); + slot.setValueList(valueListType); + return slot; + } + + public static AdhocQueryRequest createAdhocQueryRequest(final ReturnType returnType) { + var result = new AdhocQueryRequest(); + result.setFederated(false); + result.setStartIndex(BigInteger.ZERO); + result.setMaxResults(BigInteger.valueOf(-1)); + result.setResponseOption(addResponseOptions(returnType)); return result; } - public static List getFormattedValues(List value) { + protected static List getFormattedValues(List value) { return value.stream().map(AdhocQueryUtils::formatIfUnformattedListElement).toList(); } - private static ResponseOptionType addResponseOptions(FindRequest request) { + public static ResponseOptionType addResponseOptions(ReturnType returnType) { var responseOption = new ResponseOptionType(); - responseOption.setReturnType(request.returnType().getKeyword()); + responseOption.setReturnType(returnType.getKeyword()); responseOption.setReturnComposedObjects(true); return responseOption; } - private static AdhocQueryType createAdhocQuery(FindRequest request) { - var adhocQuery = new AdhocQueryType(); - adhocQuery.setId(request.query().getUrn()); - adhocQuery.setHome(request.recordIdentifier().getHomeCommunityId()); - return adhocQuery; - } - private static String formatAsList(@NonNull String value) { return String.format("('%s')", value); } diff --git a/src/main/java/de/gematik/epa/conversion/ProvideAndRegisterUtils.java b/src/main/java/de/gematik/epa/conversion/ProvideAndRegisterUtils.java index bdf15f7..260e749 100644 --- a/src/main/java/de/gematik/epa/conversion/ProvideAndRegisterUtils.java +++ b/src/main/java/de/gematik/epa/conversion/ProvideAndRegisterUtils.java @@ -19,7 +19,6 @@ import de.gematik.epa.conversion.internal.AssociationGenerator; import de.gematik.epa.conversion.internal.DateUtil; import de.gematik.epa.conversion.internal.requests.DocumentGenerator; -import de.gematik.epa.conversion.internal.requests.DocumentGenerator.DocumentGeneratorList; import de.gematik.epa.conversion.internal.requests.ExtrinsicObjectGenerator; import de.gematik.epa.conversion.internal.requests.RegistryPackageGenerator; import de.gematik.epa.conversion.internal.requests.factories.classification.RegistryPackageTypeClassificationFactory; @@ -41,7 +40,6 @@ import oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectListType; import oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectType; import oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryPackageType; -import oasis.names.tc.ebxml_regrep.xsd.rim._3.SlotListType; @UtilityClass public class ProvideAndRegisterUtils { @@ -50,8 +48,7 @@ public static ProvideAndRegisterDocumentSetRequestType toProvideAndRegisterDocum SubmissionRequestInterface submissionRequest) { var docGenerators = - DocumentGenerator.generators( - submissionRequest.documents(), submissionRequest.recordIdentifier()); + DocumentGenerator.generators(submissionRequest.documents(), submissionRequest.insurantId()); var submitObjectRequest = createSubmitObjectsRequest(submissionRequest, docGenerators); var provideAndRegisterDocumentSetRequest = new ProvideAndRegisterDocumentSetRequestType(); @@ -61,12 +58,10 @@ public static ProvideAndRegisterDocumentSetRequestType toProvideAndRegisterDocum } public static SubmitObjectsRequest createSubmitObjectsRequest( - SubmissionRequestInterface submissionRequest, DocumentGeneratorList docGenerators) { + SubmissionRequestInterface submissionRequest, + DocumentGenerator.DocumentGeneratorList docGenerators) { var submitObjectRequest = new SubmitObjectsRequest(); - var slotList = createRequestSlotList(submissionRequest); - submitObjectRequest.setRequestSlotList(slotList); - var registryObjectList = new RegistryObjectListType(); submitObjectRequest.setRegistryObjectList(registryObjectList); @@ -93,7 +88,9 @@ public static SubmitObjectsRequest createSubmitObjectsRequest( registryObjectList .getIdentifiable() .add( - 0, RegistryPackageGenerator.toRegistryPackageJaxbElement(submissionSetRegistryPackage)); + 0, + de.gematik.epa.conversion.internal.requests.RegistryPackageGenerator + .toRegistryPackageJaxbElement(submissionSetRegistryPackage)); return submitObjectRequest; } @@ -101,10 +98,10 @@ public static SubmitObjectsRequest createSubmitObjectsRequest( public static RegistryPackageType createSubmissionSetRegistryPackage( SubmissionRequestInterface submissionRequestInterface) { var submissionSetMetadata = submissionRequestInterface.submissionSetMetadata(); - var recordIdentifier = submissionRequestInterface.recordIdentifier(); var registryPackage = - RegistryPackageGenerator.createNewRegistryPackage(recordIdentifier.getHomeCommunityId()); + de.gematik.epa.conversion.internal.requests.RegistryPackageGenerator + .createNewRegistryPackage(); registryPackage.setId(UUID.randomUUID().toString()); registryPackage @@ -114,20 +111,21 @@ public static RegistryPackageType createSubmissionSetRegistryPackage( RegistryPackageTypeClassificationFactory.createSubmissionSetClassifications( submissionSetMetadata, registryPackage); - ExternalIdentifierFactory.forSubmissionSet(registryPackage, recordIdentifier.getInsurantId()); + ExternalIdentifierFactory.forSubmissionSet( + registryPackage, submissionRequestInterface.insurantId()); return registryPackage; } public static List> createExtrinsicObjects( - DocumentGeneratorList docGenerators) { + DocumentGenerator.DocumentGeneratorList docGenerators) { return ExtrinsicObjectGenerator.toJaxbElements(docGenerators.extrinsicObjects()); } public static List> createFolderRegistryPackagesAndAssociations( DocumentSubmissionRequest documentSubmissionRequest, - DocumentGeneratorList docGenerators) { + DocumentGenerator.DocumentGeneratorList docGenerators) { var associations = AssociationGenerator.createFolderToDocumentAssociations(docGenerators); var folderRegistryPackages = @@ -151,7 +149,8 @@ public static List> createSubmissionSetAssociation .map( identifiable -> { var association = - AssociationGenerator.createNewMemberAssociation(identifiable.getId()); + de.gematik.epa.conversion.internal.AssociationGenerator + .createNewMemberAssociation(identifiable.getId()); association.setSourceObject(submissionSet.getId()); return association; }) @@ -160,19 +159,8 @@ public static List> createSubmissionSetAssociation } private static List> createReplaceAssociations( - DocumentGeneratorList docGenerators) { + DocumentGenerator.DocumentGeneratorList docGenerators) { return AssociationGenerator.toAssociationJaxbElements( AssociationGenerator.createDocumentReplaceAssociations(docGenerators)); } - - private static SlotListType createRequestSlotList( - SubmissionRequestInterface submissionRequestInterface) { - var recordIdentifier = submissionRequestInterface.recordIdentifier(); - SlotListType slot = new SlotListType(); - slot.getSlot() - .add( - SlotFactory.slot( - SlotName.HOME_COMMUNITY_ID.getName(), recordIdentifier.getHomeCommunityId())); - return slot; - } } diff --git a/src/main/java/de/gematik/epa/conversion/ResponseUtils.java b/src/main/java/de/gematik/epa/conversion/ResponseUtils.java index c14fb81..0f51e7a 100644 --- a/src/main/java/de/gematik/epa/conversion/ResponseUtils.java +++ b/src/main/java/de/gematik/epa/conversion/ResponseUtils.java @@ -115,6 +115,7 @@ private static boolean neitherSuccessNorFailure(String statusValue) { private static RetrieveDocumentElement createRetrieveDocumentElement( RetrieveDocumentSetResponseType.DocumentResponse iheDocResponse) { return new RetrieveDocumentElement( + iheDocResponse.getRepositoryUniqueId(), iheDocResponse.getDocumentUniqueId(), iheDocResponse.getMimeType(), iheDocResponse.getDocument()); diff --git a/src/main/java/de/gematik/epa/conversion/RestrictedUpdateDocumentUtils.java b/src/main/java/de/gematik/epa/conversion/RestrictedUpdateDocumentUtils.java new file mode 100644 index 0000000..eaf774d --- /dev/null +++ b/src/main/java/de/gematik/epa/conversion/RestrictedUpdateDocumentUtils.java @@ -0,0 +1,84 @@ +/* + * Copyright 2023 gematik GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package de.gematik.epa.conversion; + +import static de.gematik.epa.conversion.ProvideAndRegisterUtils.createExtrinsicObjects; +import static de.gematik.epa.conversion.ProvideAndRegisterUtils.createSubmissionSetRegistryPackage; + +import de.gematik.epa.conversion.internal.AssociationGenerator; +import de.gematik.epa.conversion.internal.requests.DocumentGenerator; +import de.gematik.epa.ihe.model.document.RestrictedUpdateDocument; +import de.gematik.epa.ihe.model.request.SubmissionRequestInterface; +import jakarta.xml.bind.JAXBElement; +import java.util.List; +import lombok.experimental.UtilityClass; +import oasis.names.tc.ebxml_regrep.xsd.lcm._3.SubmitObjectsRequest; +import oasis.names.tc.ebxml_regrep.xsd.rim._3.AssociationType1; +import oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryObjectListType; +import oasis.names.tc.ebxml_regrep.xsd.rim._3.RegistryPackageType; + +@UtilityClass +public class RestrictedUpdateDocumentUtils { + + public static SubmitObjectsRequest toUpdateDocumentSetRequest( + SubmissionRequestInterface submissionRequest) { + var docGenerators = + DocumentGenerator.generators(submissionRequest.documents(), submissionRequest.insurantId()); + + return createSubmitObjectsRequest(submissionRequest, docGenerators); + } + + private static SubmitObjectsRequest createSubmitObjectsRequest( + SubmissionRequestInterface submissionRequest, + DocumentGenerator.DocumentGeneratorList docGenerators) { + + var submitObjectRequest = new SubmitObjectsRequest(); + var registryObjectList = new RegistryObjectListType(); + submitObjectRequest.setRegistryObjectList(registryObjectList); + registryObjectList.getIdentifiable().addAll(createExtrinsicObjects(docGenerators)); + + var submissionSetRegistryPackage = createSubmissionSetRegistryPackage(submissionRequest); + registryObjectList + .getIdentifiable() + .addAll( + createSubmissionSetUpdateDocumentAssociations( + submissionSetRegistryPackage, registryObjectList)); + registryObjectList + .getIdentifiable() + .add( + 0, + de.gematik.epa.conversion.internal.requests.RegistryPackageGenerator + .toRegistryPackageJaxbElement(submissionSetRegistryPackage)); + return submitObjectRequest; + } + + public static List> createSubmissionSetUpdateDocumentAssociations( + RegistryPackageType submissionSet, RegistryObjectListType registryObjectList) { + return registryObjectList.getIdentifiable().stream() + .map(JAXBElement::getValue) + .map( + identifiable -> { + var association = + AssociationGenerator.createNewMemberUpdateDocumentAssociation( + identifiable.getId()); + association.setSourceObject(submissionSet.getId()); + return association; + }) + .map(AssociationGenerator::toAssociationJaxbElement) + .toList(); + } +} diff --git a/src/main/java/de/gematik/epa/conversion/RetrieveDocumentsUtils.java b/src/main/java/de/gematik/epa/conversion/RetrieveDocumentsUtils.java index 2227795..f75ca92 100644 --- a/src/main/java/de/gematik/epa/conversion/RetrieveDocumentsUtils.java +++ b/src/main/java/de/gematik/epa/conversion/RetrieveDocumentsUtils.java @@ -34,8 +34,7 @@ public static RetrieveDocumentSetRequestType toRetrieveDocumentSetRequest( docUniqueId -> new RetrieveDocumentSetRequestType.DocumentRequest() .withDocumentUniqueId(docUniqueId) - .withHomeCommunityId(retrieveDocumentsRequest.homeCommunityId()) - .withRepositoryUniqueId(retrieveDocumentsRequest.homeCommunityId())) + .withRepositoryUniqueId(retrieveDocumentsRequest.repositoryUniqueId())) .toList()); } } diff --git a/src/main/java/de/gematik/epa/conversion/internal/AssociationGenerator.java b/src/main/java/de/gematik/epa/conversion/internal/AssociationGenerator.java index 7ce7432..2533e3c 100644 --- a/src/main/java/de/gematik/epa/conversion/internal/AssociationGenerator.java +++ b/src/main/java/de/gematik/epa/conversion/internal/AssociationGenerator.java @@ -17,7 +17,8 @@ package de.gematik.epa.conversion.internal; import de.gematik.epa.conversion.internal.requests.DocumentGenerator; -import de.gematik.epa.conversion.internal.requests.DocumentGenerator.DocumentGeneratorList; +import de.gematik.epa.conversion.internal.requests.factories.slot.SlotFactory; +import de.gematik.epa.conversion.internal.requests.factories.slot.SlotName; import de.gematik.epa.ihe.model.simple.FolderMetadata; import jakarta.xml.bind.JAXBElement; import java.util.List; @@ -35,7 +36,7 @@ public class AssociationGenerator { public static final String ASSOCIATION_TYPE_REPLACE = "urn:ihe:iti:2007:AssociationType:RPLC"; public static List createFolderToDocumentAssociations( - DocumentGeneratorList docGenerators) { + DocumentGenerator.DocumentGeneratorList docGenerators) { return docGenerators.stream() .filter(dg -> Objects.nonNull(dg.folderMetadata())) .map(dg -> createFolderToDocumentAssociation(dg.folderMetadata(), dg.id())) @@ -43,7 +44,7 @@ public static List createFolderToDocumentAssociations( } public static List createDocumentReplaceAssociations( - DocumentGeneratorList docGenerators) { + DocumentGenerator.DocumentGeneratorList docGenerators) { return docGenerators.stream() .filter(dg -> Objects.nonNull(dg.idOfDocumentToReplace())) .map(AssociationGenerator::createReplaceAssociation) @@ -61,15 +62,26 @@ public static JAXBElement toAssociationJaxbElement( .createAssociation(association); } - public static AssociationType1 createNewMemberAssociation(String targetId) { + public static AssociationType1 createNewMemberUpdateDocumentAssociation(String targetId) { var association = createNewAssociation(targetId); association.setAssociationType(ASSOCIATION_TYPE_HAS_MEMBER); + var slots = + new java.util.ArrayList<>( + List.of( + SlotFactory.slotIf(SlotName.SUBMISSION_SET_STATUS, Objects::nonNull, "Original"), + SlotFactory.slotIf(SlotName.PREVIOUS_VERSION, Objects::nonNull, "1"), + SlotFactory.slotIf(SlotName.ASSOCIATION_PROPAGATION, Objects::nonNull, "no"))); + association.getSlot().addAll(slots); return association; } - // region private + public static AssociationType1 createNewMemberAssociation(String targetId) { + var association = createNewAssociation(targetId); + association.setAssociationType(ASSOCIATION_TYPE_HAS_MEMBER); + return association; + } - private static AssociationType1 createFolderToDocumentAssociation( + public static AssociationType1 createFolderToDocumentAssociation( FolderMetadata folderMetadata, String documentId) { if (Objects.nonNull(folderMetadata.entryUUID())) { return createDocumentAssociationForExistingDynamicFolder( @@ -79,19 +91,15 @@ private static AssociationType1 createFolderToDocumentAssociation( } } - private static AssociationType1 createDocumentAssociationForExistingDynamicFolder( - String documentId, String entryUUID) { - var association = createNewMemberAssociation(documentId); - association.setSourceObject(entryUUID); - return association; - } + public static AssociationType1 createNewAssociation(String targetId) { + var association = new AssociationType1(); + association.setTargetObject(targetId); + association.setId(UUID.randomUUID().toString()); - private static AssociationType1 createDocumentAssociationForNewFolder(String documentId) { - var association = createNewMemberAssociation(documentId); - association.setSourceObject(UUID.randomUUID().toString()); return association; } + // region private private static AssociationType1 createReplaceAssociation(DocumentGenerator docGenerator) { var association = createNewAssociation(docGenerator.idOfDocumentToReplace()); association.setAssociationType(ASSOCIATION_TYPE_REPLACE); @@ -99,11 +107,16 @@ private static AssociationType1 createReplaceAssociation(DocumentGenerator docGe return association; } - private static AssociationType1 createNewAssociation(String targetId) { - var association = new AssociationType1(); - association.setTargetObject(targetId); - association.setId(UUID.randomUUID().toString()); + private static AssociationType1 createDocumentAssociationForExistingDynamicFolder( + String documentId, String entryUUID) { + var association = createNewMemberAssociation(documentId); + association.setSourceObject(entryUUID); + return association; + } + private static AssociationType1 createDocumentAssociationForNewFolder(String documentId) { + var association = createNewMemberAssociation(documentId); + association.setSourceObject(UUID.randomUUID().toString()); return association; } diff --git a/src/main/java/de/gematik/epa/conversion/internal/requests/DocumentGenerator.java b/src/main/java/de/gematik/epa/conversion/internal/requests/DocumentGenerator.java index d293cb0..4431ea1 100644 --- a/src/main/java/de/gematik/epa/conversion/internal/requests/DocumentGenerator.java +++ b/src/main/java/de/gematik/epa/conversion/internal/requests/DocumentGenerator.java @@ -20,8 +20,7 @@ import de.gematik.epa.ihe.model.document.DocumentMetadata; import de.gematik.epa.ihe.model.document.ReplaceDocument; import de.gematik.epa.ihe.model.simple.FolderMetadata; -import de.gematik.epa.ihe.model.simple.RecordIdentifier; -import ihe.iti.xds_b._2007.ProvideAndRegisterDocumentSetRequestType; +import de.gematik.epa.ihe.model.simple.InsurantId; import ihe.iti.xds_b._2007.ProvideAndRegisterDocumentSetRequestType.Document; import java.util.ArrayList; import java.util.List; @@ -36,8 +35,10 @@ /** * Generator class to generate the objects, which are created from the document data ({@link - * de.gematik.epa.ihe.model.document.Document} or {@link ReplaceDocument}) of a request.
- * These are {@link ExtrinsicObjectType} and {@link Document}. + * de.gematik.epa.ihe.model.document.Document} or {@link + * de.gematik.epa.ihe.model.document.ReplaceDocument}) of a request.
+ * These are {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ExtrinsicObjectType} and {@link + * ihe.iti.xds_b._2007.ProvideAndRegisterDocumentSetRequestType.Document}. */ @Getter @Accessors(fluent = true) @@ -48,19 +49,18 @@ public class DocumentGenerator { public static final String UUID_PREFIX = "urn:uuid:"; public static DocumentGeneratorList generators( - List documents, RecordIdentifier recordIdentifier) { + List documents, InsurantId insurantId) { return new DocumentGeneratorList( - documents.stream().map(doc -> generator(doc, recordIdentifier)).toList()); + documents.stream().map(doc -> generator(doc, insurantId)).toList()); } @NonNull private final DocumentInterface document; - - @NonNull private final RecordIdentifier recordIdentifier; + @NonNull private final InsurantId insurantId; /** * Get the id, which is used for the id attribute of the ExtrinsicObject and the Document. Has the - * value of {@link DocumentMetadata#entryUUID()} if it is not null, otherwise a new id will be - * generated. + * value of {@link de.gematik.epa.ihe.model.document.DocumentMetadata#entryUUID()} if it is not + * null, otherwise a new id will be generated. */ @Getter(lazy = true) private final String id = @@ -69,22 +69,22 @@ public static DocumentGeneratorList generators( .orElseGet(() -> UUID_PREFIX + UUID.randomUUID()); /** - * Get the {@link Document} generated from the provided {@link DocumentInterface} implementation. + * Get the {@link ihe.iti.xds_b._2007.ProvideAndRegisterDocumentSetRequestType.Document} generated + * from the provided {@link de.gematik.epa.ihe.model.document.DocumentInterface} implementation. */ @Getter(lazy = true) - private final ProvideAndRegisterDocumentSetRequestType.Document iheDocument = - toIheDocument(document, id()); + private final Document iheDocument = toIheDocument(document, id()); /** - * Get the {@link ExtrinsicObjectType} generated from the provided {@link DocumentInterface} - * implementation. + * Get the {@link oasis.names.tc.ebxml_regrep.xsd.rim._3.ExtrinsicObjectType} generated from the + * provided {@link de.gematik.epa.ihe.model.document.DocumentInterface} implementation. */ @Getter(lazy = true) private final ExtrinsicObjectType extrinsicObject = - ExtrinsicObjectGenerator.createExtrinsicObject(document, recordIdentifier, id()); + ExtrinsicObjectGenerator.createExtrinsicObject(document, id(), insurantId); /** - * Get the {@link FolderMetadata} from the provided document.
+ * Get the {@link de.gematik.epa.ihe.model.simple.FolderMetadata} from the provided document.
* This will only return a value, if the provided document is of type {@link * de.gematik.epa.ihe.model.document.Document} otherwise null will be returned. */ @@ -98,8 +98,8 @@ public static DocumentGeneratorList generators( /** * Get the id of the document, which is to be replaced by the provided document.
- * This will only return a value, if the provided document is of type {@link ReplaceDocument} - * otherwise null will be returned. + * This will only return a value, if the provided document is of type {@link + * de.gematik.epa.ihe.model.document.ReplaceDocument} otherwise null will be returned. */ @Getter(lazy = true) private final String idOfDocumentToReplace = @@ -109,9 +109,8 @@ public static DocumentGeneratorList generators( .map(ReplaceDocument::entryUUIDOfDocumentToReplace) .orElse(null); - private static ProvideAndRegisterDocumentSetRequestType.Document toIheDocument( - DocumentInterface document, String id) { - var iheDocument = new ProvideAndRegisterDocumentSetRequestType.Document(); + private static Document toIheDocument(DocumentInterface document, String id) { + var iheDocument = new Document(); iheDocument.setValue(document.documentData().value()); iheDocument.setId(id); return iheDocument; @@ -123,7 +122,7 @@ private DocumentGeneratorList(List list) { super(list); } - public List iheDocuments() { + public List iheDocuments() { return stream().map(DocumentGenerator::iheDocument).toList(); } diff --git a/src/main/java/de/gematik/epa/conversion/internal/requests/ExtrinsicObjectGenerator.java b/src/main/java/de/gematik/epa/conversion/internal/requests/ExtrinsicObjectGenerator.java index 0fef134..cdc9a42 100644 --- a/src/main/java/de/gematik/epa/conversion/internal/requests/ExtrinsicObjectGenerator.java +++ b/src/main/java/de/gematik/epa/conversion/internal/requests/ExtrinsicObjectGenerator.java @@ -16,13 +16,15 @@ package de.gematik.epa.conversion.internal.requests; +import static de.gematik.epa.conversion.internal.requests.ExtrinsicObjectGenerator.toExtrinsicObject; + import de.gematik.epa.conversion.internal.requests.factories.RegistryObjectFactory; import de.gematik.epa.conversion.internal.requests.factories.classification.ExtrinsicObjectClassificationFactory; import de.gematik.epa.conversion.internal.requests.factories.externalidentifier.ExternalIdentifierFactory; import de.gematik.epa.conversion.internal.requests.factories.slot.ExtrinsicObjectSlotFactory; import de.gematik.epa.ihe.model.document.DocumentInterface; import de.gematik.epa.ihe.model.document.ObjectType; -import de.gematik.epa.ihe.model.simple.RecordIdentifier; +import de.gematik.epa.ihe.model.simple.InsurantId; import jakarta.xml.bind.JAXBElement; import java.util.List; import oasis.names.tc.ebxml_regrep.xsd.rim._3.ExtrinsicObjectType; @@ -32,13 +34,10 @@ public class ExtrinsicObjectGenerator { private ExtrinsicObjectGenerator() {} public static void fillExtrinsicObject( - ExtrinsicObjectType extrinsicObject, - DocumentInterface document, - RecordIdentifier recordIdentifier) { + ExtrinsicObjectType extrinsicObject, DocumentInterface document, InsurantId insurantId) { extrinsicObject.setMimeType(document.documentMetadata().mimeType()); extrinsicObject.setIsOpaque(false); extrinsicObject.setObjectType(ObjectType.DOCUMENT_ENTRY.getId()); - extrinsicObject.setHome(recordIdentifier.getHomeCommunityId()); RegistryObjectFactory.setName(extrinsicObject, document.documentMetadata().title()); RegistryObjectFactory.setDescription(extrinsicObject, document.documentMetadata().comments()); @@ -46,20 +45,19 @@ public static void fillExtrinsicObject( ExtrinsicObjectSlotFactory.createSlotTypes(extrinsicObject, document); ExtrinsicObjectClassificationFactory.createClassifications(extrinsicObject, document); - ExternalIdentifierFactory.forDocumentEntry( - extrinsicObject, document, recordIdentifier.getInsurantId()); + ExternalIdentifierFactory.forDocumentEntry(extrinsicObject, document, insurantId); } - public static ExtrinsicObjectType toExtrinsicObject(String documentId) { - var extrinsicObject = new ExtrinsicObjectType(); - extrinsicObject.setId(documentId); + public static ExtrinsicObjectType createExtrinsicObject( + DocumentInterface document, String documentId, InsurantId insurantId) { + var extrinsicObject = toExtrinsicObject(documentId); + fillExtrinsicObject(extrinsicObject, document, insurantId); return extrinsicObject; } - public static ExtrinsicObjectType createExtrinsicObject( - DocumentInterface document, RecordIdentifier recordIdentifier, String documentId) { - var extrinsicObject = toExtrinsicObject(documentId); - fillExtrinsicObject(extrinsicObject, document, recordIdentifier); + public static ExtrinsicObjectType toExtrinsicObject(String documentId) { + var extrinsicObject = new ExtrinsicObjectType(); + extrinsicObject.setId(documentId); return extrinsicObject; } diff --git a/src/main/java/de/gematik/epa/conversion/internal/requests/RegistryPackageGenerator.java b/src/main/java/de/gematik/epa/conversion/internal/requests/RegistryPackageGenerator.java index 01e0222..5fcfe2a 100644 --- a/src/main/java/de/gematik/epa/conversion/internal/requests/RegistryPackageGenerator.java +++ b/src/main/java/de/gematik/epa/conversion/internal/requests/RegistryPackageGenerator.java @@ -16,7 +16,6 @@ package de.gematik.epa.conversion.internal.requests; -import de.gematik.epa.conversion.internal.requests.DocumentGenerator.DocumentGeneratorList; import de.gematik.epa.conversion.internal.requests.factories.OasisObjectType; import de.gematik.epa.conversion.internal.requests.factories.RegistryObjectFactory; import de.gematik.epa.conversion.internal.requests.factories.classification.RegistryPackageTypeClassificationFactory; @@ -36,7 +35,7 @@ public class RegistryPackageGenerator { public static List createFolderRegistryPackages( DocumentSubmissionRequest documentSubmissionRequest, List documentToFolderAssociations, - DocumentGeneratorList documentGenerators) { + DocumentGenerator.DocumentGeneratorList documentGenerators) { return documentGenerators.stream() .filter(dg -> Objects.nonNull(dg.folderMetadata())) .filter(dg -> Objects.isNull(dg.folderMetadata().entryUUID())) @@ -65,10 +64,7 @@ public static RegistryPackageType createFolderRegistryPackage( .orElseThrow( () -> new IllegalArgumentException("Association for the new folder is missing")); - var registryPackage = - createNewFolderRegistryPackage( - association.getSourceObject(), - documentSubmissionRequest.recordIdentifier().getHomeCommunityId()); + var registryPackage = createNewFolderRegistryPackage(association.getSourceObject()); RegistryObjectFactory.setName(registryPackage, folderMetadata.title()); RegistryObjectFactory.setDescription(registryPackage, folderMetadata.comments()); @@ -79,25 +75,20 @@ public static RegistryPackageType createFolderRegistryPackage( folderMetadata, registryPackage); ExternalIdentifierFactory.forFolder( - registryPackage, - folderMetadata, - documentSubmissionRequest.recordIdentifier().getInsurantId()); + registryPackage, folderMetadata, documentSubmissionRequest.insurantId()); return registryPackage; } - public static RegistryPackageType createNewFolderRegistryPackage( - String id, String homeCommunityId) { - var registryPackage = createNewRegistryPackage(homeCommunityId); + public static RegistryPackageType createNewFolderRegistryPackage(String id) { + var registryPackage = createNewRegistryPackage(); registryPackage.setId(id); return registryPackage; } - public static RegistryPackageType createNewRegistryPackage(String homeCommunityId) { + public static RegistryPackageType createNewRegistryPackage() { var registryPackage = new RegistryPackageType(); registryPackage.setObjectType(OasisObjectType.REGISTRY_PACKAGE.getValue()); - registryPackage.setHome(homeCommunityId); - return registryPackage; } diff --git a/src/main/java/de/gematik/epa/conversion/internal/requests/factories/slot/SlotName.java b/src/main/java/de/gematik/epa/conversion/internal/requests/factories/slot/SlotName.java index b61aa8d..dfb8e76 100644 --- a/src/main/java/de/gematik/epa/conversion/internal/requests/factories/slot/SlotName.java +++ b/src/main/java/de/gematik/epa/conversion/internal/requests/factories/slot/SlotName.java @@ -43,7 +43,10 @@ public enum SlotName { SOURCE_PATIENT_INFO("sourcePatientInfo"), SUBMISSION_TIME("submissionTime"), URI("URI"), - HOME_COMMUNITY_ID("homeCommunityId"); + HOME_COMMUNITY_ID("homeCommunityId"), + PREVIOUS_VERSION("PreviousVersion"), + ASSOCIATION_PROPAGATION("AssociationPropagation"), + SUBMISSION_SET_STATUS("SubmissionSetStatus"); private final String name; } diff --git a/src/main/java/de/gematik/epa/ihe/model/document/RestrictedUpdateDocument.java b/src/main/java/de/gematik/epa/ihe/model/document/RestrictedUpdateDocument.java new file mode 100644 index 0000000..2f9c792 --- /dev/null +++ b/src/main/java/de/gematik/epa/ihe/model/document/RestrictedUpdateDocument.java @@ -0,0 +1,29 @@ +/* + * Copyright 2023 gematik GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package de.gematik.epa.ihe.model.document; + +import de.gematik.epa.ihe.model.simple.ByteArray; + +public record RestrictedUpdateDocument( + ByteArray documentData, DocumentMetadata documentMetadata, String entryUUIDOfDocumentToUpdate) + implements DocumentInterface { + + public RestrictedUpdateDocument( + DocumentMetadata documentMetadata, String entryUUIDOfDocumentToUpdate) { + this(null, documentMetadata, entryUUIDOfDocumentToUpdate); + } +} diff --git a/src/main/java/de/gematik/epa/ihe/model/query/Query.java b/src/main/java/de/gematik/epa/ihe/model/query/Query.java index bd1c484..f635ee2 100644 --- a/src/main/java/de/gematik/epa/ihe/model/query/Query.java +++ b/src/main/java/de/gematik/epa/ihe/model/query/Query.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import de.gematik.epa.ihe.model.request.FindRequest; +import de.gematik.epa.ihe.model.simple.InsurantId; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -53,7 +53,15 @@ public enum Query { GET_FOLDER_AND_CONTENTS( "GetFolderAndContents", "urn:uuid:b909a503-523d-4517-8acf-8e5834dfc4c7", null), GET_RELATED_APPROVED_DOCUMENTS( - "GetRelatedApprovedDocuments", "urn:uuid:1c1f1cea-ad3a-11ed-afa1-0242ac120002", null); + "GetRelatedApprovedDocuments", "urn:uuid:1c1f1cea-ad3a-11ed-afa1-0242ac120002", null), + FIND_DOCUMENTS_BY_COMMENT( + "FindDocumentsByComment", + "urn:uuid:2609dda5-2b97-44d5-a795-3e999c24ca99", + PatientIdNames.XDS_DOCUMENT_ENTRY_PATIENT_ID), + FIND_DOCUMENTS_BY_REFERENCE_ID( + "FindDocumentsByReferenceId", + "urn:uuid:12941a89-e02e-4be5-967c-ce4bfc8fe492", + PatientIdNames.XDS_DOCUMENT_ENTRY_PATIENT_ID); private final String keyword; private final String urn; @@ -65,17 +73,13 @@ public enum Query { this.patientIdSlotName = patientIdSlotName; } - public List fillPatientIdSlot(FindRequest request) { + public List fillPatientIdSlot(InsurantId insurantId) { List slots = new ArrayList<>(); if (this.patientIdSlotName != null) { var slot = new SlotType1(); var valueListType = new ValueListType(); slot.setName(patientIdSlotName.value()); - valueListType - .getValue() - .add( - formatIfUnformattedListElement( - request.recordIdentifier().getInsurantId().getPatientIdValue())); + valueListType.getValue().add(formatIfUnformattedListElement(insurantId.getPatientIdValue())); slot.setValueList(valueListType); slots.add(slot); } diff --git a/src/main/java/de/gematik/epa/ihe/model/query/QueryKey.java b/src/main/java/de/gematik/epa/ihe/model/query/QueryKey.java index 5b155bd..1e2c449 100644 --- a/src/main/java/de/gematik/epa/ihe/model/query/QueryKey.java +++ b/src/main/java/de/gematik/epa/ihe/model/query/QueryKey.java @@ -35,7 +35,9 @@ public enum QueryKey { XDS_FOLDER_STATUS("$XDSFolderStatus"), XDS_SUBMISSION_SET_STATUS("$XDSSubmissionSetStatus"), XDS_FOLDER_ENTRY_UUID("$XDSFolderEntryUUID"), - XDS_FOLDER_UNIQUE_ID("$XDSFolderUniqueId"); + XDS_FOLDER_UNIQUE_ID("$XDSFolderUniqueId"), + XDS_DOCUMENT_ENTRY_COMMENT("$XDSDocumentEntryComment"), + XDS_DOCUMENT_ENTRY_REFERENCE_ID_LIST("$XDSDocumentEntryReferenceIdList"); private final String keyword; diff --git a/src/main/java/de/gematik/epa/ihe/model/request/DocumentReplaceRequest.java b/src/main/java/de/gematik/epa/ihe/model/request/DocumentReplaceRequest.java index 2263233..3218580 100644 --- a/src/main/java/de/gematik/epa/ihe/model/request/DocumentReplaceRequest.java +++ b/src/main/java/de/gematik/epa/ihe/model/request/DocumentReplaceRequest.java @@ -17,12 +17,12 @@ package de.gematik.epa.ihe.model.request; import de.gematik.epa.ihe.model.document.ReplaceDocument; -import de.gematik.epa.ihe.model.simple.RecordIdentifier; +import de.gematik.epa.ihe.model.simple.InsurantId; import de.gematik.epa.ihe.model.simple.SubmissionSetMetadata; import java.util.List; public record DocumentReplaceRequest( - RecordIdentifier recordIdentifier, + InsurantId insurantId, List documents, SubmissionSetMetadata submissionSetMetadata) implements SubmissionRequestInterface {} diff --git a/src/main/java/de/gematik/epa/ihe/model/request/DocumentSubmissionRequest.java b/src/main/java/de/gematik/epa/ihe/model/request/DocumentSubmissionRequest.java index fdb4a02..757d4f1 100644 --- a/src/main/java/de/gematik/epa/ihe/model/request/DocumentSubmissionRequest.java +++ b/src/main/java/de/gematik/epa/ihe/model/request/DocumentSubmissionRequest.java @@ -17,12 +17,10 @@ package de.gematik.epa.ihe.model.request; import de.gematik.epa.ihe.model.document.Document; -import de.gematik.epa.ihe.model.simple.RecordIdentifier; +import de.gematik.epa.ihe.model.simple.InsurantId; import de.gematik.epa.ihe.model.simple.SubmissionSetMetadata; import java.util.List; public record DocumentSubmissionRequest( - RecordIdentifier recordIdentifier, - List documents, - SubmissionSetMetadata submissionSetMetadata) + InsurantId insurantId, List documents, SubmissionSetMetadata submissionSetMetadata) implements SubmissionRequestInterface {} diff --git a/src/main/java/de/gematik/epa/ihe/model/request/FindRequest.java b/src/main/java/de/gematik/epa/ihe/model/request/FindRequest.java index 84303f1..51335ae 100644 --- a/src/main/java/de/gematik/epa/ihe/model/request/FindRequest.java +++ b/src/main/java/de/gematik/epa/ihe/model/request/FindRequest.java @@ -19,12 +19,12 @@ import de.gematik.epa.ihe.model.query.Query; import de.gematik.epa.ihe.model.query.QueryKey; import de.gematik.epa.ihe.model.query.ReturnType; -import de.gematik.epa.ihe.model.simple.RecordIdentifier; +import de.gematik.epa.ihe.model.simple.InsurantId; import java.util.List; import java.util.Map; public record FindRequest( - RecordIdentifier recordIdentifier, + InsurantId insurantId, ReturnType returnType, Query query, Map> queryMetadata) {} diff --git a/src/main/java/de/gematik/epa/ihe/model/request/RestrictedUpdateDocumentRequest.java b/src/main/java/de/gematik/epa/ihe/model/request/RestrictedUpdateDocumentRequest.java new file mode 100644 index 0000000..fe890eb --- /dev/null +++ b/src/main/java/de/gematik/epa/ihe/model/request/RestrictedUpdateDocumentRequest.java @@ -0,0 +1,58 @@ +/* + * Copyright 2023 gematik GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package de.gematik.epa.ihe.model.request; + +import de.gematik.epa.ihe.model.document.RestrictedUpdateDocument; +import de.gematik.epa.ihe.model.simple.InsurantId; +import de.gematik.epa.ihe.model.simple.SubmissionSetMetadata; +import java.util.List; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +public class RestrictedUpdateDocumentRequest + implements SubmissionRequestInterface { + + private InsurantId insurantId; + private List documentMetadataList; + private SubmissionSetMetadata submissionSetMetadata; + + public RestrictedUpdateDocumentRequest( + InsurantId insurantId, + List documentMetadataList, + SubmissionSetMetadata submissionSetMetadata) { + this.insurantId = insurantId; + this.documentMetadataList = documentMetadataList; + this.submissionSetMetadata = submissionSetMetadata; + } + + @Override + public InsurantId insurantId() { + return insurantId; + } + + @Override + public List documents() { + return documentMetadataList; + } + + @Override + public SubmissionSetMetadata submissionSetMetadata() { + return submissionSetMetadata; + } +} diff --git a/src/main/java/de/gematik/epa/ihe/model/request/RetrieveDocumentsRequest.java b/src/main/java/de/gematik/epa/ihe/model/request/RetrieveDocumentsRequest.java index e0c3d7a..a99e9e7 100644 --- a/src/main/java/de/gematik/epa/ihe/model/request/RetrieveDocumentsRequest.java +++ b/src/main/java/de/gematik/epa/ihe/model/request/RetrieveDocumentsRequest.java @@ -18,4 +18,4 @@ import java.util.List; -public record RetrieveDocumentsRequest(String homeCommunityId, List documentUniqueIds) {} +public record RetrieveDocumentsRequest(String repositoryUniqueId, List documentUniqueIds) {} diff --git a/src/main/java/de/gematik/epa/ihe/model/request/SubmissionRequestInterface.java b/src/main/java/de/gematik/epa/ihe/model/request/SubmissionRequestInterface.java index 966521c..ef76606 100644 --- a/src/main/java/de/gematik/epa/ihe/model/request/SubmissionRequestInterface.java +++ b/src/main/java/de/gematik/epa/ihe/model/request/SubmissionRequestInterface.java @@ -17,13 +17,13 @@ package de.gematik.epa.ihe.model.request; import de.gematik.epa.ihe.model.document.DocumentInterface; -import de.gematik.epa.ihe.model.simple.RecordIdentifier; +import de.gematik.epa.ihe.model.simple.InsurantId; import de.gematik.epa.ihe.model.simple.SubmissionSetMetadata; import java.util.List; public interface SubmissionRequestInterface { - RecordIdentifier recordIdentifier(); + InsurantId insurantId(); List documents(); diff --git a/src/main/java/de/gematik/epa/ihe/model/response/RetrieveDocumentElement.java b/src/main/java/de/gematik/epa/ihe/model/response/RetrieveDocumentElement.java index 709ef12..121146d 100644 --- a/src/main/java/de/gematik/epa/ihe/model/response/RetrieveDocumentElement.java +++ b/src/main/java/de/gematik/epa/ihe/model/response/RetrieveDocumentElement.java @@ -19,9 +19,10 @@ import de.gematik.epa.ihe.model.simple.ByteArray; public record RetrieveDocumentElement( - String documentUniqueId, String mimeType, ByteArray document) { + String repositoryUniqueId, String documentUniqueId, String mimeType, ByteArray document) { - public RetrieveDocumentElement(String documentUniqueId, String mimeType, byte[] document) { - this(documentUniqueId, mimeType, ByteArray.of(document)); + public RetrieveDocumentElement( + String repositoryUniqueId, String documentUniqueId, String mimeType, byte[] document) { + this(repositoryUniqueId, documentUniqueId, mimeType, ByteArray.of(document)); } } diff --git a/src/test/java/de/gematik/epa/conversion/AbstractRegistryObjectTest.java b/src/test/java/de/gematik/epa/conversion/AbstractRegistryObjectTest.java index 231ba8b..0081a03 100644 --- a/src/test/java/de/gematik/epa/conversion/AbstractRegistryObjectTest.java +++ b/src/test/java/de/gematik/epa/conversion/AbstractRegistryObjectTest.java @@ -18,11 +18,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import de.gematik.epa.conversion.internal.requests.DocumentGenerator; -import de.gematik.epa.conversion.internal.requests.DocumentGenerator.DocumentGeneratorList; import de.gematik.epa.ihe.model.request.DocumentSubmissionRequest; -import de.gematik.epa.ihe.model.request.SubmissionRequestInterface; import de.gematik.epa.unit.util.ResourceLoader; import jakarta.xml.bind.JAXBElement; import java.util.List; @@ -33,13 +32,13 @@ public abstract class AbstractRegistryObjectTest { DocumentSubmissionRequest documentSubmissionRequest; - DocumentGeneratorList documentGenerators; + DocumentGenerator.DocumentGeneratorList documentGenerators; public void createSubmissionRequest(String template) { documentSubmissionRequest = ResourceLoader.documentSubmissionRequest(template); documentGenerators = DocumentGenerator.generators( - documentSubmissionRequest.documents(), documentSubmissionRequest.recordIdentifier()); + documentSubmissionRequest.documents(), documentSubmissionRequest.insurantId()); } public List> filter( @@ -49,11 +48,8 @@ public List> filter( .toList(); } - public void assertHomeCommunityId( - RegistryObjectType registryObjectType, SubmissionRequestInterface submissionRequest) { - String expectedHomeCommunityId = submissionRequest.recordIdentifier().getHomeCommunityId(); - String actualHomeCommunityId = registryObjectType.getHome(); - assertEquals(expectedHomeCommunityId, actualHomeCommunityId); + public void assertHomeCommunityIdIsNull(RegistryObjectType registryObjectType) { + assertNull(registryObjectType.getHome()); } public void assertName(RegistryObjectType registryObjectType, String expectedName) { diff --git a/src/test/java/de/gematik/epa/conversion/AdhocQueryUtilsTest.java b/src/test/java/de/gematik/epa/conversion/AdhocQueryUtilsTest.java index 74e230b..c338b57 100644 --- a/src/test/java/de/gematik/epa/conversion/AdhocQueryUtilsTest.java +++ b/src/test/java/de/gematik/epa/conversion/AdhocQueryUtilsTest.java @@ -17,6 +17,7 @@ package de.gematik.epa.conversion; import static de.gematik.epa.ihe.model.query.PatientIdNames.XDS_DOCUMENT_ENTRY_PATIENT_ID; +import static de.gematik.epa.ihe.model.query.QueryKey.XDS_DOCUMENT_ENTRY_REFERENCE_ID_LIST; import static de.gematik.epa.ihe.model.query.QueryKey.XDS_DOCUMENT_ENTRY_STATUS; import static org.junit.jupiter.api.Assertions.*; @@ -31,6 +32,8 @@ import java.util.Map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; class AdhocQueryUtilsTest { @@ -45,19 +48,14 @@ void generateFindRequestBody() { queryMetadata.put(XDS_DOCUMENT_ENTRY_STATUS, List.of(documentEntryStatus)); var query = Query.FIND_DOCUMENTS; - String hci = "urn:oid:1.2.3.4.5"; var testdata = new FindRequest( - MessageUtils.createRecordIdentifier(patientId, hci), - ReturnType.OBJECT_REF, - query, - queryMetadata); + MessageUtils.createInsurantId(), ReturnType.OBJECT_REF, query, queryMetadata); var result = assertDoesNotThrow(() -> AdhocQueryUtils.generateFindRequestBody(testdata)); assertNotNull(result); int slotCount = queryMetadata.size() + (query.getPatientIdSlotName() == null ? 0 : 1); assertEquals(2, slotCount); - assertEquals(hci, result.getAdhocQuery().getHome()); assertEquals(2, result.getAdhocQuery().getSlot().size()); String actualStatus = @@ -109,4 +107,99 @@ void testIsFormattedAsListWithIllFormattedValue() { () -> AdhocQueryUtils.isFormattedAsList(value), "The parameter value is ill formatted. It either is bracketed like \"('value')\" or it is not bracketed like \"value\"! But the received parameter value is \"example')\""); } + + @ParameterizedTest + @EnumSource( + value = Query.class, + names = {"FIND_DOCUMENTS_BY_COMMENT", "FIND_DOCUMENTS", "FIND_DOCUMENTS_BY_TITLE"}) + void generateFindRequestBody(Query query) { + Map> queryMetadata = new EnumMap<>(QueryKey.class); + String documentEntryStatus = "urn:oasis:names:tc:ebxml-regrep:StatusType:Approved"; + queryMetadata.put(XDS_DOCUMENT_ENTRY_STATUS, List.of(documentEntryStatus)); + + var testdata = + new FindRequest( + MessageUtils.createInsurantId(), ReturnType.OBJECT_REF, query, queryMetadata); + var result = + Assertions.assertDoesNotThrow(() -> AdhocQueryUtils.generateFindRequestBody(testdata)); + assertNotNull(result); + + int slotCount = queryMetadata.size() + (query.getPatientIdSlotName() == null ? 0 : 1); + assertEquals(2, slotCount); + assertEquals(2, result.getAdhocQuery().getSlot().size()); + assertNull(result.getAdhocQuery().getHome()); + + String actualStatus = + result.getAdhocQuery().getSlot().stream() + .filter(slot -> slot.getName().equals(XDS_DOCUMENT_ENTRY_STATUS.getKeyword())) + .findFirst() + .map(slot -> slot.getValueList().getValue().get(0)) + .orElse(null); + String formattedStatus = "('urn:oasis:names:tc:ebxml-regrep:StatusType:Approved')"; + assertEquals(formattedStatus, actualStatus); + + String actualPatientId = + result.getAdhocQuery().getSlot().stream() + .filter(slot -> slot.getName().equals(XDS_DOCUMENT_ENTRY_PATIENT_ID.value())) + .flatMap(slot -> slot.getValueList().getValue().stream()) + .findFirst() + .orElse(null); + String formattedPatientId = "('X110454647^^^&1.2.276.0.76.4.8&ISO')"; + assertEquals(formattedPatientId, actualPatientId); + } + + @Test + void generateFindDocumentsByReferenceIdRequest() { + Map> queryMetadata = new EnumMap<>(QueryKey.class); + + String documentEntryStatus = "urn:oasis:names:tc:ebxml-regrep:StatusType:Approved"; + queryMetadata.put(XDS_DOCUMENT_ENTRY_STATUS, List.of(documentEntryStatus)); + + String referenceId = "1.2.3.4.5.6^^^^urn.gematik.iti.xds.2023.rootDocumentUniqueId"; + queryMetadata.put(XDS_DOCUMENT_ENTRY_REFERENCE_ID_LIST, List.of(referenceId)); + + var testdata = + new FindRequest( + MessageUtils.createInsurantId(), + ReturnType.LEAF_CLASS, + Query.FIND_DOCUMENTS_BY_REFERENCE_ID, + queryMetadata); + var result = + Assertions.assertDoesNotThrow(() -> AdhocQueryUtils.generateFindRequestBody(testdata)); + assertNotNull(result); + + int slotCount = + queryMetadata.size() + (Query.FIND_DOCUMENTS.getPatientIdSlotName() == null ? 0 : 1); + assertEquals(3, slotCount); + assertEquals(3, result.getAdhocQuery().getSlot().size()); + assertNull(result.getAdhocQuery().getHome()); + + String actualStatus = + result.getAdhocQuery().getSlot().stream() + .filter(slot -> slot.getName().equals(XDS_DOCUMENT_ENTRY_STATUS.getKeyword())) + .findFirst() + .map(slot -> slot.getValueList().getValue().get(0)) + .orElse(null); + String formattedStatus = "('urn:oasis:names:tc:ebxml-regrep:StatusType:Approved')"; + assertEquals(formattedStatus, actualStatus); + + String actualPatientId = + result.getAdhocQuery().getSlot().stream() + .filter(slot -> slot.getName().equals(XDS_DOCUMENT_ENTRY_PATIENT_ID.value())) + .flatMap(slot -> slot.getValueList().getValue().stream()) + .findFirst() + .orElse(null); + String formattedPatientId = "('X110454647^^^&1.2.276.0.76.4.8&ISO')"; + assertEquals(formattedPatientId, actualPatientId); + + String actualReferenceId = + result.getAdhocQuery().getSlot().stream() + .filter(slot -> slot.getName().equals(XDS_DOCUMENT_ENTRY_REFERENCE_ID_LIST.value())) + .flatMap(slot -> slot.getValueList().getValue().stream()) + .findFirst() + .orElse(null); + String formattedReferenceId = + "('1.2.3.4.5.6^^^^urn.gematik.iti.xds.2023.rootDocumentUniqueId')"; + assertEquals(formattedReferenceId, actualReferenceId); + } } diff --git a/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsCreateExtrinsicObjectTest.java b/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsCreateExtrinsicObjectTest.java index 49d397b..b04bb54 100644 --- a/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsCreateExtrinsicObjectTest.java +++ b/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsCreateExtrinsicObjectTest.java @@ -59,8 +59,7 @@ void createExtrinsicObjectsWithAllAttributes() { final DocumentMetadata documentMetadata = documentSubmissionRequest.documents().get(0).documentMetadata(); - - assertHomeCommunityId(extrinsicObjectType, documentSubmissionRequest); + assertHomeCommunityIdIsNull(extrinsicObjectType); assertMimeType(extrinsicObjectType, documentMetadata); assertName(extrinsicObjectType, documentMetadata.title()); assertDescription(extrinsicObjectType, documentMetadata); @@ -74,7 +73,6 @@ void createExtrinsicObjectsWithAllAttributes() { } @Test - // Test basiert auf xml Datei von Iryna void createExtrinsicObjectsWithCustomAttributes() { createSubmissionRequest(PUT_DOCUMENTS_WITHOUT_ATTRIBUTES_REQUEST); diff --git a/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsCreateFolderTest.java b/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsCreateFolderTest.java index d19ec85..eebc14a 100644 --- a/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsCreateFolderTest.java +++ b/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsCreateFolderTest.java @@ -51,7 +51,7 @@ void createFolderObjectsWithAllAttributes() { final List> folders = filter(folderAndAssociations, REGISTRY_PACKAGE); - folders.forEach(f -> assertHomeCommunityId(f.getValue(), documentSubmissionRequest)); + folders.forEach(f -> assertHomeCommunityIdIsNull(f.getValue())); folders.forEach(f -> assertStatus(f.getValue())); folders.forEach(f -> assertName(f.getValue(), folderMetadata.title())); folders.forEach(f -> assertDescription(f.getValue(), folderMetadata.comments())); @@ -80,7 +80,7 @@ void createFolderWithoutAttributes() { final RegistryObjectType value = folders.get(0).getValue(); assertNull(value.getName()); - assertHomeCommunityId(value, documentSubmissionRequest); + assertHomeCommunityIdIsNull(value); assertNull(value.getStatus()); // this folder classification is alsways there assertEquals(1, value.getClassification().size()); diff --git a/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsCreateSubmissionSetTest.java b/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsCreateSubmissionSetTest.java index 5f86267..0778acf 100644 --- a/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsCreateSubmissionSetTest.java +++ b/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsCreateSubmissionSetTest.java @@ -50,8 +50,6 @@ void createSubmissionSetWithAllAttributes() { ProvideAndRegisterUtils.createSubmissionSetRegistryPackage(documentSubmissionRequest); assertEquals(submissionSet.getObjectType(), OasisObjectType.REGISTRY_PACKAGE.getValue()); - assertEquals( - submissionSet.getHome(), documentSubmissionRequest.recordIdentifier().getHomeCommunityId()); assertEquals(1, submissionSet.getSlot().size()); assertEquals(submissionSet.getSlot().get(0).getName(), SlotName.SUBMISSION_TIME.getName()); // in beispiel xml befinden sich derzeit 3, aber die Classification diff --git a/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsTest.java b/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsTest.java index 9a0f53f..0e6004a 100644 --- a/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsTest.java +++ b/src/test/java/de/gematik/epa/conversion/ProvideAndRegisterUtilsTest.java @@ -16,7 +16,9 @@ package de.gematik.epa.conversion; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import de.gematik.epa.ihe.model.document.Document; import de.gematik.epa.ihe.model.request.DocumentSubmissionRequest; @@ -25,10 +27,8 @@ import org.junit.jupiter.api.Test; class ProvideAndRegisterUtilsTest { - @Test void toProvideAndRegisterDocumentSetRequestTest() { - final String homeCommunityId = "urn:oid:1.2.276.0.76.3.1.321.12.1.60.22"; var testdata = ResourceLoader.documentSubmissionRequest( ResourceLoader.PUT_DOCUMENTS_WITH_FOLDER_METADATA_REQUEST); @@ -40,17 +40,13 @@ void toProvideAndRegisterDocumentSetRequestTest() { assertNotNull(testResult.getSubmitObjectsRequest()); assertNotNull(testResult.getSubmitObjectsRequest().getRegistryObjectList()); - var requestSlotList = testResult.getSubmitObjectsRequest().getRequestSlotList(); - assertNotNull(requestSlotList); - assertEquals(1, requestSlotList.getSlot().size()); + assertNull(testResult.getSubmitObjectsRequest().getRequestSlotList()); var registryObjectList = testResult.getSubmitObjectsRequest().getRegistryObjectList(); // +1 for the SubmissionSet RegistryPackage // this will need further modification, once folder and associations are added to the request assertEquals( calculateNumberOfRegistryObjects(testdata), registryObjectList.getIdentifiable().size()); - var actualHomeCommunityId = requestSlotList.getSlot().get(0).getValueList().getValue().get(0); - assertEquals(homeCommunityId, actualHomeCommunityId); } private long calculateNumberOfRegistryObjects(DocumentSubmissionRequest testdata) { diff --git a/src/test/java/de/gematik/epa/conversion/ResponseUtilsTest.java b/src/test/java/de/gematik/epa/conversion/ResponseUtilsTest.java index bb52071..f1d8a02 100644 --- a/src/test/java/de/gematik/epa/conversion/ResponseUtilsTest.java +++ b/src/test/java/de/gematik/epa/conversion/ResponseUtilsTest.java @@ -115,6 +115,15 @@ void toRetrieveDocumentResponseTest() { .toArray(), result.documents().stream().map(RetrieveDocumentElement::documentUniqueId).toArray()); + assertEquals( + iheResponse.getDocumentResponse().stream() + .map(DocumentResponse::getRepositoryUniqueId) + .findFirst() + .orElse(null), + result.documents().stream() + .map(RetrieveDocumentElement::repositoryUniqueId) + .findFirst() + .orElse(null)); assertArrayEquals( iheResponse.getDocumentResponse().stream().map(DocumentResponse::getDocument).toArray(), result.documents().stream() diff --git a/src/test/java/de/gematik/epa/conversion/RestrictedUpdateDocumentUtilsTest.java b/src/test/java/de/gematik/epa/conversion/RestrictedUpdateDocumentUtilsTest.java new file mode 100644 index 0000000..1dcf394 --- /dev/null +++ b/src/test/java/de/gematik/epa/conversion/RestrictedUpdateDocumentUtilsTest.java @@ -0,0 +1,51 @@ +/* + * Copyright 2023 gematik GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package de.gematik.epa.conversion; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import de.gematik.epa.unit.util.ResourceLoader; +import org.junit.jupiter.api.Test; + +class RestrictedUpdateDocumentUtilsTest { + @Test + void toUpdateDocumentRequest() { + var testdata = + ResourceLoader.updateDocumentSetRequest(ResourceLoader.RESTRICTED_UPDATE_DOCUMENT_REQUEST); + + var testResult = RestrictedUpdateDocumentUtils.toUpdateDocumentSetRequest(testdata); + assertNull(testResult.getRequestSlotList()); + assertNotNull(testResult); + assertEquals(3, testResult.getRegistryObjectList().getIdentifiable().size()); + assertNotNull(testResult.getRegistryObjectList()); + } + + @Test + void toUpdateDocumentListRequest() { + var testdata = + ResourceLoader.updateDocumentSetRequest( + ResourceLoader.RESTRICTED_UPDATE_DOCUMENT_LIST_REQUEST); + + var testResult = RestrictedUpdateDocumentUtils.toUpdateDocumentSetRequest(testdata); + assertNull(testResult.getRequestSlotList()); + assertNotNull(testResult); + assertEquals(5, testResult.getRegistryObjectList().getIdentifiable().size()); + assertNotNull(testResult.getRegistryObjectList()); + } +} diff --git a/src/test/java/de/gematik/epa/conversion/RetrieveDocumentsUtilsTest.java b/src/test/java/de/gematik/epa/conversion/RetrieveDocumentsUtilsTest.java index a144dd7..d5f91f2 100644 --- a/src/test/java/de/gematik/epa/conversion/RetrieveDocumentsUtilsTest.java +++ b/src/test/java/de/gematik/epa/conversion/RetrieveDocumentsUtilsTest.java @@ -16,35 +16,36 @@ package de.gematik.epa.conversion; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import de.gematik.epa.ihe.model.request.RetrieveDocumentsRequest; import de.gematik.epa.unit.util.ResourceLoader; -import ihe.iti.xds_b._2007.RetrieveDocumentSetRequestType.DocumentRequest; +import ihe.iti.xds_b._2007.RetrieveDocumentSetRequestType; import org.junit.jupiter.api.Test; class RetrieveDocumentsUtilsTest { @Test void toRetrieveDocumentSetRequestTest() { - var libRequest = + RetrieveDocumentsRequest libRequest = ResourceLoader.retrieveDocumentsRequest(ResourceLoader.RETRIEVE_DOCUMENTS_REQUEST_PATH); var iheRequest = assertDoesNotThrow(() -> RetrieveDocumentsUtils.toRetrieveDocumentSetRequest(libRequest)); assertNotNull(iheRequest); + assertTrue( iheRequest.getDocumentRequest().stream() - .map(DocumentRequest::getHomeCommunityId) - .allMatch(hcid -> hcid.equals(libRequest.homeCommunityId()))); - assertTrue( - iheRequest.getDocumentRequest().stream() - .map(DocumentRequest::getRepositoryUniqueId) - .allMatch(ruid -> ruid.equals(libRequest.homeCommunityId()))); + .map(RetrieveDocumentSetRequestType.DocumentRequest::getRepositoryUniqueId) + .allMatch(ruid -> ruid.equals(libRequest.repositoryUniqueId()))); assertArrayEquals( libRequest.documentUniqueIds().toArray(), iheRequest.getDocumentRequest().stream() - .map(DocumentRequest::getDocumentUniqueId) + .map(RetrieveDocumentSetRequestType.DocumentRequest::getDocumentUniqueId) .toArray()); } } diff --git a/src/test/java/de/gematik/epa/conversion/internal/AssociationGeneratorTest.java b/src/test/java/de/gematik/epa/conversion/internal/AssociationGeneratorTest.java index d026406..2467830 100644 --- a/src/test/java/de/gematik/epa/conversion/internal/AssociationGeneratorTest.java +++ b/src/test/java/de/gematik/epa/conversion/internal/AssociationGeneratorTest.java @@ -16,23 +16,28 @@ package de.gematik.epa.conversion.internal; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; import de.gematik.epa.conversion.internal.requests.DocumentGenerator; import de.gematik.epa.unit.util.ResourceLoader; import oasis.names.tc.ebxml_regrep.xsd.rim._3.AssociationType1; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class AssociationGeneratorTest { + private static final String ASSOCIATION_TYPE_HAS_MEMBER = + "urn:oasis:names:tc:ebxml-regrep:AssociationType:HasMember"; @Test void createDocumentReplaceAssociationsTest() { var request = ResourceLoader.documentsReplaceRequest(ResourceLoader.REPLACE_DOCUMENTS_REQUEST); - var docGenerators = - DocumentGenerator.generators(request.documents(), request.recordIdentifier()); + var docGenerators = DocumentGenerator.generators(request.documents(), request.insurantId()); var associations = - assertDoesNotThrow( + Assertions.assertDoesNotThrow( () -> AssociationGenerator.createDocumentReplaceAssociations(docGenerators)); assertNotNull(associations); @@ -41,4 +46,18 @@ void createDocumentReplaceAssociationsTest() { docGenerators.stream().map(DocumentGenerator::idOfDocumentToReplace).toArray(), associations.stream().map(AssociationType1::getTargetObject).toArray()); } + + @Test + void createRMUAssociationTest() { + String targetId = "targetId"; + var association = + Assertions.assertDoesNotThrow( + () -> AssociationGenerator.createNewMemberUpdateDocumentAssociation(targetId)); + + assertNotNull(association); + assertEquals(ASSOCIATION_TYPE_HAS_MEMBER, association.getAssociationType()); + assertFalse(association.getSlot().isEmpty()); + assertEquals(3, association.getSlot().size()); + assertEquals(targetId, association.getTargetObject()); + } } diff --git a/src/test/java/de/gematik/epa/conversion/internal/enumerated/QueryTest.java b/src/test/java/de/gematik/epa/conversion/internal/enumerated/QueryTest.java index a2de8b7..a467667 100644 --- a/src/test/java/de/gematik/epa/conversion/internal/enumerated/QueryTest.java +++ b/src/test/java/de/gematik/epa/conversion/internal/enumerated/QueryTest.java @@ -37,12 +37,8 @@ class QueryTest { void fillPatientIdSlotForFindFolders() { var insurantId = MessageUtils.createInsurantId(); FindRequest request = - new FindRequest( - MessageUtils.createRecordIdentifier(insurantId, "urn:oid:1.2.276.0.76.3.1.315.3.2.1.1"), - ReturnType.LEAF_CLASS, - Query.FIND_FOLDERS, - Map.of()); - var actual = assertDoesNotThrow(() -> request.query().fillPatientIdSlot(request)); + new FindRequest(insurantId, ReturnType.LEAF_CLASS, Query.FIND_FOLDERS, Map.of()); + var actual = assertDoesNotThrow(() -> request.query().fillPatientIdSlot(request.insurantId())); assertNotNull(actual); assertEquals(1, actual.size()); assertEquals( @@ -56,13 +52,11 @@ void fillPatientIdSlotForGetFolderAndContents() { queryMetadata.put(QueryKey.XDS_FOLDER_ENTRY_UUID, List.of("1.2.3")); FindRequest request = new FindRequest( - MessageUtils.createRecordIdentifier(), - null, - Query.GET_FOLDER_AND_CONTENTS, - queryMetadata); + MessageUtils.createInsurantId(), null, Query.GET_FOLDER_AND_CONTENTS, queryMetadata); assertNull(Query.GET_FOLDER_AND_CONTENTS.getPatientIdSlotName()); var slotType1 = - assertDoesNotThrow(() -> Query.GET_FOLDER_AND_CONTENTS.fillPatientIdSlot(request)); + assertDoesNotThrow( + () -> Query.GET_FOLDER_AND_CONTENTS.fillPatientIdSlot(request.insurantId())); assertEquals(0, slotType1.size()); } @@ -72,13 +66,48 @@ void fillPatientIdSlotForGetRelatedApprovedDocuments() { queryMetadata.put(QueryKey.XDS_DOCUMENT_ENTRY_ENTRY_UUID, List.of("1.2.3")); FindRequest request = new FindRequest( - MessageUtils.createRecordIdentifier(), + MessageUtils.createInsurantId(), null, Query.GET_RELATED_APPROVED_DOCUMENTS, queryMetadata); assertNull(Query.GET_RELATED_APPROVED_DOCUMENTS.getPatientIdSlotName()); var slotType1 = - assertDoesNotThrow(() -> Query.GET_RELATED_APPROVED_DOCUMENTS.fillPatientIdSlot(request)); + assertDoesNotThrow( + () -> Query.GET_RELATED_APPROVED_DOCUMENTS.fillPatientIdSlot(request.insurantId())); assertEquals(0, slotType1.size()); } + + @Test + void fillPatientIdSlotForFindDocumentsByComment() { + var insurantId = MessageUtils.createInsurantId(); + FindRequest request = + new FindRequest( + insurantId, ReturnType.LEAF_CLASS, Query.FIND_DOCUMENTS_BY_COMMENT, Map.of()); + var query = request.query(); + assertEquals("FindDocumentsByComment", query.getKeyword()); + assertEquals("urn:uuid:2609dda5-2b97-44d5-a795-3e999c24ca99", query.getUrn()); + var actual = assertDoesNotThrow(() -> request.query().fillPatientIdSlot(request.insurantId())); + assertNotNull(actual); + assertEquals(1, actual.size()); + assertEquals( + "('" + insurantId.getPatientIdValue() + "')", + actual.get(0).getValueList().getValue().get(0)); + } + + @Test + void fillPatientIdSlotForFindDocumentsByReferenceId() { + var insurantId = MessageUtils.createInsurantId(); + FindRequest request = + new FindRequest( + insurantId, ReturnType.LEAF_CLASS, Query.FIND_DOCUMENTS_BY_REFERENCE_ID, Map.of()); + var query = request.query(); + assertEquals("FindDocumentsByReferenceId", query.getKeyword()); + assertEquals("urn:uuid:12941a89-e02e-4be5-967c-ce4bfc8fe492", query.getUrn()); + var actual = assertDoesNotThrow(() -> request.query().fillPatientIdSlot(request.insurantId())); + assertNotNull(actual); + assertEquals(1, actual.size()); + assertEquals( + "('" + insurantId.getPatientIdValue() + "')", + actual.get(0).getValueList().getValue().get(0)); + } } diff --git a/src/test/java/de/gematik/epa/conversion/internal/requests/DocumentGeneratorTest.java b/src/test/java/de/gematik/epa/conversion/internal/requests/DocumentGeneratorTest.java index 68525b0..8b89757 100644 --- a/src/test/java/de/gematik/epa/conversion/internal/requests/DocumentGeneratorTest.java +++ b/src/test/java/de/gematik/epa/conversion/internal/requests/DocumentGeneratorTest.java @@ -16,7 +16,11 @@ package de.gematik.epa.conversion.internal.requests; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import de.gematik.epa.ihe.model.document.Document; import de.gematik.epa.ihe.model.document.DocumentInterface; @@ -26,6 +30,7 @@ import de.gematik.epa.unit.util.ResourceLoader; import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; class DocumentGeneratorTest { @@ -37,9 +42,9 @@ class DocumentGeneratorTest { @Test void generatorsTest() { var documents = documents(); - var recordIdentifier = request.recordIdentifier(); var result = - assertDoesNotThrow(() -> DocumentGenerator.generators(documents, recordIdentifier)); + Assertions.assertDoesNotThrow( + () -> DocumentGenerator.generators(documents, request.insurantId())); assertNotNull(result); assertEquals(documents.size(), result.size()); @@ -49,28 +54,27 @@ void generatorsTest() { void generatorTest() { var document = request.documents().get(0); var result = - assertDoesNotThrow(() -> DocumentGenerator.generator(document, request.recordIdentifier())); + assertDoesNotThrow(() -> DocumentGenerator.generator(document, request.insurantId())); assertNotNull(result); assertEquals(document, result.document()); - assertEquals(request.recordIdentifier(), result.recordIdentifier()); + assertEquals(request.insurantId(), result.insurantId()); } @Test void idTest() { var replaceRequest = - ResourceLoader.documentsReplaceRequest(ResourceLoader.REPLACE_DOCUMENTS_REQUEST); + de.gematik.epa.unit.util.ResourceLoader.documentsReplaceRequest( + de.gematik.epa.unit.util.ResourceLoader.REPLACE_DOCUMENTS_REQUEST); DocumentGenerator docGenerator = - DocumentGenerator.generator( - replaceRequest.documents().get(0), replaceRequest.recordIdentifier()); + DocumentGenerator.generator(replaceRequest.documents().get(0), replaceRequest.insurantId()); String id = assertDoesNotThrow(docGenerator::id); assertEquals(replaceRequest.documents().get(0).documentMetadata().entryUUID(), id); assertId(docGenerator); - docGenerator = - DocumentGenerator.generator(request.documents().get(0), request.recordIdentifier()); + docGenerator = DocumentGenerator.generator(request.documents().get(0), request.insurantId()); id = assertDoesNotThrow(docGenerator::id); assertNotNull(id); @@ -80,7 +84,7 @@ void idTest() { @Test void iheDocumentTest() { var docGenerator = - DocumentGenerator.generator(request.documents().get(0), request.recordIdentifier()); + DocumentGenerator.generator(request.documents().get(0), request.insurantId()); var result = assertDoesNotThrow(docGenerator::iheDocument); @@ -91,7 +95,7 @@ void iheDocumentTest() { @Test void extrinsicObjectTest() { var docGenerator = - DocumentGenerator.generator(request.documents().get(0), request.recordIdentifier()); + DocumentGenerator.generator(request.documents().get(0), request.insurantId()); var result = assertDoesNotThrow(docGenerator::extrinsicObject); @@ -101,11 +105,12 @@ void extrinsicObjectTest() { @Test void folderMetadataTest() { var replaceRequest = - ResourceLoader.documentsReplaceRequest(ResourceLoader.REPLACE_DOCUMENTS_REQUEST); + de.gematik.epa.unit.util.ResourceLoader.documentsReplaceRequest( + de.gematik.epa.unit.util.ResourceLoader.REPLACE_DOCUMENTS_REQUEST); var minimalRequest = new DocumentSubmissionRequest( - request.recordIdentifier(), new ArrayList<>(), request.submissionSetMetadata()); + request.insurantId(), new ArrayList<>(), request.submissionSetMetadata()); minimalRequest .documents() .add( @@ -115,21 +120,19 @@ void folderMetadataTest() { null)); DocumentGenerator docGenerator = - DocumentGenerator.generator(request.documents().get(0), request.recordIdentifier()); + DocumentGenerator.generator(request.documents().get(0), request.insurantId()); FolderMetadata folderMetadata = assertDoesNotThrow(docGenerator::folderMetadata); assertNotNull(folderMetadata); docGenerator = - DocumentGenerator.generator( - replaceRequest.documents().get(0), replaceRequest.recordIdentifier()); + DocumentGenerator.generator(replaceRequest.documents().get(0), replaceRequest.insurantId()); folderMetadata = assertDoesNotThrow(docGenerator::folderMetadata); assertNull(folderMetadata); docGenerator = - DocumentGenerator.generator( - minimalRequest.documents().get(0), minimalRequest.recordIdentifier()); + DocumentGenerator.generator(minimalRequest.documents().get(0), minimalRequest.insurantId()); folderMetadata = assertDoesNotThrow(docGenerator::folderMetadata); assertNull(folderMetadata); @@ -138,17 +141,17 @@ void folderMetadataTest() { @Test void idOfDocumentToReplaceTest() { var replaceRequest = - ResourceLoader.documentsReplaceRequest(ResourceLoader.REPLACE_DOCUMENTS_REQUEST); + de.gematik.epa.unit.util.ResourceLoader.documentsReplaceRequest( + de.gematik.epa.unit.util.ResourceLoader.REPLACE_DOCUMENTS_REQUEST); DocumentGenerator docGenerator = - DocumentGenerator.generator(request.documents().get(0), request.recordIdentifier()); + DocumentGenerator.generator(request.documents().get(0), request.insurantId()); String idToReplace = assertDoesNotThrow(docGenerator::idOfDocumentToReplace); assertNull(idToReplace); docGenerator = - DocumentGenerator.generator( - replaceRequest.documents().get(0), replaceRequest.recordIdentifier()); + DocumentGenerator.generator(replaceRequest.documents().get(0), replaceRequest.insurantId()); idToReplace = assertDoesNotThrow(docGenerator::idOfDocumentToReplace); assertNotNull(idToReplace); @@ -157,8 +160,7 @@ void idOfDocumentToReplaceTest() { @Test void documentGeneratorListTest() { var documents = documents(); - var recordIdentifier = request.recordIdentifier(); - var docGeneratorList = DocumentGenerator.generators(documents, recordIdentifier); + var docGeneratorList = DocumentGenerator.generators(documents, request.insurantId()); var iheDocuments = assertDoesNotThrow(docGeneratorList::iheDocuments); diff --git a/src/test/java/de/gematik/epa/ihe/model/document/RestrictedUpdateDocumentTest.java b/src/test/java/de/gematik/epa/ihe/model/document/RestrictedUpdateDocumentTest.java new file mode 100644 index 0000000..280415e --- /dev/null +++ b/src/test/java/de/gematik/epa/ihe/model/document/RestrictedUpdateDocumentTest.java @@ -0,0 +1,64 @@ +/* + * Copyright 2023 gematik GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package de.gematik.epa.ihe.model.document; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import de.gematik.epa.ihe.model.simple.ByteArray; +import de.gematik.epa.unit.util.MetadataTestUtils; +import java.nio.charset.StandardCharsets; +import org.junit.jupiter.api.Test; + +class RestrictedUpdateDocumentTest extends MetadataTestUtils { + + @Test + void testConstructorWithNullDocumentData() { + DocumentMetadata documentMetadata = getDocumentMetadata(); + + String entryUUIDOfDocumentToUpdate = "exampleEntryUUID"; + + RestrictedUpdateDocument restrictedUpdateDocument = + new RestrictedUpdateDocument(documentMetadata, entryUUIDOfDocumentToUpdate); + + assertNull(restrictedUpdateDocument.documentData()); + assertNotNull(restrictedUpdateDocument.documentMetadata()); + assertEquals(documentMetadata, restrictedUpdateDocument.documentMetadata()); + assertNotNull(restrictedUpdateDocument.entryUUIDOfDocumentToUpdate()); + assertEquals( + entryUUIDOfDocumentToUpdate, restrictedUpdateDocument.entryUUIDOfDocumentToUpdate()); + } + + @Test + void testConstructorWithNonNullDocumentData() { + byte[] value = "My test byte array".getBytes(StandardCharsets.UTF_8); + var documentData = ByteArray.of(value); + + DocumentMetadata documentMetadata = getDocumentMetadata(); + String entryUUIDOfDocumentToUpdate = "exampleEntryUUID"; + + RestrictedUpdateDocument restrictedUpdateDocument = + new RestrictedUpdateDocument(documentData, documentMetadata, entryUUIDOfDocumentToUpdate); + + assertNotNull(restrictedUpdateDocument.documentData()); + assertEquals(documentData, restrictedUpdateDocument.documentData()); + assertEquals(documentMetadata, restrictedUpdateDocument.documentMetadata()); + assertEquals( + entryUUIDOfDocumentToUpdate, restrictedUpdateDocument.entryUUIDOfDocumentToUpdate()); + } +} diff --git a/src/test/java/de/gematik/epa/ihe/model/request/RestrictedUpdateDocumentRequestTest.java b/src/test/java/de/gematik/epa/ihe/model/request/RestrictedUpdateDocumentRequestTest.java new file mode 100644 index 0000000..3dd1b50 --- /dev/null +++ b/src/test/java/de/gematik/epa/ihe/model/request/RestrictedUpdateDocumentRequestTest.java @@ -0,0 +1,63 @@ +/* + * Copyright 2023 gematik GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package de.gematik.epa.ihe.model.request; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import de.gematik.epa.ihe.model.document.DocumentMetadata; +import de.gematik.epa.ihe.model.document.RestrictedUpdateDocument; +import de.gematik.epa.ihe.model.simple.InsurantId; +import de.gematik.epa.ihe.model.simple.SubmissionSetMetadata; +import de.gematik.epa.unit.util.MessageUtils; +import de.gematik.epa.unit.util.MetadataTestUtils; +import java.util.List; +import org.junit.jupiter.api.Test; + +class RestrictedUpdateDocumentRequestTest extends MetadataTestUtils { + + @Test + void testConstructorRestrictedUpdateDocumentRequest() { + DocumentMetadata documentMetadata = getDocumentMetadata(); + + String entryUUIDOfDocumentToUpdate = "exampleEntryUUID"; + + SubmissionSetMetadata submissionSetMetadata = getSubmissionSetMetadata(); + RestrictedUpdateDocument restrictedUpdateDocument = + new RestrictedUpdateDocument(documentMetadata, entryUUIDOfDocumentToUpdate); + List documents = List.of(restrictedUpdateDocument); + InsurantId patientId = MessageUtils.createInsurantId(); + + RestrictedUpdateDocumentRequest request = + new RestrictedUpdateDocumentRequest(patientId, documents, submissionSetMetadata); + + assertNotNull(request); + assertEquals(patientId, request.insurantId()); + assertEquals(documents, request.documents()); + assertEquals(submissionSetMetadata, request.submissionSetMetadata()); + } + + @Test + void testDefaultConstructorAndGetters() { + RestrictedUpdateDocumentRequest request = new RestrictedUpdateDocumentRequest(); + + assertNull(request.documents()); + assertNull(request.insurantId()); + assertNull(request.submissionSetMetadata()); + } +} diff --git a/src/test/java/de/gematik/epa/unit/util/ExternalIdentifierTestUtils.java b/src/test/java/de/gematik/epa/unit/util/ExternalIdentifierTestUtils.java index a5153bf..0f75886 100644 --- a/src/test/java/de/gematik/epa/unit/util/ExternalIdentifierTestUtils.java +++ b/src/test/java/de/gematik/epa/unit/util/ExternalIdentifierTestUtils.java @@ -52,7 +52,7 @@ public static void assertExternalIdentifierPatientId( RegistryObjectType registryObjectType, SubmissionRequestInterface submissionRequest, String externalIdentifierScheme) { - var insurantId = submissionRequest.recordIdentifier().getInsurantId(); + var insurantId = submissionRequest.insurantId(); String patientId = getExternalIdentifier(registryObjectType, externalIdentifierScheme); String expectedPatientId = insurantId.getExtension() + "^^^&" + insurantId.getRoot() + "&ISO"; assertEquals(expectedPatientId, patientId); diff --git a/src/test/java/de/gematik/epa/unit/util/MessageUtils.java b/src/test/java/de/gematik/epa/unit/util/MessageUtils.java index f465b6f..1035c46 100644 --- a/src/test/java/de/gematik/epa/unit/util/MessageUtils.java +++ b/src/test/java/de/gematik/epa/unit/util/MessageUtils.java @@ -17,10 +17,15 @@ package de.gematik.epa.unit.util; import de.gematik.epa.conversion.internal.requests.factories.UniqueIdFactory; +import de.gematik.epa.ihe.model.Author; +import de.gematik.epa.ihe.model.document.DocumentMetadata; import de.gematik.epa.ihe.model.simple.InsurantId; -import de.gematik.epa.ihe.model.simple.RecordIdentifier; +import de.gematik.epa.ihe.model.simple.SubmissionSetMetadata; import ihe.iti.xds_b._2007.RetrieveDocumentSetResponseType; import java.nio.charset.StandardCharsets; +import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.List; import lombok.experimental.UtilityClass; import oasis.names.tc.ebxml_regrep.xsd.rs._3.RegistryResponseType; @@ -30,7 +35,7 @@ public class MessageUtils { public static final String RESPONSE_STATUS_SUCCESS = "urn:oasis:names:tc:ebxml-regrep:ResponseStatusType:Success"; - public static final String HOME_COMMUNITY_ID = "1.2.276.0.76.3.1.315.3.2.1.1"; + public static final String REPOSITORY_UNIQUE_ID = "1.2.276.0.76.3.1.315.3.2.1.1"; public static RetrieveDocumentSetResponseType createRetrieveDocumentSetResponse() { var retrieveDocumentSetResponse = new RetrieveDocumentSetResponseType(); @@ -57,8 +62,7 @@ public static RegistryResponseType createRegistryResponseSuccess() { createRetrieveDocumentSetDocumentResponse() { var docResponse = new RetrieveDocumentSetResponseType.DocumentResponse(); - docResponse.setHomeCommunityId(HOME_COMMUNITY_ID); - docResponse.setRepositoryUniqueId(HOME_COMMUNITY_ID); + docResponse.setRepositoryUniqueId(REPOSITORY_UNIQUE_ID); docResponse.setMimeType("application/xml"); docResponse.setDocumentUniqueId(UniqueIdFactory.createOID()); docResponse.setDocument("".getBytes(StandardCharsets.UTF_8)); @@ -84,21 +88,48 @@ public static InsurantId createInsurantId() { return createInsurantId("X110454647", "1.2.276.0.76.4.8"); } - public static RecordIdentifier createRecordIdentifier(InsurantId insurantId, String hcid) { - return new RecordIdentifier() { - @Override - public InsurantId getInsurantId() { - return insurantId; - } + public static DocumentMetadata getDocumentMetadata() { + List authors = getAuthors(); + String availabilityStatus = "Approved"; + List confidentialityCode = List.of("V"); + + return new DocumentMetadata( + authors, + availabilityStatus, + confidentialityCode, + "classCode", + "comments", + LocalDateTime.now(), + "uuid", + Arrays.asList("eventCode1", "eventCode2"), + "formatCode", + "hash", + "healthcareFacilityTypeCodeValue", + "DE-de", + "legalAuthenticator", + "mimeType", + "practiceSettingCode", + Arrays.asList("referenceId1", "referenceId2"), + LocalDateTime.now(), + LocalDateTime.now().plusHours(1), + 1024, + "Mediplan", + "typeCode", + "7.8.9.4.5.6", + "uri", + "1.2.3.45.6", + "hci", + "X123456"); + } - @Override - public String getHomeCommunityId() { - return hcid; - } - }; + private static List getAuthors() { + Author nullAuthor = new Author("1", null, null, null, null, null, null, null, null, null, null); + return List.of(nullAuthor); } - public static RecordIdentifier createRecordIdentifier() { - return createRecordIdentifier(createInsurantId(), HOME_COMMUNITY_ID); + protected static SubmissionSetMetadata getSubmissionSetMetadata() { + List authors = getAuthors(); + return new SubmissionSetMetadata( + authors, "title", LocalDateTime.now(), "Approved", "1.2.3", "uuid"); } } diff --git a/src/test/java/de/gematik/epa/unit/util/MetadataTestUtils.java b/src/test/java/de/gematik/epa/unit/util/MetadataTestUtils.java new file mode 100644 index 0000000..7d50758 --- /dev/null +++ b/src/test/java/de/gematik/epa/unit/util/MetadataTestUtils.java @@ -0,0 +1,134 @@ +/* + * Copyright 2023 gematik GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package de.gematik.epa.unit.util; + +import de.gematik.epa.conversion.internal.requests.factories.UniqueIdFactory; +import de.gematik.epa.ihe.model.Author; +import de.gematik.epa.ihe.model.document.DocumentMetadata; +import de.gematik.epa.ihe.model.simple.InsurantId; +import de.gematik.epa.ihe.model.simple.SubmissionSetMetadata; +import ihe.iti.xds_b._2007.RetrieveDocumentSetResponseType; +import java.nio.charset.StandardCharsets; +import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.List; +import oasis.names.tc.ebxml_regrep.xsd.rs._3.RegistryResponseType; + +// @UtilityClass +public class MetadataTestUtils { + + public static final String RESPONSE_STATUS_SUCCESS = + "urn:oasis:names:tc:ebxml-regrep:ResponseStatusType:Success"; + + public static final String REPOSITORY_UNIQUE_ID = "1.2.276.0.76.3.1.315.3.2.1.1"; + + public static RetrieveDocumentSetResponseType createRetrieveDocumentSetResponse() { + var retrieveDocumentSetResponse = new RetrieveDocumentSetResponseType(); + retrieveDocumentSetResponse.setRegistryResponse(createRegistryResponseSuccess()); + + retrieveDocumentSetResponse + .getDocumentResponse() + .add(createRetrieveDocumentSetDocumentResponse()); + retrieveDocumentSetResponse + .getDocumentResponse() + .add(createRetrieveDocumentSetDocumentResponse()); + + return retrieveDocumentSetResponse; + } + + public static RegistryResponseType createRegistryResponseSuccess() { + var registryResponse = new RegistryResponseType(); + registryResponse.setStatus(RESPONSE_STATUS_SUCCESS); + + return registryResponse; + } + + public static RetrieveDocumentSetResponseType.DocumentResponse + createRetrieveDocumentSetDocumentResponse() { + var docResponse = new RetrieveDocumentSetResponseType.DocumentResponse(); + + docResponse.setRepositoryUniqueId(REPOSITORY_UNIQUE_ID); + docResponse.setMimeType("application/xml"); + docResponse.setDocumentUniqueId(UniqueIdFactory.createOID()); + docResponse.setDocument("".getBytes(StandardCharsets.UTF_8)); + + return docResponse; + } + + public static InsurantId createInsurantId(String extension, String root) { + return new InsurantId() { + @Override + public String getRoot() { + return root; + } + + @Override + public String getExtension() { + return extension; + } + }; + } + + public static InsurantId createInsurantId() { + return createInsurantId("X110454647", "1.2.276.0.76.4.8"); + } + + public static DocumentMetadata getDocumentMetadata() { + List authors = getAuthors(); + String availabilityStatus = "Approved"; + List confidentialityCode = List.of("V"); + + return new DocumentMetadata( + authors, + availabilityStatus, + confidentialityCode, + "classCode", + "comments", + LocalDateTime.now(), + "uuid", + Arrays.asList("eventCode1", "eventCode2"), + "formatCode", + "hash", + "healthcareFacilityTypeCodeValue", + "DE-de", + "legalAuthenticator", + "mimeType", + "practiceSettingCode", + Arrays.asList("referenceId1", "referenceId2"), + LocalDateTime.now(), + LocalDateTime.now().plusHours(1), + 1024, + "Mediplan", + "typeCode", + "7.8.9.4.5.6", + "uri", + "1.2.3.45.6", + "hci", + "X123456"); + } + + private static List getAuthors() { + Author nullAuthor = new Author("1", null, null, null, null, null, null, null, null, null, null); + return List.of(nullAuthor); + } + + protected static SubmissionSetMetadata getSubmissionSetMetadata() { + List authors = getAuthors(); + return new SubmissionSetMetadata( + authors, "title", LocalDateTime.now(), "Approved", "1.2.3", "uuid"); + } +} diff --git a/src/test/java/de/gematik/epa/unit/util/ResourceLoader.java b/src/test/java/de/gematik/epa/unit/util/ResourceLoader.java index d5a4eee..db84a46 100644 --- a/src/test/java/de/gematik/epa/unit/util/ResourceLoader.java +++ b/src/test/java/de/gematik/epa/unit/util/ResourceLoader.java @@ -25,9 +25,9 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import de.gematik.epa.ihe.model.request.DocumentReplaceRequest; import de.gematik.epa.ihe.model.request.DocumentSubmissionRequest; +import de.gematik.epa.ihe.model.request.RestrictedUpdateDocumentRequest; import de.gematik.epa.ihe.model.request.RetrieveDocumentsRequest; import de.gematik.epa.ihe.model.simple.InsurantId; -import de.gematik.epa.ihe.model.simple.RecordIdentifier; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Objects; @@ -37,17 +37,24 @@ public class ResourceLoader { public static final String REQUEST_PATH = "src/test/resources/"; + public static final String PUT_DOCUMENTS_WITH_FOLDER_METADATA_REQUEST = REQUEST_PATH + "documentSubmissionRequest.json"; public static final String PUT_DOCUMENTS_WITHOUT_ATTRIBUTES_REQUEST = REQUEST_PATH + "documentSubmissionRequestWithoutAttributes.json"; + public static final String REPLACE_DOCUMENTS_REQUEST = + REQUEST_PATH + "documentReplaceRequest.json"; + public static final String RETRIEVE_DOCUMENTS_REQUEST_PATH = REQUEST_PATH + "retrieveDocumentsRequest.json"; - public static final String REPLACE_DOCUMENTS_REQUEST = - REQUEST_PATH + "documentReplaceRequest.json"; + public static final String RESTRICTED_UPDATE_DOCUMENT_REQUEST = + REQUEST_PATH + "updateDocumentRequest.json"; + + public static final String RESTRICTED_UPDATE_DOCUMENT_LIST_REQUEST = + REQUEST_PATH + "updateDocumentListRequest.json"; private static ObjectMapper objMapper; @@ -56,6 +63,11 @@ public static DocumentSubmissionRequest documentSubmissionRequest(String templat return loadDtoFromJsonFile(DocumentSubmissionRequest.class, template); } + @SneakyThrows + public static RestrictedUpdateDocumentRequest updateDocumentSetRequest(String template) { + return loadDtoFromJsonFile(RestrictedUpdateDocumentRequest.class, template); + } + @SneakyThrows public static RetrieveDocumentsRequest retrieveDocumentsRequest(String template) { return loadDtoFromJsonFile(RetrieveDocumentsRequest.class, template); @@ -88,10 +100,7 @@ public static ObjectMapper getObjectMapper() { .registerModule( new SimpleModule() .addDeserializer( - InsurantId.class, new InsurantIdInterfaceDeserializer()) - .addDeserializer( - RecordIdentifier.class, - new RecordIdentifierInterfaceDeserializer())); + InsurantId.class, new InsurantIdInterfaceDeserializer())); return objMapper; }); } @@ -116,27 +125,4 @@ public String getExtension() { }; } } - - private static class RecordIdentifierInterfaceDeserializer - extends JsonDeserializer { - @Override - public RecordIdentifier deserialize( - JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException { - JsonNode node = jsonParser.getCodec().readTree(jsonParser); - InsurantId insurantId = - deserializationContext.readTreeAsValue(node.get("insurantId"), InsurantId.class); - String homeCommunityId = node.get("homeCommunityId").asText(); - return new RecordIdentifier() { - @Override - public InsurantId getInsurantId() { - return insurantId; - } - - @Override - public String getHomeCommunityId() { - return homeCommunityId; - } - }; - } - } } diff --git a/src/test/resources/documentReplaceRequest.json b/src/test/resources/documentReplaceRequest.json index 5cc4b33..fe24c5b 100644 --- a/src/test/resources/documentReplaceRequest.json +++ b/src/test/resources/documentReplaceRequest.json @@ -1,11 +1,7 @@ { - "recordIdentifier": { - "insurantId": { - "root": "1.2.276.0.76.4.8", - "extension": "X110425143" - }, - "homeCommunityId": "urn:oid:1.2.276.0.76.3.1.321.12.1.60.22" - + "insurantId": { + "root": "1.2.276.0.76.4.8", + "extension": "X110425143" }, "documents": [ { diff --git a/src/test/resources/documentSubmissionRequest.json b/src/test/resources/documentSubmissionRequest.json index 24fe176..c759ac9 100644 --- a/src/test/resources/documentSubmissionRequest.json +++ b/src/test/resources/documentSubmissionRequest.json @@ -1,11 +1,7 @@ { - "recordIdentifier": { - "insurantId": { - "root": "1.2.276.0.76.4.8", - "extension": "X110425143" - }, - "homeCommunityId": "urn:oid:1.2.276.0.76.3.1.321.12.1.60.22" - + "insurantId": { + "root": "1.2.276.0.76.4.8", + "extension": "X110425143" }, "documents": [ { diff --git a/src/test/resources/documentSubmissionRequestWithoutAttributes.json b/src/test/resources/documentSubmissionRequestWithoutAttributes.json index 0a670bb..98dd6aa 100644 --- a/src/test/resources/documentSubmissionRequestWithoutAttributes.json +++ b/src/test/resources/documentSubmissionRequestWithoutAttributes.json @@ -1,11 +1,7 @@ { - "recordIdentifier": { - "insurantId": { - "root": "1.2.276.0.76.4.8", - "extension": "X110425143" - }, - "homeCommunityId": "urn:oid:1.2.276.0.76.3.1.321.12.1.60.22" - + "insurantId": { + "root": "1.2.276.0.76.4.8", + "extension": "X110425143" }, "documents": [ { diff --git a/src/test/resources/retrieveDocumentsRequest.json b/src/test/resources/retrieveDocumentsRequest.json index bc8f62a..22006cc 100644 --- a/src/test/resources/retrieveDocumentsRequest.json +++ b/src/test/resources/retrieveDocumentsRequest.json @@ -1,5 +1,5 @@ { - "homeCommunityId": "1.2.276.0.76.3.1.315.3.2.1.1", + "repositoryUniqueId": "1.2.276.0.76.3.1.315.3.2.1.1", "documentUniqueIds": [ "2.25.270306510056635547875", "2.25.268944235405876235196" diff --git a/src/test/resources/updateDocumentListRequest.json b/src/test/resources/updateDocumentListRequest.json new file mode 100644 index 0000000..13b6456 --- /dev/null +++ b/src/test/resources/updateDocumentListRequest.json @@ -0,0 +1,109 @@ +{ + "insurantId": { + "root": "1.2.276.0.76.4.8", + "extension": "X110425143" + }, + "documentMetadataList": [ + { + "documentMetadata": { + "author": [ + { + "identifier": "165746304", + "familyName": "Blankenburg", + "givenName": "Sigrid", + "title": "Dr.", + "authorInstitution": [ + { + "name": "arztpraxis", + "identifier": "5-SMC-B-Testkarte-883110000117894" + } + ], + "authorRole": [ + "11^^^&1.3.6.1.4.1.19376.3.276.1.5.13&ISO" + ] + } + ], + "classCode": "PLA", + "eventCodeList": [ + "H1" + ], + "confidentialityCode": [ + "N" + ], + "creationTime": "2023-06-09T11:54:20Z", + "formatCode": "urn:gematik:ig:Medikationsplan:r3.1", + "healthcareFacilityTypeCode": "PRA", + "languageCode": "de-DE", + "mimeType": "application/xml", + "practiceSettingCode": "ALLG", + "title": "MediPlan", + "serviceStartTime": "2021-03-01T08:28:55.194Z", + "serviceStopTime": "2021-03-01T08:38:55.194Z", + "typeCode": "MEDI", + "uri": "Medikationsplan.xml", + "comments": "Neue Cooles MediPlan" + }, + "entryUUIDOfDocumentToUpdate": "1.2.276.0.76.4.8" + }, + { + "documentMetadata": { + "author": [ + { + "identifier": "165746304", + "familyName": "Blankenburg", + "givenName": "Sigrid", + "title": "Dr.", + "authorInstitution": [ + { + "name": "arztpraxis", + "identifier": "5-SMC-B-Testkarte-883110000117894" + } + ], + "authorRole": [ + "11^^^&1.3.6.1.4.1.19376.3.276.1.5.13&ISO" + ] + } + ], + "classCode": "PLA", + "eventCodeList": [ + "H1" + ], + "confidentialityCode": [ + "N" + ], + "creationTime": "2023-06-09T11:54:20Z", + "formatCode": "urn:gematik:ig:Medikationsplan:r3.1", + "healthcareFacilityTypeCode": "PRA", + "languageCode": "de-DE", + "mimeType": "application/xml", + "practiceSettingCode": "ALLG", + "title": "MediPlan2", + "serviceStartTime": "2021-03-01T08:28:55.194Z", + "serviceStopTime": "2021-03-01T08:38:55.194Z", + "typeCode": "MEDI", + "uri": "Medikationsplan.xml", + "comments": "Neue Cooles MediPlan" + }, + "entryUUIDOfDocumentToUpdate": "1.2.276.0.76.4.9" + } + ], + "submissionSetMetadata": { + "authors": [ + { + "identifier": "30432750", + "familyName": "Dunkelbaum", + "givenName": "Marta", + "title": "Prof. Dr.", + "authorInstitution": [ + { + "name": "arztpraxis", + "identifier": "1-SMC-B-Testkarte-883110000092397" + } + ], + "authorRole": [ + "11^^^&1.3.6.1.4.1.19376.3.276.1.5.13&ISO" + ] + } + ] + } +} \ No newline at end of file diff --git a/src/test/resources/updateDocumentRequest.json b/src/test/resources/updateDocumentRequest.json new file mode 100644 index 0000000..fa131bc --- /dev/null +++ b/src/test/resources/updateDocumentRequest.json @@ -0,0 +1,68 @@ +{ + "insurantId": { + "root": "1.2.276.0.76.4.8", + "extension": "X110425143" + }, + "documentMetadataList": [ + { + "documentMetadata": { + "author": [ + { + "identifier": "165746304", + "familyName": "Blankenburg", + "givenName": "Sigrid", + "title": "Dr.", + "authorInstitution": [ + { + "name": "arztpraxis", + "identifier": "5-SMC-B-Testkarte-883110000117894" + } + ], + "authorRole": [ + "11^^^&1.3.6.1.4.1.19376.3.276.1.5.13&ISO" + ] + } + ], + "classCode": "PLA", + "eventCodeList": [ + "H1" + ], + "confidentialityCode": [ + "N" + ], + "creationTime": "2023-06-09T11:54:20Z", + "formatCode": "urn:gematik:ig:Medikationsplan:r3.1", + "healthcareFacilityTypeCode": "PRA", + "languageCode": "de-DE", + "mimeType": "application/xml", + "practiceSettingCode": "ALLG", + "title": "MediPlan", + "serviceStartTime": "2021-03-01T08:28:55.194Z", + "serviceStopTime": "2021-03-01T08:38:55.194Z", + "typeCode": "MEDI", + "uri": "Medikationsplan.xml", + "comments": "Neue Cooles MediPlan" + }, + "entryUUIDOfDocumentToUpdate": "1.2.276.0.76.4.8" + } + ], + "submissionSetMetadata": { + "authors": [ + { + "identifier": "30432750", + "familyName": "Dunkelbaum", + "givenName": "Marta", + "title": "Prof. Dr.", + "authorInstitution": [ + { + "name": "arztpraxis", + "identifier": "1-SMC-B-Testkarte-883110000092397" + } + ], + "authorRole": [ + "11^^^&1.3.6.1.4.1.19376.3.276.1.5.13&ISO" + ] + } + ] + } +} \ No newline at end of file