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 28460490c28ef..c2ff0bb292d7b 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 @@ private Collection getAllNonTestScopedDependencies() throws MojoExecut private Collection getAllDependencies() throws MojoExecutionException { List 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(); @@ -407,10 +405,7 @@ private List processClass(String fqn) throws ClassNotFoundExce private boolean filterSetter(Method setter) { // special for some - if ("setBindingMode".equals(setter.getName())) { - // we only want the string setter - return setter.getParameterTypes()[0] == String.class; - } else if ("setHostNameResolver".equals(setter.getName())) { + if ("setBindingMode".equals(setter.getName()) || "setHostNameResolver".equals(setter.getName())) { // we only want the string setter return setter.getParameterTypes()[0] == String.class; } 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 e6b0a67438f3a..4dbe09c6be72b 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 @@ -43,6 +43,7 @@ import org.sonatype.plexus.build.incremental.BuildContext; public abstract class AbstractGenerateMojo extends AbstractMojo { + private static final String INCREMENTAL_DATA = ""; @Parameter(property = "project", required = true, readonly = true) protected MavenProject project; @@ -63,7 +64,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { writeIncrementalInfo(project); } } catch (Exception e) { - throw new MojoFailureException("Error generating data " + e.toString(), e); + throw new MojoFailureException("Error generating data " + e, e); } } @@ -103,10 +104,9 @@ protected void invoke(Class mojoClass, Map stale = Stream.concat(Stream.concat( project.getCompileSourceRoots().stream().map(File::new), @@ -155,6 +149,14 @@ private boolean isUpToDate(MavenProject project) throws MojoExecutionException { return false; } + private String getPreviousRunData(Path cacheData) throws IOException { + if (Files.isRegularFile(cacheData)) { + return new String(Files.readAllBytes(cacheData), StandardCharsets.UTF_8); + } else { + return null; + } + } + private String getIncrementalData() { return ""; } @@ -183,7 +185,7 @@ private Stream newer(long lastmod, File file) { try (ZipFile zf = new ZipFile(file)) { return zf.stream().filter(ze -> !ze.isDirectory()) .filter(ze -> ze.getLastModifiedTime().toMillis() > lastmod) - .map(ze -> file.toString() + "!" + ze.getName()).collect(Collectors.toList()).stream(); + .map(ze -> file + "!" + ze.getName()).collect(Collectors.toList()).stream(); } catch (IOException e) { throw new IOException("Error reading zip file: " + file, e); } 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 3b10f3b293709..457ecefb4d757 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 static boolean haveResourcesChanged(Log log, MavenProject project, BuildC } protected static Supplier cache(Supplier supplier) { - return new Supplier() { + 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 6721fb658468f..9b4cc1020b544 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 @@ -32,6 +32,7 @@ import javax.annotation.Generated; +import org.apache.camel.maven.packaging.dsl.DslHelper; import org.apache.camel.tooling.model.BaseModel; import org.apache.camel.tooling.model.ComponentModel; import org.apache.camel.tooling.model.ComponentModel.EndpointOptionModel; @@ -845,7 +846,7 @@ private boolean synchronizeEndpointBuildersStaticClass(List methods) thr 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); @@ -919,19 +920,7 @@ private static String camelCaseLower(String s) { } if (s != null) { s = s.substring(0, 1).toLowerCase() + s.substring(1); - switch (s) { - case "class": - s = "clas"; - break; - case "package": - s = "packag"; - break; - case "rest": - s = "restEndpoint"; - break; - default: - break; - } + s = DslHelper.sanitizeText(s); } return s; } @@ -963,7 +952,7 @@ private String getMainDescription(ComponentModel model) { if (option.isDeprecated()) { descSb.append(" deprecated"); } - descSb.append("\n" + option.getDescription()); + descSb.append("\n").append(option.getDescription()); if (option.getDefaultValue() != null) { descSb.append("\nDefault value: ").append(option.getDefaultValue()); } 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 db6b4d34f246f..bcfd78cc77705 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 @@ private void executeUriEndpoint() { } } // 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 models = new HashMap<>(); for (Class classElement : classes) { @@ -295,9 +295,8 @@ protected ComponentModel writeJSonSchemeAndPropertyConfigurer( private String getExcludedEnd(Metadata classElement) { String excludedEndpointProperties = ""; - Metadata endpointMetadata = classElement; - if (endpointMetadata != null) { - excludedEndpointProperties = endpointMetadata.excludeProperties(); + if (classElement != null) { + excludedEndpointProperties = classElement.excludeProperties(); } return excludedEndpointProperties; } @@ -339,7 +338,7 @@ private String loadResource(String fileName) { } data = PackageHelper.loadText(is); } catch (Exception e) { - throw new RuntimeException("Error while loading " + fileName + ": " + e.toString(), e); + throw new RuntimeException("Error while loading " + fileName + ": " + e, e); } resources.put(fileName, data); return data; diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java index 24e2aa85a1c1f..dcd52605b388b 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java @@ -111,7 +111,7 @@ public static String generateEndpointUriFactory(String pn, String cn, String psn w.append("\n"); w.append(" @Override\n"); w.append(" public boolean isLenientProperties() {\n"); - w.append(" return " + model.isLenientProperties() + ";\n"); + w.append(" return ").append(model.isLenientProperties()).append(";\n"); w.append(" }\n"); w.append("}\n"); w.append("\n"); @@ -213,7 +213,7 @@ private static String alternativeSchemes(ComponentModel model) { for (String alt : alts) { sj.add("\"" + alt + "\""); } - sb.append(sj.toString()); + sb.append(sj); sb.append("}"); } if (sb.length() == 0) { diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MvelHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MvelHelper.java index 9db78f0943630..8e0870436d6db 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MvelHelper.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MvelHelper.java @@ -39,9 +39,8 @@ public static String escape(final String raw) { } final String escapedCurlyBrackets = CURLY_BRACKET_ESCAPE.matcher(raw).replaceAll("\\\\$1\\}"); - final String escapedUrls = URL_ESCAPE.matcher(escapedCurlyBrackets).replaceAll("\\\\$1"); - return escapedUrls; + return URL_ESCAPE.matcher(escapedCurlyBrackets).replaceAll("\\\\$1"); } public static String componentName(String scheme) { 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 d9222d0a1b35d..928c18e8404c8 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 static void generateArchetypeCatalog(Log log, MavenProject project, Maven 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 models = new ArrayList<>(); @@ -154,7 +148,7 @@ public boolean accept(File pathname) { } // 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/PackageDataFormatMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java index bc0ccc8d522df..461861f77fb58 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 @@ -22,7 +22,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -222,8 +221,9 @@ public int prepareDataFormat() throws MojoExecutionException { .collect(Collectors.toSet()); List options = parseConfigurationSource(project, javaType); options.removeIf(o -> !names.contains(o.getName())); - names.removeAll(options.stream().map(DataFormatOptionModel::getName).collect(Collectors.toList())); - names.removeAll(Arrays.asList("id")); + options.stream().map(DataFormatOptionModel::getName).collect(Collectors.toList()) + .forEach(names::remove); + names.removeAll(List.of("id")); if (!names.isEmpty()) { log.warn("Unmapped options: " + String.join(",", names)); } diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareAssemblyMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareAssemblyMojo.java index 59becddabe5cd..5a2291e5bc5c9 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareAssemblyMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareAssemblyMojo.java @@ -112,8 +112,8 @@ protected void updatePomAndCommonBin(File allComponentsPom, String groupId, Stri StringBuilder sb = new StringBuilder(); for (String aid : artifactIds) { sb.append(" \n"); - sb.append(" " + groupId + "\n"); - sb.append(" " + aid + "\n"); + sb.append(" ").append(groupId).append("\n"); + sb.append(" ").append(aid).append("\n"); sb.append(" ${project.version}\n"); sb.append(" \n"); } @@ -130,7 +130,7 @@ protected void updatePomAndCommonBin(File allComponentsPom, String groupId, Stri // update common-bin.xml sb = new StringBuilder(); for (String aid : artifactIds) { - sb.append(" " + groupId + ":" + aid + "\n"); + sb.append(" ").append(groupId).append(":").append(aid).append("\n"); } changed = sb.toString(); updated = updateXmlFile(commonBinXml, token, changed, " "); 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 3aa2f1233a88f..15b7977c3ed98 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 @@ -198,7 +198,7 @@ public class PrepareCatalogMojo extends AbstractMojo { private Collection allJsonFiles; private Collection allPropertiesFiles; - private Map> allModels = new HashMap<>(); + private final Map> allModels = new HashMap<>(); private static String asComponentName(Path file) { String name = file.getFileName().toString(); @@ -825,10 +825,9 @@ private void printMissingDocumentsReport(Set docs, Set component missing.clear(); for (String other : others) { - String name = other; - if (!docs.contains(name)) { - missing.add(name); + if (!docs.contains(other)) { + missing.add(other); } } if (!missing.isEmpty()) { diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareExampleMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareExampleMojo.java index 6cd433914f362..4d2e0e5f4d229 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareExampleMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareExampleMojo.java @@ -196,8 +196,7 @@ private String templateExamples(List models, long deprecated) thro Map map = new HashMap<>(); map.put("examples", models); map.put("numberOfDeprecated", deprecated); - String out = (String) TemplateRuntime.eval(template, map, Collections.singletonMap("util", MvelHelper.INSTANCE)); - return out; + return (String) TemplateRuntime.eval(template, map, Collections.singletonMap("util", MvelHelper.INSTANCE)); } catch (Exception e) { throw new MojoExecutionException("Error processing mvel template. Reason: " + e, e); } diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareParentPomMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareParentPomMojo.java index 40c6cc1d79fd9..2f17ec5dc5628 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareParentPomMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareParentPomMojo.java @@ -96,8 +96,8 @@ protected void updateParentPom(String groupId, File dir, String token) throws Mo StringBuilder sb = new StringBuilder(); for (String aid : artifactIds) { sb.append(" \n"); - sb.append(" " + groupId + "\n"); - sb.append(" " + aid + "\n"); + sb.append(" ").append(groupId).append("\n"); + sb.append(" ").append(aid).append("\n"); sb.append(" ${project.version}\n"); sb.append(" \n"); } diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PropertyConfigurerGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PropertyConfigurerGenerator.java index b0a32571a464b..9b0e10466c3b1 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PropertyConfigurerGenerator.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PropertyConfigurerGenerator.java @@ -403,9 +403,9 @@ private static String createGetOrCreateConfiguration( String line1 = String.format(" private %s %s(%s target) {\n", configurationClass, methodName, targetClass); String line2 = String.format(" if (target.%s() == null) {\n", getter); String line3 = String.format(" target.%s(new %s());\n", setter, configurationClass); - String line4 = String.format(" }\n"); + String line4 = " }\n"; String line5 = String.format(" return target.%s();\n", getter); - String line6 = String.format(" }\n"); + String line6 = " }\n"; sb.append(line1).append(line2).append(line3).append(line4).append(line5).append(line6); return sb.toString(); 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 d4af08824fdd4..513ff7cc306d3 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 @@ -380,7 +380,7 @@ private boolean processAttribute( // we want to skip inheritErrorHandler which is only applicable for // the load-balancer - boolean loadBalancer = "LoadBalanceDefinition".equals(originalClassType.getSimpleName().toString()); + boolean loadBalancer = "LoadBalanceDefinition".equals(originalClassType.getSimpleName()); if (!loadBalancer && "inheritErrorHandler".equals(name)) { return true; } diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java index e755cf6116384..369023b4b96a0 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java @@ -757,8 +757,7 @@ private static String loadEipJson(File file) { } private ComponentModel generateComponentModel(String json) { - ComponentModel component = JsonMapper.generateComponentModel(json); - return component; + return JsonMapper.generateComponentModel(json); } private OtherModel generateOtherModel(String json) { @@ -767,8 +766,7 @@ private OtherModel generateOtherModel(String json) { } private DataFormatModel generateDataFormatModel(String json) { - DataFormatModel model = JsonMapper.generateDataFormatModel(json); - return model; + return JsonMapper.generateDataFormatModel(json); } private AnnotationModel generateAnnotationModel(Class annotation) { 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 0cac411163ccd..25cdce6784338 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 List checkXRef(Path path) throws IOException { Map 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> componentPaths = new HashMap<>(); Map> componentNavs = new HashMap<>(); @@ -116,7 +116,7 @@ public List checkXRef(Path path) throws IOException { .filter(Files::isRegularFile) .forEach(page -> { Path rel = pagesDir.relativize(page); - pages.put(component + ":" + m + ":" + rel.toString(), page); + pages.put(component + ":" + m + ":" + rel, page); }); }); } diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java index 67dc018416ff1..5c10174958561 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java @@ -30,11 +30,6 @@ public final class DslHelper { private DslHelper() { } - public static List loadAllJavaFiles(final File dir, final String targetJavaPackageName) { - final File allComponentsDslEndpointFactory = new File(dir, targetJavaPackageName.replace('.', '/')); - return loadAllJavaFiles(allComponentsDslEndpointFactory); - } - public static List loadAllJavaFiles(final File dir) { final File[] files = dir.listFiles(); @@ -52,19 +47,24 @@ public static List loadAllJavaFiles(final File dir) { public static String toCamelCaseLower(final String schema) { String convertedText = CaseUtils.toCamelCase(schema, false, '-', '+'); if (convertedText != null) { - switch (convertedText) { - case "class": - convertedText = "clas"; - break; - case "package": - convertedText = "packag"; - break; - case "rest": - convertedText = "restEndpoint"; - break; - default: - break; - } + convertedText = sanitizeText(convertedText); + } + return convertedText; + } + + public static String sanitizeText(String convertedText) { + switch (convertedText) { + case "class": + convertedText = "clas"; + break; + case "package": + convertedText = "packag"; + break; + case "rest": + convertedText = "restEndpoint"; + break; + default: + break; } return convertedText; } @@ -80,42 +80,8 @@ public static String getMainDescriptionWithoutPathOptions(final ComponentModel c return desc; } - public static String getMainDescription(final ComponentModel componentModel) { - String desc = getMainDescriptionWithoutPathOptions(componentModel); - // include javadoc for all path parameters and mark which are required - desc += "\n"; - desc += "\nSyntax: " + componentModel.getSyntax() + ""; - - for (ComponentModel.EndpointOptionModel option : componentModel.getEndpointOptions()) { - if ("path".equals(option.getKind())) { - desc += "\n"; - desc += "\nPath parameter: " + option.getName(); - if (option.isRequired()) { - desc += " (required)"; - } - if (option.isDeprecated()) { - desc += " deprecated"; - } - desc += "\n" + option.getDescription(); - if (option.getDefaultValue() != null) { - desc += "\nDefault value: " + option.getDefaultValue(); - } - if (option.getEnums() != null && !option.getEnums().isEmpty()) { - desc += "\nThere are " + option.getEnums().size() + " enums and the value can be one of: " - + wrapEnumValues(option.getEnums()); - } - } - } - return desc; - } - public static String generateComponentBuilderClassName(final ComponentModel componentModel, final String suffix) { return StringUtils.capitalize(toCamelCaseLower(componentModel.getScheme())) + "Component" + suffix; } - - private static String wrapEnumValues(List enumValues) { - // comma to space so we can wrap words (which uses space) - return String.join(", ", enumValues); - } } diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java index 4e586725b1668..e37788035d5c6 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java @@ -35,7 +35,7 @@ public final class ComponentDslBuilderFactoryGenerator { private final ComponentModel componentModel; private final String packageName; - private JavaClass javaClass; + private final JavaClass javaClass; private ComponentDslInnerBuilderGenerator componentDslInnerBuilderGenerator; private ComponentDslInnerImplBuilderGenerator componentDslInnerImplBuilderGenerator; diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGenerator.java index f2f5d1075feff..20275be78fc9f 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGenerator.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGenerator.java @@ -136,7 +136,7 @@ private static String createGetOrCreateConfigurationBody(String configurationCla StringBuilder sb = new StringBuilder(); String line1 = String.format("if (component.%s() == null) {\n", getter); String line2 = String.format(" component.%s(new %s());\n", setter, configurationClass); - String line3 = String.format("}\n"); + String line3 = "}\n"; String line4 = String.format("return component.%s();\n", getter); sb.append(line1).append(line2).append(line3).append(line4); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java index e7df1ee65220c..284e9b53b7bc6 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java @@ -38,7 +38,7 @@ public final class ComponentsBuilderFactoryGenerator { private final String packageName; private final Set componentModels; - private JavaClass javaClass; + private final JavaClass javaClass; private ComponentsBuilderFactoryGenerator(final Set componentModels, final ClassLoader classLoader, final String packageName) { diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java index ab73b572cd149..7f9bc62d44702 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java @@ -41,9 +41,9 @@ */ public class ComponentsDslMetadataRegistry { - private Map componentsCache; - private Set componentsDslFactories; - private File metadataFile; + private final Map componentsCache; + private final Set componentsDslFactories; + private final File metadataFile; public ComponentsDslMetadataRegistry(final File componentDslDir, final File metadataFile) { // First: Load the content of the metadata file into memory 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 e1bb23cbcbe32..005e055d3588e 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 @@ private static Class getRawPrimitiveType(Type type) { 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(); } } diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java index 7cc64e075f53c..443634f4e9e88 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java @@ -17,7 +17,6 @@ package org.apache.camel.maven.packaging.generics; import java.lang.reflect.Array; -import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.GenericArrayType; import java.lang.reflect.GenericDeclaration; @@ -43,55 +42,6 @@ public final class GenericsUtil { private GenericsUtil() { } - public static boolean satisfiesDependency( - boolean isDelegateOrEvent, boolean isProducer, Type injectionPointType, Type beanType) { - if (beanType instanceof TypeVariable || beanType instanceof WildcardType || beanType instanceof GenericArrayType) { - return isAssignableFrom(isDelegateOrEvent, isProducer, injectionPointType, beanType); - } else { - Type injectionPointRawType = injectionPointType instanceof ParameterizedType - ? ((ParameterizedType) injectionPointType).getRawType() : injectionPointType; - Type beanRawType = beanType instanceof ParameterizedType ? ((ParameterizedType) beanType).getRawType() : beanType; - - if (ClassUtil.isSame(injectionPointRawType, beanRawType)) { - return isAssignableFrom(isDelegateOrEvent, isProducer, injectionPointType, beanType); - } - } - - return false; - } - - public static boolean satisfiesDependencyRaw( - boolean isDelegateOrEvent, boolean isProducer, Type injectionPointType, Type beanType) { - if (beanType instanceof TypeVariable || beanType instanceof WildcardType || beanType instanceof GenericArrayType) { - return isAssignableFrom(isDelegateOrEvent, isProducer, injectionPointType, beanType); - } else { - Type injectionPointRawType = injectionPointType instanceof ParameterizedType - ? ((ParameterizedType) injectionPointType).getRawType() : injectionPointType; - Type beanRawType = beanType instanceof ParameterizedType ? ((ParameterizedType) beanType).getRawType() : beanType; - - if (ClassUtil.isSame(injectionPointRawType, beanRawType)) { - return isAssignableFrom(isDelegateOrEvent, isProducer, injectionPointRawType, beanRawType); - } else { - Class bean = (Class) beanType; - if (bean.getSuperclass() != null && ClassUtil.isRawClassEquals(injectionPointType, bean.getSuperclass())) { - return true; - } - - Class[] interfaces = bean.getInterfaces(); - if (interfaces == null || interfaces.length == 0) { - return false; - } - - for (Class clazz : interfaces) { - if (ClassUtil.isRawClassEquals(injectionPointType, clazz)) { - return true; - } - } - } - } - - return false; - } /** * 5.2.3 and 5.2.4 @@ -402,10 +352,6 @@ public static boolean containsTypeVariable(Type type) { } - public static boolean containTypeVariable(Collection types) { - return containTypeVariable(types.toArray(new Type[types.size()])); - } - public static boolean containTypeVariable(Type[] types) { for (Type type : types) { if (containsTypeVariable(type)) { @@ -415,30 +361,6 @@ public static boolean containTypeVariable(Type[] types) { return false; } - /** - * @param type to check - * @return {@code true} if the given type contains a {@link WildcardType} {@code false} otherwise - */ - public static boolean containsWildcardType(Type type) { - if (!(type instanceof ParameterizedType)) { - return false; - } - - for (Type typeArgument : getParameterizedType(type).getActualTypeArguments()) { - if (ClassUtil.isParameterizedType(typeArgument)) { - if (containsWildcardType(typeArgument)) { - return true; - } - } else { - if (ClassUtil.isWildCardType(typeArgument)) { - return true; - } - } - } - - return false; - } - /** * Resolves the actual type of the specified field for the type hierarchy specified by the given subclass */ @@ -446,21 +368,6 @@ public static Type resolveType(Class subclass, Field field) { return resolveType(field.getGenericType(), subclass, newSeenList()); } - /** - * Resolves the actual return type of the specified method for the type hierarchy specified by the given subclass - */ - public static Type resolveReturnType(Class subclass, Method method) { - return resolveType(method.getGenericReturnType(), subclass, newSeenList()); - } - - /** - * Resolves the actual parameter generics of the specified constructor for the type hierarchy specified by the given - * subclass - */ - public static Type[] resolveParameterTypes(Class subclass, Constructor constructor) { - return resolveTypes(constructor.getGenericParameterTypes(), subclass); - } - /** * Resolves the actual parameter generics of the specified method for the type hierarchy specified by the given * subclass @@ -469,17 +376,6 @@ public static Type[] resolveParameterTypes(Class subclass, Method method) { return resolveTypes(method.getGenericParameterTypes(), subclass); } - /** - * Resolves the actual type of the specified type for the type hierarchy specified by the given subclass - */ - public static Type resolveType(Type type, Class subclass, Member member) { - return resolveType(type, subclass, newSeenList()); - } - - public static Type resolveType(Type type, Class subclass, Member member, Collection> seen) { - return resolveType(type, subclass, seen); - } - public static Type resolveType(Type type, Type actualType, Collection> seen) { if (type instanceof Class) { return type; @@ -535,10 +431,6 @@ public static Type[] resolveTypes(Type[] types, Type actualType) { return resolvedTypeArguments; } - public static Set getTypeClosure(Class type) { - return getTypeClosure(type, type); - } - public static Set getTypeClosure(Type actualType) { return getTypeClosure(actualType, actualType); } @@ -895,8 +787,4 @@ private static Type createArrayType(Type componentType) { return new OwbGenericArrayTypeImpl(componentType); } } - - public static Type resolveType(ParameterizedType parameterizedType, Type metadataType) { - return resolveType(parameterizedType, metadataType, newSeenList()); - } } diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbGenericArrayTypeImpl.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbGenericArrayTypeImpl.java index 501580de759bf..47fa6d2be47fc 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbGenericArrayTypeImpl.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbGenericArrayTypeImpl.java @@ -21,7 +21,7 @@ public class OwbGenericArrayTypeImpl implements GenericArrayType { - private Type componentType; + private final Type componentType; public OwbGenericArrayTypeImpl(Type componentType) { this.componentType = componentType; diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbTypeVariableImpl.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbTypeVariableImpl.java index f3c73eb41a55f..96d50cf3d1c69 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbTypeVariableImpl.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbTypeVariableImpl.java @@ -41,17 +41,16 @@ public class OwbTypeVariableImpl { * @return the typeVariable with the defined bounds. */ public static TypeVariable createTypeVariable(TypeVariable typeVariable, Type... bounds) { - TypeVariable tv = (TypeVariable)Proxy.newProxyInstance(OwbTypeVariableImpl.class.getClassLoader(), TYPE_VARIABLE_TYPES, - new OwbTypeVariableInvocationHandler(typeVariable, bounds)); - return tv; + return (TypeVariable)Proxy.newProxyInstance(OwbTypeVariableImpl.class.getClassLoader(), TYPE_VARIABLE_TYPES, + new OwbTypeVariableInvocationHandler(typeVariable, bounds)); } public static class OwbTypeVariableInvocationHandler implements InvocationHandler { - private String name; - private GenericDeclaration genericDeclaration; - private Type[] bounds; + private final String name; + private final GenericDeclaration genericDeclaration; + private final Type[] bounds; public OwbTypeVariableInvocationHandler(TypeVariable typeVariable, Type... bounds) { name = typeVariable.getName(); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbWildcardTypeImpl.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbWildcardTypeImpl.java index 14bb1de301cce..458d7e5c095fa 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbWildcardTypeImpl.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbWildcardTypeImpl.java @@ -21,8 +21,8 @@ public class OwbWildcardTypeImpl implements WildcardType { - private Type[] upperBounds; - private Type[] lowerBounds; + private final Type[] upperBounds; + private final Type[] lowerBounds; public OwbWildcardTypeImpl(Type[] upperBounds, Type[] lowerBounds) { this.upperBounds = upperBounds.clone();