Publish Release 2.0.1

Automerge Pull-Request for Release 2.0.1
gematik · Nov 14, 2024 · 4115aac · 4115aac
2 parents ce64897 + 42a7d65
commit 4115aac
Show file tree

Hide file tree

Showing 98 changed files with 1,625 additions and 769 deletions.
diff --git 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
@@ -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
@@ -6,7 +6,7 @@
     <groupId>de.gematik.epa</groupId>
     <artifactId>lib-ihe-xds</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.8</version>
+    <version>2.0.1</version>
     <name>lib-ihe-xds</name>
     <description>A lib to create and process IHE requests from/to more descriptive Java records</description>
     <url>https://github.com/gematik/lib-ihe-xds</url>
@@ -27,31 +27,31 @@
         <sonar.language>java</sonar.language>
         <sonar.exclusions>${generated.sources.path}/*,${generated.sources.path}/**/*</sonar.exclusions>
         <!-- Dependencies -->
-        <asm.version>9.3</asm.version>
-        <jacoco.version>0.8.8</jacoco.version>
-        <junit.version>5.9.0</junit.version>
-        <junit.platform.version>1.9.0</junit.platform.version>
-        <pmd-java.version>6.46.0</pmd-java.version>
+        <asm.version>9.7.1</asm.version>
+        <jacoco.version>0.8.12</jacoco.version>
+        <pmd-java.version>7.7.0</pmd-java.version>
+        <junit.version>5.11.3</junit.version>
+        <junit.platform.version>1.11.3</junit.platform.version>
         <!-- Plugin Versions -->
-        <compiler.plugin.version>3.8.1</compiler.plugin.version>
-        <fmt.maven.plugin.version>2.19</fmt.maven.plugin.version>
-        <pmd.plugin.version>3.21.0</pmd.plugin.version>
-        <surefire.plugin.version>3.0.0-M7</surefire.plugin.version>
-        <enforcer.plugin.version>3.0.0</enforcer.plugin.version>
-        <helper.plugin.version>3.4.0</helper.plugin.version>
-        <source.plugin.version>3.2.1</source.plugin.version>
-        <javadoc.plugin.version>3.4.1</javadoc.plugin.version>
-        <cxf-xjc.version>4.0.0</cxf-xjc.version>
+        <compiler.plugin.version>3.13.0</compiler.plugin.version>
+        <fmt.maven.plugin.version>2.25</fmt.maven.plugin.version>
+        <pmd.plugin.version>3.26.0</pmd.plugin.version>
+        <surefire.plugin.version>3.5.2</surefire.plugin.version>
+        <enforcer.plugin.version>3.5.0</enforcer.plugin.version>
+        <helper.plugin.version>3.6.0</helper.plugin.version>
+        <source.plugin.version>3.3.1</source.plugin.version>
+        <javadoc.plugin.version>3.11.1</javadoc.plugin.version>
+        <cxf-xjc.version>4.0.2</cxf-xjc.version>
         <xml.bind.jaxb.version>2.3.1</xml.bind.jaxb.version>
-        <jackson.version>2.15.2</jackson.version>
+        <jackson.version>2.18.1</jackson.version>
     </properties>
 
 
     <dependencies>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.xjc-utils</groupId>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
+            <version>1.18.34</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.10.0</version>
+            <version>1.12.0</version>
         </dependency>
     </dependencies>
 
@@ -354,7 +354,7 @@
                         <artifactId>cxf-xjc-plugin</artifactId>
                         <version>${cxf-xjc.version}</version>
                         <configuration>
-                            <additionalJvmArgs>-Djavax.xml.accessExternalDTD=file</additionalJvmArgs>
+                            <additionalJvmArgs>-Djavax.xml.accessExternalDTD=file -Duser.language=en</additionalJvmArgs>
                             <extensions>
                                 <extension>org.apache.cxf.xjcplugins:cxf-xjc-ts:${cxf-xjc.version}</extension>
                                 <extension>org.jvnet.jaxb2_commons:jaxb2-fluent-api:3.0</extension>
@@ -397,7 +397,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
+                        <version>3.2.7</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -418,7 +418,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.13</version>
+                        <version>1.7.0</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>ossrh</serverId>

diff --git 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<RetrieveDocumentSetRequestType> 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
@@ -83,62 +83,62 @@ 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() {
         return new ProvideAndRegisterDocumentSetRequestType.Document();
     }
 
     /**
-     * Create an instance of {@link RetrieveDocumentSetResponseType.DocumentResponse }
+     * Create an instance of {@link ihe.iti.xds_b._2007.RetrieveDocumentSetResponseType.DocumentResponse }
      * 
      */
     public RetrieveDocumentSetResponseType.DocumentResponse createRetrieveDocumentSetResponseTypeDocumentResponse() {
         return new RetrieveDocumentSetResponseType.DocumentResponse();
     }
 
     /**
-     * Create an instance of {@link RetrieveDocumentSetRequestType.DocumentRequest }
+     * Create an instance of {@link ihe.iti.xds_b._2007.RetrieveDocumentSetRequestType.DocumentRequest }
      * 
      */
     public RetrieveDocumentSetRequestType.DocumentRequest createRetrieveDocumentSetRequestTypeDocumentRequest() {
         return new RetrieveDocumentSetRequestType.DocumentRequest();
     }
 
     /**
-     * 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<RetrieveDocumentSetRequestType> createRetrieveDocumentSetRequest(RetrieveDocumentSetRequestType value) {
         return new JAXBElement<RetrieveDocumentSetRequestType>(_RetrieveDocumentSetRequest_QNAME, RetrieveDocumentSetRequestType.class, null, value);
     }
 
     /**
-     * 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<RetrieveDocumentSetResponseType> createRetrieveDocumentSetResponse(RetrieveDocumentSetResponseType value) {
         return new JAXBElement<RetrieveDocumentSetResponseType>(_RetrieveDocumentSetResponse_QNAME, RetrieveDocumentSetResponseType.class, null, value);
     }
 
     /**
-     * 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<ProvideAndRegisterDocumentSetRequestType> 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
@@ -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<ProvideAndRegisterDocumentSetRequestType.Document> document;
+    protected List<Document> 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) {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link ProvideAndRegisterDocumentSetRequestType.Document }
+     * {@link ihe.iti.xds_b._2007.ProvideAndRegisterDocumentSetRequestType.Document }
      * 
      * 
      */
-    public List<ProvideAndRegisterDocumentSetRequestType.Document> getDocument() {
+    public List<Document> getDocument() {
         if (document == null) {
-            document = new ArrayList<ProvideAndRegisterDocumentSetRequestType.Document>();
+            document = new ArrayList<Document>();
         }
         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<ProvideAndRegisterDocumentSetRequestType.Document> values) {
+    public ProvideAndRegisterDocumentSetRequestType withDocument(Collection<Document> values) {
         if (values!= null) {
             getDocument().addAll(values);
         }
@@ -185,9 +185,9 @@ public boolean equals(Object object) {
             }
         }
         {
-            List<ProvideAndRegisterDocumentSetRequestType.Document> leftDocument;
+            List<Document> leftDocument;
             leftDocument = (((this.document!= null)&&(!this.document.isEmpty()))?this.getDocument():null);
-            List<ProvideAndRegisterDocumentSetRequestType.Document> rightDocument;
+            List<Document> 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<ProvideAndRegisterDocumentSetRequestType.Document> theDocument;
+            List<Document> 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();