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/19 15:08:15 UTC
[camel] branch main updated: CAMEL-17499: camel-yaml-dsl - Fix source generator enums to only output enum constants
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
The following commit(s) were added to refs/heads/main by this push:
new f1bfa05 CAMEL-17499: camel-yaml-dsl - Fix source generator enums to only output enum constants
f1bfa05 is described below
commit f1bfa051c010de9eea516791e50c3b131047ae70
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 19 16:07:38 2022 +0100
CAMEL-17499: camel-yaml-dsl - Fix source generator enums to only output enum constants
---
.../camel/dsl/yaml/deserializers/ModelDeserializers.java | 8 ++++----
.../maven/dsl/yaml/GenerateYamlDeserializersMojo.java | 16 ++++++++++++----
.../src/generated/resources/camel-yaml-dsl.json | 8 ++++----
3 files changed, 20 insertions(+), 12 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 cc6af99..787d678 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
@@ -587,7 +587,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@YamlProperty(name = "include", type = "string"),
@YamlProperty(name = "instance-class-name", type = "string"),
@YamlProperty(name = "json-view", type = "string"),
- @YamlProperty(name = "library", type = "enum:ApacheAvro,Jackson,dataFormatName"),
+ @YamlProperty(name = "library", type = "enum:ApacheAvro,Jackson"),
@YamlProperty(name = "module-class-names", type = "string"),
@YamlProperty(name = "module-refs", type = "string"),
@YamlProperty(name = "object-mapper", type = "string"),
@@ -7274,7 +7274,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@YamlProperty(name = "id", type = "string"),
@YamlProperty(name = "include", type = "string"),
@YamlProperty(name = "json-view", type = "string"),
- @YamlProperty(name = "library", type = "enum:Fastjson,Gson,Jackson,Johnzon,Jsonb,XStream,dataFormatName"),
+ @YamlProperty(name = "library", type = "enum:Fastjson,Gson,Jackson,Johnzon,Jsonb,XStream"),
@YamlProperty(name = "module-class-names", type = "string"),
@YamlProperty(name = "module-refs", type = "string"),
@YamlProperty(name = "naming-strategy", type = "string"),
@@ -10197,7 +10197,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@YamlProperty(name = "include", type = "string"),
@YamlProperty(name = "instance-class", type = "string"),
@YamlProperty(name = "json-view", type = "string"),
- @YamlProperty(name = "library", type = "enum:GoogleProtobuf,Jackson,dataFormatName"),
+ @YamlProperty(name = "library", type = "enum:GoogleProtobuf,Jackson"),
@YamlProperty(name = "module-class-names", type = "string"),
@YamlProperty(name = "module-refs", type = "string"),
@YamlProperty(name = "object-mapper", type = "string"),
@@ -18233,7 +18233,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
@YamlProperty(name = "constructor", type = "string"),
@YamlProperty(name = "dumper-options", type = "string"),
@YamlProperty(name = "id", type = "string"),
- @YamlProperty(name = "library", type = "enum:SnakeYAML,dataFormatName"),
+ @YamlProperty(name = "library", type = "enum:SnakeYAML"),
@YamlProperty(name = "max-aliases-for-collections", type = "number"),
@YamlProperty(name = "pretty-flow", type = "boolean"),
@YamlProperty(name = "representer", type = "string"),
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
index f821fb6..e3ba7fa 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
@@ -912,9 +912,13 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
Set<String> values = new TreeSet<>();
+ // gather enum values
List<FieldInfo> fields = c.fields();
- for (int i = 1; i< fields.size(); i++) {
- values.add(fields.get(i).name());
+ for (int i = 1; i < fields.size(); i++) {
+ FieldInfo f = fields.get(i);
+ if (f.isEnumConstant()) {
+ values.add(f.name());
+ }
}
AnnotationSpec.Builder builder = AnnotationSpec.builder(CN_YAML_PROPERTY);
@@ -1055,9 +1059,13 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
Set<String> values = new TreeSet<>();
+ // gather enum values
List<FieldInfo> fields = c.fields();
- for (int i = 1; i< fields.size(); i++) {
- values.add(fields.get(i).name());
+ for (int i = 1; i < fields.size(); i++) {
+ FieldInfo f = fields.get(i);
+ if (f.isEnumConstant()) {
+ values.add(f.name());
+ }
}
AnnotationSpec.Builder builder = AnnotationSpec.builder(CN_YAML_PROPERTY);
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 40c67e1..f63b229 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
@@ -3861,7 +3861,7 @@
},
"library" : {
"type" : "string",
- "enum" : [ "ApacheAvro", "Jackson", "dataFormatName" ]
+ "enum" : [ "ApacheAvro", "Jackson" ]
},
"module-class-names" : {
"type" : "string"
@@ -4666,7 +4666,7 @@
},
"library" : {
"type" : "string",
- "enum" : [ "Fastjson", "Gson", "Jackson", "Johnzon", "Jsonb", "XStream", "dataFormatName" ]
+ "enum" : [ "Fastjson", "Gson", "Jackson", "Johnzon", "Jsonb", "XStream" ]
},
"module-class-names" : {
"type" : "string"
@@ -4834,7 +4834,7 @@
},
"library" : {
"type" : "string",
- "enum" : [ "GoogleProtobuf", "Jackson", "dataFormatName" ]
+ "enum" : [ "GoogleProtobuf", "Jackson" ]
},
"module-class-names" : {
"type" : "string"
@@ -5277,7 +5277,7 @@
},
"library" : {
"type" : "string",
- "enum" : [ "SnakeYAML", "dataFormatName" ]
+ "enum" : [ "SnakeYAML" ]
},
"max-aliases-for-collections" : {
"type" : "number"