You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2022/10/21 08:45:55 UTC
[camel] branch camel-3.18.x updated (2b1c1202cfd -> 03d60c7ed63)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from 2b1c1202cfd CAMEL-18631: Upgrade dependencies
new 366c0e1c2ef camel-fhir: Override commons-text version
new 03d60c7ed63 camel-fhir: Reformat code
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-fhir/camel-fhir-api/pom.xml | 12 +++++
.../apache/camel/component/fhir/api/FhirRead.java | 61 +++++++++++-----------
.../camel/component/fhir/api/FhirUpdate.java | 44 ++++++++--------
.../camel/component/fhir/api/FhirValidate.java | 8 +--
components/camel-fhir/camel-fhir-component/pom.xml | 13 +++++
5 files changed, 82 insertions(+), 56 deletions(-)
[camel] 02/02: camel-fhir: Reformat code
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 03d60c7ed63506a22d0e178275a119660d5a111b
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Oct 21 08:55:13 2022 +0100
camel-fhir: Reformat code
---
.../apache/camel/component/fhir/api/FhirRead.java | 61 +++++++++++-----------
.../camel/component/fhir/api/FhirUpdate.java | 44 ++++++++--------
.../camel/component/fhir/api/FhirValidate.java | 8 +--
3 files changed, 57 insertions(+), 56 deletions(-)
diff --git a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirRead.java b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirRead.java
index 13663781048..a7b856f2f1c 100644
--- a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirRead.java
+++ b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirRead.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.fhir.api;
import java.util.Map;
-import ca.uhn.fhir.rest.api.MethodOutcome;
import ca.uhn.fhir.rest.client.api.IGenericClient;
import ca.uhn.fhir.rest.gclient.IReadExecutable;
import ca.uhn.fhir.rest.gclient.IReadIfNoneMatch;
@@ -43,13 +42,13 @@ public class FhirRead {
/**
* Reads a {@link IBaseResource} on the server by id
*
- * @param resource The resource to read (e.g. Patient)
- * @param id the {@link IIdType} referencing the resource
+ * @param resource The resource to read (e.g. Patient)
+ * @param id the {@link IIdType} referencing the resource
* @param ifVersionMatches a version to match against the newest version on the server.
* @param returnNull return null if version matches
* @param returnResource return the resource if version matches
* @param throwError throw error if the version matches
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public IBaseResource resourceById(
Class<IBaseResource> resource, IIdType id, String ifVersionMatches,
@@ -63,13 +62,13 @@ public class FhirRead {
/**
* Reads a {@link IBaseResource} on the server by id
*
- * @param resourceClass the resource to read (e.g. Patient.class)
- * @param id the {@link IIdType} referencing the resource
+ * @param resourceClass the resource to read (e.g. Patient.class)
+ * @param id the {@link IIdType} referencing the resource
* @param ifVersionMatches a version to match against the newest version on the server.
* @param returnNull return null if version matches
* @param returnResource return the resource if version matches
* @param throwError throw error if the version matches
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public IBaseResource resourceById(
String resourceClass, IIdType id, String ifVersionMatches, Boolean returnNull,
@@ -82,14 +81,14 @@ public class FhirRead {
/**
* Reads a {@link IBaseResource} on the server by id
*
- * @param resource The resource to read (e.g. Patient)
- * @param stringId The resource ID
+ * @param resource The resource to read (e.g. Patient)
+ * @param stringId The resource ID
* @param version the resource version
* @param ifVersionMatches a version to match against the newest version on the server.
* @param returnNull return null if version matches
* @param returnResource return the resource if version matches
* @param throwError throw error if the version matches
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public IBaseResource resourceById(
Class<IBaseResource> resource, String stringId, String version, String ifVersionMatches,
@@ -104,14 +103,14 @@ public class FhirRead {
/**
* Reads a {@link IBaseResource} on the server by id
*
- * @param resourceClass the resource to read (e.g. Patient.class)
- * @param stringId The resource ID
+ * @param resourceClass the resource to read (e.g. Patient.class)
+ * @param stringId The resource ID
* @param version the resource version
* @param ifVersionMatches a version to match against the newest version on the server.
* @param returnNull return null if version matches
* @param returnResource return the resource if version matches
* @param throwError throw error if the version matches
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public IBaseResource resourceById(
String resourceClass, String stringId, String ifVersionMatches, String version,
@@ -126,13 +125,13 @@ public class FhirRead {
/**
* Reads a {@link IBaseResource} on the server by id
*
- * @param resource The resource to read (e.g. Patient)
- * @param longId The resource ID
+ * @param resource The resource to read (e.g. Patient)
+ * @param longId The resource ID
* @param ifVersionMatches a version to match against the newest version on the server.
* @param returnNull return null if version matches
* @param returnResource return the resource if version matches
* @param throwError throw error if the version matches
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public IBaseResource resourceById(
Class<IBaseResource> resource, Long longId, String ifVersionMatches,
@@ -146,13 +145,13 @@ public class FhirRead {
/**
* Reads a {@link IBaseResource} on the server by id
*
- * @param resourceClass the resource to read (e.g. Patient)
- * @param longId The resource ID
+ * @param resourceClass the resource to read (e.g. Patient)
+ * @param longId The resource ID
* @param ifVersionMatches a version to match against the newest version on the server.
* @param returnNull return null if version matches
* @param returnResource return the resource if version matches
* @param throwError throw error if the version matches
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public IBaseResource resourceById(
String resourceClass, Long longId, String ifVersionMatches, Boolean returnNull,
@@ -165,13 +164,13 @@ public class FhirRead {
/**
* Reads a {@link IBaseResource} on the server by url
*
- * @param resource The resource to read (e.g. Patient)
- * @param iUrl the {@link IIdType} referencing the resource by absolute url
+ * @param resource The resource to read (e.g. Patient)
+ * @param iUrl the {@link IIdType} referencing the resource by absolute url
* @param ifVersionMatches a version to match against the newest version on the server.
* @param returnNull return null if version matches
* @param returnResource return the resource if version matches
* @param throwError throw error if the version matches
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public IBaseResource resourceByUrl(
Class<IBaseResource> resource, IIdType iUrl, String ifVersionMatches,
@@ -185,13 +184,13 @@ public class FhirRead {
/**
* Reads a {@link IBaseResource} on the server by url
*
- * @param resourceClass the resource to read (e.g. Patient.class)
- * @param iUrl the {@link IIdType} referencing the resource by absolute url
+ * @param resourceClass the resource to read (e.g. Patient.class)
+ * @param iUrl the {@link IIdType} referencing the resource by absolute url
* @param ifVersionMatches a version to match against the newest version on the server.
* @param returnNull return null if version matches
* @param returnResource return the resource if version matches
* @param throwError throw error if the version matches
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public IBaseResource resourceByUrl(
String resourceClass, IIdType iUrl, String ifVersionMatches, Boolean returnNull,
@@ -204,13 +203,13 @@ public class FhirRead {
/**
* Reads a {@link IBaseResource} on the server by url
*
- * @param resource The resource to read (e.g. Patient)
- * @param url referencing the resource by absolute url
+ * @param resource The resource to read (e.g. Patient)
+ * @param url referencing the resource by absolute url
* @param ifVersionMatches a version to match against the newest version on the server.
* @param returnNull return null if version matches
* @param returnResource return the resource if version matches
* @param throwError throw error if the version matches
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public IBaseResource resourceByUrl(
Class<IBaseResource> resource, String url, String ifVersionMatches,
@@ -224,13 +223,13 @@ public class FhirRead {
/**
* Reads a {@link IBaseResource} on the server by url
*
- * @param resourceClass the resource to read (e.g. Patient.class)
- * @param url referencing the resource by absolute url
+ * @param resourceClass the resource to read (e.g. Patient.class)
+ * @param url referencing the resource by absolute url
* @param ifVersionMatches a version to match against the newest version on the server.
* @param returnNull return null if version matches
* @param returnResource return the resource if version matches
* @param throwError throw error if the version matches
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public IBaseResource resourceByUrl(
String resourceClass, String url, String ifVersionMatches, Boolean returnNull,
diff --git a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirUpdate.java b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirUpdate.java
index f51333e6db2..5fe0ad43af8 100644
--- a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirUpdate.java
+++ b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirUpdate.java
@@ -41,10 +41,10 @@ public class FhirUpdate {
/**
* Updates a {@link IBaseResource} on the server by id
*
- * @param resource The resource to update (e.g. Patient)
- * @param id the {@link IIdType} referencing the resource
- * @param preferReturn whether the server include or suppress the resource body as a part of the result
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param resource The resource to update (e.g. Patient)
+ * @param id the {@link IIdType} referencing the resource
+ * @param preferReturn whether the server include or suppress the resource body as a part of the result
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public MethodOutcome resource(
IBaseResource resource, IIdType id, PreferReturnEnum preferReturn, Map<ExtraParameters, Object> extraParameters) {
@@ -57,10 +57,10 @@ public class FhirUpdate {
/**
* Updates a {@link IBaseResource} on the server by id
*
- * @param resourceAsString The resource body to update
- * @param id the {@link IIdType} referencing the resource
+ * @param resourceAsString The resource body to update
+ * @param id the {@link IIdType} referencing the resource
* @param preferReturn whether the server include or suppress the resource body as a part of the result
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public MethodOutcome resource(
String resourceAsString, IIdType id, PreferReturnEnum preferReturn, Map<ExtraParameters, Object> extraParameters) {
@@ -73,10 +73,10 @@ public class FhirUpdate {
/**
* Updates a {@link IBaseResource} on the server by id
*
- * @param resource The resource to update (e.g. Patient)
- * @param stringId the ID referencing the resource
- * @param preferReturn whether the server include or suppress the resource body as a part of the result
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param resource The resource to update (e.g. Patient)
+ * @param stringId the ID referencing the resource
+ * @param preferReturn whether the server include or suppress the resource body as a part of the result
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public MethodOutcome resource(
IBaseResource resource, String stringId, PreferReturnEnum preferReturn,
@@ -90,10 +90,10 @@ public class FhirUpdate {
/**
* Updates a {@link IBaseResource} on the server by id
*
- * @param resourceAsString The resource body to update
- * @param stringId the ID referencing the resource
+ * @param resourceAsString The resource body to update
+ * @param stringId the ID referencing the resource
* @param preferReturn whether the server include or suppress the resource body as a part of the result
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public MethodOutcome resource(
String resourceAsString, String stringId, PreferReturnEnum preferReturn,
@@ -107,10 +107,11 @@ public class FhirUpdate {
/**
* Updates a {@link IBaseResource} on the server by search url
*
- * @param resource The resource to update (e.g. Patient)
- * @param url Specifies that the update should be performed as a conditional create against a given search URL.
- * @param preferReturn whether the server include or suppress the resource body as a part of the result
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param resource The resource to update (e.g. Patient)
+ * @param url Specifies that the update should be performed as a conditional create against a given
+ * search URL.
+ * @param preferReturn whether the server include or suppress the resource body as a part of the result
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public MethodOutcome resourceBySearchUrl(
IBaseResource resource, String url, PreferReturnEnum preferReturn, Map<ExtraParameters, Object> extraParameters) {
@@ -122,10 +123,11 @@ public class FhirUpdate {
/**
* Updates a {@link IBaseResource} on the server by search url
*
- * @param resourceAsString The resource body to update
- * @param url Specifies that the update should be performed as a conditional create against a given search URL.
+ * @param resourceAsString The resource body to update
+ * @param url Specifies that the update should be performed as a conditional create against a given
+ * search URL.
* @param preferReturn whether the server include or suppress the resource body as a part of the result
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public MethodOutcome resourceBySearchUrl(
String resourceAsString, String url, PreferReturnEnum preferReturn, Map<ExtraParameters, Object> extraParameters) {
diff --git a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirValidate.java b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirValidate.java
index 372151e0224..a10353876fd 100644
--- a/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirValidate.java
+++ b/components/camel-fhir/camel-fhir-api/src/main/java/org/apache/camel/component/fhir/api/FhirValidate.java
@@ -37,8 +37,8 @@ public class FhirValidate {
/**
* Validates the resource
*
- * @param resource the {@link IBaseResource} to validate
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param resource the {@link IBaseResource} to validate
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public MethodOutcome resource(IBaseResource resource, Map<ExtraParameters, Object> extraParameters) {
IValidateUntyped validateUntyped = client.validate().resource(resource);
@@ -49,8 +49,8 @@ public class FhirValidate {
/**
* Validates the resource
*
- * @param resourceAsString raw resource to validate
- * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
+ * @param resourceAsString raw resource to validate
+ * @param extraParameters see {@link ExtraParameters} for a full list of parameters that can be passed, may be NULL
*/
public MethodOutcome resource(String resourceAsString, Map<ExtraParameters, Object> extraParameters) {
IValidateUntyped validateUntyped = client.validate().resource(resourceAsString);
[camel] 01/02: camel-fhir: Override commons-text version
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 366c0e1c2ef62867c6b695c7bf5f0b0d533dbd89
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Oct 21 07:35:17 2022 +0100
camel-fhir: Override commons-text version
---
components/camel-fhir/camel-fhir-api/pom.xml | 12 ++++++++++++
components/camel-fhir/camel-fhir-component/pom.xml | 13 +++++++++++++
2 files changed, 25 insertions(+)
diff --git a/components/camel-fhir/camel-fhir-api/pom.xml b/components/camel-fhir/camel-fhir-api/pom.xml
index ca2e3021635..9fc07138a8a 100644
--- a/components/camel-fhir/camel-fhir-api/pom.xml
+++ b/components/camel-fhir/camel-fhir-api/pom.xml
@@ -40,10 +40,22 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
</dependency>
+ <!-- Overrides commons-text in hapi-fhir-base -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>${commons-text-version}</version>
+ </dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-base</artifactId>
<version>${hapi-fhir-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/components/camel-fhir/camel-fhir-component/pom.xml b/components/camel-fhir/camel-fhir-component/pom.xml
index 59800958f84..f49a25eaef1 100644
--- a/components/camel-fhir/camel-fhir-component/pom.xml
+++ b/components/camel-fhir/camel-fhir-component/pom.xml
@@ -49,10 +49,23 @@
<artifactId>camel-support</artifactId>
</dependency>
+ <!-- Overrides commons-text in hapi-fhir-base -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>${commons-text-version}</version>
+ </dependency>
+
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-base</artifactId>
<version>${hapi-fhir-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>