You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2021/02/26 10:08:50 UTC
[camel] 02/09: CAMEL-12545: create a yaml based route loader (fix
findings)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b39bbad583b2c2b9a8bf24c44c4283513de5f592
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Thu Feb 25 14:28:06 2021 +0100
CAMEL-12545: create a yaml based route loader (fix findings)
---
.../apache/camel/dsl/yaml/common/YamlSupport.java | 2 +-
.../EndpointConsumerDeserializersResolver.java | 1 +
.../EndpointProducerDeserializersResolver.java | 1 +
.../deserializers/ExpressionDeserializers.java | 1 +
.../dsl/yaml/deserializers/ModelDeserializers.java | 1 +
.../deserializers/ModelDeserializersResolver.java | 1 +
.../dsl/yaml/GenerateYamlDeserializersMojo.java | 39 ++++++++++------------
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlSupport.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlSupport.java
index 054158d..823b3f1 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlSupport.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlSupport.java
@@ -53,7 +53,7 @@ public final class YamlSupport {
ObjectHelper.notNull(properties, "properties");
if (target instanceof CamelContext) {
- throw new UnsupportedOperationException("Configuring the Camel Context si not supported");
+ throw new UnsupportedOperationException("Configuring the Camel Context is not supported");
}
PropertyConfigurer configurer = null;
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointConsumerDeserializersResolver.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointConsumerDeserializersResolver.java
index 2039f99..08e3926 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointConsumerDeserializersResolver.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointConsumerDeserializersResolver.java
@@ -1,3 +1,4 @@
+// Generated by camel-yaml-dsl-maven-plugin - do NOT edit this file!
package org.apache.camel.dsl.yaml.deserializers;
import java.lang.Override;
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointProducerDeserializersResolver.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointProducerDeserializersResolver.java
index 6e88e76..f4a0fb2 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointProducerDeserializersResolver.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/EndpointProducerDeserializersResolver.java
@@ -1,3 +1,4 @@
+// Generated by camel-yaml-dsl-maven-plugin - do NOT edit this file!
package org.apache.camel.dsl.yaml.deserializers;
import java.lang.Override;
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ExpressionDeserializers.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ExpressionDeserializers.java
index 1e32016..983ec9e 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ExpressionDeserializers.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ExpressionDeserializers.java
@@ -1,3 +1,4 @@
+// Generated by camel-yaml-dsl-maven-plugin - do NOT edit this file!
package org.apache.camel.dsl.yaml.deserializers;
import java.lang.Object;
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 0b68363..4b8acce 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
@@ -1,3 +1,4 @@
+// Generated by camel-yaml-dsl-maven-plugin - do NOT edit this file!
package org.apache.camel.dsl.yaml.deserializers;
import java.lang.Override;
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
index de0acb8..8d6755f 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
@@ -1,3 +1,4 @@
+// Generated by camel-yaml-dsl-maven-plugin - do NOT edit this file!
package org.apache.camel.dsl.yaml.deserializers;
import java.lang.Override;
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 5c58bfe..374870b 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
@@ -78,31 +78,26 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
@Override
protected void generate() throws MojoFailureException {
try {
- JavaFile.builder(packageName, generateExpressionDeserializers())
+ write(generateExpressionDeserializers());
+ write(generateEndpointProducer());
+ write(generateEndpointConsumer());
+ write(generateDeserializers());
+ } catch (Exception e) {
+ throw new MojoFailureException(e.getMessage(), e);
+ }
+ }
+
+ private void write(TypeSpec... specs) throws Exception {
+ write(Arrays.asList(specs));
+ }
+
+ private void write(Collection<TypeSpec> specs) throws Exception {
+ for (TypeSpec typeSpec: specs) {
+ JavaFile.builder(packageName, typeSpec)
+ .addFileComment("Generated by camel-yaml-dsl-maven-plugin - do NOT edit this file!")
.indent(" ")
.build()
.writeTo(sourcesOutputDir.toPath());
-
- for (TypeSpec type: generateEndpointProducer()) {
- JavaFile.builder(packageName, type)
- .indent(" ")
- .build()
- .writeTo(sourcesOutputDir.toPath());
- }
- for (TypeSpec type: generateEndpointConsumer()) {
- JavaFile.builder(packageName, type)
- .indent(" ")
- .build()
- .writeTo(sourcesOutputDir.toPath());
- }
- for (TypeSpec type: generateDeserializers()) {
- JavaFile.builder(packageName, type)
- .indent(" ")
- .build()
- .writeTo(sourcesOutputDir.toPath());
- }
- } catch (Exception e) {
- throw new MojoFailureException(e.getMessage(), e);
}
}