This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch api
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bc2a363dc6726ea90d912eb9afed543991dd2af1
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Sep 16 13:39:55 2020 +0200
CAMEL-15478: Generate enum values in component json in a nicer human
readable form.
---
tooling/maven/camel-package-maven-plugin/pom.xml | 5 ++++-
.../camel/maven/packaging/EndpointSchemaGeneratorMojo.java | 7 +++++++
.../org/apache/camel/maven/packaging/SchemaGeneratorMojo.java | 11 +++++++++--
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml
b/tooling/maven/camel-package-maven-plugin/pom.xml
index e29d56b..f52959e 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -45,7 +45,10 @@
</dependencyManagement>
<dependencies>
- <!-- use our patched ordered json-simple parser -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-util</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-util-json</artifactId>
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index 1433df9..2b5e9f9 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -71,6 +71,7 @@ import org.apache.camel.tooling.util.JavadocHelper;
import org.apache.camel.tooling.util.PackageHelper;
import org.apache.camel.tooling.util.Strings;
import org.apache.camel.tooling.util.srcgen.GenericType;
+import org.apache.camel.util.StringHelper;
import org.apache.camel.util.json.Jsoner;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -751,6 +752,8 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
enums = new ArrayList<>();
for (Object val : fieldType.getEnumConstants()) {
String str = val.toString();
+ // make the enum nicely human readable instead of
typically upper cased
+ str = StringHelper.camelCaseToDash(str);
if (!enums.contains(str)) {
enums.add(str);
}
@@ -918,6 +921,8 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
enums = new ArrayList<>();
for (Object val : fieldTypeElement.getEnumConstants())
{
String str = val.toString();
+ // make the enum nicely human readable instead of
typically upper cased
+ str = StringHelper.camelCaseToDash(str);
if (!enums.contains(str)) {
enums.add(str);
}
@@ -1041,6 +1046,8 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
enums = new ArrayList<>();
for (Object val :
fieldTypeElement.getEnumConstants()) {
String str = val.toString();
+ // make the enum nicely human readable instead
of typically upper cased
+ str = StringHelper.camelCaseToDash(str);
if (!enums.contains(str)) {
enums.add(str);
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
index 54e6976..09f7c98 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
@@ -56,6 +56,7 @@ import org.apache.camel.tooling.util.JavadocHelper;
import org.apache.camel.tooling.util.PackageHelper;
import org.apache.camel.tooling.util.Strings;
import org.apache.camel.tooling.util.srcgen.GenericType;
+import org.apache.camel.util.StringHelper;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -410,7 +411,10 @@ public class SchemaGeneratorMojo extends
AbstractGeneratorMojo {
isEnum = fieldTypeElement.isEnum();
if (isEnum) {
for (Object val : fieldTypeElement.getEnumConstants()) {
- enums.add(val.toString());
+ // make the enum nicely human readable instead of
typically upper cased
+ String str = val.toString();
+ str = StringHelper.camelCaseToDash(str);
+ enums.add(str);
}
}
}
@@ -535,7 +539,10 @@ public class SchemaGeneratorMojo extends
AbstractGeneratorMojo {
isEnum = fieldTypeElement.isEnum();
if (isEnum) {
for (Object val : fieldTypeElement.getEnumConstants()) {
- enums.add(val.toString());
+ // make the enum nicely human readable instead of
typically upper cased
+ String str = val.toString();
+ str = StringHelper.camelCaseToDash(str);
+ enums.add(str);
}
}
}
