You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2023/06/28 08:18:10 UTC
[camel] branch main updated (4b5bf1b8e3b -> 0245ede2b30)
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 4b5bf1b8e3b Camel-Bindy: Use isEmpty instead of comparing with empty String
new 91bc716c142 CAMEL-19495 - Avoid using Guava where possible
new 970071cf1ce CAMEL-19496 - Manage single version of Guava
new 0245ede2b30 Upgrade to Guava 32.0.1-jre
The 3 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:
camel-dependencies/pom.xml | 9 +-------
components/camel-bonita/pom.xml | 13 -----------
.../camel-google/camel-google-bigquery/pom.xml | 16 -------------
.../camel-google/camel-google-functions/pom.xml | 16 -------------
components/camel-google/camel-google-mail/pom.xml | 5 ----
.../camel-google/camel-google-pubsub/pom.xml | 6 -----
.../camel-google-secret-manager/pom.xml | 16 -------------
.../camel-google/camel-google-storage/pom.xml | 16 -------------
components/camel-grpc/pom.xml | 2 +-
components/camel-guava-eventbus/pom.xml | 1 -
components/camel-hdfs/pom.xml | 9 --------
components/camel-ignite/pom.xml | 1 -
components/camel-jira/pom.xml | 17 --------------
components/camel-leveldb/pom.xml | 11 ---------
components/camel-oaipmh/pom.xml | 15 +-----------
components/camel-openstack/pom.xml | 13 -----------
components/camel-platform-http-vertx/pom.xml | 13 -----------
components/camel-pubnub/pom.xml | 7 ------
components/camel-rest-openapi/pom.xml | 15 +-----------
components/camel-wordpress/pom.xml | 5 ----
.../wordpress/api/WordpressAPIConfiguration.java | 4 +---
.../wordpress/api/WordpressServiceProvider.java | 9 +++-----
.../api/auth/BaseWordpressAuthentication.java | 4 +---
.../component/wordpress/api/model/Comment.java | 8 ++-----
.../wordpress/api/model/PostRevision.java | 4 +---
.../wordpress/api/model/SearchCriteria.java | 6 +----
.../wordpress/api/model/TextPublishable.java | 7 +-----
.../camel/component/wordpress/api/model/User.java | 5 +---
.../impl/AbstractWordpressCrudServiceAdapter.java | 27 ++++++++++++++--------
.../impl/AbstractWordpressServiceAdapter.java | 7 ++----
.../impl/WordpressServiceCategoriesAdapter.java | 5 ++--
.../impl/WordpressServiceCommentsAdapter.java | 7 ++----
.../service/impl/WordpressServicePagesAdapter.java | 10 ++++----
.../service/impl/WordpressServicePostsAdapter.java | 12 +++++-----
.../service/impl/WordpressServiceTagsAdapter.java | 5 ++--
.../impl/WordpressServiceTaxonomyAdapter.java | 6 ++---
.../impl/WordpressSevicePostRevisionAdapter.java | 22 ++++++++++++------
components/camel-xchange/pom.xml | 11 ---------
components/camel-zookeeper-master/pom.xml | 11 ---------
components/camel-zookeeper/pom.xml | 11 ---------
.../java/org/apache/camel/util/ObjectHelper.java | 15 ++++++++++++
parent/pom.xml | 20 +++++++++-------
.../maven/camel-api-component-maven-plugin/pom.xml | 1 -
43 files changed, 95 insertions(+), 328 deletions(-)
[camel] 03/03: Upgrade to Guava 32.0.1-jre
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0245ede2b304121c2de53c6f45ae9430e1dfb3a0
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Jun 27 15:14:40 2023 +0200
Upgrade to Guava 32.0.1-jre
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 14764df3f74..ee7cc003f79 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -194,7 +194,7 @@
<grpc-netty-tcnative-boringssl-static-version>2.0.59.Final</grpc-netty-tcnative-boringssl-static-version>
<grpc-protobuf-version>3.22.2</grpc-protobuf-version>
<gson-version>2.10.1</gson-version>
- <guava-version>32.0.0-jre</guava-version>
+ <guava-version>32.0.1-jre</guava-version>
<guice3-version>3.0</guice3-version>
<hadoop3-version>3.3.5</hadoop3-version>
<hamcrest-version>2.2</hamcrest-version>
[camel] 02/03: CAMEL-19496 - Manage single version of Guava
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 970071cf1ceb83e805f82d54fa464cfd84e5579c
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Jun 23 22:16:29 2023 +0200
CAMEL-19496 - Manage single version of Guava
---
camel-dependencies/pom.xml | 9 +--------
components/camel-bonita/pom.xml | 13 -------------
.../camel-google/camel-google-bigquery/pom.xml | 16 ----------------
.../camel-google/camel-google-functions/pom.xml | 16 ----------------
components/camel-google/camel-google-mail/pom.xml | 5 -----
components/camel-google/camel-google-pubsub/pom.xml | 6 ------
.../camel-google/camel-google-secret-manager/pom.xml | 16 ----------------
components/camel-google/camel-google-storage/pom.xml | 16 ----------------
components/camel-grpc/pom.xml | 2 +-
components/camel-guava-eventbus/pom.xml | 1 -
components/camel-hdfs/pom.xml | 9 ---------
components/camel-ignite/pom.xml | 1 -
components/camel-jira/pom.xml | 17 -----------------
components/camel-leveldb/pom.xml | 11 -----------
components/camel-oaipmh/pom.xml | 15 +--------------
components/camel-openstack/pom.xml | 13 -------------
components/camel-platform-http-vertx/pom.xml | 13 -------------
components/camel-pubnub/pom.xml | 7 -------
components/camel-rest-openapi/pom.xml | 15 +--------------
components/camel-xchange/pom.xml | 11 -----------
components/camel-zookeeper-master/pom.xml | 11 -----------
components/camel-zookeeper/pom.xml | 11 -----------
.../java/org/apache/camel/util/ObjectHelper.java | 15 +++++++++++++++
parent/pom.xml | 20 ++++++++++++--------
.../maven/camel-api-component-maven-plugin/pom.xml | 1 -
25 files changed, 31 insertions(+), 239 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index b843cab761a..4b260a5f45a 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -161,9 +161,7 @@
<google-cloud-bom-version>26.1.6</google-cloud-bom-version>
<google-cloud-functions-bom-version>2.2.0</google-cloud-functions-bom-version>
<google-cloud-functions-gax-grpc-version>1.62.0</google-cloud-functions-gax-grpc-version>
- <google-cloud-guava-version>32.0.0-jre</google-cloud-guava-version>
<google-cloud-secretmanager-bom-version>2.2.0</google-cloud-secretmanager-bom-version>
- <google-mail-guava-version>32.0.0-jre</google-mail-guava-version>
<google-maps-services-version>2.2.0</google-maps-services-version>
<google-oauth-client-version>1.34.0</google-oauth-client-version>
<graaljs-version>22.3.0</graaljs-version>
@@ -171,15 +169,13 @@
<greenmail-version>2.0.0</greenmail-version>
<grizzly-websockets-version>2.4.4</grizzly-websockets-version>
<grpc-google-auth-library-version>1.5.3</grpc-google-auth-library-version>
- <grpc-guava-version>32.0.0-jre</grpc-guava-version>
<grpc-java-jwt-version>4.3.0</grpc-java-jwt-version>
<grpc-netty-tcnative-boringssl-static-version>2.0.59.Final</grpc-netty-tcnative-boringssl-static-version>
<grpc-protobuf-version>3.22.2</grpc-protobuf-version>
<grpc-version>1.56.0</grpc-version>
<gson-version>2.10.1</gson-version>
- <guava-eventbus-version>32.0.0-jre</guava-eventbus-version>
+ <guava-version>32.0.0-jre</guava-version>
<guice3-version>3.0</guice3-version>
- <hadoop3-guava-version>32.0.0-jre</hadoop3-guava-version>
<hadoop3-version>3.3.5</hadoop3-version>
<hamcrest-version>2.2</hamcrest-version>
<hapi-base-version>2.3</hapi-base-version>
@@ -263,7 +259,6 @@
<jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
<jgroups-raft-version>0.5.3.Final</jgroups-raft-version>
<jgroups-version>4.2.17.Final</jgroups-version>
- <jira-guava-version>32.0.0-jre</jira-guava-version>
<jira-rest-client-api-version>5.2.5</jira-rest-client-api-version>
<jnats-version>2.16.12</jnats-version>
<jodatime2-version>2.11.1</jodatime2-version>
@@ -300,7 +295,6 @@
<kubernetes-model-version>6.7.2</kubernetes-model-version>
<kudu-version>1.16.0</kudu-version>
<leveldb-api-version>0.12</leveldb-api-version>
- <leveldb-guava-version>32.0.0-jre</leveldb-guava-version>
<leveldb-version>0.12</leveldb-version>
<leveldbjni-version>1.8</leveldbjni-version>
<libphonenumber-version>8.13.3</libphonenumber-version>
@@ -458,7 +452,6 @@
<woodstox-version>4.4.1</woodstox-version>
<xbean-asm5-shaded-version>4.5</xbean-asm5-shaded-version>
<xbean-spring-version>4.21</xbean-spring-version>
- <xchange-guava-version>32.0.0-jre</xchange-guava-version>
<xchange-version>5.0.14</xchange-version>
<xerces-version>2.12.2</xerces-version>
<xml-apis-ext-version>1.3.04</xml-apis-ext-version>
diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml
index 1e2bddfffcc..fcbe5d27a1f 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -69,19 +69,6 @@
<version>${mockito-version}</version>
<scope>test</scope>
</dependency>
- <!-- Override the guava version prescribed by Camel with the one needed by wiremock for tests -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-google/camel-google-bigquery/pom.xml b/components/camel-google/camel-google-bigquery/pom.xml
index 738984c0717..bef05254527 100644
--- a/components/camel-google/camel-google-bigquery/pom.xml
+++ b/components/camel-google/camel-google-bigquery/pom.xml
@@ -37,12 +37,6 @@
<dependencyManagement>
<dependencies>
- <!-- Override the android JDK 7 guava in libraries-bom -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-cloud-guava-version}</version>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
@@ -58,16 +52,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquery</artifactId>
diff --git a/components/camel-google/camel-google-functions/pom.xml b/components/camel-google/camel-google-functions/pom.xml
index 2a1174433dc..fbb7ef0f7d3 100644
--- a/components/camel-google/camel-google-functions/pom.xml
+++ b/components/camel-google/camel-google-functions/pom.xml
@@ -38,12 +38,6 @@
<dependencyManagement>
<dependencies>
- <!-- Override the android JDK 7 guava in libraries-bom -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-cloud-guava-version}</version>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-functions-bom</artifactId>
@@ -61,16 +55,6 @@
<artifactId>camel-support</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-functions</artifactId>
diff --git a/components/camel-google/camel-google-mail/pom.xml b/components/camel-google/camel-google-mail/pom.xml
index 946d1f82d17..d911b714674 100644
--- a/components/camel-google/camel-google-mail/pom.xml
+++ b/components/camel-google/camel-google-mail/pom.xml
@@ -45,11 +45,6 @@
<artifactId>camel-support</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-mail-guava-version}</version>
- </dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
diff --git a/components/camel-google/camel-google-pubsub/pom.xml b/components/camel-google/camel-google-pubsub/pom.xml
index 6e472a4d2fc..3c07936b4a7 100644
--- a/components/camel-google/camel-google-pubsub/pom.xml
+++ b/components/camel-google/camel-google-pubsub/pom.xml
@@ -48,12 +48,6 @@
<dependencyManagement>
<dependencies>
- <!-- Override the android JDK 7 guava in libraries-bom -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-cloud-guava-version}</version>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
diff --git a/components/camel-google/camel-google-secret-manager/pom.xml b/components/camel-google/camel-google-secret-manager/pom.xml
index 93932062b46..4916f16a8ab 100644
--- a/components/camel-google/camel-google-secret-manager/pom.xml
+++ b/components/camel-google/camel-google-secret-manager/pom.xml
@@ -38,12 +38,6 @@
<dependencyManagement>
<dependencies>
- <!-- Override the android JDK 7 guava in libraries-bom -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-cloud-guava-version}</version>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-secretmanager-bom</artifactId>
@@ -71,16 +65,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-util-json</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-secretmanager</artifactId>
diff --git a/components/camel-google/camel-google-storage/pom.xml b/components/camel-google/camel-google-storage/pom.xml
index 758475958b0..3f0d99f4e60 100644
--- a/components/camel-google/camel-google-storage/pom.xml
+++ b/components/camel-google/camel-google-storage/pom.xml
@@ -34,12 +34,6 @@
<dependencyManagement>
<dependencies>
- <!-- Override the android JDK 7 guava in libraries-bom -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${google-cloud-guava-version}</version>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
@@ -59,16 +53,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-health</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 941ec9b5dde..dc58353348e 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -250,7 +250,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${grpc-guava-version}</version>
+ <version>${guava-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/components/camel-guava-eventbus/pom.xml b/components/camel-guava-eventbus/pom.xml
index db5b7bc1006..0a1158f1c61 100644
--- a/components/camel-guava-eventbus/pom.xml
+++ b/components/camel-guava-eventbus/pom.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava-eventbus-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index 8fcb7704838..12f1026ade1 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -53,10 +53,6 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -75,11 +71,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${hadoop3-guava-version}</version>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index e4a10b3a49b..3d15594c1db 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -71,7 +71,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml
index 979ed06d372..677792dfd6c 100644
--- a/components/camel-jira/pom.xml
+++ b/components/camel-jira/pom.xml
@@ -49,17 +49,8 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${jira-guava-version}</version>
- </dependency>
<!-- atlassian jira dependencies -->
<dependency>
@@ -82,10 +73,6 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -97,10 +84,6 @@
<groupId>com.atlassian.sal</groupId>
<artifactId>sal-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
<exclusion>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 607948922c3..34e559654d0 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -54,17 +54,6 @@
<groupId>org.iq80.leveldb</groupId>
<artifactId>leveldb</artifactId>
<version>${leveldb-version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${leveldb-guava-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/components/camel-oaipmh/pom.xml b/components/camel-oaipmh/pom.xml
index 23e3ec77189..b7af5b9bb37 100644
--- a/components/camel-oaipmh/pom.xml
+++ b/components/camel-oaipmh/pom.xml
@@ -31,7 +31,7 @@
<packaging>jar</packaging>
<name>Camel :: OAIPMH</name>
<description>Camel OAI-PMH support</description>
-
+
<dependencies>
<!-- camel -->
<dependency>
@@ -60,19 +60,6 @@
<artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
- <!-- Override the guava version prescribed by Camel with the one needed by wiremock for tests -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-openstack/pom.xml b/components/camel-openstack/pom.xml
index 367d060da8a..9fcda89430d 100644
--- a/components/camel-openstack/pom.xml
+++ b/components/camel-openstack/pom.xml
@@ -77,19 +77,6 @@
<version>${mockito-version}</version>
<scope>test</scope>
</dependency>
- <!-- Override the guava version prescribed by Camel with the one needed by wiremock for tests -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-platform-http-vertx/pom.xml b/components/camel-platform-http-vertx/pom.xml
index ecf2f3dff22..2671897939b 100644
--- a/components/camel-platform-http-vertx/pom.xml
+++ b/components/camel-platform-http-vertx/pom.xml
@@ -102,19 +102,6 @@
<version>${rest-assured-version}</version>
<scope>test</scope>
</dependency>
- <!-- Override the guava version prescribed by Camel with the one needed by wiremock for tests -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-pubnub/pom.xml b/components/camel-pubnub/pom.xml
index 601bc8b0c49..d75f32541da 100644
--- a/components/camel-pubnub/pom.xml
+++ b/components/camel-pubnub/pom.xml
@@ -76,13 +76,6 @@
<version>${hamcrest-version}</version>
<scope>test</scope>
</dependency>
- <!-- Override the guava version prescribed by Camel with the one needed by wiremock for tests -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-rest-openapi/pom.xml b/components/camel-rest-openapi/pom.xml
index 0f88e93336d..66b35aaf26f 100644
--- a/components/camel-rest-openapi/pom.xml
+++ b/components/camel-rest-openapi/pom.xml
@@ -49,7 +49,7 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-rest</artifactId>
</dependency>
-
+
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-models</artifactId>
@@ -104,19 +104,6 @@
<scope>test</scope>
</dependency>
- <!-- Override the guava version prescribed by Camel with the one needed by wiremock for tests -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
diff --git a/components/camel-xchange/pom.xml b/components/camel-xchange/pom.xml
index cb596f3d4db..2ec39c70f08 100644
--- a/components/camel-xchange/pom.xml
+++ b/components/camel-xchange/pom.xml
@@ -55,17 +55,6 @@
<artifactId>xchange-binance</artifactId>
<version>${xchange-version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${xchange-guava-version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml
index abaa1629dd9..2911b621414 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -66,17 +66,6 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>${curator-version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava-eventbus-version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index 35adf3759f7..6718f80efa9 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -72,17 +72,6 @@
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<version>${curator-version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava-eventbus-version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java b/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
index 8544d492b4d..eb37a1e4384 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
@@ -159,6 +159,21 @@ public final class ObjectHelper {
return value;
}
+ /**
+ * Asserts that the given {@code value} is neither {@code null} nor an emptyString.
+ *
+ * @param value the value to test
+ * @param name the key that resolved the value
+ * @return the passed {@code value} as is
+ * @throws IllegalArgumentException is thrown if assertion fails
+ */
+ public static String notNullOrEmpty(String value, String name) {
+ if (value == null || value.isEmpty()) {
+ throw new IllegalArgumentException(name + " must be specified and non-empty");
+ }
+ return value;
+ }
+
/**
* Asserts whether the value is <b>not</b> <tt>null</tt>
*
diff --git a/parent/pom.xml b/parent/pom.xml
index bcee555b6c8..14764df3f74 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -182,9 +182,7 @@
<google-cloud-bom-version>26.1.6</google-cloud-bom-version>
<google-cloud-functions-bom-version>2.2.0</google-cloud-functions-bom-version>
<google-cloud-functions-gax-grpc-version>1.62.0</google-cloud-functions-gax-grpc-version>
- <google-cloud-guava-version>32.0.0-jre</google-cloud-guava-version>
<google-cloud-secretmanager-bom-version>2.2.0</google-cloud-secretmanager-bom-version>
- <google-mail-guava-version>32.0.0-jre</google-mail-guava-version>
<graaljs-version>22.3.0</graaljs-version>
<graphql-java-version>18.4</graphql-java-version>
<greenmail-version>2.0.0</greenmail-version>
@@ -192,15 +190,13 @@
<grpc-version>1.56.0</grpc-version>
<!-- keep grpc-google-auth-library-version in sync with that used by grpc-auth -->
<grpc-google-auth-library-version>1.5.3</grpc-google-auth-library-version>
- <grpc-guava-version>32.0.0-jre</grpc-guava-version>
<grpc-java-jwt-version>4.3.0</grpc-java-jwt-version>
<grpc-netty-tcnative-boringssl-static-version>2.0.59.Final</grpc-netty-tcnative-boringssl-static-version>
<grpc-protobuf-version>3.22.2</grpc-protobuf-version>
<gson-version>2.10.1</gson-version>
- <guava-eventbus-version>32.0.0-jre</guava-eventbus-version>
+ <guava-version>32.0.0-jre</guava-version>
<guice3-version>3.0</guice3-version>
<hadoop3-version>3.3.5</hadoop3-version>
- <hadoop3-guava-version>32.0.0-jre</hadoop3-guava-version>
<hamcrest-version>2.2</hamcrest-version>
<hapi-version>2.3</hapi-version>
<hapi-base-version>2.3</hapi-base-version>
@@ -283,7 +279,6 @@
<jgroups-raft-version>0.5.3.Final</jgroups-raft-version>
<jgroups-raft-leveldbjni-version>1.8</jgroups-raft-leveldbjni-version>
<jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
- <jira-guava-version>32.0.0-jre</jira-guava-version>
<jira-rest-client-api-version>5.2.5</jira-rest-client-api-version>
<libthrift-version>0.18.1</libthrift-version>
<jodatime2-version>2.11.1</jodatime2-version>
@@ -322,7 +317,6 @@
<leveldbjni-version>1.8</leveldbjni-version>
<leveldb-api-version>0.12</leveldb-api-version>
<leveldb-version>0.12</leveldb-version>
- <leveldb-guava-version>32.0.0-jre</leveldb-guava-version>
<libphonenumber-version>8.13.3</libphonenumber-version>
<!-- virtual dependency only used by Eclipse m2e -->
<lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
@@ -483,7 +477,6 @@
<xbean-spring-version>4.21</xbean-spring-version>
<xbean-asm5-shaded-version>4.5</xbean-asm5-shaded-version>
<xchange-version>5.0.14</xchange-version>
- <xchange-guava-version>32.0.0-jre</xchange-guava-version>
<xerces-version>2.12.2</xerces-version>
<!-- needed to manage the xml-apis version in camel-xmljson -->
<xml-apis-version>1.4.01</xml-apis-version>
@@ -2749,6 +2742,17 @@
<artifactId>gson</artifactId>
<version>${gson-version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml
index 345954ab1cc..1e8a55c1a09 100644
--- a/tooling/maven/camel-api-component-maven-plugin/pom.xml
+++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml
@@ -144,7 +144,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>32.0.0-jre</version>
</dependency>
<!-- logging -->
[camel] 01/03: CAMEL-19495 - Avoid using Guava where possible
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 91bc716c142a90c508f6fab6e7a5f4e1e8f3a55f
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Jun 23 22:12:17 2023 +0200
CAMEL-19495 - Avoid using Guava where possible
---
components/camel-wordpress/pom.xml | 5 ----
.../wordpress/api/WordpressAPIConfiguration.java | 4 +---
.../wordpress/api/WordpressServiceProvider.java | 9 +++-----
.../api/auth/BaseWordpressAuthentication.java | 4 +---
.../component/wordpress/api/model/Comment.java | 8 ++-----
.../wordpress/api/model/PostRevision.java | 4 +---
.../wordpress/api/model/SearchCriteria.java | 6 +----
.../wordpress/api/model/TextPublishable.java | 7 +-----
.../camel/component/wordpress/api/model/User.java | 5 +---
.../impl/AbstractWordpressCrudServiceAdapter.java | 27 ++++++++++++++--------
.../impl/AbstractWordpressServiceAdapter.java | 7 ++----
.../impl/WordpressServiceCategoriesAdapter.java | 5 ++--
.../impl/WordpressServiceCommentsAdapter.java | 7 ++----
.../service/impl/WordpressServicePagesAdapter.java | 10 ++++----
.../service/impl/WordpressServicePostsAdapter.java | 12 +++++-----
.../service/impl/WordpressServiceTagsAdapter.java | 5 ++--
.../impl/WordpressServiceTaxonomyAdapter.java | 6 ++---
.../impl/WordpressSevicePostRevisionAdapter.java | 22 ++++++++++++------
18 files changed, 64 insertions(+), 89 deletions(-)
diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml
index 9a4410c2002..ac39aa0cda6 100644
--- a/components/camel-wordpress/pom.xml
+++ b/components/camel-wordpress/pom.xml
@@ -93,10 +93,5 @@
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava-eventbus-version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressAPIConfiguration.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressAPIConfiguration.java
index 7d32f01af5b..698d520deb8 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressAPIConfiguration.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressAPIConfiguration.java
@@ -21,7 +21,6 @@ import java.util.Objects;
import org.apache.camel.component.wordpress.api.auth.WordpressAuthentication;
-import static com.google.common.base.MoreObjects.toStringHelper;
import static java.util.Objects.hash;
/**
@@ -69,8 +68,7 @@ public final class WordpressAPIConfiguration implements Serializable {
@Override
public String toString() {
- return toStringHelper(this).addValue(this.apiUrl).add("Version", this.apiVersion).addValue(this.authentication)
- .toString();
+ return "WordpressAPIConfiguration{" + this.apiUrl + ", Version=" + this.apiVersion + ", " + this.authentication + "}";
}
@Override
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressServiceProvider.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressServiceProvider.java
index f26c98b2a49..f6a50d25e4b 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressServiceProvider.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressServiceProvider.java
@@ -23,13 +23,10 @@ import org.apache.camel.component.wordpress.api.service.WordpressServicePosts;
import org.apache.camel.component.wordpress.api.service.WordpressServiceUsers;
import org.apache.camel.component.wordpress.api.service.impl.WordpressServicePostsAdapter;
import org.apache.camel.component.wordpress.api.service.impl.WordpressServiceUsersAdapter;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Strings.emptyToNull;
-import static com.google.common.base.Strings.isNullOrEmpty;
-
public final class WordpressServiceProvider {
private static final Logger LOGGER = LoggerFactory.getLogger(WordpressServiceProvider.class);
@@ -58,10 +55,10 @@ public final class WordpressServiceProvider {
}
public void init(WordpressAPIConfiguration config) {
- checkNotNull(emptyToNull(config.getApiUrl()),
+ ObjectHelper.notNullOrEmpty(config.getApiUrl(),
"Please inform the Wordpress API url , eg.: http://myblog.com/wp-json/wp");
- if (isNullOrEmpty(config.getApiVersion())) {
+ if (config.getApiVersion() == null || config.getApiVersion().isEmpty()) {
config.setApiVersion(WordpressConstants.API_VERSION);
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/auth/BaseWordpressAuthentication.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/auth/BaseWordpressAuthentication.java
index a8eb26917d1..a2715c752e5 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/auth/BaseWordpressAuthentication.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/auth/BaseWordpressAuthentication.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.wordpress.api.auth;
-import com.google.common.base.Strings;
-
abstract class BaseWordpressAuthentication implements WordpressAuthentication {
protected String username;
@@ -52,6 +50,6 @@ abstract class BaseWordpressAuthentication implements WordpressAuthentication {
}
protected final boolean isCredentialsSet() {
- return !Strings.isNullOrEmpty(username) && !Strings.isNullOrEmpty(password);
+ return username != null && !username.isEmpty() && password != null && !password.isEmpty();
}
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/Comment.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/Comment.java
index c641cc7c1fa..6a8cb85d46e 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/Comment.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/Comment.java
@@ -24,8 +24,6 @@ import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
-import static com.google.common.base.MoreObjects.toStringHelper;
-
@JsonIgnoreProperties(ignoreUnknown = true)
public class Comment implements Serializable {
@@ -209,10 +207,8 @@ public class Comment implements Serializable {
@Override
public String toString() {
- // @formatter:off
- return toStringHelper(this).add("ID", this.id).addValue(this.authorName).addValue(this.authorEmail).addValue(this.date)
- .addValue(this.status).add("PostID", this.parent).toString();
- // @formatter:on
+ return "Comment{ID=" + getId() + ", " + this.authorName + ", " + this.authorEmail + ", " + this.date + ", "
+ + this.status + ", PostID=" + this.parent + "}";
}
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/PostRevision.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/PostRevision.java
index 90a91e50683..1837e416cd9 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/PostRevision.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/PostRevision.java
@@ -20,8 +20,6 @@ import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import static com.google.common.base.MoreObjects.toStringHelper;
-
@JsonIgnoreProperties(ignoreUnknown = true)
public class PostRevision extends Publishable implements Serializable {
@@ -83,7 +81,7 @@ public class PostRevision extends Publishable implements Serializable {
@Override
public String toString() {
- return toStringHelper(this).add("ID", this.getId()).add("PostID", this.parent).addValue(this.getTitle()).toString();
+ return "PostRevision{ID=" + getId() + ", PostID=" + this.parent + ", " + getTitle() + "}";
}
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/SearchCriteria.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/SearchCriteria.java
index 8437ec39d9e..503f9588ae1 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/SearchCriteria.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/SearchCriteria.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.wordpress.api.model;
import java.io.Serializable;
import java.util.List;
-import static com.google.common.base.MoreObjects.toStringHelper;
-
/**
* Search criterias.
*/
@@ -85,9 +83,7 @@ public class SearchCriteria implements Serializable {
@Override
public String toString() {
- // @formatter:off
- return toStringHelper(this).add("Query", this.search).add("Page", page).add("Per Page", perPage).addValue(this.order)
- .toString();
+ return "SearchCriteria{Query=" + search + ", Page=" + page + ", Per Page=" + perPage + ", " + order + "}";
}
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/TextPublishable.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/TextPublishable.java
index 825dc858c67..7b5c2d2338c 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/TextPublishable.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/TextPublishable.java
@@ -22,8 +22,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import static com.google.common.base.MoreObjects.toStringHelper;
-
/**
* Describes a object that may be published on the Wordpress engine, eg. a Post, a Page etc.
*/
@@ -160,11 +158,8 @@ public abstract class TextPublishable extends Publishable {
this.template = template;
}
- // @formatter:off
@Override
public String toString() {
- return toStringHelper(this).add("ID", this.getId()).add("Status", this.getStatus()).addValue(this.guid)
- .addValue(this.getTitle()).toString();
+ return "PostRevision{ID=" + getId() + ", Status=" + this.getStatus() + ", " + guid + "}";
}
- // @formatter:on
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/User.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/User.java
index d073627755e..c2376828f66 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/User.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/User.java
@@ -24,8 +24,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import static com.google.common.base.MoreObjects.toStringHelper;
-
@JacksonXmlRootElement
@JsonIgnoreProperties(ignoreUnknown = true)
public class User implements Serializable {
@@ -207,8 +205,7 @@ public class User implements Serializable {
@Override
public String toString() {
- return toStringHelper(this).addValue(this.id).addValue(this.username).addValue(this.email).addValue(this.name)
- .toString();
+ return "User{" + id + ", " + username + ", " + email + ", " + name + "}";
}
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressCrudServiceAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressCrudServiceAdapter.java
index 15b04beea58..27eeb7d9be3 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressCrudServiceAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressCrudServiceAdapter.java
@@ -16,14 +16,13 @@
*/
package org.apache.camel.component.wordpress.api.service.impl;
+import java.util.Objects;
+
import org.apache.camel.component.wordpress.api.model.Context;
import org.apache.camel.component.wordpress.api.model.DeletedModel;
import org.apache.camel.component.wordpress.api.model.SearchCriteria;
import org.apache.camel.component.wordpress.api.service.WordpressCrudService;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
/**
* Base service adapter implementation with CRUD commons operations.
*
@@ -39,7 +38,7 @@ abstract class AbstractWordpressCrudServiceAdapter<A, T, S extends SearchCriteri
@Override
public final T create(T object) {
- checkNotNull(object, "Please define an object to create");
+ Objects.requireNonNull(object, "Please define an object to create");
return this.doCreate(object);
}
@@ -47,13 +46,17 @@ abstract class AbstractWordpressCrudServiceAdapter<A, T, S extends SearchCriteri
@Override
public final T delete(Integer id) {
- checkArgument(id > 0, "The id is mandatory");
+ if (!(id > 0)) {
+ throw new IllegalArgumentException("The id is mandatory");
+ }
return this.doDelete(id);
}
@Override
public final DeletedModel<T> forceDelete(Integer id) {
- checkArgument(id > 0, "The id is mandatory");
+ if (!(id > 0)) {
+ throw new IllegalArgumentException("The id is mandatory");
+ }
return this.doForceDelete(id);
}
@@ -70,8 +73,10 @@ abstract class AbstractWordpressCrudServiceAdapter<A, T, S extends SearchCriteri
@Override
public final T update(Integer id, T object) {
- checkNotNull(object, "Please define an object to update");
- checkArgument(id > 0, "The id is mandatory");
+ Objects.requireNonNull(object, "Please define an object to update");
+ if (!(id > 0)) {
+ throw new IllegalArgumentException("The id is mandatory");
+ }
return this.doUpdate(id, object);
}
@@ -84,8 +89,10 @@ abstract class AbstractWordpressCrudServiceAdapter<A, T, S extends SearchCriteri
@Override
public final T retrieve(Integer entityID, Context context) {
- checkArgument(entityID > 0, "Please provide a non zero id");
- checkNotNull(context, "Provide a context");
+ if (!(entityID > 0)) {
+ throw new IllegalArgumentException("Please provide a non zero id");
+ }
+ Objects.requireNonNull(context, "Provide a context");
// return this.getSpi().retrieve(getApiVersion(), entityID, context);
return doRetrieve(entityID, context);
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressServiceAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressServiceAdapter.java
index 2bcd29e81a5..4804ad60e10 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressServiceAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressServiceAdapter.java
@@ -23,6 +23,7 @@ import jakarta.ws.rs.core.MediaType;
import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
import org.apache.camel.component.wordpress.api.auth.WordpressAuthentication;
import org.apache.camel.component.wordpress.api.service.WordpressService;
+import org.apache.camel.util.ObjectHelper;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
@@ -30,9 +31,6 @@ import org.apache.cxf.jaxrs.client.WebClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Strings.emptyToNull;
-
abstract class AbstractWordpressServiceAdapter<A> implements WordpressService {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractWordpressServiceAdapter.class);
@@ -42,8 +40,7 @@ abstract class AbstractWordpressServiceAdapter<A> implements WordpressService {
private WordpressAuthentication authentication;
AbstractWordpressServiceAdapter(final String wordpressUrl, final String apiVersion) {
- checkNotNull(emptyToNull(apiVersion));
- this.apiVersion = apiVersion;
+ this.apiVersion = ObjectHelper.notNullOrEmpty(apiVersion, "apiVersion");
// @formatter:off
this.spi = JAXRSClientFactory.create(wordpressUrl, this.getSpiType(),
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCategoriesAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCategoriesAdapter.java
index 6a554573d81..1a2d00e7608 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCategoriesAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCategoriesAdapter.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.wordpress.api.service.impl;
import java.util.List;
+import java.util.Objects;
import org.apache.camel.component.wordpress.api.model.Category;
import org.apache.camel.component.wordpress.api.model.CategorySearchCriteria;
@@ -24,8 +25,6 @@ import org.apache.camel.component.wordpress.api.model.Context;
import org.apache.camel.component.wordpress.api.service.WordpressServiceCategories;
import org.apache.camel.component.wordpress.api.service.spi.CategoriesSPI;
-import static com.google.common.base.Preconditions.checkNotNull;
-
public class WordpressServiceCategoriesAdapter
extends AbstractWordpressCrudServiceAdapter<CategoriesSPI, Category, CategorySearchCriteria>
implements WordpressServiceCategories {
@@ -42,7 +41,7 @@ public class WordpressServiceCategoriesAdapter
// @formatter:off
@Override
public List<Category> list(CategorySearchCriteria criteria) {
- checkNotNull(criteria, "The search criteria must be defined");
+ Objects.requireNonNull(criteria, "The search criteria must be defined");
return getSpi().list(this.getApiVersion(), criteria.getContext(), criteria.getPage(), criteria.getPerPage(),
criteria.getSearch(), criteria.getExclude(), criteria.getInclude(),
criteria.getOrder(), criteria.getOrderBy(), criteria.isHideEmpty(), criteria.getParent(), criteria.getPostId(),
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCommentsAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCommentsAdapter.java
index fad100b0fa5..b01a69b4549 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCommentsAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCommentsAdapter.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.wordpress.api.service.impl;
import java.util.List;
+import java.util.Objects;
import org.apache.camel.component.wordpress.api.model.Comment;
import org.apache.camel.component.wordpress.api.model.CommentSearchCriteria;
@@ -24,8 +25,6 @@ import org.apache.camel.component.wordpress.api.model.Context;
import org.apache.camel.component.wordpress.api.service.WordpressServiceComments;
import org.apache.camel.component.wordpress.api.service.spi.CommentsSPI;
-import static com.google.common.base.Preconditions.checkNotNull;
-
public class WordpressServiceCommentsAdapter
extends AbstractWordpressCrudServiceAdapter<CommentsSPI, Comment, CommentSearchCriteria>
implements WordpressServiceComments {
@@ -39,16 +38,14 @@ public class WordpressServiceCommentsAdapter
return CommentsSPI.class;
}
- // @formatter:off
@Override
public List<Comment> list(CommentSearchCriteria c) {
- checkNotNull(c, "The search criteria must be defined");
+ Objects.requireNonNull(c, "The search criteria must be defined");
return getSpi().list(this.getApiVersion(), c.getContext(), c.getPage(), c.getPerPage(), c.getSearch(), c.getAfter(),
c.getAuthor(), c.getAuthorExclude(), c.getAuthorEmail(), c.getBefore(),
c.getExclude(), c.getInclude(), c.getKarma(), c.getOffset(), c.getOrder(), c.getOrderBy(), c.getParent(),
c.getParentExclude(), c.getPost(), c.getStatus(), c.getType());
}
- // @formatter:on
@Override
protected Comment doCreate(Comment object) {
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePagesAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePagesAdapter.java
index 3fd527c1d60..af5bab46cdb 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePagesAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePagesAdapter.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.wordpress.api.service.impl;
import java.util.List;
+import java.util.Objects;
import org.apache.camel.component.wordpress.api.model.Context;
import org.apache.camel.component.wordpress.api.model.Page;
@@ -29,9 +30,6 @@ import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
/**
* The {@link WordpressServicePosts} implementation. Aggregates the {@link PostsSPI} interface using
* {@link JAXRSClientFactory} to make the API calls.
@@ -56,7 +54,7 @@ public class WordpressServicePagesAdapter extends AbstractWordpressCrudServiceAd
@Override
public List<Page> list(PageSearchCriteria c) {
LOGGER.debug("Calling list pages: searchCriteria {}", c);
- checkNotNull(c, "Please provide a search criteria");
+ Objects.requireNonNull(c, "Please provide a search criteria");
return getSpi().list(this.getApiVersion(), c.getContext(), c.getPage(), c.getPerPage(), c.getSearch(), c.getAfter(),
c.getAuthor(), c.getAuthorExclude(), c.getBefore(), c.getExclude(),
c.getInclude(), c.getMenuOrder(), c.getOffset(), c.getOrder(), c.getOrderBy(), c.getParent(),
@@ -67,7 +65,9 @@ public class WordpressServicePagesAdapter extends AbstractWordpressCrudServiceAd
@Override
public Page retrieve(Integer pageId, Context context, String password) {
LOGGER.debug("Calling retrieve: postId {}; context: {}", pageId, context);
- checkArgument(pageId > 0, "Please provide a non zero post id");
+ if (pageId <= 0) {
+ throw new IllegalArgumentException("Please provide a non zero post id");
+ }
return getSpi().retrieve(this.getApiVersion(), pageId, context, password);
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePostsAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePostsAdapter.java
index 6066df60694..72647c61d28 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePostsAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePostsAdapter.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.wordpress.api.service.impl;
import java.util.List;
+import java.util.Objects;
import org.apache.camel.component.wordpress.api.model.Context;
import org.apache.camel.component.wordpress.api.model.DeletedModel;
@@ -28,9 +29,6 @@ import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
/**
* The {@link WordpressServicePosts} implementation. Aggregates the {@link PostsSPI} interface using
* {@link JAXRSClientFactory} to make the API calls.
@@ -54,7 +52,7 @@ public class WordpressServicePostsAdapter extends AbstractWordpressCrudServiceAd
@Override
public List<Post> list(PostSearchCriteria criteria) {
LOGGER.debug("Calling list posts: searchCriteria {}", criteria);
- checkNotNull(criteria, "Please provide a search criteria");
+ Objects.requireNonNull(criteria, "Please provide a search criteria");
return getSpi().list(this.getApiVersion(), criteria.getContext(), criteria.getPage(), criteria.getPerPage(),
criteria.getSearch(), criteria.getAfter(), criteria.getAuthor(),
criteria.getAuthorExclude(), criteria.getBefore(), criteria.getExclude(), criteria.getInclude(),
@@ -66,8 +64,10 @@ public class WordpressServicePostsAdapter extends AbstractWordpressCrudServiceAd
@Override
public Post retrieve(Integer postId, Context context, String password) {
LOGGER.debug("Calling retrievePosts: postId {}; postContext: {}", postId, context);
- checkArgument(postId > 0, "Please provide a non zero post id");
- checkNotNull(context, "Provide a post context");
+ if (postId <= 0) {
+ throw new IllegalArgumentException("Please provide a non zero post id");
+ }
+ Objects.requireNonNull(context, "Provide a post context");
return getSpi().retrieve(this.getApiVersion(), postId, context, password);
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTagsAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTagsAdapter.java
index b190359f1c3..3d338847111 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTagsAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTagsAdapter.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.wordpress.api.service.impl;
import java.util.List;
+import java.util.Objects;
import org.apache.camel.component.wordpress.api.model.Context;
import org.apache.camel.component.wordpress.api.model.Tag;
@@ -24,8 +25,6 @@ import org.apache.camel.component.wordpress.api.model.TagSearchCriteria;
import org.apache.camel.component.wordpress.api.service.WordpressServiceTags;
import org.apache.camel.component.wordpress.api.service.spi.TagsSPI;
-import static com.google.common.base.Preconditions.checkNotNull;
-
public class WordpressServiceTagsAdapter extends AbstractWordpressCrudServiceAdapter<TagsSPI, Tag, TagSearchCriteria>
implements WordpressServiceTags {
@@ -41,7 +40,7 @@ public class WordpressServiceTagsAdapter extends AbstractWordpressCrudServiceAda
// @formatter:off
@Override
public List<Tag> list(TagSearchCriteria criteria) {
- checkNotNull(criteria, "The search criteria must be defined");
+ Objects.requireNonNull(criteria, "The search criteria must be defined");
return this.getSpi().list(this.getApiVersion(), criteria.getContext(), criteria.getPage(), criteria.getPerPage(),
criteria.getSearch(), criteria.getExclude(), criteria.getInclude(),
criteria.getOffset(), criteria.getOrder(), criteria.getOrderBy(), criteria.isHideEmpty(), criteria.getPostId(),
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTaxonomyAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTaxonomyAdapter.java
index b0a8322e143..f113240e868 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTaxonomyAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTaxonomyAdapter.java
@@ -22,9 +22,7 @@ import org.apache.camel.component.wordpress.api.model.Context;
import org.apache.camel.component.wordpress.api.model.Taxonomy;
import org.apache.camel.component.wordpress.api.service.WordpressServiceTaxonomy;
import org.apache.camel.component.wordpress.api.service.spi.TaxonomySPI;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Strings.emptyToNull;
+import org.apache.camel.util.ObjectHelper;
public class WordpressServiceTaxonomyAdapter extends AbstractWordpressServiceAdapter<TaxonomySPI>
implements WordpressServiceTaxonomy {
@@ -45,7 +43,7 @@ public class WordpressServiceTaxonomyAdapter extends AbstractWordpressServiceAda
@Override
public Taxonomy retrieve(Context context, String taxonomy) {
- checkNotNull(emptyToNull(taxonomy), "Please define a taxonomy");
+ ObjectHelper.notNullOrEmpty(taxonomy, "Please define a taxonomy");
return getSpi().retrieve(this.getApiVersion(), context, taxonomy);
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressSevicePostRevisionAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressSevicePostRevisionAdapter.java
index c58b45b653e..22a098d063e 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressSevicePostRevisionAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressSevicePostRevisionAdapter.java
@@ -23,8 +23,6 @@ import org.apache.camel.component.wordpress.api.model.PostRevision;
import org.apache.camel.component.wordpress.api.service.WordpressServicePostRevision;
import org.apache.camel.component.wordpress.api.service.spi.PostRevisionsSPI;
-import static com.google.common.base.Preconditions.checkArgument;
-
public class WordpressSevicePostRevisionAdapter extends AbstractWordpressServiceAdapter<PostRevisionsSPI>
implements WordpressServicePostRevision {
@@ -39,21 +37,31 @@ public class WordpressSevicePostRevisionAdapter extends AbstractWordpressService
@Override
public void delete(Integer postId, Integer revisionId) {
- checkArgument(postId > 0, "Please define a post id");
- checkArgument(revisionId > 0, "Please define a revision id");
+ if (!(postId > 0)) {
+ throw new IllegalArgumentException("Please define a post id");
+ }
+ if (!(revisionId > 0)) {
+ throw new IllegalArgumentException("Please define a revision id");
+ }
this.getSpi().delete(this.getApiVersion(), postId, revisionId);
}
@Override
public PostRevision retrieve(Integer postId, Integer revisionId, Context context) {
- checkArgument(postId > 0, "Please define a post id");
- checkArgument(revisionId > 0, "Please define a revision id");
+ if (!(postId > 0)) {
+ throw new IllegalArgumentException("Please define a post id");
+ }
+ if (!(revisionId > 0)) {
+ throw new IllegalArgumentException("Please define a revision id");
+ }
return this.getSpi().retrieveRevision(this.getApiVersion(), postId, revisionId, context);
}
@Override
public List<PostRevision> list(Integer postId, Context context) {
- checkArgument(postId > 0, "Please define a post id");
+ if (!(postId > 0)) {
+ throw new IllegalArgumentException("Please define a post id");
+ }
return this.getSpi().list(this.getApiVersion(), postId, context);
}