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
commit a9acd0be4bf7123f25da1d277ae80b9d756a16b4
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Oct 14 07:39:50 2021 +0200
CAMEL-17079: Deprecate SimpleBuilder and migrate to not use it anymore.
---
.../java/org/apache/camel/builder/EndpointConsumerBuilder.java | 5 -----
.../java/org/apache/camel/builder/EndpointProducerBuilder.java | 5 -----
.../main/java/org/apache/camel/model/ProcessorDefinition.java | 6 +++---
.../apache/camel/builder/endpoint/AbstractEndpointBuilder.java | 9 ---------
4 files changed, 3 insertions(+), 22 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
index 9a273ff..7b52e88 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointConsumerBuilder.java
@@ -49,11 +49,6 @@ public interface EndpointConsumerBuilder extends
EndpointConsumerResolver {
void doSetMultiValueProperties(String name, String prefix, Map<String,
Object> values);
/**
- * Builds an expression of this endpoint url. This API is only intended
for Camel internally.
- */
- Expression expr();
-
- /**
* Builds a dynamic expression of this endpoint url. This API is only
intended for Camel internally.
*/
Expression expr(CamelContext camelContext);
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
index 252cc24..e5122be 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/EndpointProducerBuilder.java
@@ -49,11 +49,6 @@ public interface EndpointProducerBuilder extends
EndpointProducerResolver {
void doSetMultiValueProperties(String name, String prefix, Map<String,
Object> values);
/**
- * Builds an expression of this endpoint url. This API is only intended
for Camel internally.
- */
- Expression expr();
-
- /**
* Builds a dynamic expression of this endpoint url. This API is only
intended for Camel internally.
*/
Expression expr(CamelContext camelContext);
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 2a1267e..60d3bfb 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -3207,7 +3207,7 @@ public abstract class ProcessorDefinition<Type extends
ProcessorDefinition<Type>
* @see org.apache.camel.processor.PollEnricher
*/
public Type pollEnrich(EndpointConsumerBuilder resourceUri) {
- return pollEnrich(resourceUri.expr(), -1, (String) null, false);
+ return pollEnrich(new SimpleExpression(resourceUri.getUri()), -1,
(String) null, false);
}
/**
@@ -3432,7 +3432,7 @@ public abstract class ProcessorDefinition<Type extends
ProcessorDefinition<Type>
public Type pollEnrich(
@AsEndpointUri EndpointConsumerBuilder resourceUri, long timeout,
AggregationStrategy aggregationStrategy,
boolean aggregateOnException) {
- return pollEnrich(resourceUri.expr(), timeout, aggregationStrategy,
aggregateOnException);
+ return pollEnrich(new SimpleExpression(resourceUri.getUri()), timeout,
aggregationStrategy, aggregateOnException);
}
/**
@@ -3459,7 +3459,7 @@ public abstract class ProcessorDefinition<Type extends
ProcessorDefinition<Type>
public Type pollEnrich(
@AsEndpointUri EndpointConsumerBuilder resourceUri, long timeout,
String aggregationStrategyRef,
boolean aggregateOnException) {
- return pollEnrich(resourceUri.expr(), timeout, aggregationStrategyRef,
aggregateOnException);
+ return pollEnrich(new SimpleExpression(resourceUri.getUri()), timeout,
aggregationStrategyRef, aggregateOnException);
}
/**
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
index f77e3e0..ed46421 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
@@ -30,7 +30,6 @@ import org.apache.camel.Expression;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.builder.SimpleBuilder;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.NormalizedEndpointUri;
import org.apache.camel.spi.PropertiesComponent;
@@ -186,14 +185,6 @@ public class AbstractEndpointBuilder {
});
}
- /**
- * Use {@link #expr(CamelContext)}
- */
- @Deprecated
- public Expression expr() {
- return SimpleBuilder.simple(getUri());
- }
-
public Expression expr(CamelContext camelContext) {
// need to bind complex properties so we can return an uri that
includes these parameters too
// do not encode computed uri as we want to preserve simple
expressions, as this is used
