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
commit 35529af24e16e073182cd08aae34e433d68a2092
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Fri Oct 25 01:38:14 2019 +0200
fhir: build time config options (improved)
---
.../java/org/apache/camel/quarkus/component/fhir/FhirConfig.java | 8 ++++----
integration-tests/fhir/pom.xml | 2 ++
.../camel/quarkus/component/fhir/it/FhirDstu2RouteBuilder.java | 5 ++---
.../camel/quarkus/component/fhir/it/FhirDstu3RouteBuilder.java | 4 ++--
.../camel/quarkus/component/fhir/it/FhirR4RouteBuilder.java | 5 ++---
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/extensions/fhir/runtime/src/main/java/org/apache/camel/quarkus/component/fhir/FhirConfig.java
b/extensions/fhir/runtime/src/main/java/org/apache/camel/quarkus/component/fhir/FhirConfig.java
index a2b05f0..e2dd4c7 100644
---
a/extensions/fhir/runtime/src/main/java/org/apache/camel/quarkus/component/fhir/FhirConfig.java
+++
b/extensions/fhir/runtime/src/main/java/org/apache/camel/quarkus/component/fhir/FhirConfig.java
@@ -20,24 +20,24 @@ import io.quarkus.runtime.annotations.ConfigItem;
import io.quarkus.runtime.annotations.ConfigPhase;
import io.quarkus.runtime.annotations.ConfigRoot;
-@ConfigRoot(name = "camel.fhir", phase = ConfigPhase.BUILD_TIME)
+@ConfigRoot(name = "camel.fhir", phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
public final class FhirConfig {
/**
* Enable FHIR DSTU2 Specs.
*/
- @ConfigItem(defaultValue = "true")
+ @ConfigItem(name = "enable-dstu2", defaultValue = "true")
public boolean enableDstu2;
/**
* Enable FHIR DSTU3 Specs.
*/
- @ConfigItem(defaultValue = "false")
+ @ConfigItem(name = "enable-dstu3", defaultValue = "true")
public boolean enableDstu3;
/**
* Enable FHIR R4 Specs.
*/
- @ConfigItem(defaultValue = "true")
+ @ConfigItem(name = "enable-r4", defaultValue = "true")
public boolean enableR4;
}
diff --git a/integration-tests/fhir/pom.xml b/integration-tests/fhir/pom.xml
index 1b1547d..a3172b2 100644
--- a/integration-tests/fhir/pom.xml
+++ b/integration-tests/fhir/pom.xml
@@ -79,8 +79,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties combine.children="append">
+ <!--
<quarkus.camel.fhir.enable-dstu2>true</quarkus.camel.fhir.enable-dstu2>
<quarkus.camel.fhir.enable-r4>true</quarkus.camel.fhir.enable-r4>
+ -->
</systemProperties>
</configuration>
</plugin>
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 92a7cdb..fcb8122 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
@@ -23,11 +23,10 @@ import org.apache.camel.component.fhir.FhirXmlDataFormat;
import org.apache.camel.quarkus.component.fhir.FhirFlags;
public class FhirDstu2RouteBuilder extends RouteBuilder {
-
+ private static final Boolean ENABLED = new
FhirFlags.Dstu2Enabled().getAsBoolean();
@Override
public void configure() {
- Boolean dstu2 = new FhirFlags.Dstu2Enabled().getAsBoolean();
- if (dstu2) {
+ if (ENABLED) {
FhirJsonDataFormat fhirJsonDataFormat = new FhirJsonDataFormat();
fhirJsonDataFormat.setFhirVersion(FhirVersionEnum.DSTU2.name());
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 f93b2d2..2b1a5ea 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
@@ -23,11 +23,11 @@ import org.apache.camel.component.fhir.FhirXmlDataFormat;
import org.apache.camel.quarkus.component.fhir.FhirFlags;
public class FhirDstu3RouteBuilder extends RouteBuilder {
+ private static final Boolean ENABLED = new
FhirFlags.Dstu3Enabled().getAsBoolean();
@Override
public void configure() {
- Boolean dstu3 = new FhirFlags.Dstu3Enabled().getAsBoolean();
- if (dstu3) {
+ if (ENABLED) {
FhirJsonDataFormat fhirJsonDataFormat = new FhirJsonDataFormat();
fhirJsonDataFormat.setFhirVersion(FhirVersionEnum.DSTU3.name());
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 03641a6..2622534 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
@@ -23,12 +23,11 @@ import org.apache.camel.component.fhir.FhirXmlDataFormat;
import org.apache.camel.quarkus.component.fhir.FhirFlags;
public class FhirR4RouteBuilder extends RouteBuilder {
+ private static final Boolean ENABLED = new
FhirFlags.R4Enabled().getAsBoolean();
@Override
public void configure() {
- Boolean r4 = new FhirFlags.R4Enabled().getAsBoolean();
-
- if (r4) {
+ if (ENABLED) {
FhirJsonDataFormat fhirJsonDataFormat = new FhirJsonDataFormat();
fhirJsonDataFormat.setFhirVersion(FhirVersionEnum.R4.name());
