#513: add missing files, mae return values of ClientRequestFactory#getClientExecutable more specific

Christian Ohr · Christian Ohr · commit 9920cf2fd5f2 · 2026-05-19T15:06:50.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,5 @@ work
 generated-stubs
 /commons/audit/.vertx
 /local_history.patch
+/CLAUDE.md
+/.claude/settings.local.json
diff --git a/commons/audit/src/main/java/org/openehealth/ipf/commons/audit/marshal/dicom/DICOM2024d.java b/commons/audit/src/main/java/org/openehealth/ipf/commons/audit/marshal/dicom/DICOM2024d.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2026 the original author or authors.
+ *
+ *  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 org.openehealth.ipf.commons.audit.marshal.dicom;
+
+/**
+ *
+ * @author Christian Ohr
+ * @since 6.0
+ */
+public class DICOM2024d extends DICOM2017c {
+
+}
diff --git a/commons/audit/src/main/resources/dicom2024d.xsd b/commons/audit/src/main/resources/dicom2024d.xsd
diff --git a/commons/ihe/fhir/r4/chppqm/src/main/java/org/openehealth/ipf/commons/ihe/fhir/chppqm/chppq3/ChPpq3RequestFactory.java b/commons/ihe/fhir/r4/chppqm/src/main/java/org/openehealth/ipf/commons/ihe/fhir/chppqm/chppq3/ChPpq3RequestFactory.java
@@ -16,6 +16,7 @@
 
 package org.openehealth.ipf.commons.ihe.fhir.chppqm.chppq3;
 
+import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ca.uhn.fhir.rest.gclient.IClientExecutable;
 import org.hl7.fhir.r4.model.Consent;
@@ -28,7 +29,7 @@
 public class ChPpq3RequestFactory implements ClientRequestFactory {
 
     @Override
-    public IClientExecutable getClientExecutable(
+    public IClientExecutable<?, MethodOutcome> getClientExecutable(
             IGenericClient client,
             Object requestData,
             Map<String, Object> parameters)
diff --git a/commons/ihe/fhir/r4/mhd/src/main/java/org/openehealth/ipf/commons/ihe/fhir/iti105/Iti105RequestFactory.java b/commons/ihe/fhir/r4/mhd/src/main/java/org/openehealth/ipf/commons/ihe/fhir/iti105/Iti105RequestFactory.java
@@ -17,7 +17,7 @@
 package org.openehealth.ipf.commons.ihe.fhir.iti105;
 
 import ca.uhn.fhir.rest.client.api.IGenericClient;
-import ca.uhn.fhir.rest.gclient.IClientExecutable;
+import ca.uhn.fhir.rest.gclient.ICreateTyped;
 import org.hl7.fhir.r4.model.DocumentReference;
 import org.openehealth.ipf.commons.ihe.fhir.ClientRequestFactory;
 
@@ -32,7 +32,7 @@
 public class Iti105RequestFactory implements ClientRequestFactory {
 
     @Override
-    public IClientExecutable getClientExecutable(
+    public ICreateTyped getClientExecutable(
             IGenericClient client,
             Object requestData,
             Map<String, Object> parameters) {
diff --git a/commons/ihe/fhir/r4/mhd/src/main/java/org/openehealth/ipf/commons/ihe/fhir/iti68bin/Iti68BinaryRequestFactory.java b/commons/ihe/fhir/r4/mhd/src/main/java/org/openehealth/ipf/commons/ihe/fhir/iti68bin/Iti68BinaryRequestFactory.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2023 the original author or authors.
+ *
+ * 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 org.openehealth.ipf.commons.ihe.fhir.iti68bin;
+
+import ca.uhn.fhir.rest.client.api.IGenericClient;
+import ca.uhn.fhir.rest.gclient.IReadExecutable;
+import org.hl7.fhir.r4.model.Binary;
+import org.openehealth.ipf.commons.ihe.fhir.ClientRequestFactory;
+
+import java.util.Map;
+
+/**
+ * A {@link ClientRequestFactory} for ITI-105 requests
+ *
+ * @author Boris Stanojevic
+ * @since 4.8
+ */
+public class Iti68BinaryRequestFactory implements ClientRequestFactory {
+
+    @Override
+    public IReadExecutable<Binary> getClientExecutable(
+            IGenericClient client,
+            Object requestData,
+            Map<String, Object> parameters) {
+        return client.read().resource(Binary.class).withId(requestData.toString());
+    }
+
+}
diff --git a/commons/ihe/fhir/r4/mhd/src/main/java/org/openehealth/ipf/commons/ihe/fhir/pharm5/Pharm5ClientRequestFactory.java b/commons/ihe/fhir/r4/mhd/src/main/java/org/openehealth/ipf/commons/ihe/fhir/pharm5/Pharm5ClientRequestFactory.java
@@ -16,7 +16,6 @@
 package org.openehealth.ipf.commons.ihe.fhir.pharm5;
 
 import ca.uhn.fhir.rest.client.api.IGenericClient;
-import ca.uhn.fhir.rest.gclient.IClientExecutable;
 import ca.uhn.fhir.rest.gclient.IOperationUntypedWithInput;
 import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.DocumentReference;
@@ -35,7 +34,7 @@
 public class Pharm5ClientRequestFactory implements ClientRequestFactory {
 
     @Override
-    public IClientExecutable<IOperationUntypedWithInput<Bundle>, ?> getClientExecutable(final IGenericClient client,
+    public IOperationUntypedWithInput<Bundle> getClientExecutable(final IGenericClient client,
                                                                                             final Object requestData,
                                                                                             final Map<String, Object> parameters) {
 
diff --git a/commons/ihe/fhir/r4/pixpdq/src/main/java/org/openehealth/ipf/commons/ihe/fhir/iti119/Iti119ClientRequestFactory.java b/commons/ihe/fhir/r4/pixpdq/src/main/java/org/openehealth/ipf/commons/ihe/fhir/iti119/Iti119ClientRequestFactory.java
@@ -17,7 +17,6 @@
 package org.openehealth.ipf.commons.ihe.fhir.iti119;
 
 import ca.uhn.fhir.rest.client.api.IGenericClient;
-import ca.uhn.fhir.rest.gclient.IClientExecutable;
 import ca.uhn.fhir.rest.gclient.IOperationUntypedWithInput;
 import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.Parameters;
@@ -40,7 +39,7 @@
 public class Iti119ClientRequestFactory implements ClientRequestFactory {
 
     @Override
-    public IClientExecutable<IOperationUntypedWithInput<Bundle>, ?> getClientExecutable(IGenericClient client, Object requestData, Map<String, Object> parameters) {
+    public IOperationUntypedWithInput<Bundle> getClientExecutable(IGenericClient client, Object requestData, Map<String, Object> parameters) {
 
         if (requestData instanceof Parameters p) {
             return getClientExecutable(client, p);
@@ -62,7 +61,7 @@ public class Iti119ClientRequestFactory implements ClientRequestFactory {
     }
 
 
-    private IClientExecutable<IOperationUntypedWithInput<Bundle>, ?> getClientExecutable(IGenericClient client, Parameters requestData) {
+    private IOperationUntypedWithInput<Bundle> getClientExecutable(IGenericClient client, Parameters requestData) {
         return client.operation()
             .onType(Patient.class)
             .named(Iti119Constants.PDQM_MATCH_OPERATION_NAME)
diff --git a/commons/ihe/fhir/r4/pixpdq/src/main/java/org/openehealth/ipf/commons/ihe/fhir/iti83/Iti83ClientRequestFactory.java b/commons/ihe/fhir/r4/pixpdq/src/main/java/org/openehealth/ipf/commons/ihe/fhir/iti83/Iti83ClientRequestFactory.java
@@ -17,7 +17,6 @@
 package org.openehealth.ipf.commons.ihe.fhir.iti83;
 
 import ca.uhn.fhir.rest.client.api.IGenericClient;
-import ca.uhn.fhir.rest.gclient.IClientExecutable;
 import ca.uhn.fhir.rest.gclient.IOperationUntypedWithInput;
 import org.hl7.fhir.r4.model.Parameters;
 import org.hl7.fhir.r4.model.Patient;
@@ -35,7 +34,7 @@
 public class Iti83ClientRequestFactory implements ClientRequestFactory {
 
     @Override
-    public IClientExecutable<IOperationUntypedWithInput<Parameters>, ?> getClientExecutable(IGenericClient client, Object requestData, Map<String, Object> parameters) {
+    public IOperationUntypedWithInput<Parameters> getClientExecutable(IGenericClient client, Object requestData, Map<String, Object> parameters) {
 
         if (requestData instanceof Parameters p) {
             return getClientExecutable(client, p);
@@ -51,7 +50,7 @@ public class Iti83ClientRequestFactory implements ClientRequestFactory {
 
     }
 
-    private IClientExecutable<IOperationUntypedWithInput<Parameters>, ?> getClientExecutable(IGenericClient client, Parameters requestData) {
+    private IOperationUntypedWithInput<Parameters> getClientExecutable(IGenericClient client, Parameters requestData) {
         return client.operation()
                 .onType(Patient.class)
                 .named(Iti83Constants.PIXM_OPERATION_NAME)
diff --git a/commons/ihe/fhir/r4/qedm/src/main/java/org/openehealth/ipf/commons/ihe/fhir/pcc44/Pcc44ClientRequestFactory.java b/commons/ihe/fhir/r4/qedm/src/main/java/org/openehealth/ipf/commons/ihe/fhir/pcc44/Pcc44ClientRequestFactory.java
@@ -17,7 +17,6 @@
 package org.openehealth.ipf.commons.ihe.fhir.pcc44;
 
 import ca.uhn.fhir.rest.client.api.IGenericClient;
-import ca.uhn.fhir.rest.gclient.IClientExecutable;
 import ca.uhn.fhir.rest.gclient.ICriterion;
 import ca.uhn.fhir.rest.gclient.IQuery;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
@@ -37,14 +36,14 @@ public class Pcc44ClientRequestFactory implements ClientRequestFactory {
 
 
     @Override
-    public IClientExecutable<IQuery<Bundle>, ?> getClientExecutable(IGenericClient client, Object requestData, Map<String, Object> parameters) {
+    public IQuery<Bundle> getClientExecutable(IGenericClient client, Object requestData, Map<String, Object> parameters) {
         IQuery<IBaseBundle> query;
         var queriedResourceType = (String) parameters.get(Constants.FHIR_RESOURCE_TYPE_HEADER);
-        if (requestData instanceof ICriterion criterion) {
+        if (requestData instanceof ICriterion<?> criterion) {
             query = client.search()
                     .forResource(queriedResourceType)
                     .where(criterion);
-        } else if (requestData instanceof ICriterion[] criteria) {
+        } else if (requestData instanceof ICriterion<?>[] criteria) {
             query = client.search()
                     .forResource(queriedResourceType);
             if (criteria.length > 0) {
diff --git a/commons/ihe/fhir/stu3/pixpdq/src/main/java/org/openehealth/ipf/commons/ihe/fhir/iti83/Iti83ClientRequestFactory.java b/commons/ihe/fhir/stu3/pixpdq/src/main/java/org/openehealth/ipf/commons/ihe/fhir/iti83/Iti83ClientRequestFactory.java
@@ -17,7 +17,6 @@
 package org.openehealth.ipf.commons.ihe.fhir.iti83;
 
 import ca.uhn.fhir.rest.client.api.IGenericClient;
-import ca.uhn.fhir.rest.gclient.IClientExecutable;
 import ca.uhn.fhir.rest.gclient.IOperationUntypedWithInput;
 import org.hl7.fhir.dstu3.model.Parameters;
 import org.hl7.fhir.dstu3.model.Patient;
@@ -35,7 +34,7 @@
 public class Iti83ClientRequestFactory implements ClientRequestFactory {
 
     @Override
-    public IClientExecutable<IOperationUntypedWithInput<Parameters>, ?> getClientExecutable(IGenericClient client, Object requestData, Map<String, Object> parameters) {
+    public IOperationUntypedWithInput<Parameters> getClientExecutable(IGenericClient client, Object requestData, Map<String, Object> parameters) {
 
         if (requestData instanceof Parameters p) {
             return getClientExecutable(client, p);
@@ -51,7 +50,7 @@ public class Iti83ClientRequestFactory implements ClientRequestFactory {
 
     }
 
-    private IClientExecutable<IOperationUntypedWithInput<Parameters>, ?> getClientExecutable(IGenericClient client, Parameters requestData) {
+    private IOperationUntypedWithInput<Parameters> getClientExecutable(IGenericClient client, Parameters requestData) {
         return client.operation()
                 .onType(Patient.class)
                 .named(Iti83Constants.PIXM_OPERATION_NAME)
diff --git a/commons/ihe/fhir/stu3/qedm/src/main/java/org/openehealth/ipf/commons/ihe/fhir/pcc44/Pcc44ClientRequestFactory.java b/commons/ihe/fhir/stu3/qedm/src/main/java/org/openehealth/ipf/commons/ihe/fhir/pcc44/Pcc44ClientRequestFactory.java
@@ -17,7 +17,6 @@
 package org.openehealth.ipf.commons.ihe.fhir.pcc44;
 
 import ca.uhn.fhir.rest.client.api.IGenericClient;
-import ca.uhn.fhir.rest.gclient.IClientExecutable;
 import ca.uhn.fhir.rest.gclient.ICriterion;
 import ca.uhn.fhir.rest.gclient.IQuery;
 import org.hl7.fhir.dstu3.model.Bundle;
@@ -36,14 +35,14 @@
 public class Pcc44ClientRequestFactory implements ClientRequestFactory {
 
     @Override
-    public IClientExecutable<IQuery<Bundle>, ?> getClientExecutable(IGenericClient client, Object requestData, Map<String, Object> parameters) {
+    public IQuery<Bundle> getClientExecutable(IGenericClient client, Object requestData, Map<String, Object> parameters) {
         IQuery<IBaseBundle> query;
         var queriedResourceType = (String) parameters.get(Constants.FHIR_RESOURCE_TYPE_HEADER);
-        if (requestData instanceof ICriterion criterion) {
+        if (requestData instanceof ICriterion<?> criterion) {
             query = client.search()
                     .forResource(queriedResourceType)
                     .where(criterion);
-        } else if (requestData instanceof ICriterion[] criteria) {
+        } else if (requestData instanceof ICriterion<?>[] criteria) {
             query = client.search()
                     .forResource(queriedResourceType);
             if (criteria.length > 0) {
diff --git a/platform-camel/ihe/fhir/core/src/main/java/org/openehealth/ipf/platform/camel/ihe/fhir/datamodel/JsonFhirDataFormatDefinition.java b/platform-camel/ihe/fhir/core/src/main/java/org/openehealth/ipf/platform/camel/ihe/fhir/datamodel/JsonFhirDataFormatDefinition.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2026 the original author or authors.
+ * 
+ * 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 org.openehealth.ipf.platform.camel.ihe.fhir.datamodel;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import org.apache.camel.model.DataFormatDefinition;
+
+@XmlRootElement(name = "jsonFhir")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class JsonFhirDataFormatDefinition extends DataFormatDefinition {
+
+    public JsonFhirDataFormatDefinition() {
+        super("jsonFhir");
+    }
+
+}
diff --git a/platform-camel/ihe/fhir/core/src/main/java/org/openehealth/ipf/platform/camel/ihe/fhir/datamodel/JsonFhirDataFormatReifier.java b/platform-camel/ihe/fhir/core/src/main/java/org/openehealth/ipf/platform/camel/ihe/fhir/datamodel/JsonFhirDataFormatReifier.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2026 the original author or authors.
+ *
+ * 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 org.openehealth.ipf.platform.camel.ihe.fhir.datamodel;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.reifier.dataformat.DataFormatReifier;
+
+import java.util.Map;
+
+/**
+ * @author Christian Ohr
+ */
+public class JsonFhirDataFormatReifier extends DataFormatReifier<JsonFhirDataFormatDefinition> {
+
+    public JsonFhirDataFormatReifier(CamelContext camelContext, DataFormatDefinition definition) {
+        super(camelContext, (JsonFhirDataFormatDefinition) definition);
+    }
+
+    @Override
+    protected void prepareDataFormatConfig(Map<String, Object> properties) {
+    }
+}
diff --git a/platform-camel/ihe/fhir/core/src/main/java/org/openehealth/ipf/platform/camel/ihe/fhir/datamodel/XmlFhirDataFormatDefinition.java b/platform-camel/ihe/fhir/core/src/main/java/org/openehealth/ipf/platform/camel/ihe/fhir/datamodel/XmlFhirDataFormatDefinition.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2026 the original author or authors.
+ * 
+ * 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 org.openehealth.ipf.platform.camel.ihe.fhir.datamodel;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import org.apache.camel.model.DataFormatDefinition;
+
+@XmlRootElement(name = "xmlFhir")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class XmlFhirDataFormatDefinition extends DataFormatDefinition {
+
+    public XmlFhirDataFormatDefinition() {
+        super("xmlFhir");
+    }
+
+}
diff --git a/platform-camel/ihe/fhir/core/src/main/java/org/openehealth/ipf/platform/camel/ihe/fhir/datamodel/XmlFhirDataFormatReifier.java b/platform-camel/ihe/fhir/core/src/main/java/org/openehealth/ipf/platform/camel/ihe/fhir/datamodel/XmlFhirDataFormatReifier.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2026 the original author or authors.
+ *
+ * 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 org.openehealth.ipf.platform.camel.ihe.fhir.datamodel;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.reifier.dataformat.DataFormatReifier;
+
+import java.util.Map;
+
+/**
+ * @author Christian Ohr
+ */
+public class XmlFhirDataFormatReifier extends DataFormatReifier<XmlFhirDataFormatDefinition> {
+
+    public XmlFhirDataFormatReifier(CamelContext camelContext, DataFormatDefinition definition) {
+        super(camelContext, (XmlFhirDataFormatDefinition) definition);
+    }
+
+    @Override
+    protected void prepareDataFormatConfig(Map<String, Object> properties) {
+    }
+}
diff --git a/platform-camel/ihe/fhir/core/src/main/java/org/openehealth/ipf/platform/camel/ihe/fhir/extend/FhirExtensionModuleInitializer.java b/platform-camel/ihe/fhir/core/src/main/java/org/openehealth/ipf/platform/camel/ihe/fhir/extend/FhirExtensionModuleInitializer.java
diff --git a/platform-camel/ihe/fhir/core/src/main/resources/META-INF/services/org/apache/camel/dataformat/jsonFhir b/platform-camel/ihe/fhir/core/src/main/resources/META-INF/services/org/apache/camel/dataformat/jsonFhir
diff --git a/platform-camel/ihe/fhir/core/src/main/resources/META-INF/services/org/apache/camel/dataformat/xmlFhir b/platform-camel/ihe/fhir/core/src/main/resources/META-INF/services/org/apache/camel/dataformat/xmlFhir
