You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2018/09/03 10:11:48 UTC
[camel] branch master updated (6bc0e74 -> e788aa7)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 6bc0e74 Regen
new a5008b3 [CAMEL-12763] Improve the logic to relate the consumer to the producer in the direct component
new dedd946 [CAMEL-12770] Allow endpoints to migrate from the dynamic to the static map in the endpoint registry
new a53b165 [CAMEL-12771] Do not use the deprecated methods on ObjectHelper in camel-core
new e788aa7 [CAMEL-12771] Do not use the deprecated methods on ObjectHelper in other modules
The 4 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/builder/DeadLetterChannelBuilder.java | 4 +-
.../apache/camel/builder/ExpressionBuilder.java | 8 +-
.../org/apache/camel/builder/RouteBuilder.java | 3 +-
.../org/apache/camel/builder/xml/XPathBuilder.java | 3 +-
.../bean/AbstractCamelInvocationHandler.java | 5 +-
.../bean/BeanAnnotationExpressionFactory.java | 3 +-
.../component/dataformat/DataFormatComponent.java | 6 +-
.../component/direct/DirectBlockingProducer.java | 96 ----------------------
.../camel/component/direct/DirectConsumer.java | 11 +--
.../camel/component/direct/DirectEndpoint.java | 70 ++++++++++++----
.../camel/component/direct/DirectProducer.java | 37 +++++++--
.../apache/camel/component/file/FileConsumer.java | 3 +-
.../apache/camel/component/file/GenericFile.java | 5 +-
.../camel/component/file/GenericFileComponent.java | 3 +-
.../camel/component/file/GenericFileEndpoint.java | 4 +-
.../component/file/GenericFileOnCompletion.java | 4 +-
.../camel/component/file/GenericFileProducer.java | 2 +-
.../MarkerFileExclusiveReadLockStrategy.java | 4 +-
.../component/language/LanguageComponent.java | 5 +-
.../properties/DefaultPropertiesParser.java | 5 +-
.../properties/EnvPropertiesFunction.java | 6 +-
.../component/properties/PropertiesLocation.java | 4 +-
.../properties/ServiceHostPropertiesFunction.java | 6 +-
.../properties/ServicePortPropertiesFunction.java | 6 +-
.../properties/ServicePropertiesFunction.java | 6 +-
.../properties/SysPropertiesFunction.java | 6 +-
.../apache/camel/component/rest/RestComponent.java | 10 +--
.../apache/camel/converter/jaxp/XmlConverter.java | 3 +-
.../org/apache/camel/impl/DefaultCamelContext.java | 16 ++--
.../apache/camel/impl/DefaultClassResolver.java | 9 +-
.../org/apache/camel/impl/DefaultEndpoint.java | 6 +-
.../apache/camel/impl/DefaultEndpointRegistry.java | 4 +
.../camel/impl/DefaultExecutorServiceManager.java | 5 +-
.../camel/impl/DefaultManagementNameStrategy.java | 6 +-
.../impl/ExplicitCamelContextNameStrategy.java | 4 +-
.../impl/InterceptSendToMockEndpointStrategy.java | 4 +-
.../apache/camel/language/bean/BeanLanguage.java | 5 +-
.../simple/ast/SimpleFunctionExpression.java | 28 +++----
.../camel/management/DefaultManagementAgent.java | 3 +-
.../camel/management/MBeanInfoAssembler.java | 3 +-
.../apache/camel/model/LoadBalancerDefinition.java | 4 +-
.../java/org/apache/camel/model/LogDefinition.java | 3 +-
.../camel/model/ProcessorDefinitionHelper.java | 3 +-
.../apache/camel/model/ToDynamicDefinition.java | 10 +--
.../loadbalancer/CustomLoadBalancerDefinition.java | 4 +-
.../apache/camel/model/rest/RestDefinition.java | 3 +-
.../org/apache/camel/processor/RecipientList.java | 5 +-
.../apache/camel/processor/RedeliveryPolicy.java | 5 +-
.../camel/processor/interceptor/BacklogTracer.java | 4 +-
.../camel/support/TokenPairExpressionIterator.java | 7 +-
.../camel/support/TokenXMLExpressionIterator.java | 7 +-
.../support/TokenXMLPairExpressionIterator.java | 5 +-
.../camel/support/XMLTokenExpressionIterator.java | 3 +-
.../java/org/apache/camel/util/EndpointHelper.java | 6 +-
.../apache/camel/util/IntrospectionSupport.java | 12 +--
.../java/org/apache/camel/util/ObjectHelper.java | 2 +-
.../java/org/apache/camel/util/OgnlHelper.java | 2 +-
.../java/org/apache/camel/util/ResourceHelper.java | 8 +-
.../java/org/apache/camel/util/URISupport.java | 4 +-
.../apache/camel/util/concurrent/ThreadHelper.java | 4 +-
.../org/apache/camel/builder/xml/XPathTest.java | 4 +-
.../StaticMethodWithExchangeTestConverter.java | 4 +-
...kTest.java => DefaultEndpointRegistryTest.java} | 33 ++++----
.../component/apns/factory/ApnsServiceFactory.java | 5 +-
.../chronicle/engine/ChronicleEngineComponent.java | 6 +-
.../org/apache/camel/component/cm/CMEndpoint.java | 4 +-
.../context/QualifiedContextComponent.java | 4 +-
.../crypto/DefaultPGPSecretKeyAccessor.java | 5 +-
.../camel/component/cxf/cxfbean/CxfBeanTest.java | 4 +-
.../apache/camel/component/dns/DnsIpProducer.java | 4 +-
.../camel/component/dns/DnsLookupProducer.java | 4 +-
.../apache/camel/component/exec/ExecEndpoint.java | 5 +-
.../camel/component/geocoder/GeoCoderProducer.java | 6 +-
.../hawtdb/HawtDBAggregationRepository.java | 9 +-
.../org/apache/camel/http/common/HttpHelper.java | 4 +-
.../camel/component/http4/HttpComponent.java | 3 +-
.../component/jasypt/JasyptPropertiesParser.java | 7 +-
.../camel/component/jcache/JCacheProducer.java | 3 +-
.../apache/camel/component/jcr/JcrEndpoint.java | 7 +-
.../camel/component/jetty/JettyHttpComponent.java | 3 +-
.../component/validator/jing/JingEndpoint.java | 4 +-
.../leveldb/LevelDBAggregationRepository.java | 9 +-
.../apache/camel/component/mail/MailBinding.java | 3 +-
.../apache/camel/component/mail/MailComponent.java | 6 +-
.../org/apache/camel/component/mail/MailUtils.java | 3 +-
.../camel/component/metrics/MetricsComponent.java | 6 +-
.../netty/http/DefaultNettyHttpBinding.java | 5 +-
.../component/netty/http/NettyHttpEndpoint.java | 5 +-
.../component/netty/http/NettyHttpHelper.java | 3 +-
.../http/handlers/HttpServerChannelHandler.java | 11 +--
.../netty4/http/DefaultNettyHttpBinding.java | 5 +-
.../component/netty4/http/NettyHttpEndpoint.java | 5 +-
.../component/netty4/http/NettyHttpHelper.java | 3 +-
.../http/handlers/HttpServerChannelHandler.java | 17 ++--
.../cinder/producer/SnapshotProducer.java | 10 +--
.../openstack/cinder/producer/VolumeProducer.java | 14 ++--
.../common/AbstractOpenstackProducer.java | 3 +-
.../component/openstack/glance/GlanceProducer.java | 7 +-
.../keystone/producer/DomainProducer.java | 8 +-
.../openstack/keystone/producer/GroupProducer.java | 20 ++---
.../keystone/producer/ProjectProducer.java | 8 +-
.../keystone/producer/RegionProducer.java | 6 +-
.../openstack/keystone/producer/UserProducer.java | 8 +-
.../neutron/producer/NetworkProducer.java | 8 +-
.../openstack/neutron/producer/PortProducer.java | 8 +-
.../openstack/neutron/producer/RouterProducer.java | 13 +--
.../openstack/neutron/producer/SubnetProducer.java | 9 +-
.../openstack/nova/producer/FlavorsProducer.java | 8 +-
.../openstack/nova/producer/KeypairProducer.java | 8 +-
.../openstack/nova/producer/ServerProducer.java | 13 +--
.../swift/producer/ContainerProducer.java | 14 ++--
.../openstack/swift/producer/ObjectProducer.java | 24 +++---
.../camel/component/quartz2/QuartzComponent.java | 5 +-
.../QuartzScheduledPollConsumerScheduler.java | 3 +-
.../component/servicenow/ServiceNowParams.java | 3 +-
.../integration/SpringIntegrationConsumer.java | 5 +-
.../integration/SpringIntegrationProducer.java | 5 +-
.../swagger/producer/DummyRestProducerFactory.java | 4 +-
.../component/websocket/WebsocketComponent.java | 3 +-
.../camel/itest/jetty/JettyFreemarkerTest.java | 3 +-
.../camel/tests/partialclasspath/MyConverter.java | 4 +-
.../camel/tests/typeconverterscan/MyConverter.java | 4 +-
122 files changed, 479 insertions(+), 480 deletions(-)
delete mode 100644 camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java
copy camel-core/src/test/java/org/apache/camel/impl/{DefaultUnitOfWorkTest.java => DefaultEndpointRegistryTest.java} (59%)
[camel] 02/04: [CAMEL-12770] Allow endpoints to migrate from the
dynamic to the static map in the endpoint registry
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dedd9466d43ce9711e330b22f6c7db240f030668
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Sep 3 10:58:43 2018 +0200
[CAMEL-12770] Allow endpoints to migrate from the dynamic to the static map in the endpoint registry
---
.../apache/camel/impl/DefaultEndpointRegistry.java | 4 +++
.../camel/impl/DefaultEndpointRegistryTest.java | 39 ++++++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointRegistry.java
index bbe9c3a..683dc5e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointRegistry.java
@@ -70,6 +70,10 @@ public class DefaultEndpointRegistry extends AbstractMap<EndpointKey, Endpoint>
Endpoint answer = staticMap.get(o);
if (answer == null) {
answer = dynamicMap.get(o);
+ if (answer != null && (context.isSetupRoutes() || context.isStartingRoutes())) {
+ dynamicMap.remove(o);
+ staticMap.put((EndpointKey) o, answer);
+ }
}
return answer;
}
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointRegistryTest.java b/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointRegistryTest.java
new file mode 100644
index 0000000..100422b
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultEndpointRegistryTest.java
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.impl;
+
+import org.apache.camel.component.direct.DirectEndpoint;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+public class DefaultEndpointRegistryTest {
+
+ @Test
+ public void testMigration() throws Exception {
+ DefaultCamelContext ctx = new DefaultCamelContext();
+ ctx.start();
+ DefaultEndpointRegistry reg = (DefaultEndpointRegistry) ctx.getEndpointRegistry();
+
+ ctx.getEndpoint("direct:error");
+ assertTrue(reg.isDynamic("direct:error"));
+
+ ctx.setupRoutes(false);
+ ctx.getEndpoint("direct:error");
+ assertTrue(reg.isStatic("direct:error"));
+ }
+
+}
[camel] 03/04: [CAMEL-12771] Do not use the deprecated methods on
ObjectHelper in camel-core
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a53b1654cf1a9afbf2e60963ed3983c02c7c9515
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Sep 3 12:01:08 2018 +0200
[CAMEL-12771] Do not use the deprecated methods on ObjectHelper in camel-core
---
.../camel/builder/DeadLetterChannelBuilder.java | 4 ++--
.../apache/camel/builder/ExpressionBuilder.java | 8 +++----
.../org/apache/camel/builder/RouteBuilder.java | 3 ++-
.../org/apache/camel/builder/xml/XPathBuilder.java | 3 ++-
.../bean/AbstractCamelInvocationHandler.java | 5 ++--
.../bean/BeanAnnotationExpressionFactory.java | 3 ++-
.../component/dataformat/DataFormatComponent.java | 6 ++---
.../apache/camel/component/file/FileConsumer.java | 3 ++-
.../apache/camel/component/file/GenericFile.java | 5 ++--
.../camel/component/file/GenericFileComponent.java | 3 ++-
.../camel/component/file/GenericFileEndpoint.java | 4 ++--
.../component/file/GenericFileOnCompletion.java | 4 ++--
.../camel/component/file/GenericFileProducer.java | 2 +-
.../MarkerFileExclusiveReadLockStrategy.java | 4 ++--
.../component/language/LanguageComponent.java | 5 ++--
.../properties/DefaultPropertiesParser.java | 5 ++--
.../properties/EnvPropertiesFunction.java | 6 ++---
.../component/properties/PropertiesLocation.java | 4 ++--
.../properties/ServiceHostPropertiesFunction.java | 6 ++---
.../properties/ServicePortPropertiesFunction.java | 6 ++---
.../properties/ServicePropertiesFunction.java | 6 ++---
.../properties/SysPropertiesFunction.java | 6 ++---
.../apache/camel/component/rest/RestComponent.java | 10 ++++----
.../apache/camel/converter/jaxp/XmlConverter.java | 3 ++-
.../org/apache/camel/impl/DefaultCamelContext.java | 16 ++++++-------
.../apache/camel/impl/DefaultClassResolver.java | 9 +++----
.../org/apache/camel/impl/DefaultEndpoint.java | 6 ++---
.../camel/impl/DefaultExecutorServiceManager.java | 5 ++--
.../camel/impl/DefaultManagementNameStrategy.java | 6 ++---
.../impl/ExplicitCamelContextNameStrategy.java | 4 ++--
.../impl/InterceptSendToMockEndpointStrategy.java | 4 ++--
.../apache/camel/language/bean/BeanLanguage.java | 5 ++--
.../simple/ast/SimpleFunctionExpression.java | 28 +++++++++++-----------
.../camel/management/DefaultManagementAgent.java | 3 ++-
.../camel/management/MBeanInfoAssembler.java | 3 ++-
.../apache/camel/model/LoadBalancerDefinition.java | 4 ++--
.../java/org/apache/camel/model/LogDefinition.java | 3 ++-
.../camel/model/ProcessorDefinitionHelper.java | 3 ++-
.../apache/camel/model/ToDynamicDefinition.java | 10 ++++----
.../loadbalancer/CustomLoadBalancerDefinition.java | 4 ++--
.../apache/camel/model/rest/RestDefinition.java | 3 ++-
.../org/apache/camel/processor/RecipientList.java | 5 ++--
.../apache/camel/processor/RedeliveryPolicy.java | 5 ++--
.../camel/processor/interceptor/BacklogTracer.java | 4 ++--
.../camel/support/TokenPairExpressionIterator.java | 7 +++---
.../camel/support/TokenXMLExpressionIterator.java | 7 +++---
.../support/TokenXMLPairExpressionIterator.java | 5 ++--
.../camel/support/XMLTokenExpressionIterator.java | 3 ++-
.../java/org/apache/camel/util/EndpointHelper.java | 6 ++---
.../apache/camel/util/IntrospectionSupport.java | 12 +++++-----
.../java/org/apache/camel/util/ObjectHelper.java | 2 +-
.../java/org/apache/camel/util/OgnlHelper.java | 2 +-
.../java/org/apache/camel/util/ResourceHelper.java | 8 +++----
.../java/org/apache/camel/util/URISupport.java | 4 ++--
.../apache/camel/util/concurrent/ThreadHelper.java | 4 ++--
.../org/apache/camel/builder/xml/XPathTest.java | 4 ++--
.../StaticMethodWithExchangeTestConverter.java | 4 ++--
57 files changed, 168 insertions(+), 144 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
index f6b50ec..594aada 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
@@ -26,7 +26,7 @@ import org.apache.camel.processor.FatalFallbackErrorHandler;
import org.apache.camel.processor.SendProcessor;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.CamelLogger;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.LoggerFactory;
/**
@@ -90,7 +90,7 @@ public class DeadLetterChannelBuilder extends DefaultErrorHandlerBuilder {
protected void validateDeadLetterUri(RouteContext routeContext) {
if (deadLetter == null) {
- ObjectHelper.notEmpty(deadLetterUri, "deadLetterUri", this);
+ StringHelper.notEmpty(deadLetterUri, "deadLetterUri", this);
deadLetter = routeContext.getCamelContext().getEndpoint(deadLetterUri);
if (deadLetter == null) {
throw new NoSuchEndpointException(deadLetterUri);
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
index 36c4ced..459fbcc 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
@@ -1604,17 +1604,17 @@ public final class ExpressionBuilder {
* Returns an {@link TokenXMLExpressionIterator} expression
*/
public static Expression tokenizeXMLExpression(String tagName, String inheritNamespaceTagName) {
- ObjectHelper.notEmpty(tagName, "tagName");
+ StringHelper.notEmpty(tagName, "tagName");
return new TokenXMLExpressionIterator(tagName, inheritNamespaceTagName);
}
public static Expression tokenizeXMLAwareExpression(String path, char mode) {
- ObjectHelper.notEmpty(path, "path");
+ StringHelper.notEmpty(path, "path");
return new XMLTokenExpressionIterator(path, mode);
}
public static Expression tokenizeXMLAwareExpression(String path, char mode, int group) {
- ObjectHelper.notEmpty(path, "path");
+ StringHelper.notEmpty(path, "path");
return new XMLTokenExpressionIterator(path, mode, group);
}
@@ -2505,7 +2505,7 @@ public final class ExpressionBuilder {
return null;
}
// the remainder is the rest of the ognl without the key
- String remainder = ObjectHelper.after(ognl, key + keySuffix);
+ String remainder = StringHelper.after(ognl, key + keySuffix);
return new MethodCallExpression(property, remainder).evaluate(exchange);
}
diff --git a/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
index 8f20626..e4bd4b2 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -42,6 +42,7 @@ import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.model.rest.RestsDefinition;
import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -246,7 +247,7 @@ public abstract class RouteBuilder extends BuilderSupport implements RoutesBuild
* @throws Exception is thrown if property with key not found or error converting to the given type.
*/
public <T> T propertyInject(String key, Class<T> type) throws Exception {
- ObjectHelper.notEmpty(key, "key");
+ StringHelper.notEmpty(key, "key");
ObjectHelper.notNull(type, "Class type");
// the properties component is mandatory
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
index 3f3ea41..dc83baf 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
@@ -39,6 +39,7 @@ import javax.xml.xpath.XPathFunction;
import javax.xml.xpath.XPathFunctionException;
import javax.xml.xpath.XPathFunctionResolver;
+import org.apache.camel.util.StringHelper;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -1323,7 +1324,7 @@ public class XPathBuilder extends ServiceSupport implements CamelContextAware, E
for (Map.Entry<Object, Object> prop : properties.entrySet()) {
String key = (String) prop.getKey();
if (key.startsWith(XPathFactory.DEFAULT_PROPERTY_NAME)) {
- String uri = ObjectHelper.after(key, ":");
+ String uri = StringHelper.after(key, ":");
if (uri != null) {
factory = XPathFactory.newInstance(uri);
LOG.info("Using system property {} with value {} when created default XPathFactory {}", new Object[]{key, uri, factory});
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java b/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
index 3e73283..68f1344 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
@@ -45,6 +45,7 @@ import org.apache.camel.Producer;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -267,11 +268,11 @@ public abstract class AbstractCamelInvocationHandler implements InvocationHandle
// type of the return type
// due type erasure, so we have to gather it based on a String
// representation
- String name = ObjectHelper.between(type.toString(), "<", ">");
+ String name = StringHelper.between(type.toString(), "<", ">");
if (name != null) {
if (name.contains("<")) {
// we only need the outer type
- name = ObjectHelper.before(name, "<");
+ name = StringHelper.before(name, "<");
}
return context.getClassResolver().resolveMandatoryClass(name);
} else {
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java b/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java
index afc0aa0..a02a1a1 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java
@@ -24,6 +24,7 @@ import org.apache.camel.Expression;
import org.apache.camel.language.LanguageAnnotation;
import org.apache.camel.language.bean.BeanExpression;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* @version
@@ -36,7 +37,7 @@ public class BeanAnnotationExpressionFactory extends DefaultAnnotationExpression
String method = getFromAnnotation(annotation, "method");
// ref is mandatory
- ObjectHelper.notEmpty(beanName, "ref", annotation);
+ StringHelper.notEmpty(beanName, "ref", annotation);
// method is optional but provide it as null to the bean expression
if (ObjectHelper.isEmpty(method)) {
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java b/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
index 9aee141..01a9961 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataformat/DataFormatComponent.java
@@ -22,7 +22,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.impl.UriEndpointComponent;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.util.EndpointHelper;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* The <a href="http://camel.apache.org/dataformat-component.html">Data Format Component</a> enables using <a href="https://camel.apache.org/data-format.html">Data Format</a> as a component.
@@ -37,7 +37,7 @@ public class DataFormatComponent extends UriEndpointComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- String name = ObjectHelper.before(remaining, ":");
+ String name = StringHelper.before(remaining, ":");
// try to lookup data format in the registry or create it from resource
DataFormat df = getCamelContext().resolveDataFormat(name);
@@ -49,7 +49,7 @@ public class DataFormatComponent extends UriEndpointComponent {
throw new IllegalArgumentException("Cannot find data format with name: " + name);
}
- String operation = ObjectHelper.after(remaining, ":");
+ String operation = StringHelper.after(remaining, ":");
if (!"marshal".equals(operation) && !"unmarshal".equals(operation)) {
throw new IllegalArgumentException("Operation must be either marshal or unmarshal, was: " + operation);
}
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java b/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
index c984d66..86cdd97 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/FileConsumer.java
@@ -33,6 +33,7 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* File consumer.
@@ -220,7 +221,7 @@ public class FileConsumer extends GenericFileConsumer<File> {
String endpointNormalized = FileUtil.normalizePath(endpointPath);
if (file.getPath().startsWith(endpointNormalized + File.separator)) {
// skip duplicate endpoint path
- path = new File(ObjectHelper.after(file.getPath(), endpointNormalized + File.separator));
+ path = new File(StringHelper.after(file.getPath(), endpointNormalized + File.separator));
} else {
path = new File(file.getPath());
}
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
index bbf075f..7ca7dd7 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
@@ -25,6 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.WrappedFile;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -226,9 +227,9 @@ public class GenericFile<T> implements WrappedFile<T> {
// use File.separatorChar as the normalizePath uses this as path separator so we should use the same
// in this logic here
if (newEndpointPath.endsWith("" + File.separatorChar)) {
- newFileName = ObjectHelper.after(newFileName, newEndpointPath);
+ newFileName = StringHelper.after(newFileName, newEndpointPath);
} else {
- newFileName = ObjectHelper.after(newFileName, newEndpointPath + File.separatorChar);
+ newFileName = StringHelper.after(newFileName, newEndpointPath + File.separatorChar);
}
// reconstruct file with clipped name
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java
index 170ec76..4fd9849 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java
@@ -26,6 +26,7 @@ import org.apache.camel.impl.UriEndpointComponent;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.EndpointHelper;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -111,7 +112,7 @@ public abstract class GenericFileComponent<T> extends UriEndpointComponent {
boolean ignoreCase = reminder.startsWith("ignoreCase:");
reminder = ignoreCase ? ifStartsWithReturnRemainder("ignoreCase:", reminder) : reminder;
- ObjectHelper.notEmpty(reminder, "sortBy expression", this);
+ StringHelper.notEmpty(reminder, "sortBy expression", this);
// recursive add nested sorters
return GenericFileDefaultSorter.sortByFileLanguage(getCamelContext(),
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
index 6e831bd..9548593 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
@@ -1397,7 +1397,7 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
*/
protected String createDoneFileName(String fileName) {
String pattern = getDoneFileName();
- ObjectHelper.notEmpty(pattern, "doneFileName", pattern);
+ StringHelper.notEmpty(pattern, "doneFileName", pattern);
// we only support ${file:name} or ${file:name.noext} as dynamic placeholders for done files
String path = FileUtil.onlyPath(fileName);
@@ -1437,7 +1437,7 @@ public abstract class GenericFileEndpoint<T> extends ScheduledPollEndpoint imple
*/
protected boolean isDoneFile(String fileName) {
String pattern = getDoneFileName();
- ObjectHelper.notEmpty(pattern, "doneFileName", pattern);
+ StringHelper.notEmpty(pattern, "doneFileName", pattern);
if (!StringHelper.hasStartToken(pattern, "simple")) {
// no tokens, so just match names directly
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
index 5089878..a7a460f 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
@@ -20,7 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.support.LoggingExceptionHandler;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -164,7 +164,7 @@ public class GenericFileOnCompletion<T> implements Synchronization {
if (endpoint.getDoneFileName() != null && !endpoint.isNoop()) {
// done file must be in same path as the original input file
String doneFileName = endpoint.createDoneFileName(absoluteFileName);
- ObjectHelper.notEmpty(doneFileName, "doneFileName", endpoint);
+ StringHelper.notEmpty(doneFileName, "doneFileName", endpoint);
// we should delete the dynamic done file
if (endpoint.getDoneFileName().indexOf("{file:name") > 0 || complete) {
try {
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
index 1fa9a25..cc5cc33 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
@@ -208,7 +208,7 @@ public class GenericFileProducer<T> extends DefaultProducer {
// any done file to write?
if (endpoint.getDoneFileName() != null) {
String doneFileName = endpoint.createDoneFileName(target);
- ObjectHelper.notEmpty(doneFileName, "doneFileName", endpoint);
+ StringHelper.notEmpty(doneFileName, "doneFileName", endpoint);
// create empty exchange with empty body to write as the done file
Exchange empty = new DefaultExchange(exchange);
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java b/camel-core/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java
index 845e27d..3a16262 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java
@@ -28,8 +28,8 @@ import org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy;
import org.apache.camel.component.file.GenericFileFilter;
import org.apache.camel.component.file.GenericFileOperations;
import org.apache.camel.util.FileUtil;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StopWatch;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -218,7 +218,7 @@ public class MarkerFileExclusiveReadLockStrategy implements GenericFileExclusive
String endpointNormalized = FileUtil.normalizePath(endpointPath);
if (file.getPath().startsWith(endpointNormalized + File.separator)) {
// skip duplicate endpoint path
- path = new File(ObjectHelper.after(file.getPath(), endpointNormalized + File.separator));
+ path = new File(StringHelper.after(file.getPath(), endpointNormalized + File.separator));
} else {
path = new File(file.getPath());
}
diff --git a/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java b/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
index 8997c06..a9124fe 100644
--- a/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
@@ -24,6 +24,7 @@ import org.apache.camel.impl.UriEndpointComponent;
import org.apache.camel.spi.Language;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ResourceHelper;
+import org.apache.camel.util.StringHelper;
/**
* The <a href="http://camel.apache.org/language-component.html">Language component</a> enables sending
@@ -40,8 +41,8 @@ public class LanguageComponent extends UriEndpointComponent {
}
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- String name = ObjectHelper.before(remaining, ":");
- String script = ObjectHelper.after(remaining, ":");
+ String name = StringHelper.before(remaining, ":");
+ String script = StringHelper.after(remaining, ":");
// no script then remaining is the language name
if (name == null && script == null) {
name = remaining;
diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java b/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
index 0dd7769..0599815 100644
--- a/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
+++ b/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesParser.java
@@ -21,6 +21,7 @@ import java.util.Properties;
import java.util.Set;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -238,8 +239,8 @@ public class DefaultPropertiesParser implements AugmentedPropertyNameAwareProper
// they key may have a get or else expression
String defaultValue = null;
if (defaultFallbackEnabled && key.contains(GET_OR_ELSE_TOKEN)) {
- defaultValue = ObjectHelper.after(key, GET_OR_ELSE_TOKEN);
- key = ObjectHelper.before(key, GET_OR_ELSE_TOKEN);
+ defaultValue = StringHelper.after(key, GET_OR_ELSE_TOKEN);
+ key = StringHelper.before(key, GET_OR_ELSE_TOKEN);
}
String augmentedKey = getAugmentedKey(key);
diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java b/camel-core/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java
index 5111ceb..91dcecd 100644
--- a/camel-core/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java
+++ b/camel-core/src/main/java/org/apache/camel/component/properties/EnvPropertiesFunction.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.properties;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* A {@link org.apache.camel.component.properties.PropertiesFunction} that lookup the property value from
@@ -35,8 +35,8 @@ public class EnvPropertiesFunction implements PropertiesFunction {
String defaultValue = null;
if (remainder.contains(":")) {
- key = ObjectHelper.before(remainder, ":");
- defaultValue = ObjectHelper.after(remainder, ":");
+ key = StringHelper.before(remainder, ":");
+ defaultValue = StringHelper.after(remainder, ":");
}
String value = System.getenv(key);
diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java b/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java
index 46395e6..fefdb43 100644
--- a/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java
+++ b/camel-core/src/main/java/org/apache/camel/component/properties/PropertiesLocation.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.properties;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
public class PropertiesLocation {
private final String resolver;
@@ -39,7 +39,7 @@ public class PropertiesLocation {
idx = location.lastIndexOf(';');
if (idx != -1) {
- this.optional = ObjectHelper.after(location.substring(idx + 1), "optional=", Boolean::valueOf).orElse(false);
+ this.optional = StringHelper.after(location.substring(idx + 1), "optional=", Boolean::valueOf).orElse(false);
location = location.substring(0, idx);
} else {
this.optional = false;
diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java b/camel-core/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java
index 6df3eac..e7093ea 100644
--- a/camel-core/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java
+++ b/camel-core/src/main/java/org/apache/camel/component/properties/ServiceHostPropertiesFunction.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.properties;
import java.util.Locale;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* A {@link PropertiesFunction} that lookup the property value from
@@ -51,8 +51,8 @@ public class ServiceHostPropertiesFunction implements PropertiesFunction {
String defaultValue = null;
if (remainder.contains(":")) {
- key = ObjectHelper.before(remainder, ":");
- defaultValue = ObjectHelper.after(remainder, ":");
+ key = StringHelper.before(remainder, ":");
+ defaultValue = StringHelper.after(remainder, ":");
}
// make sure to use upper case
diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java b/camel-core/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java
index 8761c33..614da95 100644
--- a/camel-core/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java
+++ b/camel-core/src/main/java/org/apache/camel/component/properties/ServicePortPropertiesFunction.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.properties;
import java.util.Locale;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* A {@link org.apache.camel.component.properties.PropertiesFunction} that lookup the property value from
@@ -51,8 +51,8 @@ public class ServicePortPropertiesFunction implements PropertiesFunction {
String defaultValue = null;
if (remainder.contains(":")) {
- key = ObjectHelper.before(remainder, ":");
- defaultValue = ObjectHelper.after(remainder, ":");
+ key = StringHelper.before(remainder, ":");
+ defaultValue = StringHelper.after(remainder, ":");
}
// make sure to use upper case
diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java b/camel-core/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
index 5ba4395..36fb2be 100644
--- a/camel-core/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
+++ b/camel-core/src/main/java/org/apache/camel/component/properties/ServicePropertiesFunction.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.properties;
import java.util.Locale;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* A {@link org.apache.camel.component.properties.PropertiesFunction} that lookup the property value from
@@ -47,8 +47,8 @@ public class ServicePropertiesFunction implements PropertiesFunction {
String defaultValue = null;
if (remainder.contains(":")) {
- key = ObjectHelper.before(remainder, ":");
- defaultValue = ObjectHelper.after(remainder, ":");
+ key = StringHelper.before(remainder, ":");
+ defaultValue = StringHelper.after(remainder, ":");
}
// make sure to use upper case
diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java b/camel-core/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java
index 7a91890..d517fe8 100644
--- a/camel-core/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java
+++ b/camel-core/src/main/java/org/apache/camel/component/properties/SysPropertiesFunction.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.properties;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* A {@link PropertiesFunction} that lookup the property value from
@@ -35,8 +35,8 @@ public class SysPropertiesFunction implements PropertiesFunction {
String defaultValue = null;
if (remainder.contains(":")) {
- key = ObjectHelper.before(remainder, ":");
- defaultValue = ObjectHelper.after(remainder, ":");
+ key = StringHelper.before(remainder, ":");
+ defaultValue = StringHelper.after(remainder, ":");
}
String value = System.getProperty(key);
diff --git a/camel-core/src/main/java/org/apache/camel/component/rest/RestComponent.java b/camel-core/src/main/java/org/apache/camel/component/rest/RestComponent.java
index e2651a2..24127c7 100644
--- a/camel-core/src/main/java/org/apache/camel/component/rest/RestComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestComponent.java
@@ -35,7 +35,7 @@ import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IntrospectionSupport;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
/**
@@ -101,14 +101,14 @@ public class RestComponent extends DefaultComponent implements VerifiableCompone
throw new IllegalArgumentException("Invalid syntax. Must be rest:method:path[:uriTemplate] where uriTemplate is optional");
}
- String method = ObjectHelper.before(remaining, ":");
- String s = ObjectHelper.after(remaining, ":");
+ String method = StringHelper.before(remaining, ":");
+ String s = StringHelper.after(remaining, ":");
String path;
String uriTemplate;
if (s != null && s.contains(":")) {
- path = ObjectHelper.before(s, ":");
- uriTemplate = ObjectHelper.after(s, ":");
+ path = StringHelper.before(s, ":");
+ uriTemplate = StringHelper.after(s, ":");
} else {
path = s;
uriTemplate = null;
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index b300d6c..f8a8766 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -54,6 +54,7 @@ import javax.xml.transform.stax.StAXSource;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import org.apache.camel.util.StringHelper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -1088,7 +1089,7 @@ public class XmlConverter {
for (Map.Entry<Object, Object> prop : properties.entrySet()) {
String key = (String) prop.getKey();
if (key.startsWith(XmlConverter.DOCUMENT_BUILDER_FACTORY_FEATURE)) {
- String uri = ObjectHelper.after(key, ":");
+ String uri = StringHelper.after(key, ":");
Boolean value = Boolean.valueOf((String)prop.getValue());
try {
factory.setFeature(uri, value);
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index a58f678..224e11a 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -662,7 +662,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
public Endpoint getEndpoint(String uri) {
- ObjectHelper.notEmpty(uri, "uri");
+ StringHelper.notEmpty(uri, "uri");
log.trace("Getting endpoint with uri: {}", uri);
@@ -688,7 +688,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
if (answer == null) {
try {
// Use the URI prefix to find the component.
- String splitURI[] = ObjectHelper.splitOnCharacter(uri, ":", 2);
+ String splitURI[] = StringHelper.splitOnCharacter(uri, ":", 2);
if (splitURI[1] != null) {
scheme = splitURI[0];
log.trace("Endpoint uri: {} is from component with name: {}", uri, scheme);
@@ -799,7 +799,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
* @return the added endpoint
*/
protected Endpoint addEndpointToRegistry(String uri, Endpoint endpoint) {
- ObjectHelper.notEmpty(uri, "uri");
+ StringHelper.notEmpty(uri, "uri");
ObjectHelper.notNull(endpoint, "endpoint");
// if there is endpoint strategies, then use the endpoints they return
@@ -1836,7 +1836,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
}
- json = ObjectHelper.before(json, " \"properties\": {");
+ json = StringHelper.before(json, " \"properties\": {");
StringBuilder buffer = new StringBuilder(" \"properties\": {");
@@ -1916,7 +1916,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
if (json == null) {
// the model may be shared for multiple data formats such as bindy, json (xstream, jackson, gson)
if (dataFormatName.contains("-")) {
- dataFormatName = ObjectHelper.before(dataFormatName, "-");
+ dataFormatName = StringHelper.before(dataFormatName, "-");
json = getDataFormatParameterJsonSchema(dataFormatName);
}
if (json == null) {
@@ -2001,7 +2001,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
}
- json = ObjectHelper.before(json, " \"properties\": {");
+ json = StringHelper.before(json, " \"properties\": {");
StringBuilder buffer = new StringBuilder(" \"properties\": {");
@@ -2159,7 +2159,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
}
- json = ObjectHelper.before(json, " \"componentProperties\": {");
+ json = StringHelper.before(json, " \"componentProperties\": {");
StringBuilder buffer = new StringBuilder(" \"componentProperties\": {");
boolean first = true;
@@ -2324,7 +2324,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
// skip component properties
- json = ObjectHelper.before(json, " \"componentProperties\": {");
+ json = StringHelper.before(json, " \"componentProperties\": {");
// and rewrite properties
StringBuilder buffer = new StringBuilder(" \"properties\": {");
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultClassResolver.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultClassResolver.java
index 3c8cced..049f774 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultClassResolver.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultClassResolver.java
@@ -25,6 +25,7 @@ import org.apache.camel.CamelContextAware;
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* Default class resolver that uses regular class loader to load classes.
@@ -107,12 +108,12 @@ public class DefaultClassResolver implements ClassResolver, CamelContextAware {
}
public InputStream loadResourceAsStream(String uri) {
- ObjectHelper.notEmpty(uri, "uri");
+ StringHelper.notEmpty(uri, "uri");
return ObjectHelper.loadResourceAsStream(uri, getApplicationContextClassLoader());
}
public URL loadResourceAsURL(String uri) {
- ObjectHelper.notEmpty(uri, "uri");
+ StringHelper.notEmpty(uri, "uri");
return ObjectHelper.loadResourceAsURL(uri, getApplicationContextClassLoader());
}
@@ -121,12 +122,12 @@ public class DefaultClassResolver implements ClassResolver, CamelContextAware {
}
public Enumeration<URL> loadAllResourcesAsURL(String uri) {
- ObjectHelper.notEmpty(uri, "uri");
+ StringHelper.notEmpty(uri, "uri");
return ObjectHelper.loadResourcesAsURL(uri);
}
protected Class<?> loadClass(String name, ClassLoader loader) {
- ObjectHelper.notEmpty(name, "name");
+ StringHelper.notEmpty(name, "name");
return ObjectHelper.loadClass(name, loader);
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
index 371edf3..c5234d8 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpoint.java
@@ -36,6 +36,7 @@ import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.EndpointHelper;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -213,11 +214,10 @@ public abstract class DefaultEndpoint extends ServiceSupport implements Endpoint
public String getEndpointKey() {
if (isLenientProperties()) {
- // only use the endpoint uri without parameters as the properties is
- // lenient
+ // only use the endpoint uri without parameters as the properties are lenient
String uri = getEndpointUri();
if (uri.indexOf('?') != -1) {
- return ObjectHelper.before(uri, "?");
+ return StringHelper.before(uri, "?");
} else {
return uri;
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
index 7b4b6d0..e021354 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
@@ -44,6 +44,7 @@ import org.apache.camel.spi.ThreadPoolProfile;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StopWatch;
+import org.apache.camel.util.StringHelper;
import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.URISupport;
import org.apache.camel.util.concurrent.CamelThreadFactory;
@@ -97,7 +98,7 @@ public class DefaultExecutorServiceManager extends ServiceSupport implements Exe
@Override
public void registerThreadPoolProfile(ThreadPoolProfile profile) {
ObjectHelper.notNull(profile, "profile");
- ObjectHelper.notEmpty(profile.getId(), "id", profile);
+ StringHelper.notEmpty(profile.getId(), "id", profile);
threadPoolProfiles.put(profile.getId(), profile);
}
@@ -517,7 +518,7 @@ public class DefaultExecutorServiceManager extends ServiceSupport implements Exe
}
// id is mandatory
- ObjectHelper.notEmpty(id, "id for thread pool " + executorService);
+ StringHelper.notEmpty(id, "id for thread pool " + executorService);
// extract route id if possible
if (source instanceof ProcessorDefinition) {
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementNameStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementNameStrategy.java
index 9e2fa1c..a46533e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementNameStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementNameStrategy.java
@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.ManagementNameStrategy;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* Default implementation of {@link ManagementNameStrategy}
@@ -110,8 +110,8 @@ public class DefaultManagementNameStrategy implements ManagementNameStrategy {
* @throws IllegalArgumentException if the pattern or name is invalid or empty
*/
public String resolveManagementName(String pattern, String name, boolean invalidCheck) {
- ObjectHelper.notEmpty(pattern, "pattern");
- ObjectHelper.notEmpty(name, "name");
+ StringHelper.notEmpty(pattern, "pattern");
+ StringHelper.notEmpty(name, "name");
// must quote the names to have it work as literal replacement
name = Matcher.quoteReplacement(name);
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ExplicitCamelContextNameStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/ExplicitCamelContextNameStrategy.java
index 2a54df6..0579b50 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ExplicitCamelContextNameStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ExplicitCamelContextNameStrategy.java
@@ -17,7 +17,7 @@
package org.apache.camel.impl;
import org.apache.camel.spi.CamelContextNameStrategy;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* Strategy to used an explicit (fixed) name for {@link org.apache.camel.CamelContext}.
@@ -29,7 +29,7 @@ public class ExplicitCamelContextNameStrategy implements CamelContextNameStrateg
private final String name;
public ExplicitCamelContextNameStrategy(String name) {
- ObjectHelper.notEmpty(name, "CamelContext name ");
+ StringHelper.notEmpty(name, "CamelContext name ");
this.name = name;
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java
index 5743d03..3a25979 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java
@@ -21,7 +21,7 @@ import org.apache.camel.Producer;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.EndpointStrategy;
import org.apache.camel.util.EndpointHelper;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -89,7 +89,7 @@ public class InterceptSendToMockEndpointStrategy implements EndpointStrategy {
String key = "mock:" + endpoint.getEndpointKey().replaceFirst("://", ":");
// strip off parameters as well
if (key.contains("?")) {
- key = ObjectHelper.before(key, "?");
+ key = StringHelper.before(key, "?");
}
LOG.info("Adviced endpoint [{}] with mock endpoint [{}]", uri, key);
diff --git a/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java b/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
index 459a562..58ef2f2 100644
--- a/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
+++ b/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
@@ -22,6 +22,7 @@ import org.apache.camel.Predicate;
import org.apache.camel.spi.Language;
import org.apache.camel.util.ExpressionToPredicateAdapter;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* A <a href="http://camel.apache.org/bean-language.html">bean language</a>
@@ -88,8 +89,8 @@ public class BeanLanguage implements Language, IsSingleton {
// we support both the .method name and the ?method= syntax
// as the ?method= syntax is very common for the bean component
if (expression.contains("?method=")) {
- beanName = ObjectHelper.before(expression, "?");
- method = ObjectHelper.after(expression, "?method=");
+ beanName = StringHelper.before(expression, "?");
+ method = StringHelper.after(expression, "?method=");
} else {
//first check case :: because of my.own.Bean::method
int doubleColonIndex = expression.indexOf("::");
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java b/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
index 65baa8e..1f7cde6 100644
--- a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
@@ -227,8 +227,8 @@ public class SimpleFunctionExpression extends LiteralExpression {
String locations = null;
String key = remainder;
if (parts.length >= 2) {
- locations = ObjectHelper.before(remainder, ":");
- key = ObjectHelper.after(remainder, ":");
+ locations = StringHelper.before(remainder, ":");
+ key = StringHelper.after(remainder, ":");
}
return ExpressionBuilder.propertiesComponentExpression(key, locations, null);
}
@@ -264,12 +264,12 @@ public class SimpleFunctionExpression extends LiteralExpression {
// bodyAs
String remainder = ifStartsWithReturnRemainder("bodyAs(", function);
if (remainder != null) {
- String type = ObjectHelper.before(remainder, ")");
+ String type = StringHelper.before(remainder, ")");
if (type == null) {
throw new SimpleParserException("Valid syntax: ${bodyAs(type)} was: " + function, token.getIndex());
}
type = StringHelper.removeQuotes(type);
- remainder = ObjectHelper.after(remainder, ")");
+ remainder = StringHelper.after(remainder, ")");
if (ObjectHelper.isNotEmpty(remainder)) {
boolean invalid = OgnlHelper.isInvalidValidOgnlExpression(remainder);
if (invalid) {
@@ -284,12 +284,12 @@ public class SimpleFunctionExpression extends LiteralExpression {
// mandatoryBodyAs
remainder = ifStartsWithReturnRemainder("mandatoryBodyAs(", function);
if (remainder != null) {
- String type = ObjectHelper.before(remainder, ")");
+ String type = StringHelper.before(remainder, ")");
if (type == null) {
throw new SimpleParserException("Valid syntax: ${mandatoryBodyAs(type)} was: " + function, token.getIndex());
}
type = StringHelper.removeQuotes(type);
- remainder = ObjectHelper.after(remainder, ")");
+ remainder = StringHelper.after(remainder, ")");
if (ObjectHelper.isNotEmpty(remainder)) {
boolean invalid = OgnlHelper.isInvalidValidOgnlExpression(remainder);
if (invalid) {
@@ -319,14 +319,14 @@ public class SimpleFunctionExpression extends LiteralExpression {
// headerAs
remainder = ifStartsWithReturnRemainder("headerAs(", function);
if (remainder != null) {
- String keyAndType = ObjectHelper.before(remainder, ")");
+ String keyAndType = StringHelper.before(remainder, ")");
if (keyAndType == null) {
throw new SimpleParserException("Valid syntax: ${headerAs(key, type)} was: " + function, token.getIndex());
}
- String key = ObjectHelper.before(keyAndType, ",");
- String type = ObjectHelper.after(keyAndType, ",");
- remainder = ObjectHelper.after(remainder, ")");
+ String key = StringHelper.before(keyAndType, ",");
+ String type = StringHelper.after(keyAndType, ",");
+ remainder = StringHelper.after(remainder, ")");
if (ObjectHelper.isEmpty(key) || ObjectHelper.isEmpty(type) || ObjectHelper.isNotEmpty(remainder)) {
throw new SimpleParserException("Valid syntax: ${headerAs(key, type)} was: " + function, token.getIndex());
}
@@ -462,7 +462,7 @@ public class SimpleFunctionExpression extends LiteralExpression {
// random function
remainder = ifStartsWithReturnRemainder("random(", function);
if (remainder != null) {
- String values = ObjectHelper.before(remainder, ")");
+ String values = StringHelper.before(remainder, ")");
if (values == null || ObjectHelper.isEmpty(values)) {
throw new SimpleParserException("Valid syntax: ${random(min,max)} or ${random(max)} was: " + function, token.getIndex());
}
@@ -480,7 +480,7 @@ public class SimpleFunctionExpression extends LiteralExpression {
// skip function
remainder = ifStartsWithReturnRemainder("skip(", function);
if (remainder != null) {
- String values = ObjectHelper.before(remainder, ")");
+ String values = StringHelper.before(remainder, ")");
if (values == null || ObjectHelper.isEmpty(values)) {
throw new SimpleParserException("Valid syntax: ${skip(number)} was: " + function, token.getIndex());
}
@@ -492,7 +492,7 @@ public class SimpleFunctionExpression extends LiteralExpression {
// collate function
remainder = ifStartsWithReturnRemainder("collate(", function);
if (remainder != null) {
- String values = ObjectHelper.before(remainder, ")");
+ String values = StringHelper.before(remainder, ")");
if (values == null || ObjectHelper.isEmpty(values)) {
throw new SimpleParserException("Valid syntax: ${collate(group)} was: " + function, token.getIndex());
}
@@ -505,7 +505,7 @@ public class SimpleFunctionExpression extends LiteralExpression {
remainder = ifStartsWithReturnRemainder("messageHistory", function);
if (remainder != null) {
boolean detailed;
- String values = ObjectHelper.between(remainder, "(", ")");
+ String values = StringHelper.between(remainder, "(", ")");
if (values == null || ObjectHelper.isEmpty(values)) {
detailed = true;
} else {
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
index 548a208..49e4c1e 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
@@ -50,6 +50,7 @@ import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.InetAddressUtil;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -535,7 +536,7 @@ public class DefaultManagementAgent extends ServiceSupport implements Management
}
protected void createJmxConnector(String host) throws IOException {
- ObjectHelper.notEmpty(serviceUrlPath, "serviceUrlPath");
+ StringHelper.notEmpty(serviceUrlPath, "serviceUrlPath");
ObjectHelper.notNull(registryPort, "registryPort");
try {
diff --git a/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java b/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java
index f27bbdd..3854385 100644
--- a/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java
+++ b/camel-core/src/main/java/org/apache/camel/management/MBeanInfoAssembler.java
@@ -42,6 +42,7 @@ import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.LRUCache;
import org.apache.camel.util.LRUCacheFactory;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -222,7 +223,7 @@ public class MBeanInfoAssembler implements Service {
}
// they key must be capitalized
- key = ObjectHelper.capitalize(key);
+ key = StringHelper.capitalize(key);
// lookup first
ManagedAttributeInfo info = attributes.get(key);
diff --git a/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
index a219f9e..29f5808 100644
--- a/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
@@ -28,7 +28,7 @@ import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.IntrospectionSupport;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* Balances message processing among a number of nodes
@@ -102,7 +102,7 @@ public class LoadBalancerDefinition extends IdentifiedType implements OtherAttri
* Factory method to create the load balancer from the loadBalancerTypeName
*/
protected LoadBalancer createLoadBalancer(RouteContext routeContext) {
- ObjectHelper.notEmpty(loadBalancerTypeName, "loadBalancerTypeName", this);
+ StringHelper.notEmpty(loadBalancerTypeName, "loadBalancerTypeName", this);
LoadBalancer answer = null;
if (loadBalancerTypeName != null) {
diff --git a/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
index 48e0d50..d41a83e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
@@ -36,6 +36,7 @@ import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.CamelLogger;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -87,7 +88,7 @@ public class LogDefinition extends NoOutputDefinition<LogDefinition> {
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
- ObjectHelper.notEmpty(message, "message", this);
+ StringHelper.notEmpty(message, "message", this);
// use simple language for the message string to give it more power
Expression exp = routeContext.getCamelContext().resolveLanguage("simple").createExpression(message);
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
index 0c5f1bf..193e2be 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
@@ -34,6 +34,7 @@ import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -779,7 +780,7 @@ public final class ProcessorDefinitionHelper {
// is the value a known field (currently we only support constants from Exchange.class)
if (text.startsWith("Exchange.")) {
- String field = ObjectHelper.after(text, "Exchange.");
+ String field = StringHelper.after(text, "Exchange.");
String constant = ObjectHelper.lookupConstantFieldValue(Exchange.class, field);
if (constant != null) {
// invoke setter as the text has changed
diff --git a/camel-core/src/main/java/org/apache/camel/model/ToDynamicDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
index 070ffdb..ff25a28 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
@@ -34,7 +34,7 @@ import org.apache.camel.processor.SendDynamicProcessor;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.RouteContext;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* Sends the message to a dynamic endpoint
@@ -72,7 +72,7 @@ public class ToDynamicDefinition extends NoOutputDefinition<ToDynamicDefinition>
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
- ObjectHelper.notEmpty(uri, "uri", this);
+ StringHelper.notEmpty(uri, "uri", this);
Expression exp = createExpression(routeContext);
@@ -94,10 +94,10 @@ public class ToDynamicDefinition extends NoOutputDefinition<ToDynamicDefinition>
String[] parts = safeSplitRaw(uri);
for (String part : parts) {
// the part may have optional language to use, so you can mix languages
- String value = ObjectHelper.after(part, "language:");
+ String value = StringHelper.after(part, "language:");
if (value != null) {
- String before = ObjectHelper.before(value, ":");
- String after = ObjectHelper.after(value, ":");
+ String before = StringHelper.before(value, ":");
+ String after = StringHelper.after(value, ":");
if (before != null && after != null) {
// maybe its a language, must have language: as prefix
try {
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
index 45563ed..34ff8a3 100644
--- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
@@ -27,7 +27,7 @@ import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.CamelContextHelper;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* Custom load balancer
@@ -73,7 +73,7 @@ public class CustomLoadBalancerDefinition extends LoadBalancerDefinition {
return loadBalancer;
}
- ObjectHelper.notEmpty(ref, "ref", this);
+ StringHelper.notEmpty(ref, "ref", this);
return CamelContextHelper.mandatoryLookup(routeContext.getCamelContext(), ref, LoadBalancer.class);
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index c9be33c..20da12d 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -42,6 +42,7 @@ import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
/**
@@ -973,7 +974,7 @@ public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition>
for (RestOperationParamDefinition param : verb.getParams()) {
// name is mandatory
String name = param.getName();
- ObjectHelper.notEmpty(name, "parameter name");
+ StringHelper.notEmpty(name, "parameter name");
// need to resolve property placeholders first
try {
name = camelContext.resolvePropertyPlaceholders(name);
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java b/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
index 7534e87..fcbcc0c 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
@@ -37,6 +37,7 @@ import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -81,7 +82,7 @@ public class RecipientList extends ServiceSupport implements AsyncProcessor, IdA
public RecipientList(CamelContext camelContext, String delimiter) {
notNull(camelContext, "camelContext");
- ObjectHelper.notEmpty(delimiter, "delimiter");
+ StringHelper.notEmpty(delimiter, "delimiter");
this.camelContext = camelContext;
this.delimiter = delimiter;
}
@@ -94,7 +95,7 @@ public class RecipientList extends ServiceSupport implements AsyncProcessor, IdA
public RecipientList(CamelContext camelContext, Expression expression, String delimiter) {
notNull(camelContext, "camelContext");
ObjectHelper.notNull(expression, "expression");
- ObjectHelper.notEmpty(delimiter, "delimiter");
+ StringHelper.notEmpty(delimiter, "delimiter");
this.camelContext = camelContext;
this.expression = expression;
this.delimiter = delimiter;
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
index 5beda01..2c9a69e 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
@@ -23,6 +23,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Predicate;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -251,8 +252,8 @@ public class RedeliveryPolicy implements Cloneable, Serializable {
// find the group where the redelivery counter matches
long answer = 0;
for (String group : groups) {
- long delay = Long.valueOf(ObjectHelper.after(group, ":"));
- int count = Integer.valueOf(ObjectHelper.before(group, ":"));
+ long delay = Long.valueOf(StringHelper.after(group, ":"));
+ int count = Integer.valueOf(StringHelper.before(group, ":"));
if (count > redeliveryCounter) {
break;
} else {
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
index 89b923c..be4861e 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
@@ -33,7 +33,7 @@ import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.EndpointHelper;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -244,7 +244,7 @@ public final class BacklogTracer extends ServiceSupport implements InterceptStra
this.traceFilter = filter;
if (filter != null) {
// assume simple language
- String name = ObjectHelper.before(filter, ":");
+ String name = StringHelper.before(filter, ":");
if (name == null) {
// use simple language by default
name = "simple";
diff --git a/camel-core/src/main/java/org/apache/camel/support/TokenPairExpressionIterator.java b/camel-core/src/main/java/org/apache/camel/support/TokenPairExpressionIterator.java
index d9964b9..64a9026 100644
--- a/camel-core/src/main/java/org/apache/camel/support/TokenPairExpressionIterator.java
+++ b/camel-core/src/main/java/org/apache/camel/support/TokenPairExpressionIterator.java
@@ -27,6 +27,7 @@ import org.apache.camel.language.simple.SimpleLanguage;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.Scanner;
+import org.apache.camel.util.StringHelper;
/**
* {@link org.apache.camel.Expression} to walk a {@link org.apache.camel.Message} body
@@ -44,8 +45,8 @@ public class TokenPairExpressionIterator extends ExpressionAdapter {
protected final boolean includeTokens;
public TokenPairExpressionIterator(String startToken, String endToken, boolean includeTokens) {
- ObjectHelper.notEmpty(startToken, "startToken");
- ObjectHelper.notEmpty(endToken, "endToken");
+ StringHelper.notEmpty(startToken, "startToken");
+ StringHelper.notEmpty(endToken, "endToken");
this.startToken = startToken;
this.endToken = endToken;
this.includeTokens = includeTokens;
@@ -198,7 +199,7 @@ public class TokenPairExpressionIterator extends ExpressionAdapter {
// only grab text after the start token
if (next != null && next.contains(startToken)) {
- next = ObjectHelper.after(next, startToken);
+ next = StringHelper.after(next, startToken);
// include tokens in answer
if (next != null && includeTokens) {
diff --git a/camel-core/src/main/java/org/apache/camel/support/TokenXMLExpressionIterator.java b/camel-core/src/main/java/org/apache/camel/support/TokenXMLExpressionIterator.java
index dc4848e..3c8877b 100644
--- a/camel-core/src/main/java/org/apache/camel/support/TokenXMLExpressionIterator.java
+++ b/camel-core/src/main/java/org/apache/camel/support/TokenXMLExpressionIterator.java
@@ -35,6 +35,7 @@ import org.apache.camel.InvalidPayloadException;
import org.apache.camel.language.simple.SimpleLanguage;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* {@link org.apache.camel.Expression} to walk a {@link org.apache.camel.Message} XML body
@@ -59,7 +60,7 @@ public class TokenXMLExpressionIterator extends ExpressionAdapter {
protected final String inheritNamespaceToken;
public TokenXMLExpressionIterator(String tagToken, String inheritNamespaceToken) {
- ObjectHelper.notEmpty(tagToken, "tagToken");
+ StringHelper.notEmpty(tagToken, "tagToken");
this.tagToken = tagToken;
// namespace token is optional
this.inheritNamespaceToken = inheritNamespaceToken;
@@ -216,7 +217,7 @@ public class TokenXMLExpressionIterator extends ExpressionAdapter {
// build answer accordingly to whether namespaces should be inherited or not
if (inheritNamespaceToken != null && rootTokenNamespaces != null) {
// REVISIT should skip the prefixes that are declared within the child itself.
- String head = ObjectHelper.before(next, ">");
+ String head = StringHelper.before(next, ">");
boolean empty = false;
if (head.endsWith("/")) {
head = head.substring(0, head.length() - 1);
@@ -225,7 +226,7 @@ public class TokenXMLExpressionIterator extends ExpressionAdapter {
StringBuilder sb = new StringBuilder();
// append root namespaces to local start token
// grab the text
- String tail = ObjectHelper.after(next, ">");
+ String tail = StringHelper.after(next, ">");
// build result with inherited namespaces
next = sb.append(head).append(rootTokenNamespaces).append(empty ? "/>" : ">").append(tail).toString();
} else if (wrapToken) {
diff --git a/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java b/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java
index 23b3b2f..968f737 100644
--- a/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java
+++ b/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java
@@ -27,6 +27,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.language.simple.SimpleLanguage;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.Scanner;
+import org.apache.camel.util.StringHelper;
/**
* {@link org.apache.camel.Expression} to walk a {@link org.apache.camel.Message} XML body
@@ -152,7 +153,7 @@ public class TokenXMLPairExpressionIterator extends TokenPairExpressionIterator
}
// make sure the end tag matches the begin tag if the tag has a namespace prefix
- String tag = ObjectHelper.before(next, ">");
+ String tag = StringHelper.before(next, ">");
StringBuilder endTagSb = new StringBuilder("</");
int firstSpaceIndex = tag.indexOf(" ");
if (firstSpaceIndex > 0) {
@@ -166,7 +167,7 @@ public class TokenXMLPairExpressionIterator extends TokenPairExpressionIterator
if (inheritNamespaceToken != null && rootTokenNamespaces != null) {
// append root namespaces to local start token
// grab the text
- String text = ObjectHelper.after(next, ">");
+ String text = StringHelper.after(next, ">");
// build result with inherited namespaces
next = sb.append(tag).append(rootTokenNamespaces).append(">").append(text).append(endTagSb.toString()).toString();
} else {
diff --git a/camel-core/src/main/java/org/apache/camel/support/XMLTokenExpressionIterator.java b/camel-core/src/main/java/org/apache/camel/support/XMLTokenExpressionIterator.java
index 4523fa8..85d4f5e 100644
--- a/camel-core/src/main/java/org/apache/camel/support/XMLTokenExpressionIterator.java
+++ b/camel-core/src/main/java/org/apache/camel/support/XMLTokenExpressionIterator.java
@@ -44,6 +44,7 @@ import org.apache.camel.converter.jaxp.StaxConverter;
import org.apache.camel.spi.NamespaceAware;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,7 +62,7 @@ public class XMLTokenExpressionIterator extends ExpressionAdapter implements Nam
}
public XMLTokenExpressionIterator(String path, char mode, int group) {
- ObjectHelper.notEmpty(path, "path");
+ StringHelper.notEmpty(path, "path");
this.path = path;
this.mode = mode;
this.group = group > 1 ? group : 1;
diff --git a/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java b/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
index 2294bfc..3810981 100644
--- a/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/EndpointHelper.java
@@ -42,7 +42,7 @@ import org.apache.camel.spi.BrowsableEndpoint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.camel.util.ObjectHelper.after;
+import static org.apache.camel.util.StringHelper.after;
/**
* Some helper methods for working with {@link Endpoint} instances
@@ -130,14 +130,14 @@ public final class EndpointHelper {
// we need to test with and without scheme separators (//)
if (uri.contains("://")) {
// try without :// also
- String scheme = ObjectHelper.before(uri, "://");
+ String scheme = StringHelper.before(uri, "://");
String path = after(uri, "://");
if (matchPattern(scheme + ":" + path, pattern)) {
return true;
}
} else {
// try with :// also
- String scheme = ObjectHelper.before(uri, ":");
+ String scheme = StringHelper.before(uri, ":");
String path = after(uri, ":");
if (matchPattern(scheme + "://" + path, pattern)) {
return true;
diff --git a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
index f1738db..b2fab60 100644
--- a/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
@@ -387,14 +387,14 @@ public final class IntrospectionSupport {
public static Method getPropertyGetter(Class<?> type, String propertyName) throws NoSuchMethodException {
if (isPropertyIsGetter(type, propertyName)) {
- return type.getMethod("is" + ObjectHelper.capitalize(propertyName));
+ return type.getMethod("is" + StringHelper.capitalize(propertyName));
} else {
- return type.getMethod("get" + ObjectHelper.capitalize(propertyName));
+ return type.getMethod("get" + StringHelper.capitalize(propertyName));
}
}
public static Method getPropertySetter(Class<?> type, String propertyName) throws NoSuchMethodException {
- String name = "set" + ObjectHelper.capitalize(propertyName);
+ String name = "set" + StringHelper.capitalize(propertyName);
for (Method method : type.getMethods()) {
if (isSetter(method) && method.getName().equals(name)) {
return method;
@@ -405,7 +405,7 @@ public final class IntrospectionSupport {
public static boolean isPropertyIsGetter(Class<?> type, String propertyName) {
try {
- Method method = type.getMethod("is" + ObjectHelper.capitalize(propertyName));
+ Method method = type.getMethod("is" + StringHelper.capitalize(propertyName));
if (method != null) {
return method.getReturnType().isAssignableFrom(boolean.class) || method.getReturnType().isAssignableFrom(Boolean.class);
}
@@ -437,7 +437,7 @@ public final class IntrospectionSupport {
}
public static boolean setProperties(Object target, Map<String, Object> properties, String optionPrefix) throws Exception {
- ObjectHelper.notEmpty(optionPrefix, "optionPrefix");
+ StringHelper.notEmpty(optionPrefix, "optionPrefix");
return setProperties(target, properties, optionPrefix, false);
}
@@ -688,7 +688,7 @@ public final class IntrospectionSupport {
Set<Method> candidates = new LinkedHashSet<>();
// Build the method name.
- name = "set" + ObjectHelper.capitalize(name);
+ name = "set" + StringHelper.capitalize(name);
while (clazz != Object.class) {
// Since Object.class.isInstance all the objects,
// here we just make sure it will be add to the bottom of the set.
diff --git a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
index 949a253..1992e0a 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
@@ -1222,7 +1222,7 @@ public final class ObjectHelper {
* @return the class, or null if it could not be loaded
*/
private static Class<?> doLoadClass(String name, ClassLoader loader) {
- ObjectHelper.notEmpty(name, "name");
+ StringHelper.notEmpty(name, "name");
if (loader == null) {
return null;
}
diff --git a/camel-core/src/main/java/org/apache/camel/util/OgnlHelper.java b/camel-core/src/main/java/org/apache/camel/util/OgnlHelper.java
index 61b3aab..ee595c0 100644
--- a/camel-core/src/main/java/org/apache/camel/util/OgnlHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/OgnlHelper.java
@@ -155,7 +155,7 @@ public final class OgnlHelper {
}
if (ognlExpression.contains("[")) {
- return ObjectHelper.before(ognlExpression, "[");
+ return StringHelper.before(ognlExpression, "[");
}
return ognlExpression;
}
diff --git a/camel-core/src/main/java/org/apache/camel/util/ResourceHelper.java b/camel-core/src/main/java/org/apache/camel/util/ResourceHelper.java
index 1c9da1cc..72d6648 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ResourceHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ResourceHelper.java
@@ -233,7 +233,7 @@ public final class ResourceHelper {
*/
public static InputStream resolveResourceAsInputStream(ClassResolver classResolver, String uri) throws IOException {
if (uri.startsWith("file:")) {
- uri = ObjectHelper.after(uri, "file:");
+ uri = StringHelper.after(uri, "file:");
uri = tryDecodeUri(uri);
LOG.trace("Loading resource: {} from file system", uri);
return new FileInputStream(uri);
@@ -253,7 +253,7 @@ public final class ResourceHelper {
throw e;
}
} else if (uri.startsWith("classpath:")) {
- uri = ObjectHelper.after(uri, "classpath:");
+ uri = StringHelper.after(uri, "classpath:");
uri = tryDecodeUri(uri);
} else if (uri.contains(":")) {
LOG.trace("Loading resource: {} with UrlHandler for protocol {}", uri, uri.split(":")[0]);
@@ -298,7 +298,7 @@ public final class ResourceHelper {
public static URL resolveResourceAsUrl(ClassResolver classResolver, String uri) throws MalformedURLException {
if (uri.startsWith("file:")) {
// check if file exists first
- String name = ObjectHelper.after(uri, "file:");
+ String name = StringHelper.after(uri, "file:");
uri = tryDecodeUri(uri);
LOG.trace("Loading resource: {} from file system", uri);
File file = new File(name);
@@ -310,7 +310,7 @@ public final class ResourceHelper {
LOG.trace("Loading resource: {} from HTTP", uri);
return new URL(uri);
} else if (uri.startsWith("classpath:")) {
- uri = ObjectHelper.after(uri, "classpath:");
+ uri = StringHelper.after(uri, "classpath:");
uri = tryDecodeUri(uri);
} else if (uri.contains(":")) {
LOG.trace("Loading resource: {} with UrlHandler for protocol {}", uri, uri.split(":")[0]);
diff --git a/camel-core/src/main/java/org/apache/camel/util/URISupport.java b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
index 35f10ef..3d4bd42 100644
--- a/camel-core/src/main/java/org/apache/camel/util/URISupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
@@ -381,9 +381,9 @@ public final class URISupport {
// assemble string as new uri and replace parameters with the query instead
String s = uri.toString();
- String before = ObjectHelper.before(s, "?");
+ String before = StringHelper.before(s, "?");
if (before == null) {
- before = ObjectHelper.before(s, "#");
+ before = StringHelper.before(s, "#");
}
if (before != null) {
s = before;
diff --git a/camel-core/src/main/java/org/apache/camel/util/concurrent/ThreadHelper.java b/camel-core/src/main/java/org/apache/camel/util/concurrent/ThreadHelper.java
index c1a3df7..04157a0 100644
--- a/camel-core/src/main/java/org/apache/camel/util/concurrent/ThreadHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/concurrent/ThreadHelper.java
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* Various helper method for thread naming.
@@ -54,7 +54,7 @@ public final class ThreadHelper {
// we support #longName# and #name# as name placeholders
String longName = name;
- String shortName = name.contains("?") ? ObjectHelper.before(name, "?") : name;
+ String shortName = name.contains("?") ? StringHelper.before(name, "?") : name;
// must quote the names to have it work as literal replacement
shortName = Matcher.quoteReplacement(shortName);
longName = Matcher.quoteReplacement(longName);
diff --git a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
index 4361e37..9ece574 100644
--- a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
+++ b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.builder.xml;
+import org.apache.camel.util.StringHelper;
import org.junit.Test;
import java.io.InputStream;
@@ -42,7 +43,6 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
-import org.apache.camel.util.ObjectHelper;
import static org.apache.camel.builder.xml.XPathBuilder.xpath;
@@ -438,7 +438,7 @@ public class XPathTest extends ContextTestSupport {
assertNotNull(result);
String s = context.getTypeConverter().convertTo(String.class, result);
- assertEquals(ObjectHelper.between(xml, "<foo>", "</foo>"), s);
+ assertEquals(StringHelper.between(xml, "<foo>", "</foo>"), s);
}
@Test
diff --git a/camel-core/src/test/java/org/apache/camel/converter/myconverter/StaticMethodWithExchangeTestConverter.java b/camel-core/src/test/java/org/apache/camel/converter/myconverter/StaticMethodWithExchangeTestConverter.java
index d7f1961..da05857 100644
--- a/camel-core/src/test/java/org/apache/camel/converter/myconverter/StaticMethodWithExchangeTestConverter.java
+++ b/camel-core/src/test/java/org/apache/camel/converter/myconverter/StaticMethodWithExchangeTestConverter.java
@@ -19,14 +19,14 @@ package org.apache.camel.converter.myconverter;
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
import org.apache.camel.converter.MyBean;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
@Converter
public class StaticMethodWithExchangeTestConverter {
@Converter
public MyBean fromString(String text, Exchange exchange) {
- String[] values = ObjectHelper.splitOnCharacter(text, ":", 2);
+ String[] values = StringHelper.splitOnCharacter(text, ":", 2);
return new MyBean(Integer.parseInt(values[0]), exchange.getProperty("prefix", String.class) + values[1]);
}
}
[camel] 01/04: [CAMEL-12763] Improve the logic to relate the
consumer to the producer in the direct component
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a5008b39b08a89bc49e83cf4b7a41db8f7defbf4
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Aug 29 16:58:06 2018 +0200
[CAMEL-12763] Improve the logic to relate the consumer to the producer in the direct component
---
.../component/direct/DirectBlockingProducer.java | 96 ----------------------
.../camel/component/direct/DirectConsumer.java | 11 +--
.../camel/component/direct/DirectEndpoint.java | 70 ++++++++++++----
.../camel/component/direct/DirectProducer.java | 37 +++++++--
4 files changed, 83 insertions(+), 131 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java
deleted file mode 100644
index 76e98bc..0000000
--- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectBlockingProducer.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.direct;
-
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultAsyncProducer;
-import org.apache.camel.util.StopWatch;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The direct producer.
- * <p/>
- * If blocking is enabled ({@code DirectEndpoint#isBlock}) then the DirectEndpoint will create an instance
- * of this class instead of {@code DirectProducer}.
- * This producers {@code process} method will block for the configured duration ({@code DirectEndpoint#getTimeout},
- * default to 30 seconds). After which if a consumer is still unavailable a DirectConsumerNotAvailableException
- * will be thrown.
- * <p/>
- * Implementation note: Concurrent Producers will block for the duration it takes to determine if a
- * consumer is available, but actual consumer execution will happen concurrently.
- */
-public class DirectBlockingProducer extends DefaultAsyncProducer {
- private static final Logger LOG = LoggerFactory.getLogger(DirectBlockingProducer.class);
- private final DirectEndpoint endpoint;
-
- public DirectBlockingProducer(DirectEndpoint endpoint) {
- super(endpoint);
- this.endpoint = endpoint;
- }
-
- public void process(Exchange exchange) throws Exception {
- getConsumer(exchange).getProcessor().process(exchange);
- }
-
- public boolean process(Exchange exchange, AsyncCallback callback) {
- try {
- return getConsumer(exchange).getAsyncProcessor().process(exchange, callback);
- } catch (Exception e) {
- exchange.setException(e);
- callback.done(true);
- return true;
- }
- }
-
- protected DirectConsumer getConsumer(Exchange exchange) throws Exception {
- DirectConsumer answer = endpoint.getConsumer();
- if (answer == null) {
- // okay then await until we have a consumer or we timed out
- answer = awaitConsumer();
- if (answer == null) {
- throw new DirectConsumerNotAvailableException("No consumers available on endpoint: " + endpoint, exchange);
- }
- }
-
- return answer;
- }
-
- private DirectConsumer awaitConsumer() throws InterruptedException {
- DirectConsumer answer = null;
-
- StopWatch watch = new StopWatch();
- boolean done = false;
- while (!done) {
- // sleep a bit to give chance for the consumer to be ready
- Thread.sleep(500);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Waited {} for consumer to be ready", watch.taken());
- }
-
- answer = endpoint.getConsumer();
- if (answer != null) {
- return answer;
- }
- // we are done if we hit the timeout
- done = watch.taken() >= endpoint.getTimeout();
- }
- return answer;
- }
-
-}
diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumer.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumer.java
index 9e097f8..debed19 100644
--- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectConsumer.java
@@ -45,14 +45,7 @@ public class DirectConsumer extends DefaultConsumer implements ShutdownAware, Su
@Override
protected void doStart() throws Exception {
super.doStart();
- // add consumer to endpoint
- boolean existing = this == endpoint.getConsumer();
- if (!existing && endpoint.hasConsumer(this)) {
- throw new IllegalArgumentException("Cannot add a 2nd consumer to the same endpoint. Endpoint " + endpoint + " only allows one consumer.");
- }
- if (!existing) {
- endpoint.addConsumer(this);
- }
+ endpoint.addConsumer(this);
}
@Override
@@ -69,7 +62,7 @@ public class DirectConsumer extends DefaultConsumer implements ShutdownAware, Su
@Override
protected void doResume() throws Exception {
// resume by using the start logic
- doStart();
+ endpoint.addConsumer(this);
}
public boolean deferShutdown(ShutdownRunningTask shutdownRunningTask) {
diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
index 8347c5d..e93e973 100644
--- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
@@ -16,7 +16,9 @@
*/
package org.apache.camel.component.direct;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.apache.camel.Component;
@@ -29,6 +31,8 @@ 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.StopWatch;
+import org.apache.camel.util.StringHelper;
/**
* The direct component provides direct, synchronous call to another endpoint from the same CamelContext.
@@ -38,7 +42,8 @@ import org.apache.camel.util.ObjectHelper;
@UriEndpoint(firstVersion = "1.0.0", scheme = "direct", title = "Direct", syntax = "direct:name", consumerClass = DirectConsumer.class, label = "core,endpoint")
public class DirectEndpoint extends DefaultEndpoint {
- private volatile Map<String, DirectConsumer> consumers;
+ private final Map<String, DirectConsumer> consumers;
+ private final List<DirectProducer> producers = new ArrayList<>();
@UriPath(description = "Name of direct endpoint") @Metadata(required = "true")
private String name;
@@ -55,7 +60,7 @@ public class DirectEndpoint extends DefaultEndpoint {
}
public DirectEndpoint(String endpointUri, Component component) {
- this(endpointUri, component, new HashMap<String, DirectConsumer>());
+ this(endpointUri, component, new HashMap<>());
}
public DirectEndpoint(String uri, Component component, Map<String, DirectConsumer> consumers) {
@@ -64,11 +69,7 @@ public class DirectEndpoint extends DefaultEndpoint {
}
public Producer createProducer() throws Exception {
- if (block) {
- return new DirectBlockingProducer(this);
- } else {
- return new DirectProducer(this);
- }
+ return new DirectProducer(this);
}
public Consumer createConsumer(Processor processor) throws Exception {
@@ -82,23 +83,58 @@ public class DirectEndpoint extends DefaultEndpoint {
}
public void addConsumer(DirectConsumer consumer) {
- String key = consumer.getEndpoint().getKey();
- consumers.put(key, consumer);
+ String key = getKey();
+ synchronized (consumers) {
+ if (consumers.putIfAbsent(key, consumer) != null) {
+ throw new IllegalArgumentException("Cannot add a 2nd consumer to the same endpoint. Endpoint " + this + " only allows one consumer.");
+ }
+ consumers.notifyAll();
+ }
}
public void removeConsumer(DirectConsumer consumer) {
- String key = consumer.getEndpoint().getKey();
- consumers.remove(key);
+ String key = getKey();
+ synchronized (consumers) {
+ consumers.remove(key, consumer);
+ consumers.notifyAll();
+ }
}
- public boolean hasConsumer(DirectConsumer consumer) {
- String key = consumer.getEndpoint().getKey();
- return consumers.containsKey(key);
+ public void addProducer(DirectProducer producer) {
+ synchronized (consumers) {
+ producers.add(producer);
+ }
}
- public DirectConsumer getConsumer() {
+ public void removeProducer(DirectProducer producer) {
+ synchronized (consumers) {
+ producers.remove(producer);
+ }
+ }
+
+ protected DirectConsumer getConsumer() throws InterruptedException {
String key = getKey();
- return consumers.get(key);
+ synchronized (consumers) {
+ DirectConsumer answer = consumers.get(key);
+ if (answer == null && block) {
+ StopWatch watch = new StopWatch();
+ for (;;) {
+ answer = consumers.get(key);
+ if (answer != null) {
+ break;
+ }
+ long rem = timeout - watch.taken();
+ if (rem <= 0) {
+ break;
+ }
+ consumers.wait(rem);
+ }
+ }
+// if (answer != null && answer.getEndpoint() != this) {
+// throw new IllegalStateException();
+// }
+ return answer;
+ }
}
public boolean isBlock() {
@@ -140,7 +176,7 @@ public class DirectEndpoint extends DefaultEndpoint {
protected String getKey() {
String uri = getEndpointUri();
if (uri.indexOf('?') != -1) {
- return ObjectHelper.before(uri, "?");
+ return StringHelper.before(uri, "?");
} else {
return uri;
}
diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
index c4bcf2d..126ea9c 100644
--- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectProducer.java
@@ -36,30 +36,49 @@ public class DirectProducer extends DefaultAsyncProducer {
this.endpoint = endpoint;
}
+ @Override
+ protected void doStart() throws Exception {
+ super.doStart();
+ endpoint.addProducer(this);
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ endpoint.removeProducer(this);
+ super.doStop();
+ }
+
public void process(Exchange exchange) throws Exception {
- if (endpoint.getConsumer() == null) {
+ DirectConsumer consumer = endpoint.getConsumer();
+ if (consumer == null) {
if (endpoint.isFailIfNoConsumers()) {
throw new DirectConsumerNotAvailableException("No consumers available on endpoint: " + endpoint, exchange);
} else {
LOG.debug("message ignored, no consumers available on endpoint: {}", endpoint);
}
} else {
- endpoint.getConsumer().getProcessor().process(exchange);
+ consumer.getProcessor().process(exchange);
}
}
public boolean process(Exchange exchange, AsyncCallback callback) {
- if (endpoint.getConsumer() == null) {
- if (endpoint.isFailIfNoConsumers()) {
- // indicate its done synchronously
- exchange.setException(new DirectConsumerNotAvailableException("No consumers available on endpoint: " + endpoint, exchange));
+ try {
+ DirectConsumer consumer = endpoint.getConsumer();
+ if (consumer == null) {
+ if (endpoint.isFailIfNoConsumers()) {
+ exchange.setException(new DirectConsumerNotAvailableException("No consumers available on endpoint: " + endpoint, exchange));
+ } else {
+ LOG.debug("message ignored, no consumers available on endpoint: {}", endpoint);
+ }
+ callback.done(true);
+ return true;
} else {
- LOG.debug("message ignored, no consumers available on endpoint: {}", endpoint);
+ return consumer.getAsyncProcessor().process(exchange, callback);
}
+ } catch (Exception e) {
+ exchange.setException(e);
callback.done(true);
return true;
- } else {
- return endpoint.getConsumer().getAsyncProcessor().process(exchange, callback);
}
}
[camel] 04/04: [CAMEL-12771] Do not use the deprecated methods on
ObjectHelper in other modules
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e788aa768f66214f9f872c39bdd00c8b00a554b4
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Sep 3 12:06:29 2018 +0200
[CAMEL-12771] Do not use the deprecated methods on ObjectHelper in other modules
---
.../component/apns/factory/ApnsServiceFactory.java | 5 +++--
.../chronicle/engine/ChronicleEngineComponent.java | 6 +++---
.../org/apache/camel/component/cm/CMEndpoint.java | 4 ++--
.../context/QualifiedContextComponent.java | 4 ++--
.../crypto/DefaultPGPSecretKeyAccessor.java | 5 +++--
.../camel/component/cxf/cxfbean/CxfBeanTest.java | 4 ++--
.../apache/camel/component/dns/DnsIpProducer.java | 4 ++--
.../camel/component/dns/DnsLookupProducer.java | 4 ++--
.../apache/camel/component/exec/ExecEndpoint.java | 5 +++--
.../camel/component/geocoder/GeoCoderProducer.java | 6 +++---
.../hawtdb/HawtDBAggregationRepository.java | 9 ++++----
.../org/apache/camel/http/common/HttpHelper.java | 4 ++--
.../camel/component/http4/HttpComponent.java | 3 ++-
.../component/jasypt/JasyptPropertiesParser.java | 7 ++++---
.../camel/component/jcache/JCacheProducer.java | 3 ++-
.../apache/camel/component/jcr/JcrEndpoint.java | 7 ++++---
.../camel/component/jetty/JettyHttpComponent.java | 3 ++-
.../component/validator/jing/JingEndpoint.java | 4 ++--
.../leveldb/LevelDBAggregationRepository.java | 9 ++++----
.../apache/camel/component/mail/MailBinding.java | 3 ++-
.../apache/camel/component/mail/MailComponent.java | 6 +++---
.../org/apache/camel/component/mail/MailUtils.java | 3 ++-
.../camel/component/metrics/MetricsComponent.java | 6 +++---
.../netty/http/DefaultNettyHttpBinding.java | 5 +++--
.../component/netty/http/NettyHttpEndpoint.java | 5 +++--
.../component/netty/http/NettyHttpHelper.java | 3 +--
.../http/handlers/HttpServerChannelHandler.java | 11 +++++-----
.../netty4/http/DefaultNettyHttpBinding.java | 5 +++--
.../component/netty4/http/NettyHttpEndpoint.java | 5 +++--
.../component/netty4/http/NettyHttpHelper.java | 3 +--
.../http/handlers/HttpServerChannelHandler.java | 17 +++++++--------
.../cinder/producer/SnapshotProducer.java | 10 ++++-----
.../openstack/cinder/producer/VolumeProducer.java | 14 ++++++-------
.../common/AbstractOpenstackProducer.java | 3 ++-
.../component/openstack/glance/GlanceProducer.java | 7 ++++---
.../keystone/producer/DomainProducer.java | 8 ++++----
.../openstack/keystone/producer/GroupProducer.java | 20 +++++++++---------
.../keystone/producer/ProjectProducer.java | 8 ++++----
.../keystone/producer/RegionProducer.java | 6 +++---
.../openstack/keystone/producer/UserProducer.java | 8 ++++----
.../neutron/producer/NetworkProducer.java | 8 ++++----
.../openstack/neutron/producer/PortProducer.java | 8 ++++----
.../openstack/neutron/producer/RouterProducer.java | 13 ++++++------
.../openstack/neutron/producer/SubnetProducer.java | 9 ++++----
.../openstack/nova/producer/FlavorsProducer.java | 8 ++++----
.../openstack/nova/producer/KeypairProducer.java | 8 ++++----
.../openstack/nova/producer/ServerProducer.java | 13 ++++++------
.../swift/producer/ContainerProducer.java | 14 ++++++-------
.../openstack/swift/producer/ObjectProducer.java | 24 +++++++++++-----------
.../camel/component/quartz2/QuartzComponent.java | 5 +++--
.../QuartzScheduledPollConsumerScheduler.java | 3 ++-
.../component/servicenow/ServiceNowParams.java | 3 ++-
.../integration/SpringIntegrationConsumer.java | 5 +++--
.../integration/SpringIntegrationProducer.java | 5 +++--
.../swagger/producer/DummyRestProducerFactory.java | 4 ++--
.../component/websocket/WebsocketComponent.java | 3 ++-
.../camel/itest/jetty/JettyFreemarkerTest.java | 3 ++-
.../camel/tests/partialclasspath/MyConverter.java | 4 ++--
.../camel/tests/typeconverterscan/MyConverter.java | 4 ++--
59 files changed, 210 insertions(+), 186 deletions(-)
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
index a7de391..6c5dba3 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/factory/ApnsServiceFactory.java
@@ -36,6 +36,7 @@ import org.apache.camel.component.apns.util.ParamUtils;
import org.apache.camel.component.apns.util.ResourceUtils;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ResourceHelper;
+import org.apache.camel.util.StringHelper;
import org.apache.camel.util.jsse.SSLContextParameters;
public class ApnsServiceFactory implements CamelContextAware {
@@ -197,8 +198,8 @@ public class ApnsServiceFactory implements CamelContextAware {
}
ObjectHelper.notNull(getCamelContext(), "camelContext");
- ObjectHelper.notEmpty(getCertificatePath(), "certificatePath");
- ObjectHelper.notEmpty(getCertificatePassword(), "certificatePassword");
+ StringHelper.notEmpty(getCertificatePath(), "certificatePath");
+ StringHelper.notEmpty(getCertificatePassword(), "certificatePassword");
InputStream certificateInputStream = null;
try {
diff --git a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineComponent.java b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineComponent.java
index eb26058..cda51dc 100644
--- a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineComponent.java
+++ b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineComponent.java
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.UriEndpointComponent;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* Represents the component that manages {@link ChronicleEngineEndpoint}.
@@ -42,8 +42,8 @@ public class ChronicleEngineComponent extends UriEndpointComponent {
setProperties(configuration, parameters);
ChronicleEngineEndpoint answer = new ChronicleEngineEndpoint(uri, this, configuration);
- answer.setAddresses(ObjectHelper.before(remaining, "/"));
- answer.setPath(ObjectHelper.after(remaining, "/"));
+ answer.setAddresses(StringHelper.before(remaining, "/"));
+ answer.setPath(StringHelper.after(remaining, "/"));
return answer;
}
}
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMEndpoint.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMEndpoint.java
index 74cc7b4..995c4f5 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMEndpoint.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMEndpoint.java
@@ -26,7 +26,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;
/**
* The cm-sms component allows to integrate with <a href="https://www.cmtelecom.com/">CM SMS Gateway</a>.
@@ -65,7 +65,7 @@ public class CMEndpoint extends DefaultEndpoint {
// CMConstants.DEFAULT_SCHEME + host is a valid URL. It was previously checked
String token = config.getProductToken();
- ObjectHelper.notEmpty(token, "productToken");
+ StringHelper.notEmpty(token, "productToken");
UUID uuid = UUID.fromString(token);
return new CMProducer(this, new CMSenderOneMessageImpl(getCMUrl(), uuid));
diff --git a/components/camel-context/src/main/java/org/apache/camel/component/context/QualifiedContextComponent.java b/components/camel-context/src/main/java/org/apache/camel/component/context/QualifiedContextComponent.java
index 1d91926..0647e07 100644
--- a/components/camel-context/src/main/java/org/apache/camel/component/context/QualifiedContextComponent.java
+++ b/components/camel-context/src/main/java/org/apache/camel/component/context/QualifiedContextComponent.java
@@ -22,7 +22,7 @@ import org.apache.camel.Component;
import org.apache.camel.Endpoint;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.impl.UriEndpointComponent;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,7 +41,7 @@ public class QualifiedContextComponent extends UriEndpointComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- String splitURI[] = ObjectHelper.splitOnCharacter(remaining, ":", 2);
+ String splitURI[] = StringHelper.splitOnCharacter(remaining, ":", 2);
if (splitURI[1] != null) {
String contextId = splitURI[0];
String localEndpoint = splitURI[1];
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
index 82d9c83..5f936a0 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
@@ -26,6 +26,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.PGPPrivateKey;
import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
@@ -63,8 +64,8 @@ public class DefaultPGPSecretKeyAccessor implements PGPSecretKeyAccessor {
*/
public DefaultPGPSecretKeyAccessor(byte[] secretKeyRing, String password, String provider) throws PGPException, IOException {
ObjectHelper.notNull(secretKeyRing, "secretKeyRing");
- ObjectHelper.notEmpty(password, "password");
- ObjectHelper.notEmpty(provider, "provider");
+ StringHelper.notEmpty(password, "password");
+ StringHelper.notEmpty(provider, "provider");
pgpSecretKeyring =
new PGPSecretKeyRingCollection(PGPUtil.getDecoderStream(new ByteArrayInputStream(secretKeyRing)),
new BcKeyFingerprintCalculator());
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
index 0ea7790..7759ee0 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
@@ -26,7 +26,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.apache.camel.wsdl_first.Person;
import org.apache.camel.wsdl_first.PersonService;
import org.apache.http.HttpResponse;
@@ -217,7 +217,7 @@ public class CxfBeanTest extends AbstractJUnit4SpringContextTests {
HttpResponse response = httpclient.execute(get);
assertEquals(200, response.getStatusLine().getStatusCode());
String customers = EntityUtils.toString(response.getEntity());
- String before = ObjectHelper.before(customers, "</id><name>" + name + "</name></Customer>");
+ String before = StringHelper.before(customers, "</id><name>" + name + "</name></Customer>");
String answer = before.substring(before.lastIndexOf(">") + 1, before.length());
return answer;
} finally {
diff --git a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsIpProducer.java b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsIpProducer.java
index d72ea56..46a5d25 100644
--- a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsIpProducer.java
+++ b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsIpProducer.java
@@ -21,7 +21,7 @@ import java.net.InetAddress;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* A producer to conduct IP address lookup from the host name.
@@ -35,7 +35,7 @@ public class DnsIpProducer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
String domain = exchange.getIn().getHeader(DnsConstants.DNS_DOMAIN, String.class);
- ObjectHelper.notEmpty(domain, "Header " + DnsConstants.DNS_DOMAIN);
+ StringHelper.notEmpty(domain, "Header " + DnsConstants.DNS_DOMAIN);
InetAddress address = InetAddress.getByName(domain);
exchange.getIn().setBody(address);
diff --git a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsLookupProducer.java b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsLookupProducer.java
index 54a6096..7b6e023 100644
--- a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsLookupProducer.java
+++ b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsLookupProducer.java
@@ -20,7 +20,7 @@ import org.apache.camel.CamelException;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.xbill.DNS.DClass;
import org.xbill.DNS.Lookup;
import org.xbill.DNS.Type;
@@ -37,7 +37,7 @@ public class DnsLookupProducer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
String dnsName = exchange.getIn().getHeader(DnsConstants.DNS_NAME, String.class);
- ObjectHelper.notEmpty(dnsName, "Header " + DnsConstants.DNS_NAME);
+ StringHelper.notEmpty(dnsName, "Header " + DnsConstants.DNS_NAME);
Object type = exchange.getIn().getHeader(DnsConstants.DNS_TYPE);
Integer dnsType = null;
diff --git a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecEndpoint.java b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecEndpoint.java
index 03890f4..ec59882 100644
--- a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecEndpoint.java
+++ b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecEndpoint.java
@@ -26,6 +26,7 @@ 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;
/**
* The exec component can be used to execute OS system commands.
@@ -82,7 +83,7 @@ public class ExecEndpoint extends DefaultEndpoint {
* <code>null</code>.
*/
public void setExecutable(String executable) {
- ObjectHelper.notEmpty(executable, "executable");
+ StringHelper.notEmpty(executable, "executable");
this.executable = executable;
}
@@ -131,7 +132,7 @@ public class ExecEndpoint extends DefaultEndpoint {
* If no outFile is set, the standard output (stdout) of the executable will be used instead.
*/
public void setOutFile(String outFile) {
- ObjectHelper.notEmpty(outFile, "outFile");
+ StringHelper.notEmpty(outFile, "outFile");
this.outFile = outFile;
}
diff --git a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java
index 049170f..822da8a 100644
--- a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java
+++ b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderProducer.java
@@ -34,7 +34,7 @@ import com.google.maps.model.GeolocationResult;
import com.google.maps.model.LatLng;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,8 +66,8 @@ public class GeoCoderProducer extends DefaultProducer {
}
if (latlng != null) {
- String lat = ObjectHelper.before(latlng, ",");
- String lng = ObjectHelper.after(latlng, ",");
+ String lat = StringHelper.before(latlng, ",");
+ String lng = StringHelper.after(latlng, ",");
LatLng latLng = new LatLng(Double.parseDouble(lat), Double.parseDouble(lng));
LOG.debug("Geocode for lat/lng {}", latlng);
diff --git a/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java b/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java
index 8b34a43..b613c9d 100644
--- a/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java
+++ b/components/camel-hawtdb/src/main/java/org/apache/camel/component/hawtdb/HawtDBAggregationRepository.java
@@ -32,6 +32,7 @@ import org.apache.camel.spi.RecoverableAggregationRepository;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
+import org.apache.camel.util.StringHelper;
import org.fusesource.hawtbuf.Buffer;
import org.fusesource.hawtdb.api.OptimisticUpdateException;
import org.fusesource.hawtdb.api.SortedIndex;
@@ -72,7 +73,7 @@ public class HawtDBAggregationRepository extends ServiceSupport implements Recov
* @param repositoryName the repository name
*/
public HawtDBAggregationRepository(String repositoryName) {
- ObjectHelper.notEmpty(repositoryName, "repositoryName");
+ StringHelper.notEmpty(repositoryName, "repositoryName");
this.repositoryName = repositoryName;
}
@@ -84,8 +85,8 @@ public class HawtDBAggregationRepository extends ServiceSupport implements Recov
* @param persistentFileName the persistent store filename
*/
public HawtDBAggregationRepository(String repositoryName, String persistentFileName) {
- ObjectHelper.notEmpty(repositoryName, "repositoryName");
- ObjectHelper.notEmpty(persistentFileName, "persistentFileName");
+ StringHelper.notEmpty(repositoryName, "repositoryName");
+ StringHelper.notEmpty(persistentFileName, "persistentFileName");
this.repositoryName = repositoryName;
this.persistentFileName = persistentFileName;
}
@@ -97,7 +98,7 @@ public class HawtDBAggregationRepository extends ServiceSupport implements Recov
* @param hawtDBFile the hawtdb file to use as persistent store
*/
public HawtDBAggregationRepository(String repositoryName, HawtDBFile hawtDBFile) {
- ObjectHelper.notEmpty(repositoryName, "repositoryName");
+ StringHelper.notEmpty(repositoryName, "repositoryName");
ObjectHelper.notNull(hawtDBFile, "hawtDBFile");
this.hawtDBFile = hawtDBFile;
this.repositoryName = repositoryName;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
index 2d33bc2..c2d271c 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
@@ -105,7 +105,7 @@ public final class HttpHelper {
String charset = contentType.substring(index + 8);
// there may be another parameter after a semi colon, so skip that
if (charset.contains(";")) {
- charset = ObjectHelper.before(charset, ";");
+ charset = StringHelper.before(charset, ";");
}
return IOHelper.normalizeCharset(charset);
}
@@ -419,7 +419,7 @@ public final class HttpHelper {
relativeUrl = endpoint.getHttpUri().toASCIIString();
// strip query parameters from relative url
if (relativeUrl.contains("?")) {
- relativeUrl = ObjectHelper.before(relativeUrl, "?");
+ relativeUrl = StringHelper.before(relativeUrl, "?");
}
if (url.startsWith(relativeUrl)) {
baseUrl = url.substring(0, relativeUrl.length());
diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
index a4e243c..9c8062f 100644
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
@@ -47,6 +47,7 @@ import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
+import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
import org.apache.camel.util.jsse.SSLContextParameters;
@@ -257,7 +258,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
URI endpointUri = URISupport.createRemainingURI(uriHttpUriAddress, httpClientParameters);
// the endpoint uri should use the component name as scheme, so we need to re-create it once more
- String scheme = ObjectHelper.before(uri, "://");
+ String scheme = StringHelper.before(uri, "://");
endpointUri = URISupport.createRemainingURI(
new URI(scheme,
endpointUri.getUserInfo(),
diff --git a/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java b/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
index aa86a0c..6853e7d 100644
--- a/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
+++ b/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/JasyptPropertiesParser.java
@@ -24,6 +24,7 @@ import static java.lang.String.format;
import org.apache.camel.component.properties.DefaultPropertiesParser;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.jasypt.encryption.StringEncryptor;
import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
@@ -65,7 +66,7 @@ public class JasyptPropertiesParser extends DefaultPropertiesParser {
private synchronized void initEncryptor() {
if (encryptor == null) {
- ObjectHelper.notEmpty("password", password);
+ StringHelper.notEmpty("password", password);
StandardPBEStringEncryptor pbeStringEncryptor = new StandardPBEStringEncryptor();
pbeStringEncryptor.setPassword(password);
if (algorithm != null) {
@@ -89,10 +90,10 @@ public class JasyptPropertiesParser extends DefaultPropertiesParser {
public void setPassword(String password) {
// lookup password as either environment or JVM system property
if (password.startsWith("sysenv:")) {
- password = System.getenv(ObjectHelper.after(password, "sysenv:"));
+ password = System.getenv(StringHelper.after(password, "sysenv:"));
}
if (ObjectHelper.isNotEmpty(password) && password.startsWith("sys:")) {
- password = System.getProperty(ObjectHelper.after(password, "sys:"));
+ password = System.getProperty(StringHelper.after(password, "sys:"));
}
this.password = password;
}
diff --git a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheProducer.java b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheProducer.java
index 7863454..58dfa75 100644
--- a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheProducer.java
+++ b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheProducer.java
@@ -27,6 +27,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* The JCache producer.
@@ -47,7 +48,7 @@ public class JCacheProducer extends DefaultProducer {
actionName = configuration.getAction();
}
- ObjectHelper.notEmpty(actionName, JCacheConstants.ACTION);
+ StringHelper.notEmpty(actionName, JCacheConstants.ACTION);
Action action = Action.fromName(actionName);
if (action != null) {
diff --git a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
index abc15ae..3b0c826 100644
--- a/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
+++ b/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
@@ -32,6 +32,7 @@ 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;
/**
* The jcr component allows you to add/read nodes to/from a JCR compliant content repository.
@@ -101,7 +102,7 @@ public class JcrEndpoint extends DefaultEndpoint {
@Override
protected void doStart() throws Exception {
super.doStart();
- ObjectHelper.notEmpty(host, "host", this);
+ StringHelper.notEmpty(host, "host", this);
this.repository = getCamelContext().getRegistry().lookupByNameAndType(host, Repository.class);
if (repository == null) {
@@ -296,7 +297,7 @@ public class JcrEndpoint extends DefaultEndpoint {
* @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("@")) {
remainder = remainder.substring(remainder.indexOf('@'));
@@ -304,7 +305,7 @@ public class JcrEndpoint extends DefaultEndpoint {
if (remainder != null && remainder.contains("?")) {
// remove parameters
- remainder = ObjectHelper.before(remainder, "?");
+ remainder = StringHelper.before(remainder, "?");
}
if (ObjectHelper.isEmpty(remainder)) {
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 47018f2..1030f27 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -66,6 +66,7 @@ import org.apache.camel.util.HostUtils;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
+import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
import org.apache.camel.util.jsse.SSLContextParameters;
@@ -213,7 +214,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
// create endpoint after all known parameters have been extracted from parameters
// include component scheme in the uri
- String scheme = ObjectHelper.before(uri, ":");
+ String scheme = StringHelper.before(uri, ":");
endpointUri = new URI(scheme + ":" + endpointUri);
JettyHttpEndpoint endpoint = createEndpoint(endpointUri, httpUri);
diff --git a/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java b/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java
index fa78108..d5c2895 100644
--- a/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java
+++ b/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.validator.jing;
import java.io.InputStream;
+import org.apache.camel.util.StringHelper;
import org.xml.sax.InputSource;
import com.thaiopensource.relaxng.SchemaFactory;
@@ -33,7 +34,6 @@ 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.ResourceHelper;
/**
@@ -126,7 +126,7 @@ public class JingEndpoint extends DefaultEndpoint {
super.doStart();
if (inputSource == null) {
- ObjectHelper.notEmpty(resourceUri, "resourceUri", this);
+ StringHelper.notEmpty(resourceUri, "resourceUri", this);
InputStream inputStream = ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext(), resourceUri);
inputSource = new InputSource(inputStream);
}
diff --git a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java
index 633b3e3..eab0888 100644
--- a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java
+++ b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBAggregationRepository.java
@@ -30,6 +30,7 @@ import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
+import org.apache.camel.util.StringHelper;
import org.fusesource.hawtbuf.Buffer;
import org.iq80.leveldb.DBIterator;
import org.iq80.leveldb.WriteBatch;
@@ -66,7 +67,7 @@ public class LevelDBAggregationRepository extends ServiceSupport implements Reco
* @param repositoryName the repository name
*/
public LevelDBAggregationRepository(String repositoryName) {
- ObjectHelper.notEmpty(repositoryName, "repositoryName");
+ StringHelper.notEmpty(repositoryName, "repositoryName");
this.repositoryName = repositoryName;
}
@@ -78,8 +79,8 @@ public class LevelDBAggregationRepository extends ServiceSupport implements Reco
* @param persistentFileName the persistent store filename
*/
public LevelDBAggregationRepository(String repositoryName, String persistentFileName) {
- ObjectHelper.notEmpty(repositoryName, "repositoryName");
- ObjectHelper.notEmpty(persistentFileName, "persistentFileName");
+ StringHelper.notEmpty(repositoryName, "repositoryName");
+ StringHelper.notEmpty(persistentFileName, "persistentFileName");
this.repositoryName = repositoryName;
this.persistentFileName = persistentFileName;
}
@@ -91,7 +92,7 @@ public class LevelDBAggregationRepository extends ServiceSupport implements Reco
* @param levelDBFile the leveldb file to use as persistent store
*/
public LevelDBAggregationRepository(String repositoryName, LevelDBFile levelDBFile) {
- ObjectHelper.notEmpty(repositoryName, "repositoryName");
+ StringHelper.notEmpty(repositoryName, "repositoryName");
ObjectHelper.notNull(levelDBFile, "levelDBFile");
this.levelDBFile = levelDBFile;
this.repositoryName = repositoryName;
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
index d64a3bf..2a88acd 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
@@ -55,6 +55,7 @@ import org.apache.camel.util.CollectionHelper;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -259,7 +260,7 @@ public class MailBinding {
LOG.debug("Unsupported encoding detected: {}", uee.getMessage());
try {
String contentType = message.getContentType();
- String type = ObjectHelper.before(contentType, "charset=");
+ String type = StringHelper.before(contentType, "charset=");
if (type != null) {
// try again with fixed content type
LOG.debug("Trying to extract mail message again with fixed Content-Type: {}", type);
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
index 21b28d0..82b32f2 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
@@ -29,7 +29,7 @@ import org.apache.camel.SSLContextParametersAware;
import org.apache.camel.impl.UriEndpointComponent;
import org.apache.camel.spi.Metadata;
import org.apache.camel.util.IntrospectionSupport;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* Component for JavaMail.
@@ -114,8 +114,8 @@ public class MailComponent extends UriEndpointComponent implements SSLContextPar
}
// sanity check that we know the mail server
- ObjectHelper.notEmpty(config.getHost(), "host");
- ObjectHelper.notEmpty(config.getProtocol(), "protocol");
+ StringHelper.notEmpty(config.getHost(), "host");
+ StringHelper.notEmpty(config.getProtocol(), "protocol");
// Use global ssl if present
if (endpoint.getConfiguration().getSslContextParameters() == null) {
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailUtils.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailUtils.java
index dc4084e..6cafea4 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailUtils.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailUtils.java
@@ -24,6 +24,7 @@ import javax.mail.Message;
import javax.mail.MessagingException;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* Mail utility class.
@@ -221,7 +222,7 @@ public final class MailUtils {
for (String part : parts) {
part = part.trim();
if (part.startsWith("charset")) {
- return ObjectHelper.after(part, "charset=");
+ return StringHelper.after(part, "charset=");
}
}
return null;
diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java
index 9470edb..9e18191 100644
--- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java
+++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java
@@ -27,7 +27,7 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.UriEndpointComponent;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.Registry;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,12 +65,12 @@ public class MetricsComponent extends UriEndpointComponent {
}
String getMetricsName(String remaining) {
- String name = ObjectHelper.after(remaining, ":");
+ String name = StringHelper.after(remaining, ":");
return name == null ? remaining : name;
}
MetricsType getMetricsType(String remaining) {
- String name = ObjectHelper.before(remaining, ":");
+ String name = StringHelper.before(remaining, ":");
MetricsType type;
if (name == null) {
type = DEFAULT_METRICS_TYPE;
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
index 15cea1b..4c24782 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
@@ -40,6 +40,7 @@ import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.MessageHelper;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
@@ -108,7 +109,7 @@ public class DefaultNettyHttpBinding implements NettyHttpBinding, Cloneable {
// strip query parameters from the uri
String s = request.getUri();
if (s.contains("?")) {
- s = ObjectHelper.before(s, "?");
+ s = StringHelper.before(s, "?");
}
// we want the full path for the url, as the client may provide the url in the HTTP headers as absolute or relative, eg
@@ -179,7 +180,7 @@ public class DefaultNettyHttpBinding implements NettyHttpBinding, Cloneable {
// add uri parameters as headers to the Camel message
if (request.getUri().contains("?")) {
- String query = ObjectHelper.after(request.getUri(), "?");
+ String query = StringHelper.after(request.getUri(), "?");
Map<String, Object> uriParameters = URISupport.parseQuery(query, false, true);
for (Map.Entry<String, Object> entry : uriParameters.entrySet()) {
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
index 6a20834..3560534 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpEndpoint.java
@@ -33,6 +33,7 @@ import org.apache.camel.spi.HeaderFilterStrategyAware;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.handler.codec.http.HttpRequest;
@@ -237,8 +238,8 @@ public class NettyHttpEndpoint extends NettyEndpoint implements AsyncEndpoint, H
ObjectHelper.notNull(headerFilterStrategy, "headerFilterStrategy", this);
if (securityConfiguration != null) {
- ObjectHelper.notEmpty(securityConfiguration.getRealm(), "realm", securityConfiguration);
- ObjectHelper.notEmpty(securityConfiguration.getConstraint(), "restricted", securityConfiguration);
+ StringHelper.notEmpty(securityConfiguration.getRealm(), "realm", securityConfiguration);
+ StringHelper.notEmpty(securityConfiguration.getConstraint(), "restricted", securityConfiguration);
if (securityConfiguration.getSecurityAuthenticator() == null) {
// setup default JAAS authenticator if none was configured
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpHelper.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpHelper.java
index 97d09a6..3438709 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpHelper.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpHelper.java
@@ -30,7 +30,6 @@ import org.apache.camel.Message;
import org.apache.camel.RuntimeExchangeException;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
@@ -61,7 +60,7 @@ public final class NettyHttpHelper {
String charset = contentType.substring(index + 8);
// there may be another parameter after a semi colon, so skip that
if (charset.contains(";")) {
- charset = ObjectHelper.before(charset, ";");
+ charset = StringHelper.before(charset, ";");
}
return IOHelper.normalizeCharset(charset);
}
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java
index b1d6456..2affc2e 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java
@@ -35,6 +35,7 @@ import org.apache.camel.component.netty.http.NettyHttpSecurityConfiguration;
import org.apache.camel.component.netty.http.SecurityAuthenticator;
import org.apache.camel.util.CamelLogger;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.ChannelHandlerContext;
@@ -154,7 +155,7 @@ public class HttpServerChannelHandler extends ServerChannelHandler {
// drop parameters from url
if (url.contains("?")) {
- url = ObjectHelper.before(url, "?");
+ url = StringHelper.before(url, "?");
}
// we need the relative path without the hostname and port
@@ -254,16 +255,16 @@ public class HttpServerChannelHandler extends ServerChannelHandler {
protected static HttpPrincipal extractBasicAuthSubject(HttpRequest request) {
String auth = request.headers().get("Authorization");
if (auth != null) {
- String constraint = ObjectHelper.before(auth, " ");
+ String constraint = StringHelper.before(auth, " ");
if (constraint != null) {
if ("Basic".equalsIgnoreCase(constraint.trim())) {
- String decoded = ObjectHelper.after(auth, " ");
+ String decoded = StringHelper.after(auth, " ");
// the decoded part is base64 encoded, so we need to decode that
ChannelBuffer buf = ChannelBuffers.copiedBuffer(decoded.getBytes());
ChannelBuffer out = Base64.decode(buf);
String userAndPw = out.toString(Charset.defaultCharset());
- String username = ObjectHelper.before(userAndPw, ":");
- String password = ObjectHelper.after(userAndPw, ":");
+ String username = StringHelper.before(userAndPw, ":");
+ String password = StringHelper.after(userAndPw, ":");
HttpPrincipal principal = new HttpPrincipal(username, password);
LOG.debug("Extracted Basic Auth principal from HTTP header: {}", principal);
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
index eb96cc8..194a221 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/DefaultNettyHttpBinding.java
@@ -53,6 +53,7 @@ import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.MessageHelper;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -113,7 +114,7 @@ public class DefaultNettyHttpBinding implements NettyHttpBinding, Cloneable {
// strip query parameters from the uri
String s = request.uri();
if (s.contains("?")) {
- s = ObjectHelper.before(s, "?");
+ s = StringHelper.before(s, "?");
}
// we want the full path for the url, as the client may provide the url in the HTTP headers as absolute or relative, eg
@@ -184,7 +185,7 @@ public class DefaultNettyHttpBinding implements NettyHttpBinding, Cloneable {
// add uri parameters as headers to the Camel message
if (request.uri().contains("?")) {
- String query = ObjectHelper.after(request.uri(), "?");
+ String query = StringHelper.after(request.uri(), "?");
Map<String, Object> uriParameters = URISupport.parseQuery(query, false, true);
for (Map.Entry<String, Object> entry : uriParameters.entrySet()) {
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
index b499ff4..aa74501 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpEndpoint.java
@@ -36,6 +36,7 @@ import org.apache.camel.spi.HeaderFilterStrategyAware;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -249,8 +250,8 @@ public class NettyHttpEndpoint extends NettyEndpoint implements AsyncEndpoint, H
ObjectHelper.notNull(headerFilterStrategy, "headerFilterStrategy", this);
if (securityConfiguration != null) {
- ObjectHelper.notEmpty(securityConfiguration.getRealm(), "realm", securityConfiguration);
- ObjectHelper.notEmpty(securityConfiguration.getConstraint(), "restricted", securityConfiguration);
+ StringHelper.notEmpty(securityConfiguration.getRealm(), "realm", securityConfiguration);
+ StringHelper.notEmpty(securityConfiguration.getConstraint(), "restricted", securityConfiguration);
if (securityConfiguration.getSecurityAuthenticator() == null) {
// setup default JAAS authenticator if none was configured
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHelper.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHelper.java
index f1c748e..e1c93be 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHelper.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpHelper.java
@@ -32,7 +32,6 @@ import org.apache.camel.Message;
import org.apache.camel.RuntimeExchangeException;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.util.IOHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
@@ -61,7 +60,7 @@ public final class NettyHttpHelper {
String charset = contentType.substring(index + 8);
// there may be another parameter after a semi colon, so skip that
if (charset.contains(";")) {
- charset = ObjectHelper.before(charset, ";");
+ charset = StringHelper.before(charset, ";");
}
return IOHelper.normalizeCharset(charset);
}
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerChannelHandler.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerChannelHandler.java
index 2909f09..4cd02c4 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerChannelHandler.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerChannelHandler.java
@@ -19,11 +19,9 @@ package org.apache.camel.component.netty4.http.handlers;
import java.net.URI;
import java.nio.channels.ClosedChannelException;
import java.nio.charset.Charset;
-import java.util.Arrays;
import java.util.Iterator;
-import java.util.List;
import java.util.Locale;
-import java.util.stream.Collectors;
+
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
@@ -46,15 +44,14 @@ import org.apache.camel.component.netty4.http.HttpPrincipal;
import org.apache.camel.component.netty4.http.NettyHttpConsumer;
import org.apache.camel.component.netty4.http.NettyHttpSecurityConfiguration;
import org.apache.camel.component.netty4.http.SecurityAuthenticator;
-import org.apache.camel.http.common.CamelServlet;
import org.apache.camel.util.CamelLogger;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
import static io.netty.handler.codec.http.HttpResponseStatus.METHOD_NOT_ALLOWED;
-import static io.netty.handler.codec.http.HttpResponseStatus.OK;
import static io.netty.handler.codec.http.HttpResponseStatus.SERVICE_UNAVAILABLE;
import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED;
import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
@@ -130,7 +127,7 @@ public class HttpServerChannelHandler extends ServerChannelHandler {
// drop parameters from url
if (url.contains("?")) {
- url = ObjectHelper.before(url, "?");
+ url = StringHelper.before(url, "?");
}
// we need the relative path without the hostname and port
@@ -228,17 +225,17 @@ public class HttpServerChannelHandler extends ServerChannelHandler {
protected static HttpPrincipal extractBasicAuthSubject(HttpRequest request) {
String auth = request.headers().get("Authorization");
if (auth != null) {
- String constraint = ObjectHelper.before(auth, " ");
+ String constraint = StringHelper.before(auth, " ");
if (constraint != null) {
if ("Basic".equalsIgnoreCase(constraint.trim())) {
- String decoded = ObjectHelper.after(auth, " ");
+ String decoded = StringHelper.after(auth, " ");
// the decoded part is base64 encoded, so we need to decode that
ByteBuf buf = NettyConverter.toByteBuffer(decoded.getBytes());
ByteBuf out = Base64.decode(buf);
try {
String userAndPw = out.toString(Charset.defaultCharset());
- String username = ObjectHelper.before(userAndPw, ":");
- String password = ObjectHelper.after(userAndPw, ":");
+ String username = StringHelper.before(userAndPw, ":");
+ String password = StringHelper.after(userAndPw, ":");
HttpPrincipal principal = new HttpPrincipal(username, password);
LOG.debug("Extracted Basic Auth principal from HTTP header: {}", principal);
return principal;
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/SnapshotProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/SnapshotProducer.java
index b0d994f..f2f1888 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/SnapshotProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/SnapshotProducer.java
@@ -25,7 +25,7 @@ import org.apache.camel.component.openstack.cinder.CinderConstants;
import org.apache.camel.component.openstack.cinder.CinderEndpoint;
import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
import org.apache.camel.component.openstack.common.OpenstackConstants;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -73,7 +73,7 @@ public class SnapshotProducer extends AbstractOpenstackProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(CinderConstants.SNAPSHOT_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Snapshot ID");
+ StringHelper.notEmpty(id, "Snapshot ID");
final VolumeSnapshot out = os.blockStorage().snapshots().get(id);
msg.setBody(out);
}
@@ -87,7 +87,7 @@ public class SnapshotProducer extends AbstractOpenstackProducer {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(CinderConstants.SNAPSHOT_ID, String.class), String.class);
final VolumeSnapshot vs = messageToSnapshot(msg);
- ObjectHelper.notEmpty(id, "Cinder Snapshot ID");
+ StringHelper.notEmpty(id, "Cinder Snapshot ID");
final ActionResponse out = os.blockStorage().snapshots().update(id, vs.getName(), vs.getDescription());
checkFailure(out, msg, "Update volume snapshot " + id);
@@ -96,7 +96,7 @@ public class SnapshotProducer extends AbstractOpenstackProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(CinderConstants.SNAPSHOT_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Cinder Snapshot ID");
+ StringHelper.notEmpty(id, "Cinder Snapshot ID");
final ActionResponse out = os.blockStorage().snapshots().delete(id);
checkFailure(out, msg, "Delete snapshot " + id);
@@ -109,7 +109,7 @@ public class SnapshotProducer extends AbstractOpenstackProducer {
VolumeSnapshotBuilder builder = Builders.volumeSnapshot();
final String name = message.getHeader(OpenstackConstants.NAME, String.class);
- ObjectHelper.notEmpty(name, "Name");
+ StringHelper.notEmpty(name, "Name");
builder.name(name);
if (headers.containsKey(OpenstackConstants.DESCRIPTION)) {
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/VolumeProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/VolumeProducer.java
index 71938b3..3825450 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/VolumeProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/cinder/producer/VolumeProducer.java
@@ -25,7 +25,7 @@ import org.apache.camel.component.openstack.cinder.CinderConstants;
import org.apache.camel.component.openstack.cinder.CinderEndpoint;
import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
import org.apache.camel.component.openstack.common.OpenstackConstants;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -77,7 +77,7 @@ public class VolumeProducer extends AbstractOpenstackProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(CinderConstants.VOLUME_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Volume ID");
+ StringHelper.notEmpty(id, "Volume ID");
final Volume out = os.blockStorage().volumes().get(id);
msg.setBody(out);
}
@@ -96,9 +96,9 @@ public class VolumeProducer extends AbstractOpenstackProducer {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(CinderConstants.VOLUME_ID, String.class), String.class);
final Volume vol = messageToVolume(msg);
- ObjectHelper.notEmpty(id, "Cinder Volume ID");
- ObjectHelper.notEmpty(vol.getDescription(), "Cinder Volume Description");
- ObjectHelper.notEmpty(vol.getName(), "Cinder Volume Name");
+ StringHelper.notEmpty(id, "Cinder Volume ID");
+ StringHelper.notEmpty(vol.getDescription(), "Cinder Volume Description");
+ StringHelper.notEmpty(vol.getName(), "Cinder Volume Name");
final ActionResponse out = os.blockStorage().volumes().update(id, vol.getName(), vol.getDescription());
checkFailure(out, msg, "Update volume " + id);
}
@@ -106,7 +106,7 @@ public class VolumeProducer extends AbstractOpenstackProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(CinderConstants.VOLUME_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Cinder Volume ID");
+ StringHelper.notEmpty(id, "Cinder Volume ID");
final ActionResponse out = os.blockStorage().volumes().delete(id);
checkFailure(out, msg, "Delete volume " + id);
}
@@ -118,7 +118,7 @@ public class VolumeProducer extends AbstractOpenstackProducer {
VolumeBuilder builder = Builders.volume();
final String name = message.getHeader(OpenstackConstants.NAME, String.class);
- ObjectHelper.notEmpty(name, "Name ");
+ StringHelper.notEmpty(name, "Name ");
builder.name(name);
if (headers.containsKey(OpenstackConstants.DESCRIPTION)) {
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/AbstractOpenstackProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/AbstractOpenstackProducer.java
index c53e2c4..d22d5c3 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/AbstractOpenstackProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/common/AbstractOpenstackProducer.java
@@ -24,6 +24,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.common.Payload;
@@ -68,7 +69,7 @@ public abstract class AbstractOpenstackProducer extends DefaultProducer {
protected String getOperation(Exchange exchange) {
final String operation = exchange.getIn().getHeader(OpenstackConstants.OPERATION, endpoint.getOperation(), String.class);
- ObjectHelper.notEmpty(operation, "Operation");
+ StringHelper.notEmpty(operation, "Operation");
return operation;
}
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceProducer.java
index 74123fb..bc9cb21 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/glance/GlanceProducer.java
@@ -24,6 +24,7 @@ import org.apache.camel.Message;
import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -87,7 +88,7 @@ public class GlanceProducer extends AbstractOpenstackProducer {
private void doUpload(Exchange exchange) {
final Message msg = exchange.getIn();
final String imageId = msg.getHeader(OpenstackConstants.ID, String.class);
- ObjectHelper.notEmpty(imageId, "Image ID");
+ StringHelper.notEmpty(imageId, "Image ID");
final Image in = messageHeadersToImage(msg, false);
final Payload payload = createPayload(msg);
final Image out = os.images().upload(imageId, payload, in);
@@ -104,7 +105,7 @@ public class GlanceProducer extends AbstractOpenstackProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
final String imageId = msg.getHeader(OpenstackConstants.ID, String.class);
- ObjectHelper.notEmpty(imageId, "ImageID");
+ StringHelper.notEmpty(imageId, "ImageID");
final Image out = os.images().get(imageId);
msg.setBody(out);
}
@@ -117,7 +118,7 @@ public class GlanceProducer extends AbstractOpenstackProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String imageId = msg.getHeader(OpenstackConstants.ID, String.class);
- ObjectHelper.notEmpty(imageId, "ImageID");
+ StringHelper.notEmpty(imageId, "ImageID");
final ActionResponse response = os.compute().images().delete(imageId);
checkFailure(response, msg, "Delete image " + imageId);
}
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/DomainProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/DomainProducer.java
index 50cb9d2..9d025fe 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/DomainProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/DomainProducer.java
@@ -24,7 +24,7 @@ import org.apache.camel.Message;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.KeystoneConstants;
import org.apache.camel.component.openstack.keystone.KeystoneEndpoint;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -70,7 +70,7 @@ public class DomainProducer extends AbstractKeystoneProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(KeystoneConstants.DOMAIN_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Domain ID");
+ StringHelper.notEmpty(id, "Domain ID");
final Domain out = osV3Client.identity().domains().get(id);
exchange.getIn().setBody(out);
}
@@ -90,7 +90,7 @@ public class DomainProducer extends AbstractKeystoneProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(KeystoneConstants.DOMAIN_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Domain ID");
+ StringHelper.notEmpty(id, "Domain ID");
final ActionResponse response = osV3Client.identity().domains().delete(id);
checkFailure(response, msg, "Delete domain" + id);
}
@@ -101,7 +101,7 @@ public class DomainProducer extends AbstractKeystoneProducer {
Map headers = message.getHeaders();
DomainBuilder builder = Builders.domain();
- ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
+ StringHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
builder.name(message.getHeader(OpenstackConstants.NAME, String.class));
if (headers.containsKey(KeystoneConstants.DESCRIPTION)) {
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/GroupProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/GroupProducer.java
index 3525271..d201481 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/GroupProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/GroupProducer.java
@@ -24,7 +24,7 @@ import org.apache.camel.Message;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.KeystoneConstants;
import org.apache.camel.component.openstack.keystone.KeystoneEndpoint;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -79,7 +79,7 @@ public class GroupProducer extends AbstractKeystoneProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(KeystoneConstants.GROUP_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Group ID");
+ StringHelper.notEmpty(id, "Group ID");
final Group result = osV3Client.identity().groups().get(id);
msg.setBody(result);
}
@@ -99,7 +99,7 @@ public class GroupProducer extends AbstractKeystoneProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(KeystoneConstants.GROUP_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Group ID");
+ StringHelper.notEmpty(id, "Group ID");
final ActionResponse response = osV3Client.identity().groups().delete(id);
checkFailure(response, msg, "Delete group with ID " + id);
}
@@ -108,8 +108,8 @@ public class GroupProducer extends AbstractKeystoneProducer {
final Message msg = exchange.getIn();
final String userId = msg.getHeader(KeystoneConstants.USER_ID, String.class);
final String groupId = msg.getHeader(KeystoneConstants.GROUP_ID, String.class);
- ObjectHelper.notEmpty(userId, "User ID");
- ObjectHelper.notEmpty(groupId, "Group ID");
+ StringHelper.notEmpty(userId, "User ID");
+ StringHelper.notEmpty(groupId, "Group ID");
final ActionResponse response = osV3Client.identity().groups().addUserToGroup(groupId, userId);
checkFailure(response, msg, String.format("Add user %s to group %s", userId, groupId));
}
@@ -118,8 +118,8 @@ public class GroupProducer extends AbstractKeystoneProducer {
final Message msg = exchange.getIn();
final String userId = msg.getHeader(KeystoneConstants.USER_ID, String.class);
final String groupId = msg.getHeader(KeystoneConstants.GROUP_ID, String.class);
- ObjectHelper.notEmpty(userId, "User ID");
- ObjectHelper.notEmpty(groupId, "Group ID");
+ StringHelper.notEmpty(userId, "User ID");
+ StringHelper.notEmpty(groupId, "Group ID");
final ActionResponse response = osV3Client.identity().groups().checkGroupUser(groupId, userId);
msg.setBody(response.isSuccess());
}
@@ -128,8 +128,8 @@ public class GroupProducer extends AbstractKeystoneProducer {
final Message msg = exchange.getIn();
final String userId = msg.getHeader(KeystoneConstants.USER_ID, String.class);
final String groupId = msg.getHeader(KeystoneConstants.GROUP_ID, String.class);
- ObjectHelper.notEmpty(userId, "User ID");
- ObjectHelper.notEmpty(groupId, "Group ID");
+ StringHelper.notEmpty(userId, "User ID");
+ StringHelper.notEmpty(groupId, "Group ID");
final ActionResponse response = osV3Client.identity().groups().removeUserFromGroup(groupId, userId);
checkFailure(response, msg, String.format("Delete user %s from group %s", userId, groupId));
}
@@ -141,7 +141,7 @@ public class GroupProducer extends AbstractKeystoneProducer {
Map headers = message.getHeaders();
GroupBuilder builder = Builders.group();
- ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
+ StringHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
builder.name(message.getHeader(OpenstackConstants.NAME, String.class));
if (headers.containsKey(KeystoneConstants.DOMAIN_ID)) {
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/ProjectProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/ProjectProducer.java
index 48beb20..b661aac 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/ProjectProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/ProjectProducer.java
@@ -24,7 +24,7 @@ import org.apache.camel.Message;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.KeystoneConstants;
import org.apache.camel.component.openstack.keystone.KeystoneEndpoint;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -70,7 +70,7 @@ public class ProjectProducer extends AbstractKeystoneProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, String.class);
- ObjectHelper.notEmpty(id, "Project ID");
+ StringHelper.notEmpty(id, "Project ID");
final Project result = osV3Client.identity().projects().get(id);
msg.setBody(result);
}
@@ -90,7 +90,7 @@ public class ProjectProducer extends AbstractKeystoneProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, String.class);
- ObjectHelper.notEmpty(id, "Project ID");
+ StringHelper.notEmpty(id, "Project ID");
final ActionResponse response = osV3Client.identity().projects().delete(id);
checkFailure(response, msg, "Delete project with ID " + id);
}
@@ -102,7 +102,7 @@ public class ProjectProducer extends AbstractKeystoneProducer {
Map headers = message.getHeaders();
ProjectBuilder builder = Builders.project();
- ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
+ StringHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
builder.name(message.getHeader(OpenstackConstants.NAME, String.class));
if (headers.containsKey(KeystoneConstants.DOMAIN_ID)) {
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/RegionProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/RegionProducer.java
index 6fb0fa8..b9537e8 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/RegionProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/RegionProducer.java
@@ -24,7 +24,7 @@ import org.apache.camel.Message;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.KeystoneConstants;
import org.apache.camel.component.openstack.keystone.KeystoneEndpoint;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -69,7 +69,7 @@ public class RegionProducer extends AbstractKeystoneProducer {
private void doGet(Exchange exchange) {
final String id = exchange.getIn().getHeader(OpenstackConstants.ID, String.class);
- ObjectHelper.notEmpty(id, "Region ID");
+ StringHelper.notEmpty(id, "Region ID");
final Region out = osV3Client.identity().regions().get(id);
exchange.getIn().setBody(out);
}
@@ -89,7 +89,7 @@ public class RegionProducer extends AbstractKeystoneProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, String.class);
- ObjectHelper.notEmpty(id, "Region ID");
+ StringHelper.notEmpty(id, "Region ID");
final ActionResponse response = osV3Client.identity().regions().delete(id);
checkFailure(response, msg, "Delete network" + id);
}
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/UserProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/UserProducer.java
index 541ec48..aef9c32 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/UserProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/keystone/producer/UserProducer.java
@@ -24,7 +24,7 @@ import org.apache.camel.Message;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.keystone.KeystoneConstants;
import org.apache.camel.component.openstack.keystone.KeystoneEndpoint;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -70,7 +70,7 @@ public class UserProducer extends AbstractKeystoneProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(KeystoneConstants.USER_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "User ID");
+ StringHelper.notEmpty(id, "User ID");
final User result = osV3Client.identity().users().get(id);
msg.setBody(result);
}
@@ -90,7 +90,7 @@ public class UserProducer extends AbstractKeystoneProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(KeystoneConstants.USER_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "User ID");
+ StringHelper.notEmpty(id, "User ID");
final ActionResponse response = osV3Client.identity().users().delete(id);
checkFailure(response, msg, "Delete user with ID " + id);
}
@@ -102,7 +102,7 @@ public class UserProducer extends AbstractKeystoneProducer {
Map headers = message.getHeaders();
UserBuilder builder = Builders.user();
- ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
+ StringHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
builder.name(message.getHeader(OpenstackConstants.NAME, String.class));
if (headers.containsKey(KeystoneConstants.DOMAIN_ID)) {
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/NetworkProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/NetworkProducer.java
index 1d49b0d..32f9a79 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/NetworkProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/NetworkProducer.java
@@ -25,7 +25,7 @@ import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.neutron.NeutronConstants;
import org.apache.camel.component.openstack.neutron.NeutronEndpoint;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -69,7 +69,7 @@ public class NetworkProducer extends AbstractOpenstackProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.NETWORK_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Network ID");
+ StringHelper.notEmpty(id, "Network ID");
final Network out = os.networking().network().get(id);
exchange.getIn().setBody(out);
}
@@ -82,7 +82,7 @@ public class NetworkProducer extends AbstractOpenstackProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.NETWORK_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Network ID");
+ StringHelper.notEmpty(id, "Network ID");
final ActionResponse response = os.networking().network().delete(id);
checkFailure(response, msg, "Delete network" + id);
}
@@ -93,7 +93,7 @@ public class NetworkProducer extends AbstractOpenstackProducer {
Map headers = message.getHeaders();
NetworkBuilder builder = Builders.network();
- ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
+ StringHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
builder.name(message.getHeader(OpenstackConstants.NAME, String.class));
if (headers.containsKey(NeutronConstants.ADMIN_STATE_UP)) {
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/PortProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/PortProducer.java
index 0c7bd83..167b24b 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/PortProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/PortProducer.java
@@ -25,7 +25,7 @@ import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.neutron.NeutronConstants;
import org.apache.camel.component.openstack.neutron.NeutronEndpoint;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -71,7 +71,7 @@ public class PortProducer extends AbstractOpenstackProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.PORT_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Port ID");
+ StringHelper.notEmpty(id, "Port ID");
final Port result = os.networking().port().get(id);
msg.setBody(result);
}
@@ -91,7 +91,7 @@ public class PortProducer extends AbstractOpenstackProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.PORT_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Port ID");
+ StringHelper.notEmpty(id, "Port ID");
final ActionResponse response = os.networking().port().delete(id);
checkFailure(response, msg, "Delete port with ID " + id);
}
@@ -103,7 +103,7 @@ public class PortProducer extends AbstractOpenstackProducer {
Map headers = message.getHeaders();
PortBuilder builder = Builders.port();
- ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
+ StringHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
builder.name(message.getHeader(OpenstackConstants.NAME, String.class));
if (headers.containsKey(NeutronConstants.TENANT_ID)) {
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/RouterProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/RouterProducer.java
index 4dfcf4d..dc7f497 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/RouterProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/RouterProducer.java
@@ -26,6 +26,7 @@ import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.neutron.NeutronConstants;
import org.apache.camel.component.openstack.neutron.NeutronEndpoint;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -79,7 +80,7 @@ public class RouterProducer extends AbstractOpenstackProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.ROUTER_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Router ID");
+ StringHelper.notEmpty(id, "Router ID");
final Router result = os.networking().router().get(id);
msg.setBody(result);
}
@@ -99,7 +100,7 @@ public class RouterProducer extends AbstractOpenstackProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.ROUTER_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Router ID");
+ StringHelper.notEmpty(id, "Router ID");
final ActionResponse response = os.networking().router().delete(id);
checkFailure(response, msg, "Delete router with ID " + id);
}
@@ -109,7 +110,7 @@ public class RouterProducer extends AbstractOpenstackProducer {
final String routerId = msg.getHeader(NeutronConstants.ROUTER_ID, String.class);
final String subnetId = msg.getHeader(NeutronConstants.SUBNET_ID, String.class);
final String portId = msg.getHeader(NeutronConstants.PORT_ID, String.class);
- ObjectHelper.notEmpty(routerId, "Router ID");
+ StringHelper.notEmpty(routerId, "Router ID");
RouterInterface iface = os.networking().router().detachInterface(routerId, subnetId, portId);
msg.setBody(iface);
}
@@ -119,8 +120,8 @@ public class RouterProducer extends AbstractOpenstackProducer {
final String routerId = msg.getHeader(NeutronConstants.ROUTER_ID, String.class);
final String subnetPortId = msg.getHeader(NeutronConstants.SUBNET_ID, msg.getHeader(NeutronConstants.PORT_ID), String.class);
final AttachInterfaceType type = msg.getHeader(NeutronConstants.ITERFACE_TYPE, AttachInterfaceType.class);
- ObjectHelper.notEmpty(routerId, "Router ID");
- ObjectHelper.notEmpty(subnetPortId, "Subnet/Port ID");
+ StringHelper.notEmpty(routerId, "Router ID");
+ StringHelper.notEmpty(subnetPortId, "Subnet/Port ID");
ObjectHelper.notNull(type, "AttachInterfaceType ");
RouterInterface routerInterface = os.networking().router().attachInterface(routerId, type, subnetPortId);
msg.setBody(routerInterface);
@@ -133,7 +134,7 @@ public class RouterProducer extends AbstractOpenstackProducer {
Map headers = message.getHeaders();
RouterBuilder builder = Builders.router();
- ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
+ StringHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
builder.name(message.getHeader(OpenstackConstants.NAME, String.class));
if (headers.containsKey(NeutronConstants.TENANT_ID)) {
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/SubnetProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/SubnetProducer.java
index ee5ae6e..a4f7499 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/SubnetProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/neutron/producer/SubnetProducer.java
@@ -26,6 +26,7 @@ import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.neutron.NeutronConstants;
import org.apache.camel.component.openstack.neutron.NeutronEndpoint;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -70,7 +71,7 @@ public class SubnetProducer extends AbstractOpenstackProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.SUBNET_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Subnet ID");
+ StringHelper.notEmpty(id, "Subnet ID");
final Subnet out = os.networking().subnet().get(id);
exchange.getIn().setBody(out);
}
@@ -83,7 +84,7 @@ public class SubnetProducer extends AbstractOpenstackProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String id = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NeutronConstants.SUBNET_ID, String.class), String.class);
- ObjectHelper.notEmpty(id, "Subnet ID");
+ StringHelper.notEmpty(id, "Subnet ID");
final ActionResponse response = os.networking().subnet().delete(id);
checkFailure(response, msg, "Delete network " + id);
}
@@ -95,10 +96,10 @@ public class SubnetProducer extends AbstractOpenstackProducer {
Map headers = message.getHeaders();
SubnetBuilder builder = Builders.subnet();
- ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
+ StringHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
builder.name(message.getHeader(OpenstackConstants.NAME, String.class));
- ObjectHelper.notEmpty(message.getHeader(NeutronConstants.NETWORK_ID, String.class), "Network ID");
+ StringHelper.notEmpty(message.getHeader(NeutronConstants.NETWORK_ID, String.class), "Network ID");
builder.networkId(message.getHeader(NeutronConstants.NETWORK_ID, String.class));
ObjectHelper.notNull(message.getHeader(NeutronConstants.IP_VERSION, IPVersionType.class), "IP version");
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java
index 6e681a1..88cb316 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/FlavorsProducer.java
@@ -25,7 +25,7 @@ import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.nova.NovaConstants;
import org.apache.camel.component.openstack.nova.NovaEndpoint;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -68,7 +68,7 @@ public class FlavorsProducer extends AbstractOpenstackProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
final String flavorId = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NovaConstants.FLAVOR_ID, String.class), String.class);
- ObjectHelper.notEmpty(flavorId, "FlavorID");
+ StringHelper.notEmpty(flavorId, "FlavorID");
final Flavor out = os.compute().flavors().get(flavorId);
exchange.getIn().setBody(out);
}
@@ -81,7 +81,7 @@ public class FlavorsProducer extends AbstractOpenstackProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String flavorId = msg.getHeader(OpenstackConstants.ID, msg.getHeader(NovaConstants.FLAVOR_ID, String.class), String.class);
- ObjectHelper.notEmpty(flavorId, "FlavorID");
+ StringHelper.notEmpty(flavorId, "FlavorID");
final ActionResponse response = os.compute().flavors().delete(flavorId);
checkFailure(response, msg, "Delete flavor");
}
@@ -92,7 +92,7 @@ public class FlavorsProducer extends AbstractOpenstackProducer {
Map headers = message.getHeaders();
FlavorBuilder flavorBuilder = Builders.flavor();
- ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
+ StringHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
flavorBuilder.name(message.getHeader(OpenstackConstants.NAME, String.class));
if (headers.containsKey(NovaConstants.VCPU)) {
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/KeypairProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/KeypairProducer.java
index f496ca1..5fdcbf6 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/KeypairProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/KeypairProducer.java
@@ -23,7 +23,7 @@ import org.apache.camel.Message;
import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.nova.NovaEndpoint;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.compute.Keypair;
@@ -58,7 +58,7 @@ public class KeypairProducer extends AbstractOpenstackProducer {
private void doCreate(Exchange exchange) {
final Message msg = exchange.getIn();
final String name = msg.getHeader(OpenstackConstants.NAME, String.class);
- ObjectHelper.notEmpty(name, "Keypair name");
+ StringHelper.notEmpty(name, "Keypair name");
final String body = msg.getBody(String.class);
final Keypair kp = os.compute().keypairs().create(name, body);
@@ -68,7 +68,7 @@ public class KeypairProducer extends AbstractOpenstackProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
final String keypairName = msg.getHeader(OpenstackConstants.NAME, String.class);
- ObjectHelper.notEmpty(keypairName, "Keypair name");
+ StringHelper.notEmpty(keypairName, "Keypair name");
final Keypair kp = os.compute().keypairs().get(keypairName);
msg.setBody(kp);
}
@@ -82,7 +82,7 @@ public class KeypairProducer extends AbstractOpenstackProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String keypairName = msg.getHeader(OpenstackConstants.NAME, String.class);
- ObjectHelper.notEmpty(keypairName, "Keypair name");
+ StringHelper.notEmpty(keypairName, "Keypair name");
final ActionResponse response = os.compute().keypairs().delete(keypairName);
checkFailure(response, msg, "Delete keypair " + keypairName);
}
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/ServerProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/ServerProducer.java
index 1af60eb..77e24e9 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/ServerProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/nova/producer/ServerProducer.java
@@ -26,6 +26,7 @@ import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.nova.NovaConstants;
import org.apache.camel.component.openstack.nova.NovaEndpoint;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.Builders;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
@@ -83,8 +84,8 @@ public class ServerProducer extends AbstractOpenstackProducer {
final Message msg = exchange.getIn();
final String serverId = msg.getHeader(OpenstackConstants.ID, String.class);
final String name = msg.getHeader(OpenstackConstants.NAME, String.class);
- ObjectHelper.notEmpty(serverId, "Server ID");
- ObjectHelper.notEmpty(name, "VolumeSnapshot name");
+ StringHelper.notEmpty(serverId, "Server ID");
+ StringHelper.notEmpty(name, "VolumeSnapshot name");
final String snapshotId = os.compute().servers().createSnapshot(serverId, name);
msg.setBody(snapshotId);
@@ -93,7 +94,7 @@ public class ServerProducer extends AbstractOpenstackProducer {
private void doGet(Exchange exchange) {
final Message msg = exchange.getIn();
final String serverId = msg.getHeader(OpenstackConstants.ID, String.class);
- ObjectHelper.notEmpty(serverId, "Server ID");
+ StringHelper.notEmpty(serverId, "Server ID");
final Server result = os.compute().servers().get(serverId);
msg.setBody(result);
}
@@ -108,7 +109,7 @@ public class ServerProducer extends AbstractOpenstackProducer {
final Action action = msg.getHeader(NovaConstants.ACTION, Action.class);
final String serverId = msg.getHeader(OpenstackConstants.ID, String.class);
ObjectHelper.notNull(action, "Server action");
- ObjectHelper.notEmpty(serverId, "Server ID");
+ StringHelper.notEmpty(serverId, "Server ID");
final ActionResponse response = os.compute().servers().action(serverId, action);
checkFailure(response, msg, "Performing action " + action.name());
}
@@ -116,7 +117,7 @@ public class ServerProducer extends AbstractOpenstackProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String serverId = msg.getHeader(OpenstackConstants.ID, String.class);
- ObjectHelper.notEmpty(serverId, "Server ID");
+ StringHelper.notEmpty(serverId, "Server ID");
final ActionResponse response = os.compute().servers().delete(serverId);
checkFailure(response, msg, "Delete server with ID " + serverId);
}
@@ -128,7 +129,7 @@ public class ServerProducer extends AbstractOpenstackProducer {
Map headers = message.getHeaders();
ServerCreateBuilder builder = Builders.server();
- ObjectHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
+ StringHelper.notEmpty(message.getHeader(OpenstackConstants.NAME, String.class), "Name");
builder.name(message.getHeader(OpenstackConstants.NAME, String.class));
if (headers.containsKey(NovaConstants.IMAGE_ID)) {
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ContainerProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ContainerProducer.java
index a56d104..7535778 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ContainerProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ContainerProducer.java
@@ -25,7 +25,7 @@ import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.swift.SwiftConstants;
import org.apache.camel.component.openstack.swift.SwiftEndpoint;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.storage.object.SwiftContainer;
@@ -76,7 +76,7 @@ public class ContainerProducer extends AbstractOpenstackProducer {
private void doCreate(Exchange exchange) {
final Message msg = exchange.getIn();
final String name = msg.getHeader(OpenstackConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
- ObjectHelper.notEmpty(name, "Container name");
+ StringHelper.notEmpty(name, "Container name");
final CreateUpdateContainerOptions options = messageToCreateUpdateOptions(msg);
final ActionResponse out = os.objectStorage().containers().create(name, options);
@@ -99,7 +99,7 @@ public class ContainerProducer extends AbstractOpenstackProducer {
private void doUpdate(Exchange exchange) {
final Message msg = exchange.getIn();
final String name = msg.getHeader(OpenstackConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
- ObjectHelper.notEmpty(name, "Container name");
+ StringHelper.notEmpty(name, "Container name");
final CreateUpdateContainerOptions options = messageToCreateUpdateOptions(msg);
final ActionResponse out = os.objectStorage().containers().update(name, options);
checkFailure(out, msg, "Update container " + name);
@@ -108,7 +108,7 @@ public class ContainerProducer extends AbstractOpenstackProducer {
private void doDelete(Exchange exchange) {
final Message msg = exchange.getIn();
final String name = msg.getHeader(OpenstackConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
- ObjectHelper.notEmpty(name, "Container name");
+ StringHelper.notEmpty(name, "Container name");
final ActionResponse out = os.objectStorage().containers().delete(name);
checkFailure(out, msg, "Delete container " + name);
}
@@ -116,14 +116,14 @@ public class ContainerProducer extends AbstractOpenstackProducer {
private void doGetMetadata(Exchange exchange) {
final Message msg = exchange.getIn();
final String name = msg.getHeader(OpenstackConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
- ObjectHelper.notEmpty(name, "Container name");
+ StringHelper.notEmpty(name, "Container name");
msg.setBody(os.objectStorage().containers().getMetadata(name));
}
private void doDeleteMetadata(Exchange exchange) {
final Message msg = exchange.getIn();
final String name = msg.getHeader(OpenstackConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
- ObjectHelper.notEmpty(name, "Container name");
+ StringHelper.notEmpty(name, "Container name");
boolean success = os.objectStorage().containers().deleteMetadata(name, msg.getBody(Map.class));
msg.setFault(!success);
if (!success) {
@@ -134,7 +134,7 @@ public class ContainerProducer extends AbstractOpenstackProducer {
private void doUpdateMetadata(Exchange exchange) {
final Message msg = exchange.getIn();
final String name = msg.getHeader(OpenstackConstants.NAME, msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class), String.class);
- ObjectHelper.notEmpty(name, "Container name");
+ StringHelper.notEmpty(name, "Container name");
boolean success = os.objectStorage().containers().updateMetadata(name, msg.getBody(Map.class));
msg.setFault(!success);
if (!success) {
diff --git a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ObjectProducer.java b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ObjectProducer.java
index f51b609..2687165 100644
--- a/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ObjectProducer.java
+++ b/components/camel-openstack/src/main/java/org/apache/camel/component/openstack/swift/producer/ObjectProducer.java
@@ -25,7 +25,7 @@ import org.apache.camel.component.openstack.common.AbstractOpenstackProducer;
import org.apache.camel.component.openstack.common.OpenstackConstants;
import org.apache.camel.component.openstack.swift.SwiftConstants;
import org.apache.camel.component.openstack.swift.SwiftEndpoint;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.openstack4j.api.OSClient;
import org.openstack4j.model.common.ActionResponse;
import org.openstack4j.model.common.Payload;
@@ -71,8 +71,8 @@ public class ObjectProducer extends AbstractOpenstackProducer {
final Payload payload = createPayload(msg);
final String containerName = msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class);
final String objectName = msg.getHeader(SwiftConstants.OBJECT_NAME, String.class);
- ObjectHelper.notEmpty(containerName, "Container name");
- ObjectHelper.notEmpty(objectName, "Object name");
+ StringHelper.notEmpty(containerName, "Container name");
+ StringHelper.notEmpty(objectName, "Object name");
final String etag = os.objectStorage().objects().put(containerName, objectName, payload);
msg.setBody(etag);
}
@@ -81,8 +81,8 @@ public class ObjectProducer extends AbstractOpenstackProducer {
final Message msg = exchange.getIn();
final String containerName = msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class);
final String objectName = msg.getHeader(SwiftConstants.OBJECT_NAME, String.class);
- ObjectHelper.notEmpty(containerName, "Container name");
- ObjectHelper.notEmpty(objectName, "Object name");
+ StringHelper.notEmpty(containerName, "Container name");
+ StringHelper.notEmpty(objectName, "Object name");
final SwiftObject out = os.objectStorage().objects().get(containerName, objectName);
msg.setBody(out);
}
@@ -90,7 +90,7 @@ public class ObjectProducer extends AbstractOpenstackProducer {
private void doGetAll(Exchange exchange) {
final Message msg = exchange.getIn();
final String name = msg.getHeader(SwiftConstants.CONTAINER_NAME, msg.getHeader(OpenstackConstants.NAME, String.class), String.class);
- ObjectHelper.notEmpty(name, "Container name");
+ StringHelper.notEmpty(name, "Container name");
final List<? extends SwiftObject> out = os.objectStorage().objects().list(name);
exchange.getIn().setBody(out);
}
@@ -99,8 +99,8 @@ public class ObjectProducer extends AbstractOpenstackProducer {
final Message msg = exchange.getIn();
final String containerName = msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class);
final String objectName = msg.getHeader(SwiftConstants.OBJECT_NAME, String.class);
- ObjectHelper.notEmpty(containerName, "Container name");
- ObjectHelper.notEmpty(objectName, "Object name");
+ StringHelper.notEmpty(containerName, "Container name");
+ StringHelper.notEmpty(objectName, "Object name");
final ActionResponse out = os.objectStorage().objects().delete(containerName, objectName);
msg.setBody(out.getFault());
msg.setFault(!out.isSuccess());
@@ -110,8 +110,8 @@ public class ObjectProducer extends AbstractOpenstackProducer {
final Message msg = exchange.getIn();
final String containerName = msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class);
final String objectName = msg.getHeader(SwiftConstants.OBJECT_NAME, String.class);
- ObjectHelper.notEmpty(containerName, "Container name");
- ObjectHelper.notEmpty(objectName, "Object name");
+ StringHelper.notEmpty(containerName, "Container name");
+ StringHelper.notEmpty(objectName, "Object name");
msg.setBody(os.objectStorage().objects().getMetadata(containerName, objectName));
}
@@ -120,8 +120,8 @@ public class ObjectProducer extends AbstractOpenstackProducer {
final Message msg = exchange.getIn();
final String containerName = msg.getHeader(SwiftConstants.CONTAINER_NAME, String.class);
final String objectName = msg.getHeader(SwiftConstants.OBJECT_NAME, String.class);
- ObjectHelper.notEmpty(containerName, "Container name");
- ObjectHelper.notEmpty(objectName, "Object name");
+ StringHelper.notEmpty(containerName, "Container name");
+ StringHelper.notEmpty(objectName, "Object name");
final boolean success = os.objectStorage().objects().updateMetadata(ObjectLocation.create(containerName, objectName), msg.getBody(Map.class));
msg.setFault(!success);
if (!success) {
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
index 3002a51..c6342c5 100644
--- a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
+++ b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java
@@ -32,6 +32,7 @@ import org.apache.camel.util.IOHelper;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ResourceHelper;
+import org.apache.camel.util.StringHelper;
import org.quartz.Scheduler;
import org.quartz.SchedulerContext;
import org.quartz.SchedulerException;
@@ -365,12 +366,12 @@ public class QuartzComponent extends UriEndpointComponent implements StartupList
private TriggerKey createTriggerKey(String uri, String remaining, QuartzEndpoint endpoint) throws Exception {
// Parse uri for trigger name and group
URI u = new URI(uri);
- String path = ObjectHelper.after(u.getPath(), "/");
+ String path = StringHelper.after(u.getPath(), "/");
String host = u.getHost();
// host can be null if the uri did contain invalid host characters such as an underscore
if (host == null) {
- host = ObjectHelper.before(remaining, "/");
+ host = StringHelper.before(remaining, "/");
if (host == null) {
host = remaining;
}
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java b/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
index 02a813d..53a252a 100644
--- a/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
+++ b/components/camel-quartz2/src/main/java/org/apache/camel/pollconsumer/quartz2/QuartzScheduledPollConsumerScheduler.java
@@ -28,6 +28,7 @@ import org.apache.camel.component.quartz2.QuartzHelper;
import org.apache.camel.spi.ScheduledPollConsumerScheduler;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.quartz.CronScheduleBuilder;
import org.quartz.CronTrigger;
import org.quartz.JobBuilder;
@@ -157,7 +158,7 @@ public class QuartzScheduledPollConsumerScheduler extends ServiceSupport impleme
@Override
protected void doStart() throws Exception {
- ObjectHelper.notEmpty(cron, "cron", this);
+ StringHelper.notEmpty(cron, "cron", this);
if (quartzScheduler == null) {
// get the scheduler form the quartz component
diff --git a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowParams.java b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowParams.java
index 75f16f9..3713756 100644
--- a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowParams.java
+++ b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowParams.java
@@ -20,6 +20,7 @@ import java.util.function.Function;
import org.apache.camel.Message;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
public enum ServiceNowParams implements ServiceNowParam {
PARAM_SYS_ID("sys_id", "CamelServiceNowSysId", String.class),
@@ -91,7 +92,7 @@ public enum ServiceNowParams implements ServiceNowParam {
this.id = id;
this.header = header.startsWith(ServiceNowConstants.CAMEL_HEADER_PREFIX)
? header
- : ServiceNowConstants.CAMEL_HEADER_PREFIX + ObjectHelper.capitalize(header);
+ : ServiceNowConstants.CAMEL_HEADER_PREFIX + StringHelper.capitalize(header);
this.type = type;
this.defaultValueSupplier = defaultValueSupplier;
diff --git a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
index e4e8c5b..db126b9 100644
--- a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
+++ b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java
@@ -22,6 +22,7 @@ import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
@@ -67,7 +68,7 @@ public class SpringIntegrationConsumer extends DefaultConsumer implements Messa
inputChannelName = getEndpoint().getInputChannel();
}
- ObjectHelper.notEmpty(inputChannelName, "inputChannelName", getEndpoint());
+ StringHelper.notEmpty(inputChannelName, "inputChannelName", getEndpoint());
inputChannel = (SubscribableChannel) destinationResolver.resolveDestination(inputChannelName);
} else {
inputChannel = (SubscribableChannel) getEndpoint().getMessageChannel();
@@ -80,7 +81,7 @@ public class SpringIntegrationConsumer extends DefaultConsumer implements Messa
// if we do in-out we need to setup the input channel as well
if (getEndpoint().isInOut()) {
// we need to setup right outputChannel for further processing
- ObjectHelper.notEmpty(getEndpoint().getOutputChannel(), "OutputChannel", getEndpoint());
+ StringHelper.notEmpty(getEndpoint().getOutputChannel(), "OutputChannel", getEndpoint());
outputChannel = destinationResolver.resolveDestination(getEndpoint().getOutputChannel());
if (outputChannel == null) {
diff --git a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
index 8b653be..1a96041 100644
--- a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
+++ b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java
@@ -21,6 +21,7 @@ import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultProducer;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.messaging.Message;
@@ -61,7 +62,7 @@ public class SpringIntegrationProducer extends DefaultProducer implements Proces
outputChannelName = getEndpoint().getInputChannel();
}
- ObjectHelper.notEmpty(outputChannelName, "OutputChannelName", getEndpoint());
+ StringHelper.notEmpty(outputChannelName, "OutputChannelName", getEndpoint());
outputChannel = destinationResolver.resolveDestination(outputChannelName);
} else {
outputChannel = getEndpoint().getMessageChannel();
@@ -74,7 +75,7 @@ public class SpringIntegrationProducer extends DefaultProducer implements Proces
// if we do in-out we need to setup the input channel as well
if (getEndpoint().isInOut()) {
// we need to setup right inputChannel for further processing
- ObjectHelper.notEmpty(getEndpoint().getInputChannel(), "InputChannel", getEndpoint());
+ StringHelper.notEmpty(getEndpoint().getInputChannel(), "InputChannel", getEndpoint());
inputChannel = (DirectChannel)destinationResolver.resolveDestination(getEndpoint().getInputChannel());
if (inputChannel == null) {
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/DummyRestProducerFactory.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/DummyRestProducerFactory.java
index e402fb0..d5b4d30 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/DummyRestProducerFactory.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/DummyRestProducerFactory.java
@@ -25,7 +25,7 @@ import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultProducer;
import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.spi.RestProducerFactory;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
public class DummyRestProducerFactory implements RestProducerFactory {
@@ -42,7 +42,7 @@ public class DummyRestProducerFactory implements RestProducerFactory {
public void process(Exchange exchange) throws Exception {
String query = exchange.getIn().getHeader(Exchange.REST_HTTP_QUERY, String.class);
if (query != null) {
- String name = ObjectHelper.after(query, "name=");
+ String name = StringHelper.after(query, "name=");
exchange.getIn().setBody("Bye " + name);
}
String uri = exchange.getIn().getHeader(Exchange.REST_HTTP_URI, String.class);
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index 443f26c..22a08fd 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -31,6 +31,7 @@ import org.apache.camel.SSLContextParametersAware;
import org.apache.camel.impl.UriEndpointComponent;
import org.apache.camel.spi.Metadata;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.eclipse.jetty.jmx.MBeanContainer;
import org.eclipse.jetty.server.Connector;
@@ -774,7 +775,7 @@ public class WebsocketComponent extends UriEndpointComponent implements SSLConte
if (staticResources != null) {
// host and port must be configured
- ObjectHelper.notEmpty(host, "host", this);
+ StringHelper.notEmpty(host, "host", this);
ObjectHelper.notNull(port, "port", this);
LOG.info("Starting static resources server {}:{} with static resource: {}", new Object[]{host, port, staticResources});
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java
index 0cdb57d..03b9981 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java
@@ -28,6 +28,7 @@ import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ResourceHelper;
+import org.apache.camel.util.StringHelper;
import org.junit.Test;
public class JettyFreemarkerTest extends CamelTestSupport {
@@ -84,7 +85,7 @@ public class JettyFreemarkerTest extends CamelTestSupport {
ObjectHelper.notNull(name, "name");
// strip off the locale
- name = ObjectHelper.before(name, "_");
+ name = StringHelper.before(name, "_");
name = "org/apache/camel/itest/jetty/" + name + ".ftl";
InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext().getClassResolver(), name);
diff --git a/tests/camel-partial-classpath-test/src/test/java/org/apache/camel/tests/partialclasspath/MyConverter.java b/tests/camel-partial-classpath-test/src/test/java/org/apache/camel/tests/partialclasspath/MyConverter.java
index 5804a92..9f83e14 100644
--- a/tests/camel-partial-classpath-test/src/test/java/org/apache/camel/tests/partialclasspath/MyConverter.java
+++ b/tests/camel-partial-classpath-test/src/test/java/org/apache/camel/tests/partialclasspath/MyConverter.java
@@ -17,7 +17,7 @@
package org.apache.camel.tests.partialclasspath;
import org.apache.camel.Converter;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* @version
@@ -26,7 +26,7 @@ import org.apache.camel.util.ObjectHelper;
public class MyConverter {
@Converter
public MyBean fromString(String text) {
- String[] values = ObjectHelper.splitOnCharacter(text, ":", 2);
+ String[] values = StringHelper.splitOnCharacter(text, ":", 2);
return new MyBean(values[0], values[1]);
}
}
\ No newline at end of file
diff --git a/tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/MyConverter.java b/tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/MyConverter.java
index 5b39c60..47df8ba 100644
--- a/tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/MyConverter.java
+++ b/tests/camel-typeconverterscan-test/src/test/java/org/apache/camel/tests/typeconverterscan/MyConverter.java
@@ -17,7 +17,7 @@
package org.apache.camel.tests.typeconverterscan;
import org.apache.camel.Converter;
-import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
/**
* @version
@@ -26,7 +26,7 @@ import org.apache.camel.util.ObjectHelper;
public class MyConverter {
@Converter
public MyBean fromString(String text) {
- String[] values = ObjectHelper.splitOnCharacter(text, ":", 2);
+ String[] values = StringHelper.splitOnCharacter(text, ":", 2);
return new MyBean(values[0], values[1]);
}
}
\ No newline at end of file