This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.25.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.25.x by this push:
new 38d0acd Remove reference to Strings util class from
google-http-client, change to Camel util ObjectHelper. #CAMEL-14292
new 4ba22ac Merge pull request #3701 from greenbird/camel-2.25.x
38d0acd is described below
commit 38d0acde9f3973c2ea3314e5dcf36bccd937ab82
Author: Kristian Haugene <kristian.haug...@greenbird.com>
AuthorDate: Wed Apr 1 13:22:14 2020 +0200
Remove reference to Strings util class from google-http-client, change to
Camel util ObjectHelper. #CAMEL-14292
---
.../component/google/pubsub/GooglePubsubConnectionFactory.java | 6 +++---
.../apache/camel/component/google/pubsub/GooglePubsubConsumer.java | 4 ++--
.../apache/camel/component/google/pubsub/GooglePubsubEndpoint.java | 1 -
.../apache/camel/component/google/pubsub/GooglePubsubProducer.java | 4 ++--
.../component/google/pubsub/consumer/PubsubAcknowledgement.java | 4 ++--
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConnectionFactory.java
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConnectionFactory.java
index ee0f128..371723b 100644
---
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConnectionFactory.java
+++
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConnectionFactory.java
@@ -30,9 +30,9 @@ import com.google.api.client.http.apache.ApacheHttpTransport;
import com.google.api.client.json.JsonFactory;
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.client.util.Base64;
-import com.google.api.client.util.Strings;
import com.google.api.services.pubsub.Pubsub;
import com.google.api.services.pubsub.PubsubScopes;
+import org.apache.camel.util.ObjectHelper;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
@@ -80,14 +80,14 @@ public class GooglePubsubConnectionFactory {
GoogleCredential credential = null;
- if (!Strings.isNullOrEmpty(serviceAccount) &&
!Strings.isNullOrEmpty(serviceAccountKey)) {
+ if (!ObjectHelper.isEmpty(serviceAccount) &&
!ObjectHelper.isEmpty(serviceAccountKey)) {
if (logger.isDebugEnabled()) {
logger.debug("Service Account and Key have been set
explicitly. Initialising PubSub using Service Account " + serviceAccount);
}
credential = createFromAccountKeyPair(httpTransport);
}
- if (credential == null &&
!Strings.isNullOrEmpty(credentialsFileLocation)) {
+ if (credential == null &&
!ObjectHelper.isEmpty(credentialsFileLocation)) {
if (logger.isDebugEnabled()) {
logger.debug("Key File Name has been set explicitly.
Initialising PubSub using Key File " + credentialsFileLocation);
}
diff --git
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
index c562916..0b375c6 100644
---
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
+++
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
@@ -20,7 +20,6 @@ import java.net.SocketTimeoutException;
import java.util.List;
import java.util.concurrent.ExecutorService;
-import com.google.api.client.repackaged.com.google.common.base.Strings;
import com.google.api.services.pubsub.Pubsub;
import com.google.api.services.pubsub.model.PubsubMessage;
import com.google.api.services.pubsub.model.PullRequest;
@@ -31,6 +30,7 @@ import org.apache.camel.Processor;
import
org.apache.camel.component.google.pubsub.consumer.ExchangeAckTransaction;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.spi.Synchronization;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +55,7 @@ class GooglePubsubConsumer extends DefaultConsumer {
String loggerId = endpoint.getLoggerId();
- if (Strings.isNullOrEmpty(loggerId)) {
+ if (ObjectHelper.isEmpty(loggerId)) {
loggerId = this.getClass().getName();
}
diff --git
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
index d48bcfd..c5a1600 100644
---
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
+++
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.google.pubsub;
import java.util.concurrent.ExecutorService;
-import com.google.api.client.repackaged.com.google.common.base.Strings;
import com.google.api.services.pubsub.Pubsub;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
diff --git
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java
index aa457ef..8c419e9 100644
---
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java
+++
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java
@@ -23,12 +23,12 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import com.google.api.client.util.Strings;
import com.google.api.services.pubsub.model.PublishRequest;
import com.google.api.services.pubsub.model.PublishResponse;
import com.google.api.services.pubsub.model.PubsubMessage;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +44,7 @@ public class GooglePubsubProducer extends DefaultProducer {
String loggerId = endpoint.getLoggerId();
- if (Strings.isNullOrEmpty(loggerId)) {
+ if (ObjectHelper.isEmpty(loggerId)) {
loggerId = this.getClass().getName();
}
diff --git
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/consumer/PubsubAcknowledgement.java
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/consumer/PubsubAcknowledgement.java
index 2fc8174..0cbc3a2 100644
---
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/consumer/PubsubAcknowledgement.java
+++
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/consumer/PubsubAcknowledgement.java
@@ -18,10 +18,10 @@ package org.apache.camel.component.google.pubsub.consumer;
import java.util.List;
-import com.google.api.client.repackaged.com.google.common.base.Strings;
import com.google.api.services.pubsub.model.AcknowledgeRequest;
import com.google.api.services.pubsub.model.ModifyAckDeadlineRequest;
import org.apache.camel.component.google.pubsub.GooglePubsubEndpoint;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +40,7 @@ public abstract class PubsubAcknowledgement {
String loggerId = endpoint.getLoggerId();
- if (Strings.isNullOrEmpty(loggerId)) {
+ if (ObjectHelper.isEmpty(loggerId)) {
loggerId = this.getClass().getName();
}
