You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/01/22 22:00:50 UTC
[camel-quarkus] branch master updated: fhir: reduce uri options by
leveraging component configuration
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 52400e5 fhir: reduce uri options by leveraging component configuration
52400e5 is described below
commit 52400e575c2b49b681945596ba339cafaab10239
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Wed Jan 22 18:16:09 2020 +0100
fhir: reduce uri options by leveraging component configuration
---
.../camel/quarkus/component/fhir/it/FhirDstu2RouteBuilder.java | 2 +-
.../camel/quarkus/component/fhir/it/FhirDstu3RouteBuilder.java | 2 +-
.../camel/quarkus/component/fhir/it/FhirR4RouteBuilder.java | 2 +-
.../camel/quarkus/component/fhir/it/FhirR5RouteBuilder.java | 2 +-
integration-tests/fhir/src/main/resources/application.properties | 9 +++------
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu2RouteBuilder.java b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu2RouteBuilder.java
index 34bc739..089b3bd 100644
--- a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu2RouteBuilder.java
+++ b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu2RouteBuilder.java
@@ -54,7 +54,7 @@ public class FhirDstu2RouteBuilder extends RouteBuilder {
.marshal(fhirXmlDataFormat);
from("direct:create-dstu2")
- .to("fhir://create/resource?log={{fhir.log}}&serverUrl={{camel.fhir.test-url}}&inBody=resourceAsString&fhirVersion=DSTU2&fhirContext=#fhirContext");
+ .to("fhir://create/resource?inBody=resourceAsString&fhirVersion=DSTU2&fhirContext=#fhirContext");
}
}
}
diff --git a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu3RouteBuilder.java b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu3RouteBuilder.java
index cbc8a24..a6496ef 100644
--- a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu3RouteBuilder.java
+++ b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirDstu3RouteBuilder.java
@@ -54,7 +54,7 @@ public class FhirDstu3RouteBuilder extends RouteBuilder {
.marshal(fhirXmlDataFormat);
from("direct:create-dstu3")
- .to("fhir://create/resource?log={{fhir.log}}&serverUrl={{camel.fhir.test-url}}&inBody=resourceAsString&fhirVersion=DSTU3&fhirContext=#fhirContext");
+ .to("fhir://create/resource?inBody=resourceAsString&fhirVersion=DSTU3&fhirContext=#fhirContext");
}
}
}
diff --git a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR4RouteBuilder.java b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR4RouteBuilder.java
index a73e85b..422f551 100644
--- a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR4RouteBuilder.java
+++ b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR4RouteBuilder.java
@@ -54,7 +54,7 @@ public class FhirR4RouteBuilder extends RouteBuilder {
.marshal(fhirXmlDataFormat);
from("direct:create-r4")
- .to("fhir://create/resource?log={{fhir.log}}&serverUrl={{camel.fhir.test-url}}&inBody=resourceAsString&fhirVersion=R4&fhirContext=#fhirContext");
+ .to("fhir://create/resource?inBody=resourceAsString&fhirVersion=R4&fhirContext=#fhirContext");
}
}
}
diff --git a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR5RouteBuilder.java b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR5RouteBuilder.java
index 90672a5..4ffdab2 100644
--- a/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR5RouteBuilder.java
+++ b/integration-tests/fhir/src/main/java/org/apache/camel/quarkus/component/fhir/it/FhirR5RouteBuilder.java
@@ -54,7 +54,7 @@ public class FhirR5RouteBuilder extends RouteBuilder {
.marshal(fhirXmlDataFormat);
from("direct:create-r5")
- .to("fhir://create/resource?log={{fhir.log}}&serverUrl={{camel.fhir.test-url}}&&inBody=resourceAsString&fhirVersion=R5&fhirContext=#fhirContext");
+ .to("fhir://create/resource?inBody=resourceAsString&fhirVersion=R5&fhirContext=#fhirContext");
}
}
}
diff --git a/integration-tests/fhir/src/main/resources/application.properties b/integration-tests/fhir/src/main/resources/application.properties
index b0350ca..60b1243 100644
--- a/integration-tests/fhir/src/main/resources/application.properties
+++ b/integration-tests/fhir/src/main/resources/application.properties
@@ -34,9 +34,6 @@ quarkus.camel.fhir.enable-r5=false
#
# Camel :: FHIR
#
-#camel.component.fhir.configuration = #class:org.apache.camel.component.fhir.FhirConfiguration
-#camel.component.fhir.configuration.log = false
-#camel.component.fhir.configuration.server-url = {{camel.fhir.test-url}}
-
-# restore old configuration because of https://issues.apache.org/jira/browse/CAMEL-14268
-fhir.log = false
\ No newline at end of file
+camel.component.fhir.configuration = #class:org.apache.camel.component.fhir.FhirConfiguration
+camel.component.fhir.configuration.log = false
+camel.component.fhir.configuration.server-url = {{camel.fhir.test-url}}