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 2022/01/25 12:11:03 UTC
[camel] branch main updated (a8ae278 -> 6e629d2)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from a8ae278 CAMEL-17280: camel-jbang - Run from github using wildcards
new cd110d6 CAMEL-17283: camel-yaml-dsl - Fix route template model to not be inlined.
new 1b357c8 CAMEL-17283: camel-yaml-dsl - The xxxRef should allow to be inlined
new 6e629d2 CAMEL-17283: camel-yaml-dsl - The xxxRef should allow to be inlined
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/model/RestContextRefDefinition.java | 4 +
.../RouteConfigurationContextRefDefinition.java | 4 +
.../camel/model/RouteContextRefDefinition.java | 4 +
.../camel/model/RouteTemplateBeanDefinition.java | 9 +--
.../model/RouteTemplateContextRefDefinition.java | 4 +
.../camel/model/RouteTemplateDefinition.java | 3 +-
.../dsl/yaml/deserializers/ModelDeserializers.java | 18 +++++
.../RouteTemplateBeanDefinitionDeserializer.java | 6 +-
.../src/generated/resources/camel-yaml-dsl.json | 88 ++++++++++++----------
.../src/generated/resources/camelYamlDsl.json | 88 ++++++++++++----------
10 files changed, 137 insertions(+), 91 deletions(-)
[camel] 03/03: CAMEL-17283: camel-yaml-dsl - The xxxRef should allow to be inlined
Posted by da...@apache.org.
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 6e629d266b41cf7525addfb241838b214c557eba
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jan 25 13:10:15 2022 +0100
CAMEL-17283: camel-yaml-dsl - The xxxRef should allow to be inlined
---
.../dsl/yaml/deserializers/ModelDeserializers.java | 18 ++++++++++
.../src/generated/resources/camel-yaml-dsl.json | 42 ++++++++++++++--------
.../src/generated/resources/camelYamlDsl.json | 42 ++++++++++++++--------
3 files changed, 72 insertions(+), 30 deletions(-)
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index b15d08c..8da72b9 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -11769,6 +11769,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
}
@YamlType(
+ inline = true,
types = org.apache.camel.model.RestContextRefDefinition.class,
order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = {
@@ -11788,6 +11789,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
}
@Override
+ protected RestContextRefDefinition newInstance(String value) {
+ return new RestContextRefDefinition(value);
+ }
+
+ @Override
protected boolean setProperty(RestContextRefDefinition target, String propertyKey,
String propertyName, Node node) {
switch(propertyKey) {
@@ -13006,6 +13012,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
}
@YamlType(
+ inline = true,
types = org.apache.camel.model.RouteConfigurationContextRefDefinition.class,
order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = {
@@ -13025,6 +13032,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
}
@Override
+ protected RouteConfigurationContextRefDefinition newInstance(String value) {
+ return new RouteConfigurationContextRefDefinition(value);
+ }
+
+ @Override
protected boolean setProperty(RouteConfigurationContextRefDefinition target,
String propertyKey, String propertyName, Node node) {
switch(propertyKey) {
@@ -13042,6 +13054,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
}
@YamlType(
+ inline = true,
types = org.apache.camel.model.RouteContextRefDefinition.class,
order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = {
@@ -13061,6 +13074,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
}
@Override
+ protected RouteContextRefDefinition newInstance(String value) {
+ return new RouteContextRefDefinition(value);
+ }
+
+ @Override
protected boolean setProperty(RouteContextRefDefinition target, String propertyKey,
String propertyName, Node node) {
switch(propertyKey) {
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 ae067a2..1145a04 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
@@ -2352,12 +2352,16 @@
}
},
"org.apache.camel.model.RestContextRefDefinition" : {
- "type" : "object",
- "properties" : {
- "ref" : {
- "type" : "string"
+ "oneOf" : [ {
+ "type" : "string"
+ }, {
+ "type" : "object",
+ "properties" : {
+ "ref" : {
+ "type" : "string"
+ }
}
- },
+ } ],
"required" : [ "ref" ]
},
"org.apache.camel.model.RollbackDefinition" : {
@@ -2404,12 +2408,16 @@
"required" : [ "ref" ]
},
"org.apache.camel.model.RouteConfigurationContextRefDefinition" : {
- "type" : "object",
- "properties" : {
- "ref" : {
- "type" : "string"
+ "oneOf" : [ {
+ "type" : "string"
+ }, {
+ "type" : "object",
+ "properties" : {
+ "ref" : {
+ "type" : "string"
+ }
}
- },
+ } ],
"required" : [ "ref" ]
},
"org.apache.camel.model.RouteConfigurationDefinition" : {
@@ -2455,12 +2463,16 @@
} ]
},
"org.apache.camel.model.RouteContextRefDefinition" : {
- "type" : "object",
- "properties" : {
- "ref" : {
- "type" : "string"
+ "oneOf" : [ {
+ "type" : "string"
+ }, {
+ "type" : "object",
+ "properties" : {
+ "ref" : {
+ "type" : "string"
+ }
}
- },
+ } ],
"required" : [ "ref" ]
},
"org.apache.camel.model.RouteDefinition" : {
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
index c8fa9b5..a72a2b8 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
@@ -2256,12 +2256,16 @@
}
},
"org.apache.camel.model.RestContextRefDefinition" : {
- "type" : "object",
- "properties" : {
- "ref" : {
- "type" : "string"
+ "oneOf" : [ {
+ "type" : "string"
+ }, {
+ "type" : "object",
+ "properties" : {
+ "ref" : {
+ "type" : "string"
+ }
}
- },
+ } ],
"required" : [ "ref" ]
},
"org.apache.camel.model.RollbackDefinition" : {
@@ -2308,12 +2312,16 @@
"required" : [ "ref" ]
},
"org.apache.camel.model.RouteConfigurationContextRefDefinition" : {
- "type" : "object",
- "properties" : {
- "ref" : {
- "type" : "string"
+ "oneOf" : [ {
+ "type" : "string"
+ }, {
+ "type" : "object",
+ "properties" : {
+ "ref" : {
+ "type" : "string"
+ }
}
- },
+ } ],
"required" : [ "ref" ]
},
"org.apache.camel.model.RouteConfigurationDefinition" : {
@@ -2359,12 +2367,16 @@
} ]
},
"org.apache.camel.model.RouteContextRefDefinition" : {
- "type" : "object",
- "properties" : {
- "ref" : {
- "type" : "string"
+ "oneOf" : [ {
+ "type" : "string"
+ }, {
+ "type" : "object",
+ "properties" : {
+ "ref" : {
+ "type" : "string"
+ }
}
- },
+ } ],
"required" : [ "ref" ]
},
"org.apache.camel.model.RouteDefinition" : {
[camel] 02/03: CAMEL-17283: camel-yaml-dsl - The xxxRef should allow to be inlined
Posted by da...@apache.org.
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 1b357c857887db35a3638f3093b40a2400621b98
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jan 25 13:08:29 2022 +0100
CAMEL-17283: camel-yaml-dsl - The xxxRef should allow to be inlined
---
.../main/java/org/apache/camel/model/RestContextRefDefinition.java | 4 ++++
.../apache/camel/model/RouteConfigurationContextRefDefinition.java | 4 ++++
.../main/java/org/apache/camel/model/RouteContextRefDefinition.java | 4 ++++
.../org/apache/camel/model/RouteTemplateContextRefDefinition.java | 4 ++++
4 files changed, 16 insertions(+)
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RestContextRefDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
index e631796..b8d6ee0 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
@@ -40,6 +40,10 @@ public class RestContextRefDefinition {
public RestContextRefDefinition() {
}
+ public RestContextRefDefinition(String ref) {
+ this.ref = ref;
+ }
+
@Override
public String toString() {
return "RestContextRef[" + getRef() + "]";
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteConfigurationContextRefDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteConfigurationContextRefDefinition.java
index 6ebabdd..638c5e0 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteConfigurationContextRefDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteConfigurationContextRefDefinition.java
@@ -39,6 +39,10 @@ public class RouteConfigurationContextRefDefinition {
public RouteConfigurationContextRefDefinition() {
}
+ public RouteConfigurationContextRefDefinition(String ref) {
+ this.ref = ref;
+ }
+
@Override
public String toString() {
return "RouteConfigurationContextRef[" + getRef() + "]";
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
index b707d92..6662bec 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
@@ -39,6 +39,10 @@ public class RouteContextRefDefinition {
public RouteContextRefDefinition() {
}
+ public RouteContextRefDefinition(String ref) {
+ this.ref = ref;
+ }
+
@Override
public String toString() {
return "RouteContextRef[" + getRef() + "]";
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateContextRefDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateContextRefDefinition.java
index 4ee62a9..ee076e2 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateContextRefDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateContextRefDefinition.java
@@ -39,6 +39,10 @@ public class RouteTemplateContextRefDefinition {
public RouteTemplateContextRefDefinition() {
}
+ public RouteTemplateContextRefDefinition(String ref) {
+ this.ref = ref;
+ }
+
@Override
public String toString() {
return "RouteTemplateContextRef[" + getRef() + "]";
[camel] 01/03: CAMEL-17283: camel-yaml-dsl - Fix route template model to not be inlined.
Posted by da...@apache.org.
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 cd110d68e87d8d5f4fa506bbfbe1dfa5d32f8057
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jan 25 13:03:59 2022 +0100
CAMEL-17283: camel-yaml-dsl - Fix route template model to not be inlined.
---
.../camel/model/RouteTemplateBeanDefinition.java | 9 +----
.../camel/model/RouteTemplateDefinition.java | 3 +-
.../RouteTemplateBeanDefinitionDeserializer.java | 6 ++-
.../src/generated/resources/camel-yaml-dsl.json | 46 ++++++++++------------
.../src/generated/resources/camelYamlDsl.json | 46 ++++++++++------------
5 files changed, 49 insertions(+), 61 deletions(-)
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java
index 95767f0..08a66ac 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java
@@ -55,14 +55,7 @@ public class RouteTemplateBeanDefinition {
@XmlTransient
private RouteTemplateContext.BeanSupplier<Object> beanSupplier;
- public RouteTemplateBeanDefinition() {
- }
-
- public RouteTemplateBeanDefinition(String name) {
- this.name = name;
- }
-
- public RouteTemplateBeanDefinition(RouteTemplateDefinition parent) {
+ void setParent(RouteTemplateDefinition parent) {
this.parent = parent;
}
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java
index eeb96d7..43acd5c 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java
@@ -332,7 +332,8 @@ public class RouteTemplateDefinition extends OptionalIdentifiedDefinition {
if (templateBeans == null) {
templateBeans = new ArrayList<>();
}
- RouteTemplateBeanDefinition def = new RouteTemplateBeanDefinition(this);
+ RouteTemplateBeanDefinition def = new RouteTemplateBeanDefinition();
+ def.setParent(this);
def.setName(name);
templateBeans.add(def);
return def;
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateBeanDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateBeanDefinitionDeserializer.java
index fa950ba..19523d0 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateBeanDefinitionDeserializer.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateBeanDefinitionDeserializer.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.annotations.YamlType;
import org.snakeyaml.engine.v2.nodes.Node;
@YamlType(
- inline = true,
+ inline = false,
types = org.apache.camel.model.RouteTemplateBeanDefinition.class,
order = YamlDeserializerResolver.ORDER_DEFAULT,
nodes = { "template-bean", "templateBean" },
@@ -51,7 +51,9 @@ public class RouteTemplateBeanDefinitionDeserializer extends YamlDeserializerBas
@Override
protected RouteTemplateBeanDefinition newInstance(String value) {
- return new RouteTemplateBeanDefinition(value);
+ RouteTemplateBeanDefinition answer = new RouteTemplateBeanDefinition();
+ answer.setName(value);
+ return answer;
}
@Override
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 796d6e3..ae067a2 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
@@ -2485,34 +2485,30 @@
"required" : [ "from" ]
},
"org.apache.camel.model.RouteTemplateBeanDefinition" : {
- "oneOf" : [ {
- "type" : "string"
- }, {
- "type" : "object",
+ "type" : "object",
+ "properties" : {
+ "bean-type" : {
+ "type" : "string"
+ },
+ "name" : {
+ "type" : "string"
+ },
"properties" : {
- "bean-type" : {
- "type" : "string"
- },
- "name" : {
- "type" : "string"
- },
- "properties" : {
- "type" : "object"
- },
- "property" : {
- "type" : "array",
- "items" : {
- "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
- }
- },
- "script" : {
- "$ref" : "#/items/definitions/org.apache.camel.model.RouteTemplateScriptDefinition"
- },
- "type" : {
- "type" : "string"
+ "type" : "object"
+ },
+ "property" : {
+ "type" : "array",
+ "items" : {
+ "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
}
+ },
+ "script" : {
+ "$ref" : "#/items/definitions/org.apache.camel.model.RouteTemplateScriptDefinition"
+ },
+ "type" : {
+ "type" : "string"
}
- } ],
+ },
"required" : [ "name", "type" ]
},
"org.apache.camel.model.RouteTemplateDefinition" : {
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
index 20d41d7..c8fa9b5 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
@@ -2389,34 +2389,30 @@
"required" : [ "from" ]
},
"org.apache.camel.model.RouteTemplateBeanDefinition" : {
- "oneOf" : [ {
- "type" : "string"
- }, {
- "type" : "object",
+ "type" : "object",
+ "properties" : {
+ "beanType" : {
+ "type" : "string"
+ },
+ "name" : {
+ "type" : "string"
+ },
"properties" : {
- "beanType" : {
- "type" : "string"
- },
- "name" : {
- "type" : "string"
- },
- "properties" : {
- "type" : "object"
- },
- "property" : {
- "type" : "array",
- "items" : {
- "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
- }
- },
- "script" : {
- "$ref" : "#/items/definitions/org.apache.camel.model.RouteTemplateScriptDefinition"
- },
- "type" : {
- "type" : "string"
+ "type" : "object"
+ },
+ "property" : {
+ "type" : "array",
+ "items" : {
+ "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
}
+ },
+ "script" : {
+ "$ref" : "#/items/definitions/org.apache.camel.model.RouteTemplateScriptDefinition"
+ },
+ "type" : {
+ "type" : "string"
}
- } ],
+ },
"required" : [ "name", "type" ]
},
"org.apache.camel.model.RouteTemplateDefinition" : {