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 2020/01/16 05:09:35 UTC
[camel] 03/03: Fixed CS
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit aac0efbc7aec0e55cc829efe6c7d7a8bdcf3abe9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 16 06:09:01 2020 +0100
Fixed CS
---
.../org/apache/camel/maven/packaging/EndpointDslMojo.java | 11 +++++------
.../camel/maven/packaging/ModelXmlParserGeneratorMojo.java | 9 +++++----
2 files changed, 10 insertions(+), 10 deletions(-)
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 a8a48a5..0ce9dac 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
@@ -51,18 +51,17 @@ import org.apache.camel.maven.packaging.generics.GenericsUtil;
import org.apache.camel.maven.packaging.model.ComponentModel;
import org.apache.camel.maven.packaging.model.ComponentOptionModel;
import org.apache.camel.maven.packaging.model.EndpointOptionModel;
-import org.apache.camel.tooling.util.srcgen.GenericType;
-import org.apache.camel.tooling.util.srcgen.GenericType.BoundType;
-import org.apache.camel.tooling.util.srcgen.JavaClass;
-import org.apache.camel.tooling.util.srcgen.Method;
-import org.apache.camel.tooling.util.JSonSchemaHelper;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.spi.UriPath;
+import org.apache.camel.tooling.util.JSonSchemaHelper;
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.tooling.util.srcgen.GenericType.BoundType;
+import org.apache.camel.tooling.util.srcgen.JavaClass;
+import org.apache.camel.tooling.util.srcgen.Method;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
index 8ea2901..ad58c9b 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
@@ -79,9 +79,8 @@ import org.jboss.jandex.IndexReader;
@Mojo(name = "generate-xml-parser", threadSafe = true, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, defaultPhase = LifecyclePhase.PROCESS_CLASSES)
public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
- private static final String XML_PARSER_PACKAGE = "org.apache.camel.xml.io";
+ public static final String XML_PARSER_PACKAGE = "org.apache.camel.xml.io";
public static final String XML_PULL_PARSER_EXCEPTION = XML_PARSER_PACKAGE + ".XmlPullParserException";
-
public static final String PARSER_PACKAGE = "org.apache.camel.xml.in";
public static final String MODEL_PACKAGE = "org.apache.camel.model";
@@ -105,7 +104,7 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
try {
classLoader = DynamicClassLoader.createDynamicClassLoader(project.getCompileClasspathElements());
} catch (DependencyResolutionRequiredException e) {
- throw new MojoExecutionException( "DependencyResolutionRequiredException: " + e.getMessage(), e );
+ throw new MojoExecutionException("DependencyResolutionRequiredException: " + e.getMessage(), e);
}
outputDefinitionClass = loadClass(classLoader, MODEL_PACKAGE + ".OutputDefinition");
@@ -122,7 +121,7 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
try (InputStream is = new URL(url).openStream()) {
index = new IndexReader(is).read();
} catch (IOException e) {
- throw new MojoExecutionException( "IOException: " + e.getMessage(), e );
+ throw new MojoExecutionException("IOException: " + e.getMessage(), e);
}
List<Class<?>> model = Stream.of(XmlRootElement.class, XmlEnum.class, XmlType.class)
.map(Class::getName)
@@ -204,6 +203,7 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
);
}
+ // CHECKSTYLE:OFF
private JavaClass generateParser(List<Class<?>> model, ClassLoader classLoader) {
JavaClass parser = new JavaClass(classLoader);
parser.setMaxImportPerPackage(4);
@@ -624,6 +624,7 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
return parser;
}
+ // CHECKSTYLE:ON
private String conversion(JavaClass parser, GenericType type, String val) {
Class<?> rawClass = type.getRawClass();