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
The following commit(s) were added to refs/heads/master by this push:
new c684e2a Fixed CS
c684e2a is described below
commit c684e2a944a9b8463e7d9c32ce21eac0ffe193f7
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Feb 6 16:06:42 2020 +0100
Fixed CS
---
.../maven/packaging/AbstractGenerateMojo.java | 2 +-
.../camel/maven/packaging/ComponentDslMojo.java | 6 +--
.../packaging/EndpointSchemaGeneratorMojo.java | 8 ++--
.../maven/packaging/PackageDataFormatMojo.java | 6 ++-
.../camel/maven/packaging/PackageJaxbMojo.java | 2 +-
.../camel/maven/packaging/PrepareCatalogMojo.java | 8 ++--
.../camel/maven/packaging/SchemaGeneratorMojo.java | 52 +++++++++++-----------
.../camel/maven/packaging/SpiGeneratorMojo.java | 16 +++----
.../apache/camel/maven/packaging/JavadocTest.java | 12 +----
9 files changed, 50 insertions(+), 62 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
index 5e8c48d..340b838 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
@@ -74,7 +74,7 @@ public abstract class AbstractGenerateMojo extends
AbstractMojo {
mojo.setPluginContext(getPluginContext());
((AbstractGeneratorMojo) mojo).execute(project, projectHelper,
buildContext);
- } catch (MojoExecutionException|MojoFailureException e) {
+ } catch (MojoExecutionException | MojoFailureException e) {
throw e;
} catch (Exception e) {
throw new MojoFailureException("Unable to create mojo", e);
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
index b19533c..3876b42 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
@@ -141,15 +141,13 @@ public class ComponentDslMojo extends
AbstractGeneratorMojo {
Map<File, Supplier<String>> files;
try {
- files = Files.find(buildDir.toPath(), Integer.MAX_VALUE,
- (p, a) -> a.isRegularFile() &&
p.toFile().getName().endsWith(PackageHelper.JSON_SUFIX))
+ files = Files.find(buildDir.toPath(), Integer.MAX_VALUE, (p, a) ->
a.isRegularFile() && p.toFile().getName().endsWith(PackageHelper.JSON_SUFIX))
.collect(Collectors.toMap(Path::toFile, s -> cache(() ->
loadJson(s.toFile()))));
} catch (IOException e) {
throw new RuntimeException(e.getMessage(), e);
}
executeComponent(files);
-
}
private void executeComponent(Map<File, Supplier<String>> jsonFiles)
throws MojoExecutionException, MojoFailureException {
@@ -174,7 +172,7 @@ public class ComponentDslMojo extends AbstractGeneratorMojo
{
Map<String, List<ComponentModel>> grModels =
allModels.stream().collect(Collectors.groupingBy(ComponentModel::getJavaType));
for (String componentClass : grModels.keySet()) {
List<ComponentModel> compModels = grModels.get(componentClass);
- for(ComponentModel model: compModels) {
+ for (ComponentModel model : compModels) {
// if more than one, we have a component class with
multiple components aliases
createComponentDsl(model);
}
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 6e00247..114ad54 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
@@ -493,13 +493,13 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
// We order the methods according to the source code to keep
compatibility
// with the old apt processing tool, however, we could get rid of
that
JavaClassSource source = javaClassSource(classElement.getName());
- List<MethodSource<JavaClassSource>> methodSources = source != null
?
- source.getMethods().stream()
+ List<MethodSource<JavaClassSource>> methodSources = source != null
+ ? source.getMethods().stream()
.filter(method -> method.isPublic()
&& method.getName().startsWith("set")
&& method.getParameters().size() == 1
- &&
method.getReturnType().getName().equals("void")).collect(Collectors.toList()) :
- Collections.EMPTY_LIST;
+ &&
method.getReturnType().getName().equals("void")).collect(Collectors.toList())
+ : Collections.EMPTY_LIST;
List<Method> methods =
Stream.of(classElement.getDeclaredMethods()).filter(method -> {
Metadata metadata = method.getAnnotation(Metadata.class);
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index e654968..96412ec 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -279,7 +279,9 @@ public class PackageDataFormatMojo extends
AbstractGeneratorMojo {
case "bindy-kvp":
option.setDefaultValue("KeyValue");
break;
+ default:
}
+
}
if ("library".equals(option.getName()) &&
"json".equals(model.getModelName())) {
switch (name) {
@@ -298,6 +300,7 @@ public class PackageDataFormatMojo extends
AbstractGeneratorMojo {
case "json-xstream":
option.setDefaultValue("XStream");
break;
+ default:
}
}
model.addOption(option);
@@ -479,8 +482,7 @@ public class PackageDataFormatMojo extends
AbstractGeneratorMojo {
}
public static String generateMetaInfConfigurer(String fqn) {
- return "# " + GENERATED_MSG + NL +
- "class=" + fqn + NL;
+ return "# " + GENERATED_MSG + NL + "class=" + fqn + NL;
}
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJaxbMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJaxbMojo.java
index 3f7d94a..e497733 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJaxbMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJaxbMojo.java
@@ -66,7 +66,7 @@ public class PackageJaxbMojo extends AbstractGeneratorMojo {
* 'target/classes/META-INF/jandex.idx'
*/
@Parameter(defaultValue = "${project.build.directory}/META-INF/jandex.idx")
- private File index;
+ protected File index;
/**
* The output directory for generated components file
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index 2040222..cedfdc2 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -200,11 +200,11 @@ public class PrepareCatalogMojo extends AbstractMojo {
* Maven ProjectHelper.
*/
@Component
- private MavenProjectHelper projectHelper;
+ protected MavenProjectHelper projectHelper;
- Collection<Path> allJsonFiles;
- Collection<Path> allPropertiesFiles;
- Map<Path, BaseModel<?>> allModels;
+ private Collection<Path> allJsonFiles;
+ private Collection<Path> allPropertiesFiles;
+ private Map<Path, BaseModel<?>> allModels;
/**
* Execute goal.
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 2cb73c0..8e0610b 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
@@ -81,25 +81,23 @@ import org.jboss.jandex.IndexView;
public class SchemaGeneratorMojo extends AbstractGeneratorMojo {
public static final DotName XML_ROOT_ELEMENT =
DotName.createSimple(XmlRootElement.class.getName());
+ public static final DotName XML_TYPE =
DotName.createSimple(XmlType.class.getName());
// special when using expression/predicates in the model
private static final String ONE_OF_TYPE_NAME =
"org.apache.camel.model.ExpressionSubElementDefinition";
- private static final String[] ONE_OF_LANGUAGES = new String[]
{"org.apache.camel.model.language.ExpressionDefinition",
- "org.apache.camel.model.language.NamespaceAwareExpression"};
- // special for inputs (these classes have sub classes, so we use this to
- // find all classes)
- private static final String[] ONE_OF_INPUTS = new String[]
{"org.apache.camel.model.ProcessorDefinition",
"org.apache.camel.model.rest.VerbDefinition"};
+ private static final String[] ONE_OF_LANGUAGES = new
String[]{"org.apache.camel.model.language.ExpressionDefinition",
+ "org.apache.camel.model.language.NamespaceAwareExpression"};
+ // special for inputs (these classes have sub classes, so we use this to
find all classes)
+ private static final String[] ONE_OF_INPUTS = new
String[]{"org.apache.camel.model.ProcessorDefinition",
"org.apache.camel.model.rest.VerbDefinition"};
// special for outputs (these classes have sub classes, so we use this to
// find all classes - and not in particular if they support outputs or not)
- private static final String[] ONE_OF_OUTPUTS = new String[]
{"org.apache.camel.model.ProcessorDefinition",
"org.apache.camel.model.NoOutputDefinition",
- "org.apache.camel.model.OutputDefinition",
"org.apache.camel.model.OutputExpressionNode",
- "org.apache.camel.model.NoOutputExpressionNode",
"org.apache.camel.model.SendDefinition",
- "org.apache.camel.model.InterceptDefinition",
"org.apache.camel.model.WhenDefinition",
- "org.apache.camel.model.ToDynamicDefinition"};
- // special for verbs (these classes have sub classes, so we use this to
find
- // all classes)
- private static final String[] ONE_OF_VERBS = new String[]
{"org.apache.camel.model.rest.VerbDefinition"};
- public static final DotName XML_TYPE =
DotName.createSimple(XmlType.class.getName());
+ private static final String[] ONE_OF_OUTPUTS = new
String[]{"org.apache.camel.model.ProcessorDefinition",
"org.apache.camel.model.NoOutputDefinition",
+ "org.apache.camel.model.OutputDefinition",
"org.apache.camel.model.OutputExpressionNode",
+ "org.apache.camel.model.NoOutputExpressionNode",
"org.apache.camel.model.SendDefinition",
+ "org.apache.camel.model.InterceptDefinition",
"org.apache.camel.model.WhenDefinition",
+ "org.apache.camel.model.ToDynamicDefinition"};
+ // special for verbs (these classes have sub classes, so we use this to
find all classes)
+ private static final String[] ONE_OF_VERBS = new
String[]{"org.apache.camel.model.rest.VerbDefinition"};
@Parameter(defaultValue = "${project.build.outputDirectory}")
protected File classesDirectory;
@@ -108,9 +106,9 @@ public class SchemaGeneratorMojo extends
AbstractGeneratorMojo {
@Parameter(defaultValue = "${project.basedir}/src/generated/resources")
protected File resourcesOutputDir;
- protected ClassLoader projectClassLoader;
- protected IndexView indexView;
- protected Map<String, JavaClassSource> sources = new HashMap<>();
+ private ClassLoader projectClassLoader;
+ private IndexView indexView;
+ private final Map<String, JavaClassSource> sources = new HashMap<>();
public SchemaGeneratorMojo() {
}
@@ -1057,16 +1055,16 @@ public class SchemaGeneratorMojo extends
AbstractGeneratorMojo {
private boolean hasOutput(EipModel model) {
switch (model.getName()) {
- // if we are route/rest then we accept output
- case "route":
- case "rest":
- return true;
- // special for transacted/policy which should not have output
- case "policy":
- case "transacted":
- return false;
- default:
- return model.getOptions().stream().anyMatch(option ->
"outputs".equals(option.getName()));
+ // if we are route/rest then we accept output
+ case "route":
+ case "rest":
+ return true;
+ // special for transacted/policy which should not have output
+ case "policy":
+ case "transacted":
+ return false;
+ default:
+ return model.getOptions().stream().anyMatch(option ->
"outputs".equals(option.getName()));
}
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java
index a2fb53c..3578708 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java
@@ -53,6 +53,10 @@ import org.jboss.jandex.Indexer;
@Mojo(name = "generate-spi", threadSafe = true, requiresDependencyResolution =
ResolutionScope.COMPILE_PLUS_RUNTIME, defaultPhase =
LifecyclePhase.PROCESS_CLASSES)
public class SpiGeneratorMojo extends AbstractGeneratorMojo {
+ public static final DotName SERVICE_FACTORY =
DotName.createSimple(ServiceFactory.class.getName());
+ public static final DotName SUB_SERVICE_FACTORY =
DotName.createSimple(SubServiceFactory.class.getName());
+ public static final DotName CONSTANT_PROVIDER =
DotName.createSimple(ConstantProvider.class.getName());
+
@Parameter(defaultValue = "${project.build.outputDirectory}")
protected File classesDirectory;
@Parameter(defaultValue = "${project.basedir}/src/generated/java")
@@ -60,11 +64,7 @@ public class SpiGeneratorMojo extends AbstractGeneratorMojo {
@Parameter(defaultValue = "${project.basedir}/src/generated/resources")
protected File resourcesOutputDir;
- protected ClassLoader projectClassLoader;
-
- public static final DotName SERVICE_FACTORY =
DotName.createSimple(ServiceFactory.class.getName());
- public static final DotName SUB_SERVICE_FACTORY =
DotName.createSimple(SubServiceFactory.class.getName());
- public static final DotName CONSTANT_PROVIDER =
DotName.createSimple(ConstantProvider.class.getName());
+ private ClassLoader projectClassLoader;
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
@@ -143,12 +143,10 @@ public class SpiGeneratorMojo extends
AbstractGeneratorMojo {
if
(ServiceFactory.JDK_SERVICE.equals(sfa.value().asString())) {
updateResource(resourcesOutputDir.toPath(),
"META-INF/services/" + pval.replace('.', '/'),
- "# " + GENERATED_MSG + NL +
- "class=" + className + NL);
+ "# " + GENERATED_MSG + NL + "class=" +
className + NL);
} else {
StringBuilder sb = new StringBuilder();
- sb.append("# " + GENERATED_MSG + NL +
- "class=").append(className).append(NL);
+ sb.append("# " + GENERATED_MSG + NL +
"class=").append(className).append(NL);
for (AnnotationInstance ai :
annotation.target().asClass().classAnnotations()) {
AnnotationInstance ssf =
index.getClassByName(ai.name()).classAnnotation(SUB_SERVICE_FACTORY);
if (ssf != null) {
diff --git
a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/JavadocTest.java
b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/JavadocTest.java
index 2fff9ed..4ed0727 100644
---
a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/JavadocTest.java
+++
b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/JavadocTest.java
@@ -16,23 +16,14 @@
*/
package org.apache.camel.maven.packaging;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
import org.jboss.forge.roaster.Roaster;
-import org.jboss.forge.roaster.model.JavaDocCapable;
import org.jboss.forge.roaster.model.JavaType;
-import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import static org.junit.jupiter.params.provider.Arguments.arguments;
public class JavadocTest {
+ // CHECKSTYLE:OFF
public static final String SOURCE_CLASS_1 =
" /**\n" +
" * Path to the template.\n" +
@@ -110,6 +101,7 @@ public class JavadocTest {
public static final String JAVADOC_4 =
"Messaging with AMQP protocol using Apache QPid Client.\n\nThis
class extends JmsEndpoint " +
"because it uses Apache Qpid JMS-compatible client for\nperforming
the AMQP connectivity.";
+ // CHECKSTYLE:ON
@Test
public void testJavadoc1() {
