You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2025/07/30 12:21:54 UTC

(camel) branch edsl updated: CAMEL-22293: camel-core: Endpoint DSL using object instance as parameters should resolve via bean registry binding.

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

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


The following commit(s) were added to refs/heads/edsl by this push:
     new 91eb4409e71 CAMEL-22293: camel-core: Endpoint DSL using object instance as parameters should resolve via bean registry binding.
91eb4409e71 is described below

commit 91eb4409e71b5d7af2d9ac4f405f8daf045d2de8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jul 30 14:20:39 2025 +0200

    CAMEL-22293: camel-core: Endpoint DSL using object instance as parameters should resolve via bean registry binding.
---
 .../java/org/apache/camel/builder/EndpointConsumerBuilder.java    | 6 ------
 .../java/org/apache/camel/builder/EndpointProducerBuilder.java    | 6 ------
 .../apache/camel/builder/endpoint/AbstractEndpointBuilder.java    | 8 ++------
 3 files changed, 2 insertions(+), 18 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 b597a3af507..8edacc7ac00 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
@@ -29,12 +29,6 @@ import org.apache.camel.Expression;
  */
 public interface EndpointConsumerBuilder extends EndpointConsumerResolver {
 
-    /**
-     * Builds the encoded url of this endpoint. This API is only intended for Camel internally.
-     */
-    @Deprecated
-    String getUri(CamelContext camelContext);
-
     /**
      * Builds the raw url of this endpoint. This API is only intended for Camel internally.
      */
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 ef55f1b1e98..6a30f1569bc 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
@@ -29,12 +29,6 @@ import org.apache.camel.Expression;
  */
 public interface EndpointProducerBuilder extends EndpointProducerResolver {
 
-    /**
-     * Builds the encoded url of this endpoint. This API is only intended for Camel internally.
-     */
-    @Deprecated
-    String getUri(CamelContext camelContext);
-
     /**
      * Builds the raw url of this endpoint. This API is only intended for Camel internally.
      */
diff --git a/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java b/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
index 674be59b8ad..5ee058bb54a 100644
--- a/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
+++ b/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
@@ -55,12 +55,8 @@ public class AbstractEndpointBuilder {
         return endpointType.cast(answer);
     }
 
-    public String getUri() {
-        return getUri(null);
-    }
-
     public String getUri(CamelContext context) {
-        return computeUri(new LinkedHashMap<>(), context, context != null, true).getUri();
+        return computeUri(new LinkedHashMap<>(), context, true, true).getUri();
     }
 
     public String getRawUri() {
@@ -134,7 +130,7 @@ public class AbstractEndpointBuilder {
 
     @Override
     public String toString() {
-        return getUri();
+        return getRawUri();
     }
 
     public void doSetProperty(String key, Object value) {