This is an automated email from the ASF dual-hosted git repository.

aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new b1ff2ab  Fixed some warnings in camel-jms
b1ff2ab is described below

commit b1ff2ab79fdf545e702f2d59cf282e5d5572ae91
Author: aldettinger <aldettin...@gmail.com>
AuthorDate: Mon Mar 5 19:23:39 2018 +0100

    Fixed some warnings in camel-jms
---
 .../src/main/java/org/apache/camel/component/jms/JmsComponent.java  | 2 +-
 .../src/main/java/org/apache/camel/component/jms/JmsEndpoint.java   | 6 +++---
 .../main/java/org/apache/camel/component/jms/JmsMessageHelper.java  | 2 +-
 .../component/jms/JmsRouteWithCustomKeyFormatStrategyTest.java      | 4 ++--
 .../org/apache/camel/component/jms/JmsStreamMessageTypeTest.java    | 1 -
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
index b8b2d6a..6470203 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
@@ -43,7 +43,7 @@ import 
org.springframework.jms.support.destination.DestinationResolver;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.util.ErrorHandler;
 
-import static org.apache.camel.util.ObjectHelper.removeStartingCharacters;
+import static org.apache.camel.util.StringHelper.removeStartingCharacters;
 
 /**
  * A <a href="http://activemq.apache.org/jms.html";>JMS Component</a>
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
index 4d0e147..dd730a2 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
@@ -49,7 +49,7 @@ import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
 import org.apache.camel.util.UnsafeUriCharactersEncoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -265,10 +265,10 @@ public class JmsEndpoint extends DefaultEndpoint 
implements AsyncEndpoint, Heade
      * @return the destination name resolved from the endpoint uri
      */
     public String getEndpointConfiguredDestinationName() {
-        String remainder = ObjectHelper.after(getEndpointKey(), "//");
+        String remainder = StringHelper.after(getEndpointKey(), "//");
         if (remainder != null && remainder.contains("?")) {
             // remove parameters
-            remainder = ObjectHelper.before(remainder, "?");
+            remainder = StringHelper.before(remainder, "?");
         }
         return JmsMessageHelper.normalizeDestinationName(remainder);
     }
diff --git 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
index f352e9e..0589966 100644
--- 
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
+++ 
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
@@ -34,7 +34,7 @@ import static 
org.apache.camel.component.jms.JmsConfiguration.QUEUE_PREFIX;
 import static 
org.apache.camel.component.jms.JmsConfiguration.TEMP_QUEUE_PREFIX;
 import static 
org.apache.camel.component.jms.JmsConfiguration.TEMP_TOPIC_PREFIX;
 import static org.apache.camel.component.jms.JmsConfiguration.TOPIC_PREFIX;
-import static org.apache.camel.util.ObjectHelper.removeStartingCharacters;
+import static org.apache.camel.util.StringHelper.removeStartingCharacters;
 
 /**
  * Utility class for {@link javax.jms.Message}.
diff --git 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomKeyFormatStrategyTest.java
 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomKeyFormatStrategyTest.java
index ebfe7d7..9399ea9 100644
--- 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomKeyFormatStrategyTest.java
+++ 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomKeyFormatStrategyTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.jms;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
 
 /**
  * With the passthrough option
@@ -57,7 +57,7 @@ public class JmsRouteWithCustomKeyFormatStrategyTest extends 
JmsRouteWithDefault
         }
 
         public String decodeKey(String key) {
-            return ObjectHelper.between(key, "FOO", "BAR");
+            return StringHelper.between(key, "FOO", "BAR");
         }
     }
 }
\ No newline at end of file
diff --git 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java
 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java
index 263ea2e..0e4aa05 100644
--- 
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java
+++ 
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.jms;
 
 import java.io.File;
-import java.io.InputStream;
 import javax.jms.ConnectionFactory;
 
 import org.apache.camel.CamelContext;

-- 
To stop receiving notification emails like this one, please contact
aldettin...@apache.org.

Reply via email to