This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9b1b907f2bc055b14891620d9a77dd40a3817737 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Fri Feb 11 11:54:56 2022 +0100 (chores) camel-maven-package-plugin: use modern Java language features when possible --- .../maven/packaging/AbstractGenerateConfigurerMojo.java | 4 +--- .../apache/camel/maven/packaging/AbstractGeneratorMojo.java | 2 +- .../org/apache/camel/maven/packaging/EndpointDslMojo.java | 2 +- .../camel/maven/packaging/EndpointSchemaGeneratorMojo.java | 2 +- .../camel/maven/packaging/PackageArchetypeCatalogMojo.java | 12 +++--------- .../java/org/apache/camel/maven/packaging/XRefCheckMojo.java | 2 +- .../org/apache/camel/maven/packaging/generics/ClassUtil.java | 2 +- 7 files changed, 9 insertions(+), 17 deletions(-) diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java index 5ae9b2f..c2ff0bb 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java @@ -284,9 +284,7 @@ public abstract class AbstractGenerateConfigurerMojo extends AbstractGeneratorMo private Collection<Artifact> getAllDependencies() throws MojoExecutionException { List<Artifact> artifacts = new ArrayList<>(); - for (Iterator<?> dependencies = project.getDependencies().iterator(); dependencies.hasNext();) { - Dependency dependency = (Dependency) dependencies.next(); - + for (Dependency dependency : project.getDependencies()) { String groupId = dependency.getGroupId(); String artifactId = dependency.getArtifactId(); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGeneratorMojo.java index 3b10f3b..457ecef 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGeneratorMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGeneratorMojo.java @@ -151,7 +151,7 @@ public abstract class AbstractGeneratorMojo extends AbstractMojo { } protected static <T> Supplier<T> cache(Supplier<T> supplier) { - return new Supplier<T>() { + return new Supplier<>() { T value; @Override 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 893e17b..9b4cc10 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 @@ -846,7 +846,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo { javaClass.addAnnotation(Generated.class).setStringValue("value", EndpointDslMojo.class.getName()); // sort methods - Collections.sort(methods, (m1, m2) -> m1.getName().compareToIgnoreCase(m2.getName())); + methods.sort((m1, m2) -> m1.getName().compareToIgnoreCase(m2.getName())); // create method for (Method method : methods) { javaClass.addMethod(method); 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 8148c65..bcfd78c 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 @@ -151,7 +151,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { } } // make sure we sort the classes in case one inherit from the other - classes.sort((c1, c2) -> compareClasses(c1, c2)); + classes.sort(this::compareClasses); Map<Class, ComponentModel> models = new HashMap<>(); for (Class<?> classElement : classes) { diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageArchetypeCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageArchetypeCatalogMojo.java index d9222d0..928c18e 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageArchetypeCatalogMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageArchetypeCatalogMojo.java @@ -17,12 +17,10 @@ package org.apache.camel.maven.packaging; import java.io.File; -import java.io.FileFilter; import java.io.FileOutputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import org.apache.camel.tooling.util.PackageHelper; @@ -91,12 +89,8 @@ public class PackageArchetypeCatalogMojo extends AbstractMojo { log.info("Scanning for Camel Maven Archetypes from directory: " + archetypes); // find all archetypes which are in the parent dir of the build dir - File[] dirs = archetypes.listFiles(new FileFilter() { - @Override - public boolean accept(File pathname) { - return pathname.getName().startsWith("camel-archetype") && pathname.isDirectory(); - } - }); + File[] dirs + = archetypes.listFiles(pathname -> pathname.getName().startsWith("camel-archetype") && pathname.isDirectory()); List<ArchetypeModel> models = new ArrayList<>(); @@ -154,7 +148,7 @@ public class PackageArchetypeCatalogMojo extends AbstractMojo { } // sort the models by artifact id so its generated in same order - Collections.sort(models, (o1, o2) -> o1.getArtifactId().compareToIgnoreCase(o2.getArtifactId())); + models.sort((o1, o2) -> o1.getArtifactId().compareToIgnoreCase(o2.getArtifactId())); log.info("Found " + models.size() + " archetypes"); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java index 7f145ef..25cdce6 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java @@ -73,7 +73,7 @@ public class XRefCheckMojo extends AbstractMojo { Map<String, String> attributes = (Map) ((Map) site.get("asciidoc")).get("attributes"); if (attributes != null) { attributes = attributes.entrySet().stream() - .collect(Collectors.toMap(e -> "{" + e.getKey() + "}", e -> e.getValue())); + .collect(Collectors.toMap(e -> "{" + e.getKey() + "}", Map.Entry::getValue)); } Map<String, List<Path>> componentPaths = new HashMap<>(); Map<String, List<String>> componentNavs = new HashMap<>(); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/ClassUtil.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/ClassUtil.java index e1bb23c..005e055 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/ClassUtil.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/ClassUtil.java @@ -211,7 +211,7 @@ public final class ClassUtil { public static boolean hasAnnotation(String fqAnnotationName, Class<?> cl) { return Stream.of(cl.getAnnotations()) .map(annotation -> annotation.annotationType().getName()) - .filter(className -> fqAnnotationName.equals(className)) + .filter(fqAnnotationName::equals) .findFirst().isPresent(); } }
