This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new a63ade86c98 CAMEL-19090: Remove deprecated apis in core
a63ade86c98 is described below
commit a63ade86c985515d08cfd0394573dc02a5f9bec1
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun Feb 26 12:17:10 2023 +0100
CAMEL-19090: Remove deprecated apis in core
---
.../FtpProducerDisconnectOnBatchCompleteIT.java | 4 +-
.../remote/integration/FtpServerTestSupport.java | 5 +-
.../camel/component/hdfs/HdfsProducerTest.java | 5 +-
.../apache/camel/component/jpa/JpaProducer.java | 10 ++-
.../camel/opentelemetry/SpanProcessorsTest.java | 1 -
.../main/junit5/legacy/OverridePropertiesTest.java | 6 +-
.../camel/impl/engine/AbstractCamelContext.java | 7 --
.../camel/language/simple/SimpleLanguage.java | 39 ---------
.../camel/language/tokenizer/TokenizeLanguage.java | 45 ----------
.../java/org/apache/camel/builder/Builder.java | 42 ----------
.../org/apache/camel/builder/BuilderSupport.java | 34 +-------
.../org/apache/camel/model/CatchDefinition.java | 26 ------
.../model/InterceptSendToEndpointDefinition.java | 12 ---
.../camel/reifier/language/ExpressionReifier.java | 16 ----
.../test/java/org/apache/camel/TestSupport.java | 31 -------
.../org/apache/camel/language/TokenizerTest.java | 95 +++++++++++++++-------
.../java/org/apache/camel/main/MainSupport.java | 64 ---------------
.../camel/support/cache/DefaultProducerCache.java | 25 ------
.../java/org/apache/camel/util/ObjectHelper.java | 28 -------
.../org/apache/camel/util/PropertiesHelper.java | 13 ---
20 files changed, 84 insertions(+), 424 deletions(-)
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerDisconnectOnBatchCompleteIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerDisconnectOnBatchCompleteIT.java
index 2b7aa56f1b1..a31acbf1ae1 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerDisconnectOnBatchCompleteIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpProducerDisconnectOnBatchCompleteIT.java
@@ -21,11 +21,11 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.file.remote.FtpEndpoint;
+import org.apache.camel.model.language.SimpleExpression;
import org.apache.commons.net.ftp.FTPClient;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.apache.camel.language.simple.SimpleLanguage.simple;
import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -64,7 +64,7 @@ public class FtpProducerDisconnectOnBatchCompleteIT extends
FtpServerTestSupport
@Override
public void process(Exchange exchange) {
- exchange.getIn().setHeader(Exchange.FILE_NAME,
simple(fileName));
+ exchange.getIn().setHeader(Exchange.FILE_NAME, new
SimpleExpression(fileName));
exchange.setProperty(Exchange.BATCH_COMPLETE, true);
}
});
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpServerTestSupport.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpServerTestSupport.java
index ad0156d9603..3648c1bde06 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpServerTestSupport.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpServerTestSupport.java
@@ -18,12 +18,11 @@ package org.apache.camel.component.file.remote.integration;
import org.apache.camel.Exchange;
import org.apache.camel.component.file.remote.BaseServerTestSupport;
+import org.apache.camel.model.language.SimpleExpression;
import org.apache.camel.test.infra.ftp.services.FtpServiceFactory;
import org.apache.camel.test.infra.ftp.services.embedded.FtpEmbeddedService;
import org.junit.jupiter.api.extension.RegisterExtension;
-import static org.apache.camel.language.simple.SimpleLanguage.simple;
-
/**
* Base class for unit testing using a FTPServer
*/
@@ -33,7 +32,7 @@ public abstract class FtpServerTestSupport extends
BaseServerTestSupport {
public FtpEmbeddedService service =
FtpServiceFactory.createEmbeddedService();
public void sendFile(String url, Object body, String fileName) {
- template.sendBodyAndHeader(url, body, Exchange.FILE_NAME,
simple(fileName));
+ template.sendBodyAndHeader(url, body, Exchange.FILE_NAME, new
SimpleExpression(fileName));
}
}
diff --git
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java
index 6dcb7609824..3b76c091454 100644
---
a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java
+++
b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsProducerTest.java
@@ -23,6 +23,7 @@ import java.net.URL;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.language.SimpleExpression;
import org.apache.camel.util.IOHelper;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
@@ -46,7 +47,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.apache.camel.language.simple.SimpleLanguage.simple;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -311,7 +311,8 @@ public class HdfsProducerTest extends HdfsTestSupport {
@Test
public void testWriteTextWithDynamicFilenameExpression() throws Exception {
for (int i = 0; i < 5; i++) {
- template.sendBodyAndHeader("direct:write_dynamic_filename", "CIAO"
+ i, Exchange.FILE_NAME, simple("file-${body}"));
+ template.sendBodyAndHeader("direct:write_dynamic_filename", "CIAO"
+ i, Exchange.FILE_NAME,
+ new SimpleExpression("file-${body}"));
}
for (int i = 0; i < 5; i++) {
diff --git
a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
index e973f04c183..3b039b649a1 100644
---
a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
+++
b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
@@ -27,7 +27,7 @@ import jakarta.persistence.Query;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Message;
-import org.apache.camel.language.simple.SimpleLanguage;
+import org.apache.camel.spi.Language;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.support.ExchangeHelper;
import org.slf4j.Logger;
@@ -39,6 +39,8 @@ public class JpaProducer extends DefaultProducer {
private static final Logger LOG =
LoggerFactory.getLogger(JpaProducer.class);
+ private Language simple;
+
private final EntityManagerFactory entityManagerFactory;
private final TransactionStrategy transactionStrategy;
private final Expression expression;
@@ -215,7 +217,7 @@ public class JpaProducer extends DefaultProducer {
params.forEach((key, value) -> {
Object resolvedValue = value;
if (value instanceof String) {
- resolvedValue = SimpleLanguage.expression((String)
value).evaluate(exchange, Object.class);
+ resolvedValue = simple.createExpression((String)
value).evaluate(exchange, Object.class);
}
query.setParameter(key, resolvedValue);
});
@@ -356,4 +358,8 @@ public class JpaProducer extends DefaultProducer {
}
}
+ @Override
+ protected void doBuild() throws Exception {
+ simple = getEndpoint().getCamelContext().resolveLanguage("simple");
+ }
}
diff --git
a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java
b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java
index cbe69b7035f..8be835be8b8 100644
---
a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java
+++
b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java
@@ -21,7 +21,6 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
-import static org.apache.camel.language.simple.SimpleLanguage.simple;
import static org.junit.jupiter.api.Assertions.assertEquals;
class SpanProcessorsTest extends CamelOpenTelemetryTestSupport {
diff --git
a/components/camel-test/camel-test-main-junit5/src/test/java/org/apache/camel/test/main/junit5/legacy/OverridePropertiesTest.java
b/components/camel-test/camel-test-main-junit5/src/test/java/org/apache/camel/test/main/junit5/legacy/OverridePropertiesTest.java
index 762585ae9a2..097016e678a 100644
---
a/components/camel-test/camel-test-main-junit5/src/test/java/org/apache/camel/test/main/junit5/legacy/OverridePropertiesTest.java
+++
b/components/camel-test/camel-test-main-junit5/src/test/java/org/apache/camel/test/main/junit5/legacy/OverridePropertiesTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.test.main.junit5.CamelMainTestSupport;
import org.apache.camel.test.main.junit5.common.MyConfiguration;
import org.junit.jupiter.api.Test;
-import static org.apache.camel.util.PropertiesHelper.asProperties;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
@@ -40,8 +39,9 @@ class OverridePropertiesTest extends CamelMainTestSupport {
@Override
protected Properties useOverridePropertiesWithPropertiesComponent() {
- return asProperties(
- "name", "John");
+ Properties prop = new Properties();
+ prop.setProperty("name", "John");
+ return prop;
}
@Test
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 8e6054f2c8d..0a907d7338d 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -4556,13 +4556,6 @@ public abstract class AbstractCamelContext extends
BaseService
return status;
}
- @Deprecated
- public enum Initialization {
- Eager,
- Default,
- Lazy
- }
-
class LifecycleHelper implements AutoCloseable {
final Map<String, String> originalContextMap;
final ClassLoader tccl;
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
index fb45da2e3a2..028cb49015a 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
@@ -221,26 +221,6 @@ public class SimpleLanguage extends LanguageSupport
implements StaticService {
return answer;
}
- /**
- * Creates a new {@link Expression}.
- * <p/>
- * <b>Important:</b> If you need to use a predicate (function to return
true|false) then use
- * {@link #predicate(String)} instead.
- */
- @Deprecated
- public static Expression simple(String expression) {
- return expression(expression);
- }
-
- /**
- * Creates a new {@link Expression} (or {@link Predicate} if the
resultType is a <tt>Boolean</tt>, or
- * <tt>boolean</tt> type).
- */
- @Deprecated
- public static Expression simple(String expression, Class<?> resultType) {
- return new SimpleLanguage().createExpression(expression, resultType);
- }
-
public Expression createExpression(String expression, Class<?> resultType)
{
if (resultType == Boolean.class || resultType == boolean.class) {
// if its a boolean as result then its a predicate
@@ -255,23 +235,4 @@ public class SimpleLanguage extends LanguageSupport
implements StaticService {
}
}
- /**
- * Creates a new {@link Expression}.
- * <p/>
- * <b>Important:</b> If you need to use a predicate (function to return
true|false) then use
- * {@link #predicate(String)} instead.
- */
- @Deprecated
- public static Expression expression(String expression) {
- return SIMPLE.createExpression(expression);
- }
-
- /**
- * Creates a new {@link Predicate}.
- */
- @Deprecated
- public static Predicate predicate(String predicate) {
- return SIMPLE.createPredicate(predicate);
- }
-
}
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
index e0836186eda..a62367e37e0 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
@@ -51,51 +51,6 @@ public class TokenizeLanguage extends
SingleInputLanguageSupport implements Prop
private String groupDelimiter;
private boolean skipFirst;
- @Deprecated
- public static Expression tokenize(String token) {
- return tokenize(token, false);
- }
-
- @Deprecated
- public static Expression tokenize(String token, boolean regex) {
- TokenizeLanguage language = new TokenizeLanguage();
- language.setToken(token);
- language.setRegex(regex);
- return language.createExpression(null);
- }
-
- @Deprecated
- public static Expression tokenize(String headerName, String token) {
- return tokenize(headerName, token, false);
- }
-
- @Deprecated
- public static Expression tokenize(String headerName, String token, boolean
regex) {
- TokenizeLanguage language = new TokenizeLanguage();
- language.setHeaderName(headerName);
- language.setToken(token);
- language.setRegex(regex);
- return language.createExpression(null);
- }
-
- @Deprecated
- public static Expression tokenizePair(String startToken, String endToken,
boolean includeTokens) {
- TokenizeLanguage language = new TokenizeLanguage();
- language.setToken(startToken);
- language.setEndToken(endToken);
- language.setIncludeTokens(includeTokens);
- return language.createExpression(null);
- }
-
- @Deprecated
- public static Expression tokenizeXML(String tagName, String
inheritNamespaceTagName) {
- TokenizeLanguage language = new TokenizeLanguage();
- language.setToken(tagName);
- language.setInheritNamespaceTagName(inheritNamespaceTagName);
- language.setXml(true);
- return language.createExpression(null);
- }
-
@Override
public boolean configure(CamelContext camelContext, Object target, String
name, Object value, boolean ignoreCase) {
if (target != this) {
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/Builder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/Builder.java
index e572caa3277..c72810e5a7b 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/Builder.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/Builder.java
@@ -46,48 +46,6 @@ public final class Builder {
private Builder() {
}
- /**
- * Returns a <a href="http://camel.apache.org/bean-language.html";>bean
expression</a> value builder.
- * <p/>
- * This method accepts dual parameters. Either an bean instance or a
reference to a bean (String).
- *
- * @param beanOrBeanRef either an instanceof a bean or a reference to
bean to lookup in the Registry
- * @return the builder
- * @deprecated use {@link #method(Object)}
- */
- @Deprecated
- public static ValueBuilder bean(final Object beanOrBeanRef) {
- return method(beanOrBeanRef, null);
- }
-
- /**
- * Returns a <a href="http://camel.apache.org/bean-language.html";>bean
expression</a> value builder.
- * <p/>
- * This method accepts dual parameters. Either an bean instance or a
reference to a bean (String).
- *
- * @param beanOrBeanRef either an instanceof a bean or a reference to
bean to lookup in the Registry
- * @param method the method name
- * @return the builder
- * @deprecated use {@link #method(Class, String)} (Object,
String)}
- */
- @Deprecated
- public static ValueBuilder bean(Object beanOrBeanRef, String method) {
- return method(beanOrBeanRef, method);
- }
-
- /**
- * Returns a <a href="http://camel.apache.org/bean-language.html";>bean
expression</a> value builder
- *
- * @param beanType the bean class which will be invoked
- * @param method name of method to invoke
- * @return the builder
- * @deprecated use {@link #method(Class, String)}
- */
- @Deprecated
- public static ValueBuilder bean(Class<?> beanType, String method) {
- return method(beanType, method);
- }
-
/**
* Returns a <a href="http://camel.apache.org/bean-language.html";>method
call expression</a> value builder.
* <p/>
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
index f44ae190b6a..b536f7e1c3f 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
@@ -327,7 +327,7 @@ public abstract class BuilderSupport implements
CamelContextAware {
* @return the builder
*/
public ValueBuilder method(Class<?> beanType, String method) {
- return Builder.bean(beanType, method);
+ return Builder.method(beanType, method);
}
/**
@@ -361,7 +361,6 @@ public abstract class BuilderSupport implements
CamelContextAware {
* @return the endpoint
* @deprecated use {@link
CamelContext#getEndpoint(String)} instead
*/
- @Deprecated
public Endpoint endpoint(String uri) throws NoSuchEndpointException {
ObjectHelper.notNull(uri, "uri");
Endpoint endpoint = getContext().getEndpoint(uri);
@@ -380,7 +379,6 @@ public abstract class BuilderSupport implements
CamelContextAware {
* @return the endpoint
* @deprecated use {@link
CamelContext#getEndpoint(String, Class)} instead
*/
- @Deprecated
public <T extends Endpoint> T endpoint(String uri, Class<T> type) throws
NoSuchEndpointException {
ObjectHelper.notNull(uri, "uri");
T endpoint = getContext().getEndpoint(uri, type);
@@ -390,36 +388,6 @@ public abstract class BuilderSupport implements
CamelContextAware {
return endpoint;
}
- /**
- * Resolves the list of URIs into a list of {@link Endpoint} instances
- *
- * @param uris list of endpoints to resolve
- * @throws NoSuchEndpointException if an endpoint URI could not be
resolved
- * @return list of endpoints
- * @deprecated use {@link
CamelContext#getEndpoint(String)} instead
- */
- @Deprecated
- public List<Endpoint> endpoints(String... uris) throws
NoSuchEndpointException {
- List<Endpoint> endpoints = new ArrayList<>();
- for (String uri : uris) {
- endpoints.add(endpoint(uri));
- }
- return endpoints;
- }
-
- /**
- * Helper method to create a list of {@link Endpoint} instances
- *
- * @param endpoints endpoints
- * @return list of the given endpoints
- */
- @Deprecated
- public List<Endpoint> endpoints(Endpoint... endpoints) {
- List<Endpoint> answer = new ArrayList<>();
- answer.addAll(Arrays.asList(endpoints));
- return answer;
- }
-
/**
* Creates a default <a
href="http://camel.apache.org/error-handler.html";>error handler</a>.
*
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/CatchDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/CatchDefinition.java
index dd5b3259571..17335d3154c 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/CatchDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/CatchDefinition.java
@@ -96,18 +96,6 @@ public class CatchDefinition extends
OutputDefinition<CatchDefinition> {
// Fluent API
//
-------------------------------------------------------------------------
- /**
- * The exceptions to catch.
- *
- * @param exceptionClasses a list of the exception classes
- * @return the builder
- * @deprecated use {@link #exception(Class[])}
- */
- @Deprecated
- public CatchDefinition exceptionClasses(List<Class<? extends Throwable>>
exceptionClasses) {
- setExceptionClasses(exceptionClasses);
- return this;
- }
/**
* The exception(s) to catch.
@@ -139,20 +127,6 @@ public class CatchDefinition extends
OutputDefinition<CatchDefinition> {
return this;
}
- /**
- * Sets the exception class that the CatchType want to catch
- *
- * @param exception the exception of class
- * @return the builder
- * @deprecated use {@link #exception(Class[])}
- */
- @Deprecated
- public CatchDefinition exceptionClasses(Class<? extends Throwable>
exception) {
- List<Class<? extends Throwable>> list = getExceptionClasses();
- list.add(exception);
- return this;
- }
-
public List<String> getExceptions() {
return exceptions;
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
index be908133bef..4a9f1b766a8 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
@@ -109,18 +109,6 @@ public class InterceptSendToEndpointDefinition extends
OutputDefinition<Intercep
return this;
}
- /**
- * After sending to the endpoint then send the message to this url which
allows to process its result.
- *
- * @return the builder
- * @deprecated use {@link #afterUri(String)}
- */
- @Deprecated
- public InterceptSendToEndpointDefinition afterUrl(String url) {
- setAfterUri(url);
- return this;
- }
-
/**
* After sending to the endpoint then send the message to this url which
allows to process its result.
*
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java
index 46acced9f94..6697c6e0e1f 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java
@@ -285,20 +285,4 @@ public class ExpressionReifier<T extends
ExpressionDefinition> extends AbstractR
}
}
- @Deprecated
- protected void setProperties(Object target, Map<String, Object>
properties) {
- properties.entrySet().removeIf(e -> e.getValue() == null);
-
- PropertyConfigurer configurer = null;
- if (target instanceof PropertyConfigurerAware) {
- configurer = ((PropertyConfigurerAware)
target).getPropertyConfigurer(target);
- } else if (target instanceof PropertyConfigurer) {
- configurer = (PropertyConfigurer) target;
- }
- PropertyBindingSupport.build()
- .withConfigurer(configurer)
- .withIgnoreCase(true)
- .bind(camelContext, target, properties);
- }
-
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
index 938ee3e0e36..a1dd3941305 100644
--- a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
@@ -222,14 +222,6 @@ public abstract class TestSupport {
return assertMessageHeader(exchange.getIn(), name, expected);
}
- /**
- * Asserts the Out message on the exchange contains the expected value
- */
- @Deprecated
- public static Object assertOutMessageHeader(Exchange exchange, String
name, Object expected) {
- return assertMessageHeader(exchange.getMessage(), name, expected);
- }
-
/**
* Asserts that the given exchange has an OUT message of the given body
value
*
@@ -252,29 +244,6 @@ public abstract class TestSupport {
LOG.debug("Received response: {} with in: {}", exchange,
exchange.getIn());
}
- /**
- * Asserts that the given exchange has an OUT message of the given body
value
- *
- * @param exchange the exchange which should have an OUT
message
- * @param expected the expected value of the OUT message
- * @throws InvalidPayloadException is thrown if the payload is not the
expected class type
- */
- @Deprecated
- public static void assertOutMessageBodyEquals(Exchange exchange, Object
expected) throws InvalidPayloadException {
- assertNotNull(exchange, "Should have a response exchange!");
-
- Object actual;
- if (expected == null) {
- actual = exchange.getMessage().getMandatoryBody();
- assertEquals(expected, actual, "output body of: " + exchange);
- } else {
- actual =
exchange.getMessage().getMandatoryBody(expected.getClass());
- }
- assertEquals(expected, actual, "output body of: " + exchange);
-
- LOG.debug("Received response: {} with out: {}", exchange,
exchange.getMessage());
- }
-
public static Object assertMessageHeader(Message message, String name,
Object expected) {
Object value = message.getHeader(name);
assertEquals(expected, value, "Header: " + name + " on Message: " +
message);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java
b/core/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java
index 037f9aaf14a..37f87997594 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/TokenizerTest.java
@@ -22,7 +22,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangeTestSupport;
import org.apache.camel.Expression;
import org.apache.camel.language.tokenizer.TokenizeLanguage;
-import org.apache.camel.model.language.TokenizerExpression;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -32,6 +31,45 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class TokenizerTest extends ExchangeTestSupport {
+ Expression tokenize(String token) {
+ return tokenize(token, false);
+ }
+
+ Expression tokenize(String token, boolean regex) {
+ TokenizeLanguage language = new TokenizeLanguage();
+ language.setToken(token);
+ language.setRegex(regex);
+ return language.createExpression(null);
+ }
+
+ Expression tokenize(String headerName, String token) {
+ return tokenize(headerName, token, false);
+ }
+
+ Expression tokenize(String headerName, String token, boolean regex) {
+ TokenizeLanguage language = new TokenizeLanguage();
+ language.setHeaderName(headerName);
+ language.setToken(token);
+ language.setRegex(regex);
+ return language.createExpression(null);
+ }
+
+ Expression tokenizePair(String startToken, String endToken, boolean
includeTokens) {
+ TokenizeLanguage language = new TokenizeLanguage();
+ language.setToken(startToken);
+ language.setEndToken(endToken);
+ language.setIncludeTokens(includeTokens);
+ return language.createExpression(null);
+ }
+
+ Expression tokenizeXML(String tagName, String inheritNamespaceTagName) {
+ TokenizeLanguage language = new TokenizeLanguage();
+ language.setToken(tagName);
+ language.setInheritNamespaceTagName(inheritNamespaceTagName);
+ language.setXml(true);
+ return language.createExpression(null);
+ }
+
@Override
protected void populateExchange(Exchange exchange) {
super.populateExchange(exchange);
@@ -40,10 +78,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeHeaderWithStringConstructor() throws Exception {
- TokenizerExpression definition = new TokenizerExpression(",");
- definition.setHeaderName("names");
-
- List<?> names =
definition.createExpression(exchange.getContext()).evaluate(exchange,
List.class);
+ List<?> names = tokenize(",", "names").evaluate(exchange, List.class);
assertEquals(3, names.size());
assertEquals("Claus", names.get(0));
@@ -53,7 +88,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeHeader() throws Exception {
- Expression exp = TokenizeLanguage.tokenize("names", ",");
+ Expression exp = tokenize(",", "names");
exp.init(context);
List<?> names = exp.evaluate(exchange, List.class);
@@ -66,7 +101,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeBody() throws Exception {
- Expression exp = TokenizeLanguage.tokenize(",");
+ Expression exp = tokenize(",");
exp.init(context);
exchange.getIn().setBody("Hadrian,Charles");
@@ -80,7 +115,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeBodyRegEx() throws Exception {
- Expression exp = TokenizeLanguage.tokenize("(\\W+)\\s*", true);
+ Expression exp = tokenize("(\\W+)\\s*", true);
exp.init(context);
exchange.getIn().setBody("The little fox");
@@ -95,7 +130,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeHeaderRegEx() throws Exception {
- Expression exp = TokenizeLanguage.tokenize("quote", "(\\W+)\\s*",
true);
+ Expression exp = tokenize("quote", "(\\W+)\\s*", true);
exp.init(context);
exchange.getIn().setHeader("quote", "Camel rocks");
@@ -131,7 +166,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizePairSpecial() throws Exception {
- Expression exp = TokenizeLanguage.tokenizePair("!", "@", false);
+ Expression exp = tokenizePair("!", "@", false);
exp.init(context);
exchange.getIn().setBody("2011-11-11\n!James@!Claus@\n2 records");
@@ -145,7 +180,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizePair() throws Exception {
- Expression exp = TokenizeLanguage.tokenizePair("[START]", "[END]",
false);
+ Expression exp = tokenizePair("[START]", "[END]", false);
exp.init(context);
exchange.getIn().setBody("2011-11-11\n[START]James[END]\n[START]Claus[END]\n2
records");
@@ -159,7 +194,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizePairSimple() throws Exception {
- Expression exp = TokenizeLanguage.tokenizePair("${header.foo}",
"${header.bar}", false);
+ Expression exp = tokenizePair("${header.foo}", "${header.bar}", false);
exp.init(context);
exchange.getIn().setHeader("foo", "[START]");
@@ -175,7 +210,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizePairIncludeTokens() throws Exception {
- Expression exp = TokenizeLanguage.tokenizePair("[START]", "[END]",
true);
+ Expression exp = tokenizePair("[START]", "[END]", true);
exp.init(context);
exchange.getIn().setBody("2011-11-11\n[START]James[END]\n[START]Claus[END]\n2
records");
@@ -189,7 +224,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPair() throws Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("<person>", null);
+ Expression exp = tokenizeXML("<person>", null);
exp.init(context);
exchange.getIn().setBody(
@@ -206,7 +241,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairSimple() throws Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("${header.foo}", null);
+ Expression exp = tokenizeXML("${header.foo}", null);
exp.init(context);
exchange.getIn().setHeader("foo", "<person>");
@@ -224,7 +259,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairNoXMLTag() throws Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("person", null);
+ Expression exp = tokenizeXML("person", null);
exp.init(context);
exchange.getIn().setBody(
@@ -241,7 +276,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairWithNoise() throws Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("<person>", null);
+ Expression exp = tokenizeXML("<person>", null);
exp.init(context);
exchange.getIn()
@@ -259,7 +294,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairEmpty() throws Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("<person>", null);
+ Expression exp = tokenizeXML("<person>", null);
exp.init(context);
exchange.getIn().setBody("<?xml version=\"1.0\"?><!-- bla bla
--><persons></persons> ");
@@ -270,7 +305,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairNoData() throws Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("<person>", null);
+ Expression exp = tokenizeXML("<person>", null);
exp.init(context);
exchange.getIn().setBody("");
@@ -281,7 +316,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairNullData() throws Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("<person>", null);
+ Expression exp = tokenizeXML("<person>", null);
exp.init(context);
exchange.getIn().setBody(null);
@@ -292,7 +327,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairWithSimilarChildNames() throws Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("Trip", "Trips");
+ Expression exp = tokenizeXML("Trip", "Trips");
exp.init(context);
exchange.getIn()
@@ -303,7 +338,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairWithDefaultNamespace() throws Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("<person>", "<persons>");
+ Expression exp = tokenizeXML("<person>", "<persons>");
exp.init(context);
exchange.getIn().setBody(
@@ -321,7 +356,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairWithDefaultNamespaceNotInherit() throws
Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("<person>", null);
+ Expression exp = tokenizeXML("<person>", null);
exp.init(context);
exchange.getIn().setBody(
@@ -339,7 +374,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairWithDefaultAndFooNamespace() throws
Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("<person>", "<persons>");
+ Expression exp = tokenizeXML("<person>", "<persons>");
exp.init(context);
exchange.getIn().setBody(
@@ -357,7 +392,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairWithLocalNamespace() throws Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("<person>", null);
+ Expression exp = tokenizeXML("<person>", null);
exp.init(context);
exchange.getIn()
@@ -376,7 +411,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairWithLocalAndInheritedNamespace() throws
Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("<person>", "<persons>");
+ Expression exp = tokenizeXML("<person>", "<persons>");
exp.init(context);
exchange.getIn().setBody(
@@ -394,7 +429,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairWithLocalAndNotInheritedNamespace() throws
Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("<person>", null);
+ Expression exp = tokenizeXML("<person>", null);
exp.init(context);
exchange.getIn().setBody(
@@ -412,7 +447,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairWithAttributes() throws Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("<person>", null);
+ Expression exp = tokenizeXML("<person>", null);
exp.init(context);
exchange.getIn()
@@ -431,7 +466,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairWithAttributesInheritNamespace() throws
Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("<person>", "<persons>");
+ Expression exp = tokenizeXML("<person>", "<persons>");
exp.init(context);
exchange.getIn().setBody(
@@ -449,7 +484,7 @@ public class TokenizerTest extends ExchangeTestSupport {
@Test
public void testTokenizeXMLPairWithAttributes2InheritNamespace() throws
Exception {
- Expression exp = TokenizeLanguage.tokenizeXML("<person>", "<persons>");
+ Expression exp = tokenizeXML("<person>", "<persons>");
exp.init(context);
exchange.getIn().setBody(
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
index d4b91c1273f..fddbf12f595 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
@@ -196,70 +196,6 @@ public abstract class MainSupport extends BaseMainSupport {
}
}
- @Deprecated
- public int getDuration() {
- return mainConfigurationProperties.getDurationMaxSeconds();
- }
-
- /**
- * Sets the duration (in seconds) to run the application until it should
be terminated. Defaults to -1. Any value <=
- * 0 will run forever.
- *
- * @deprecated use {@link #configure()}
- */
- @Deprecated
- public void setDuration(int duration) {
- mainConfigurationProperties.setDurationMaxSeconds(duration);
- }
-
- @Deprecated
- public int getDurationIdle() {
- return mainConfigurationProperties.getDurationMaxIdleSeconds();
- }
-
- /**
- * Sets the maximum idle duration (in seconds) when running the
application, and if there has been no message
- * processed after being idle for more than this duration then the
application should be terminated. Defaults to -1.
- * Any value <= 0 will run forever.
- *
- * @deprecated use {@link #configure()}
- */
- @Deprecated
- public void setDurationIdle(int durationIdle) {
- mainConfigurationProperties.setDurationMaxIdleSeconds(durationIdle);
- }
-
- @Deprecated
- public int getDurationMaxMessages() {
- return mainConfigurationProperties.getDurationMaxMessages();
- }
-
- /**
- * Sets the duration to run the application to process at most max
messages until it should be terminated. Defaults
- * to -1. Any value <= 0 will run forever.
- *
- * @deprecated use {@link #configure()}
- */
- @Deprecated
- public void setDurationMaxMessages(int durationMaxMessages) {
-
mainConfigurationProperties.setDurationMaxMessages(durationMaxMessages);
- }
-
- /**
- * Sets the exit code for the application if duration was hit
- *
- * @deprecated use {@link #configure()}
- */
- @Deprecated
- public void setDurationHitExitCode(int durationHitExitCode) {
-
mainConfigurationProperties.setDurationHitExitCode(durationHitExitCode);
- }
-
- @Deprecated
- public int getDurationHitExitCode() {
- return mainConfigurationProperties.getDurationHitExitCode();
- }
-
public int getExitCode() {
return exitCode.get();
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
b/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
index 38144a9eccb..d85fe95105c 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/cache/DefaultProducerCache.java
@@ -214,31 +214,6 @@ public class DefaultProducerCache extends ServiceSupport
implements ProducerCach
}
}
- /**
- * Asynchronously sends an exchange to an endpoint using a supplied {@link
Processor} to populate the exchange
- * <p>
- * This method will <b>neither</b> throw an exception <b>nor</b> complete
future exceptionally. If processing of the
- * given Exchange failed then the exception is stored on the return
Exchange
- *
- * @param endpoint the endpoint to send the exchange to
- * @param pattern the message {@link ExchangePattern} such as
{@link ExchangePattern#InOnly} or
- * {@link ExchangePattern#InOut}
- * @param processor the transformer used to populate the new
exchange
- * @param resultProcessor a processor to process the exchange when the
send is complete.
- * @param future the preexisting future to complete when
processing is done or null if to create new one
- * @return future that completes with exchange when
processing is done. Either passed into future
- * parameter or new one if parameter was null
- */
- @Deprecated
- public CompletableFuture<Exchange> asyncSend(
- Endpoint endpoint,
- ExchangePattern pattern,
- Processor processor,
- Processor resultProcessor,
- CompletableFuture<Exchange> future) {
- return asyncSendExchange(endpoint, pattern, processor,
resultProcessor, null, future);
- }
-
@Override
public CompletableFuture<Exchange> asyncSendExchange(
Endpoint endpoint,
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
b/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
index 70e5e0eaef7..65967eb0095 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
@@ -1278,34 +1278,6 @@ public final class ObjectHelper {
|| value instanceof Double && ((Double) value).isNaN();
}
- /**
- * Wraps the caused exception in a {@link RuntimeException} if its not
already such an exception.
- *
- * @param e the caused exception
- * @return the wrapper exception
- * @deprecated Use {@link
org.apache.camel.RuntimeCamelException#wrapRuntimeCamelException} instead
- */
- @Deprecated
- public static RuntimeException wrapRuntimeCamelException(Throwable e) {
- try {
- Class<? extends RuntimeException> clazz = (Class)
Class.forName("org.apache.camel.RuntimeException");
- if (clazz.isInstance(e)) {
- // don't double wrap
- return clazz.cast(e);
- } else {
- return clazz.getConstructor(Throwable.class).newInstance(e);
- }
- } catch (Throwable t) {
- // ignore
- }
- if (e instanceof RuntimeException) {
- // don't double wrap
- return (RuntimeException) e;
- } else {
- return new RuntimeException(e);
- }
- }
-
/**
* Turns the input array to a list of objects.
*
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/PropertiesHelper.java
b/core/camel-util/src/main/java/org/apache/camel/util/PropertiesHelper.java
index f27cb9ec77c..7895bb97a88 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/PropertiesHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/PropertiesHelper.java
@@ -54,19 +54,6 @@ public final class PropertiesHelper {
return rc;
}
- @Deprecated
- public static Map<String, String> extractStringProperties(Map<String,
Object> properties) {
- Map<String, String> rc = new LinkedHashMap<>(properties.size());
-
- for (Map.Entry<String, Object> entry : properties.entrySet()) {
- String name = entry.getKey();
- String value = entry.getValue().toString();
- rc.put(name, value);
- }
-
- return rc;
- }
-
public static boolean hasProperties(Map<String, Object> properties, String
optionPrefix) {
ObjectHelper.notNull(properties, "properties");
