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 2021/08/03 12:33:45 UTC
[camel] 15/22: CAMEL-16757: Rename and polish
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-16757b
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 778fcf5e2eaed13e9562efe64f615d4a1a44ffa0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Aug 3 09:00:48 2021 +0200
CAMEL-16757: Rename and polish
---
.../java/org/apache/camel/model/RouteDefinition.java | 18 +++++++++---------
.../java/org/apache/camel/model/RoutesDefinition.java | 2 +-
.../java/org/apache/camel/reifier/RouteReifier.java | 4 +++-
.../RoutesConfigurationBuilderIdOrPatternTest.java | 8 ++++----
.../java/org/apache/camel/xml/in/ModelParser.java | 2 +-
.../deserializers/RouteDefinitionDeserializer.java | 6 +++---
.../src/generated/resources/camel-yaml-dsl.json | 2 +-
7 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
index d3ef4dd..40ef2e1 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
@@ -57,7 +57,7 @@ import org.apache.camel.spi.RoutePolicy;
public class RouteDefinition extends OutputDefinition<RouteDefinition> implements NamedRoute {
private final AtomicBoolean prepared = new AtomicBoolean();
private FromDefinition input;
- private String routeConfiguration;
+ private String routeConfigurationId;
private String group;
private String streamCache;
private String trace;
@@ -207,11 +207,11 @@ public class RouteDefinition extends OutputDefinition<RouteDefinition> implement
* The route configuration id or pattern this route should use for configuration. Multiple id/pattern can be
* separated by comma.
*
- * @param routeConfiguration id or pattern
- * @return the builder
+ * @param routeConfigurationId id or pattern
+ * @return the builder
*/
- public RouteDefinition routeConfiguration(String routeConfiguration) {
- setRouteConfiguration(routeConfiguration);
+ public RouteDefinition routeConfigurationId(String routeConfigurationId) {
+ setRouteConfigurationId(routeConfigurationId);
return this;
}
@@ -734,8 +734,8 @@ public class RouteDefinition extends OutputDefinition<RouteDefinition> implement
* The route configuration id or pattern this route should use for configuration. Multiple id/pattern can be
* separated by comma.
*/
- public String getRouteConfiguration() {
- return routeConfiguration;
+ public String getRouteConfigurationId() {
+ return routeConfigurationId;
}
/**
@@ -743,8 +743,8 @@ public class RouteDefinition extends OutputDefinition<RouteDefinition> implement
* separated by comma.
*/
@XmlAttribute
- public void setRouteConfiguration(String routeConfiguration) {
- this.routeConfiguration = routeConfiguration;
+ public void setRouteConfigurationId(String routeConfigurationId) {
+ this.routeConfigurationId = routeConfigurationId;
}
/**
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RoutesDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RoutesDefinition.java
index f4df5fa..4151ff0 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/RoutesDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RoutesDefinition.java
@@ -227,7 +227,7 @@ public class RoutesDefinition extends OptionalIdentifiedDefinition<RoutesDefinit
// global configurations have no id assigned or is a wildcard
// if the route has a route configuration assigned then use pattern matching
.filter(g -> (g.getId() == null || g.getId().equals("*"))
- || (PatternHelper.matchPattern(g.getId(), route.getRouteConfiguration())))
+ || (PatternHelper.matchPattern(g.getId(), route.getRouteConfigurationId())))
.forEach(g -> {
oe.addAll(g.getOnExceptions());
icp.addAll(g.getIntercepts());
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java
index bb7da1b..f921817 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/RouteReifier.java
@@ -373,7 +373,9 @@ public class RouteReifier extends ProcessorReifier<RouteDefinition> {
routeProperties.put(Route.REST_PROPERTY, rest);
String template = Boolean.toString(definition.isTemplate() != null && definition.isTemplate());
routeProperties.put(Route.TEMPLATE_PROPERTY, template);
- routeProperties.put(Route.CONFIGURATION_ID_PROPERTY, definition.getRouteConfiguration());
+ if (definition.getRouteConfigurationId() != null) {
+ routeProperties.put(Route.CONFIGURATION_ID_PROPERTY, definition.getRouteConfigurationId());
+ }
List<PropertyDefinition> properties = definition.getRouteProperties();
if (properties != null) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationBuilderIdOrPatternTest.java b/core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationBuilderIdOrPatternTest.java
index c21ce74..ebefa1b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationBuilderIdOrPatternTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationBuilderIdOrPatternTest.java
@@ -52,7 +52,7 @@ public class RoutesConfigurationBuilderIdOrPatternTest extends ContextTestSuppor
@Override
public void configure() throws Exception {
from("direct:start2")
- .routeConfiguration("handleError")
+ .routeConfigurationId("handleError")
.throwException(new IllegalArgumentException("Foo2"));
}
});
@@ -101,7 +101,7 @@ public class RoutesConfigurationBuilderIdOrPatternTest extends ContextTestSuppor
@Override
public void configure() throws Exception {
from("direct:start")
- .routeConfiguration("general*")
+ .routeConfigurationId("general*")
.throwException(new IllegalArgumentException("Foo"));
}
});
@@ -109,7 +109,7 @@ public class RoutesConfigurationBuilderIdOrPatternTest extends ContextTestSuppor
@Override
public void configure() throws Exception {
from("direct:start2")
- .routeConfiguration("io*")
+ .routeConfigurationId("io*")
.throwException(new IOException("Foo2"));
}
});
@@ -206,7 +206,7 @@ public class RoutesConfigurationBuilderIdOrPatternTest extends ContextTestSuppor
@Override
public void configure() throws Exception {
from("direct:start2").routeId("foo2")
- .routeConfiguration("ioError")
+ .routeConfigurationId("ioError")
.throwException(new IOException("Foo2"));
}
});
diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index 53df0c2..b8fa6e4 100644
--- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -1001,7 +1001,7 @@ public class ModelParser extends BaseParser {
case "group": def.setGroup(val); break;
case "logMask": def.setLogMask(val); break;
case "messageHistory": def.setMessageHistory(val); break;
- case "routeConfiguration": def.setRouteConfiguration(val); break;
+ case "routeConfigurationId": def.setRouteConfigurationId(val); break;
case "routePolicyRef": def.setRoutePolicyRef(val); break;
case "shutdownRoute": def.setShutdownRoute(val); break;
case "shutdownRunningTask": def.setShutdownRunningTask(val); break;
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java
index 074a387..da7ca89 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java
@@ -37,7 +37,7 @@ import org.snakeyaml.engine.v2.nodes.NodeTuple;
properties = {
@YamlProperty(name = "id", type = "string"),
@YamlProperty(name = "group", type = "string"),
- @YamlProperty(name = "route-configuration", type = "string"),
+ @YamlProperty(name = "route-configuration-id", type = "string"),
@YamlProperty(name = "from", type = "object:org.apache.camel.model.FromDefinition", required = true),
@YamlProperty(name = "steps", type = "array:org.apache.camel.model.ProcessorDefinition", required = true)
})
@@ -71,8 +71,8 @@ public class RouteDefinitionDeserializer extends YamlDeserializerBase<RouteDefin
case "group":
target.setGroup(asText(val));
break;
- case "route-configuration":
- target.setRouteConfiguration(asText(val));
+ case "route-configuration-id":
+ target.setRouteConfigurationId(asText(val));
break;
case "from":
target.setInput(asType(val, FromDefinition.class));
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
index 90d56ae..10e7ac6 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
@@ -2098,7 +2098,7 @@
"id" : {
"type" : "string"
},
- "route-configuration" : {
+ "route-configuration-id" : {
"type" : "string"
},
"steps" : {