You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by fm...@apache.org on 2025/07/09 10:20:25 UTC
(camel) 02/02: Rename INTERCEPTED_PARENT_ENDPOINT_URI to INTERCEPTED_ROUTE_ENDPOINT_URI
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4a95021560ba1f59a2d929ba2d620eaee6d0e365
Author: Croway <fe...@gmail.com>
AuthorDate: Wed Jul 9 10:49:54 2025 +0200
Rename INTERCEPTED_PARENT_ENDPOINT_URI to INTERCEPTED_ROUTE_ENDPOINT_URI
---
.../resources/org/apache/camel/catalog/models/intercept.json | 2 +-
.../resources/org/apache/camel/catalog/models/interceptFrom.json | 2 +-
.../org/apache/camel/catalog/models/interceptSendToEndpoint.json | 2 +-
.../generated/java/org/apache/camel/ExchangeConstantProvider.java | 2 +-
core/camel-api/src/main/java/org/apache/camel/Exchange.java | 4 ++--
.../src/main/java/org/apache/camel/ExchangePropertyKey.java | 6 +++---
.../resources/META-INF/org/apache/camel/model/intercept.json | 2 +-
.../resources/META-INF/org/apache/camel/model/interceptFrom.json | 2 +-
.../META-INF/org/apache/camel/model/interceptSendToEndpoint.json | 2 +-
.../main/java/org/apache/camel/reifier/InterceptFromReifier.java | 2 +-
.../src/main/java/org/apache/camel/reifier/InterceptReifier.java | 2 +-
.../org/apache/camel/reifier/InterceptSendToEndpointReifier.java | 2 +-
.../java/org/apache/camel/processor/InterceptPropertiesTest.java | 6 +++---
13 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/intercept.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/intercept.json
index 796125e30d7..c1dda10f457 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/intercept.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/intercept.json
@@ -20,7 +20,7 @@
},
"exchangeProperties": {
"CamelInterceptedNodeId": { "index": 0, "kind": "exchangeProperty", "displayName": "Intercepted Node Id", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The intercepted route's node ID" },
- "CamelInterceptedParentEndpointUri": { "index": 1, "kind": "exchangeProperty", "displayName": "Intercepted Parent Endpoint Uri", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The parent's endpoint URI that was intercepted" },
+ "CamelInterceptedRouteEndpointUri": { "index": 1, "kind": "exchangeProperty", "displayName": "Intercepted Route Endpoint Uri", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The route's endpoint URI that was intercepted" },
"CamelInterceptedRouteId": { "index": 2, "kind": "exchangeProperty", "displayName": "Intercepted Route Id", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The intercepted route's ID" }
}
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptFrom.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptFrom.json
index 317d68daff6..e46d24b406f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptFrom.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptFrom.json
@@ -22,7 +22,7 @@
"exchangeProperties": {
"CamelInterceptedEndpoint": { "index": 0, "kind": "exchangeProperty", "displayName": "Intercepted Endpoint", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The endpoint URI that was intercepted" },
"CamelInterceptedNodeId": { "index": 1, "kind": "exchangeProperty", "displayName": "Intercepted Node Id", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The intercepted route's node ID" },
- "CamelInterceptedParentEndpointUri": { "index": 2, "kind": "exchangeProperty", "displayName": "Intercepted Parent Endpoint Uri", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The parent's endpoint URI that was intercepted" },
+ "CamelInterceptedRouteEndpointUri": { "index": 2, "kind": "exchangeProperty", "displayName": "Intercepted Route Endpoint Uri", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The route's endpoint URI that was intercepted" },
"CamelInterceptedRouteId": { "index": 3, "kind": "exchangeProperty", "displayName": "Intercepted Route Id", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The intercepted route's ID" }
}
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptSendToEndpoint.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptSendToEndpoint.json
index cb440512326..dc89e8f15b6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptSendToEndpoint.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/interceptSendToEndpoint.json
@@ -24,7 +24,7 @@
"exchangeProperties": {
"CamelInterceptedEndpoint": { "index": 0, "kind": "exchangeProperty", "displayName": "Intercepted Endpoint", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The endpoint URI that was intercepted" },
"CamelInterceptedNodeId": { "index": 1, "kind": "exchangeProperty", "displayName": "Intercepted Node Id", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The intercepted route's node ID" },
- "CamelInterceptedParentEndpointUri": { "index": 2, "kind": "exchangeProperty", "displayName": "Intercepted Parent Endpoint Uri", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The parent's endpoint URI that was intercepted" },
+ "CamelInterceptedRouteEndpointUri": { "index": 2, "kind": "exchangeProperty", "displayName": "Intercepted Route Endpoint Uri", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The route's endpoint URI that was intercepted" },
"CamelInterceptedRouteId": { "index": 3, "kind": "exchangeProperty", "displayName": "Intercepted Route Id", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The intercepted route's ID" }
}
}
diff --git a/core/camel-api/src/generated/java/org/apache/camel/ExchangeConstantProvider.java b/core/camel-api/src/generated/java/org/apache/camel/ExchangeConstantProvider.java
index c8a0bec481c..51dfe0d93d7 100644
--- a/core/camel-api/src/generated/java/org/apache/camel/ExchangeConstantProvider.java
+++ b/core/camel-api/src/generated/java/org/apache/camel/ExchangeConstantProvider.java
@@ -100,7 +100,7 @@ public class ExchangeConstantProvider {
map.put("INTERCEPT_SEND_TO_ENDPOINT_WHEN_MATCHED", "CamelInterceptSendToEndpointWhenMatched");
map.put("INTERCEPTED_ENDPOINT", "CamelInterceptedEndpoint");
map.put("INTERCEPTED_NODE_ID", "CamelInterceptedNodeId");
- map.put("INTERCEPTED_PARENT_ENDPOINT_URI", "CamelInterceptedParentEndpointUri");
+ map.put("INTERCEPTED_ROUTE_ENDPOINT_URI", "CamelInterceptedParentEndpointUri");
map.put("INTERCEPTED_ROUTE_ID", "CamelInterceptedRouteId");
map.put("INTERRUPTED", "CamelInterrupted");
map.put("LANGUAGE_SCRIPT", "CamelLanguageScript");
diff --git a/core/camel-api/src/main/java/org/apache/camel/Exchange.java b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
index ea9cba6ffc9..02b659cb40e 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Exchange.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
@@ -207,9 +207,9 @@ public interface Exchange extends VariableAware {
javaType = "String")
String INTERCEPTED_NODE_ID = "CamelInterceptedNodeId";
@Metadata(label = "intercept,interceptFrom,interceptSendToEndpoint",
- description = "The parent's endpoint URI that was intercepted",
+ description = "The route's endpoint URI that was intercepted",
javaType = "String")
- String INTERCEPTED_PARENT_ENDPOINT_URI = "CamelInterceptedParentEndpointUri";
+ String INTERCEPTED_ROUTE_ENDPOINT_URI = "CamelInterceptedParentEndpointUri";
@Metadata(label = "intercept,interceptFrom,interceptSendToEndpoint", description = "The intercepted route's ID",
javaType = "String")
String INTERCEPTED_ROUTE_ID = "CamelInterceptedRouteId";
diff --git a/core/camel-api/src/main/java/org/apache/camel/ExchangePropertyKey.java b/core/camel-api/src/main/java/org/apache/camel/ExchangePropertyKey.java
index 695b4c47604..8caf3a56e7a 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExchangePropertyKey.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExchangePropertyKey.java
@@ -58,7 +58,7 @@ public enum ExchangePropertyKey {
GROUPED_EXCHANGE(Exchange.GROUPED_EXCHANGE),
INTERCEPTED_ENDPOINT(Exchange.INTERCEPTED_ENDPOINT),
INTERCEPTED_NODE_ID(Exchange.INTERCEPTED_NODE_ID),
- INTERCEPTED_PARENT_ENDPOINT_URI(Exchange.INTERCEPTED_PARENT_ENDPOINT_URI),
+ INTERCEPTED_ROUTE_ENDPOINT_URI(Exchange.INTERCEPTED_ROUTE_ENDPOINT_URI),
INTERCEPTED_ROUTE_ID(Exchange.INTERCEPTED_ROUTE_ID),
INTERCEPT_SEND_TO_ENDPOINT_WHEN_MATCHED(Exchange.INTERCEPT_SEND_TO_ENDPOINT_WHEN_MATCHED),
LOOP_INDEX(Exchange.LOOP_INDEX),
@@ -165,8 +165,8 @@ public enum ExchangePropertyKey {
return INTERCEPTED_ENDPOINT;
case Exchange.INTERCEPTED_NODE_ID:
return INTERCEPTED_NODE_ID;
- case Exchange.INTERCEPTED_PARENT_ENDPOINT_URI:
- return INTERCEPTED_PARENT_ENDPOINT_URI;
+ case Exchange.INTERCEPTED_ROUTE_ENDPOINT_URI:
+ return INTERCEPTED_ROUTE_ENDPOINT_URI;
case Exchange.INTERCEPTED_ROUTE_ID:
return INTERCEPTED_ROUTE_ID;
case Exchange.INTERCEPT_SEND_TO_ENDPOINT_WHEN_MATCHED:
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/intercept.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/intercept.json
index 796125e30d7..c1dda10f457 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/intercept.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/intercept.json
@@ -20,7 +20,7 @@
},
"exchangeProperties": {
"CamelInterceptedNodeId": { "index": 0, "kind": "exchangeProperty", "displayName": "Intercepted Node Id", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The intercepted route's node ID" },
- "CamelInterceptedParentEndpointUri": { "index": 1, "kind": "exchangeProperty", "displayName": "Intercepted Parent Endpoint Uri", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The parent's endpoint URI that was intercepted" },
+ "CamelInterceptedRouteEndpointUri": { "index": 1, "kind": "exchangeProperty", "displayName": "Intercepted Route Endpoint Uri", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The route's endpoint URI that was intercepted" },
"CamelInterceptedRouteId": { "index": 2, "kind": "exchangeProperty", "displayName": "Intercepted Route Id", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The intercepted route's ID" }
}
}
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptFrom.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptFrom.json
index 317d68daff6..e46d24b406f 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptFrom.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptFrom.json
@@ -22,7 +22,7 @@
"exchangeProperties": {
"CamelInterceptedEndpoint": { "index": 0, "kind": "exchangeProperty", "displayName": "Intercepted Endpoint", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The endpoint URI that was intercepted" },
"CamelInterceptedNodeId": { "index": 1, "kind": "exchangeProperty", "displayName": "Intercepted Node Id", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The intercepted route's node ID" },
- "CamelInterceptedParentEndpointUri": { "index": 2, "kind": "exchangeProperty", "displayName": "Intercepted Parent Endpoint Uri", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The parent's endpoint URI that was intercepted" },
+ "CamelInterceptedRouteEndpointUri": { "index": 2, "kind": "exchangeProperty", "displayName": "Intercepted Route Endpoint Uri", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The route's endpoint URI that was intercepted" },
"CamelInterceptedRouteId": { "index": 3, "kind": "exchangeProperty", "displayName": "Intercepted Route Id", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The intercepted route's ID" }
}
}
diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptSendToEndpoint.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptSendToEndpoint.json
index cb440512326..dc89e8f15b6 100644
--- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptSendToEndpoint.json
+++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/interceptSendToEndpoint.json
@@ -24,7 +24,7 @@
"exchangeProperties": {
"CamelInterceptedEndpoint": { "index": 0, "kind": "exchangeProperty", "displayName": "Intercepted Endpoint", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The endpoint URI that was intercepted" },
"CamelInterceptedNodeId": { "index": 1, "kind": "exchangeProperty", "displayName": "Intercepted Node Id", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The intercepted route's node ID" },
- "CamelInterceptedParentEndpointUri": { "index": 2, "kind": "exchangeProperty", "displayName": "Intercepted Parent Endpoint Uri", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The parent's endpoint URI that was intercepted" },
+ "CamelInterceptedRouteEndpointUri": { "index": 2, "kind": "exchangeProperty", "displayName": "Intercepted Route Endpoint Uri", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The route's endpoint URI that was intercepted" },
"CamelInterceptedRouteId": { "index": 3, "kind": "exchangeProperty", "displayName": "Intercepted Route Id", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "autowired": false, "secret": false, "description": "The intercepted route's ID" }
}
}
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java
index 26eb2882bf6..427495a48fc 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java
@@ -45,7 +45,7 @@ public class InterceptFromReifier extends ProcessorReifier<InterceptFromDefiniti
Processor p = exchange -> {
exchange.setProperty(ExchangePropertyKey.INTERCEPTED_ROUTE_ID, route.getId());
- exchange.setProperty(ExchangePropertyKey.INTERCEPTED_PARENT_ENDPOINT_URI, route.getEndpoint().getEndpointUri());
+ exchange.setProperty(ExchangePropertyKey.INTERCEPTED_ROUTE_ENDPOINT_URI, route.getEndpoint().getEndpointUri());
if (exchange.getFromEndpoint() != null) {
exchange.setProperty(ExchangePropertyKey.INTERCEPTED_ENDPOINT, exchange.getFromEndpoint().getEndpointUri());
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptReifier.java
index 96a0b4efbba..ae666ee0de0 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptReifier.java
@@ -67,7 +67,7 @@ public class InterceptReifier extends ProcessorReifier<InterceptDefinition> {
exchange.setProperty(ExchangePropertyKey.INTERCEPTED_ROUTE_ID,
ProcessorDefinitionHelper.getRouteId(definition.getParent()));
exchange.setProperty(ExchangePropertyKey.INTERCEPTED_NODE_ID, definition.getId());
- exchange.setProperty(ExchangePropertyKey.INTERCEPTED_PARENT_ENDPOINT_URI,
+ exchange.setProperty(ExchangePropertyKey.INTERCEPTED_ROUTE_ENDPOINT_URI,
route.getEndpoint().getEndpointUri());
};
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
index fb900905d24..c657dd41913 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
@@ -67,7 +67,7 @@ public class InterceptSendToEndpointReifier extends ProcessorReifier<InterceptSe
Processor p = exchange -> {
exchange.setProperty(ExchangePropertyKey.INTERCEPTED_ROUTE_ID, route.getId());
exchange.setProperty(ExchangePropertyKey.INTERCEPTED_NODE_ID, definition.getId());
- exchange.setProperty(ExchangePropertyKey.INTERCEPTED_PARENT_ENDPOINT_URI, route.getEndpoint().getEndpointUri());
+ exchange.setProperty(ExchangePropertyKey.INTERCEPTED_ROUTE_ENDPOINT_URI, route.getEndpoint().getEndpointUri());
};
// register endpoint callback so we can proxy the endpoint
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/InterceptPropertiesTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/InterceptPropertiesTest.java
index d7d4d523817..954b6dd7b38 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/InterceptPropertiesTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/InterceptPropertiesTest.java
@@ -44,7 +44,7 @@ public class InterceptPropertiesTest extends ContextTestSupport {
getMockEndpoint("mock:intercept")
.expectedPropertyReceived(ExchangePropertyKey.INTERCEPTED_ROUTE_ID.getName(), "intercept-test");
getMockEndpoint("mock:intercept")
- .expectedPropertyReceived(ExchangePropertyKey.INTERCEPTED_PARENT_ENDPOINT_URI.getName(), "direct://start");
+ .expectedPropertyReceived(ExchangePropertyKey.INTERCEPTED_ROUTE_ENDPOINT_URI.getName(), "direct://start");
// Node IDs are not always the same
// getMockEndpoint("mock:intercept")
// .expectedPropertyValuesReceivedInAnyOrder(ExchangePropertyKey.INTERCEPTED_NODE_ID.getName(), "to2", "process1",
@@ -73,7 +73,7 @@ public class InterceptPropertiesTest extends ContextTestSupport {
getMockEndpoint("mock:interceptFrom")
.expectedPropertyReceived(ExchangePropertyKey.INTERCEPTED_ROUTE_ID.getName(), "intercept-from-test");
getMockEndpoint("mock:interceptFrom")
- .expectedPropertyReceived(ExchangePropertyKey.INTERCEPTED_PARENT_ENDPOINT_URI.getName(),
+ .expectedPropertyReceived(ExchangePropertyKey.INTERCEPTED_ROUTE_ENDPOINT_URI.getName(),
"direct://startInterceptFrom");
template.sendBody("direct:startInterceptFrom", "");
@@ -101,7 +101,7 @@ public class InterceptPropertiesTest extends ContextTestSupport {
getMockEndpoint("mock:interceptSendToEndpoint")
.expectedPropertyReceived(ExchangePropertyKey.INTERCEPTED_ROUTE_ID.getName(), "intercept-test");
getMockEndpoint("mock:interceptSendToEndpoint")
- .expectedPropertyReceived(ExchangePropertyKey.INTERCEPTED_PARENT_ENDPOINT_URI.getName(), "direct://start");
+ .expectedPropertyReceived(ExchangePropertyKey.INTERCEPTED_ROUTE_ENDPOINT_URI.getName(), "direct://start");
template.sendBody("direct:start", "");