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 042d996629ca28dc19ea3236f2bc0d40760e591d
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Wed Jan 15 14:26:46 2020 +0100
CAMEL-14389: fix CS
---
.../builder/endpoint/EndpointBuilderFactory.java | 15 +++++-------
.../camel/builder/endpoint/EndpointBuilders.java | 6 ++---
.../camel/maven/packaging/EndpointDslMojo.java | 28 ++++++++++++++--------
3 files changed, 27 insertions(+), 22 deletions(-)
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index e08bd65..7954196 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -19,25 +19,21 @@ package org.apache.camel.builder.endpoint;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.camel.Exchange;
-import org.apache.camel.Expression;
-import org.apache.camel.builder.EndpointProducerBuilder;
-import org.apache.camel.support.ExpressionAdapter;
-import javax.annotation.Generated;
+// CHECKSTYLE:OFF
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
-@Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
+@javax.annotation.Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
public interface EndpointBuilderFactory {
default org.apache.camel.Expression
endpoints(org.apache.camel.builder.EndpointProducerBuilder... endpoints) {
- return new ExpressionAdapter() {
+ return new org.apache.camel.support.ExpressionAdapter() {
- List<Expression> expressions =
Stream.of(endpoints).map(EndpointProducerBuilder::expr).collect(Collectors.toList());
+ List<org.apache.camel.Expression> expressions =
Stream.of(endpoints).map(org.apache.camel.builder.EndpointProducerBuilder::expr).collect(Collectors.toList());
@Override
- public Object evaluate(Exchange exchange) {
+ public Object evaluate(org.apache.camel.Exchange exchange) {
return expressions.stream().map(e -> e.evaluate(exchange,
Object.class)).collect(Collectors.toList());
}
};
@@ -6601,3 +6597,4 @@ public interface EndpointBuilderFactory {
return
org.apache.camel.builder.endpoint.dsl.ZooKeeperMasterEndpointBuilderFactory.zookeeperMaster(path);
}
}
+// CHECKSTYLE:ON
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
index a769f85..2645359 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
@@ -16,12 +16,11 @@
*/
package org.apache.camel.builder.endpoint;
-import javax.annotation.Generated;
-
+// CHECKSTYLE:OFF
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
-@Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
+@javax.annotation.Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
public interface EndpointBuilders {
/**
@@ -6582,3 +6581,4 @@ public interface EndpointBuilders {
return
org.apache.camel.builder.endpoint.dsl.ZooKeeperMasterEndpointBuilderFactory.zookeeperMaster(path);
}
}
+// CHECKSTYLE:ON
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 88c1574..3cec9ca 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -46,6 +46,7 @@ import com.github.javaparser.ast.PackageDeclaration;
import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
import com.github.javaparser.ast.body.MethodDeclaration;
import com.github.javaparser.ast.body.TypeDeclaration;
+import com.github.javaparser.ast.comments.LineComment;
import com.github.javaparser.ast.stmt.BlockStmt;
import org.apache.camel.maven.packaging.generics.GenericsUtil;
import org.apache.camel.maven.packaging.model.ComponentModel;
@@ -490,27 +491,28 @@ public class EndpointDslMojo extends AbstractMojo {
endpointBuilderUnit.addImport("java.util.List");
endpointBuilderUnit.addImport("java.util.stream.Collectors");
endpointBuilderUnit.addImport("java.util.stream.Stream");
- endpointBuilderUnit.addImport("org.apache.camel.Exchange");
- endpointBuilderUnit.addImport("org.apache.camel.Expression");
-
endpointBuilderUnit.addImport("org.apache.camel.builder.EndpointProducerBuilder");
-
endpointBuilderUnit.addImport("org.apache.camel.support.ExpressionAdapter");
+
+ endpointBuilderUnit.addOrphanComment(new
LineComment("CHECKSTYLE:OFF"));
// EndpointBuilderFactory
ClassOrInterfaceDeclaration endpointBuilderClass =
endpointBuilderUnit.addClass("EndpointBuilderFactory");
endpointBuilderClass.setPublic(true);
endpointBuilderClass.setInterface(true);
endpointBuilderClass.setJavadocComment("Generated by
camel-package-maven-plugin - do not edit this file!");
- endpointBuilderClass.addSingleMemberAnnotation(Generated.class, "\"" +
EndpointDslMojo.class.getName() + "\"");
+
endpointBuilderClass.addSingleMemberAnnotation("javax.annotation.Generated",
"\"" + EndpointDslMojo.class.getName() + "\"");
// EndpointBuilderFactory::endpoints
MethodDeclaration endpoints =
endpointBuilderClass.addMethod("endpoints");
endpoints.setDefault(true);
endpoints.addAndGetParameter("org.apache.camel.builder.EndpointProducerBuilder",
"endpoints").setVarArgs(true);
endpoints.setBody(block(
- "return new ExpressionAdapter() {",
- " List<Expression> expressions =
Stream.of(endpoints).map(EndpointProducerBuilder::expr).collect(Collectors.toList());",
+ "return new org.apache.camel.support.ExpressionAdapter() {",
+ " List<org.apache.camel.Expression> expressions =
Stream.of(endpoints)",
+ "
.map(org.apache.camel.builder.EndpointProducerBuilder::expr)",
+ " .collect(Collectors.toList());",
+ "",
" @Override",
- " public Object evaluate(Exchange exchange) {",
+ " public Object evaluate(org.apache.camel.Exchange exchange) {",
" return expressions.stream().map(e -> e.evaluate(exchange,
Object.class)).collect(Collectors.toList());",
" }",
"};")
@@ -563,10 +565,12 @@ public class EndpointDslMojo extends AbstractMojo {
}
}
} catch (FileNotFoundException e) {
- throw new MojoFailureException(e.getMessage());
+ throw new MojoFailureException(e.getMessage());
}
}
+
+ endpointBuilderUnit.addOrphanComment(new LineComment("CHECKSTYLE:ON"));
writeSourceIfChanged(endpointBuilderUnit.toString(),
interfaceFactoryPath);
}
@@ -577,12 +581,14 @@ public class EndpointDslMojo extends AbstractMojo {
CompilationUnit endpointBuilderUnit = new CompilationUnit();
endpointBuilderUnit.setPackageDeclaration(StringHelper.before(packageName,
".dsl"));
+ endpointBuilderUnit.addOrphanComment(new
LineComment("CHECKSTYLE:OFF"));
+
// EndpointBuilderFactory
ClassOrInterfaceDeclaration endpointBuilderClass =
endpointBuilderUnit.addClass("EndpointBuilders");
endpointBuilderClass.setPublic(true);
endpointBuilderClass.setInterface(true);
endpointBuilderClass.setJavadocComment("Generated by
camel-package-maven-plugin - do not edit this file!");
- endpointBuilderClass.addSingleMemberAnnotation(Generated.class, "\"" +
EndpointDslMojo.class.getName() + "\"");
+
endpointBuilderClass.addSingleMemberAnnotation("javax.annotation.Generated",
"\"" + EndpointDslMojo.class.getName() + "\"");
// Copy entry points from builder factories
for (File file: allComponentsDslEndpointFactories) {
@@ -633,6 +639,8 @@ public class EndpointDslMojo extends AbstractMojo {
}
}
+ endpointBuilderUnit.addOrphanComment(new LineComment("CHECKSTYLE:ON"));
+
writeSourceIfChanged(endpointBuilderUnit.toString(),
interfaceFactoryPath);
}
