#414: start to integrate HAPI FHIR snapshot

oehf · Dec 15, 2023 · 8216cd8 · 8216cd8
1 parent c4cfca8
commit 8216cd8
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 34 deletions.
diff --git a/boot/pom.xml b/boot/pom.xml
@@ -19,8 +19,8 @@
         <module>ipf-hl7-spring-boot-starter</module>
         <module>ipf-hl7v3-spring-boot-starter</module>
         <module>ipf-xds-spring-boot-starter</module>
-        <!--<module>ipf-fhir-r4-spring-boot-starter</module>-->
-		<!--<module>ipf-fhir-stu3-spring-boot-starter</module>-->
+        <module>ipf-fhir-r4-spring-boot-starter</module>
+		<module>ipf-fhir-stu3-spring-boot-starter</module>
         <module>ipf-atna-spring-boot-starter</module>
         <module>ipf-hpd-spring-boot-starter</module>
         <module>ipf-xacml20-spring-boot-starter</module>

diff --git a/.../main/java/org/openehealth/ipf/commons/ihe/fhir/chppqm/chppq3/ChPpq3ResourceProvider.java b/.../main/java/org/openehealth/ipf/commons/ihe/fhir/chppqm/chppq3/ChPpq3ResourceProvider.java
@@ -25,8 +25,8 @@
 import org.openehealth.ipf.commons.ihe.fhir.AbstractResourceProvider;
 import org.openehealth.ipf.commons.ihe.fhir.chppqm.ChPpqmUtils;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public class ChPpq3ResourceProvider extends AbstractResourceProvider {
 

diff --git a/.../main/java/org/openehealth/ipf/commons/ihe/fhir/chppqm/chppq5/ChPpq5ResourceProvider.java b/.../main/java/org/openehealth/ipf/commons/ihe/fhir/chppqm/chppq5/ChPpq5ResourceProvider.java
@@ -25,8 +25,8 @@
 import org.hl7.fhir.r4.model.Consent;
 import org.openehealth.ipf.commons.ihe.fhir.AbstractPlainProvider;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public class ChPpq5ResourceProvider extends AbstractPlainProvider {
 

diff --git a/commons/ihe/pom.xml b/commons/ihe/pom.xml
@@ -27,7 +27,7 @@
         <module>hl7v2ws</module>
         <module>hl7v3</module>
         <module>hl7v3model</module>
-        <!--<module>fhir</module>-->
+        <module>fhir</module>
         <module>xua</module>
         <module>hpd</module>
         <module>xacml20</module>

diff --git a/...cml20/impl/src/main/java/org/openehealth/ipf/commons/ihe/xacml20/chadr/ChAdrPortType.java b/...cml20/impl/src/main/java/org/openehealth/ipf/commons/ihe/xacml20/chadr/ChAdrPortType.java
@@ -15,19 +15,19 @@
  */
 package org.openehealth.ipf.commons.ihe.xacml20.chadr;
 
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
 import org.apache.cxf.annotations.DataBinding;
 import org.openehealth.ipf.commons.ihe.xacml20.Xacml20JaxbDataBinding;
 import org.openehealth.ipf.commons.ihe.xacml20.stub.ehealthswiss.ObjectFactory;
 import org.openehealth.ipf.commons.ihe.xacml20.stub.saml20.protocol.ResponseType;
 import org.openehealth.ipf.commons.ihe.xacml20.stub.xacml20.saml.protocol.XACMLAuthzDecisionQueryType;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
 
 // Differences between ITI-79 and ADR service endpoint interfaces are only WS-Addressing actions
 

diff --git a/...cml20/impl/src/main/java/org/openehealth/ipf/commons/ihe/xacml20/iti79/Iti79PortType.java b/...cml20/impl/src/main/java/org/openehealth/ipf/commons/ihe/xacml20/iti79/Iti79PortType.java
@@ -15,19 +15,19 @@
  */
 package org.openehealth.ipf.commons.ihe.xacml20.iti79;
 
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Action;
 import org.apache.cxf.annotations.DataBinding;
 import org.openehealth.ipf.commons.ihe.xacml20.Xacml20JaxbDataBinding;
 import org.openehealth.ipf.commons.ihe.xacml20.stub.ehealthswiss.ObjectFactory;
 import org.openehealth.ipf.commons.ihe.xacml20.stub.saml20.protocol.ResponseType;
 import org.openehealth.ipf.commons.ihe.xacml20.stub.xacml20.saml.protocol.XACMLAuthzDecisionQueryType;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Action;
 
 @WebService(targetNamespace = "urn:ihe:iti:2014:ser", name = "AuthorizationDecisionsManager_PortType", portName = "AuthorizationDecisionsManager_Port_Soap12")
 @XmlSeeAlso({

diff --git a/...ealth/ipf/commons/ihe/xacml20/stub/xacml20/saml/protocol/XACMLAuthzDecisionQueryType.java b/...ealth/ipf/commons/ihe/xacml20/stub/xacml20/saml/protocol/XACMLAuthzDecisionQueryType.java
@@ -19,12 +19,7 @@
 import java.util.List;
 import java.util.Objects;
 import jakarta.xml.bind.JAXBElement;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlElementRef;
-import jakarta.xml.bind.annotation.XmlElementRefs;
-import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.*;
 import org.herasaf.xacml.core.context.impl.RequestType;
 import org.herasaf.xacml.core.policy.impl.PolicySetType;
 import org.herasaf.xacml.core.policy.impl.PolicyType;

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -20,7 +20,7 @@
         <equinox-common.version>3.6.200-v20130402-1505</equinox-common.version>
         <groovy-version>4.0.15</groovy-version>
         <hapi-version>2.5.1</hapi-version>
-        <hapi-fhir-version>6.10.0</hapi-fhir-version>
+        <hapi-fhir-version>6.11.7-SNAPSHOT</hapi-fhir-version>
         <herasaf-version>3.0.2</herasaf-version>
         <ipf-gazelle-version>3.0-SNAPSHOT</ipf-gazelle-version>
         <ipf-oht-mdht-version>1.2.0.201212201425</ipf-oht-mdht-version>
@@ -996,6 +996,18 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>shibboleth-releases</id>
+            <name>Shibboleth Releases</name>
+            <url>https://build.shibboleth.net/maven/releases/</url>
+            <layout>default</layout>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
     </repositories>
 
 </project>
diff --git a/platform-camel/ihe/pom.xml b/platform-camel/ihe/pom.xml
@@ -33,7 +33,7 @@
         <module>hl7v3model</module>
         <module>hl7v2ws</module>
         <module>continua</module>
-        <!--<module>fhir</module>-->
+        <module>fhir</module>
         <module>core</module>
         <module>hpd</module>
         <module>xacml20</module>

diff --git a/...xacml20/src/test/java/org/openehealth/ipf/platform/camel/ihe/xacml20/chadr/ChAdrTest.java b/...xacml20/src/test/java/org/openehealth/ipf/platform/camel/ihe/xacml20/chadr/ChAdrTest.java
@@ -31,7 +31,7 @@
 import org.openehealth.ipf.commons.ihe.xacml20.stub.saml20.protocol.ResponseType;
 import org.openehealth.ipf.platform.camel.ihe.ws.StandardTestContainer;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import java.util.List;
 import java.util.Map;
 

diff --git a/...test/java/org/openehealth/ipf/platform/camel/ihe/xacml20/chadr/ChAdrTestRouteBuilder.java b/...test/java/org/openehealth/ipf/platform/camel/ihe/xacml20/chadr/ChAdrTestRouteBuilder.java
@@ -19,7 +19,7 @@
 import org.openehealth.ipf.commons.ihe.xacml20.Xacml20Utils;
 import org.openehealth.ipf.platform.camel.ihe.core.HomeCommunityUtils;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 import static org.openehealth.ipf.platform.camel.ihe.xacml20.Xacml20CamelValidators.*;
 

diff --git a/...xacml20/src/test/java/org/openehealth/ipf/platform/camel/ihe/xacml20/iti79/Iti79Test.java b/...xacml20/src/test/java/org/openehealth/ipf/platform/camel/ihe/xacml20/iti79/Iti79Test.java
@@ -31,7 +31,7 @@
 import org.openehealth.ipf.commons.ihe.xacml20.stub.saml20.protocol.ResponseType;
 import org.openehealth.ipf.platform.camel.ihe.ws.StandardTestContainer;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;

diff --git a/...test/java/org/openehealth/ipf/platform/camel/ihe/xacml20/iti79/Iti79TestRouteBuilder.java b/...test/java/org/openehealth/ipf/platform/camel/ihe/xacml20/iti79/Iti79TestRouteBuilder.java
@@ -19,7 +19,7 @@
 import org.openehealth.ipf.commons.ihe.xacml20.Xacml20Utils;
 import org.openehealth.ipf.platform.camel.ihe.core.HomeCommunityUtils;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 import static org.openehealth.ipf.platform.camel.ihe.xacml20.Xacml20CamelValidators.*;
 

diff --git a/tutorials/pom.xml b/tutorials/pom.xml
@@ -20,7 +20,7 @@
         <module>xds</module>
         <module>config</module>
         <module>iheclient</module>
-        <!--<module>fhir</module>-->
+        <module>fhir</module>
     </modules>
 
     <build>