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 69ac29dc23105a0f8203e223356c3781731a5862 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Fri Feb 11 11:40:27 2022 +0100 (chores) camel-maven-package-plugin: consolidate duplicated logic --- .../packaging/AbstractGenerateConfigurerMojo.java | 3 --- .../maven/packaging/AbstractGenerateMojo.java | 11 ++++++-- .../camel/maven/packaging/EndpointDslMojo.java | 15 ++--------- .../packaging/EndpointSchemaGeneratorMojo.java | 5 ++-- .../apache/camel/maven/packaging/MvelHelper.java | 1 - .../camel/maven/packaging/PrepareCatalogMojo.java | 1 - .../camel/maven/packaging/dsl/DslHelper.java | 31 +++++++++++++--------- .../packaging/generics/OwbTypeVariableImpl.java | 2 -- 8 files changed, 31 insertions(+), 38 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 c0c8750..5ae9b2f 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 @@ -410,9 +410,6 @@ public abstract class AbstractGenerateConfigurerMojo extends AbstractGeneratorMo if ("setBindingMode".equals(setter.getName()) || "setHostNameResolver".equals(setter.getName())) { // we only want the string setter return setter.getParameterTypes()[0] == String.class; - } else if ("setHostNameResolver".equals(setter.getName())) { - // we only want the string setter - return setter.getParameterTypes()[0] == String.class; } Metadata meta = setter.getAnnotation(Metadata.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 0f9d995..3ec494f 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 @@ -104,10 +104,9 @@ public abstract class AbstractGenerateMojo extends AbstractMojo { private void writeIncrementalInfo(MavenProject project) throws MojoExecutionException { try { Path cacheData = getIncrementalDataPath(project); - String curdata = getIncrementalData(); Files.createDirectories(cacheData.getParent()); try (Writer w = Files.newBufferedWriter(cacheData)) { - w.append(curdata); + w.append(INCREMENTAL_DATA); } } catch (IOException e) { throw new MojoExecutionException("Error checking manifest uptodate status", e); @@ -150,6 +149,14 @@ public abstract class AbstractGenerateMojo extends AbstractMojo { 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 ""; } 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 6721fb6..89b6728 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 java.util.stream.Collectors; 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; @@ -919,19 +920,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo { } 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; } 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 cfad994..8148c65 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 @@ -295,9 +295,8 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { private String getExcludedEnd(Metadata classElement) { String excludedEndpointProperties = ""; - Metadata endpointMetadata = classElement; - if (endpointMetadata != null) { - excludedEndpointProperties = endpointMetadata.excludeProperties(); + if (classElement != null) { + excludedEndpointProperties = classElement.excludeProperties(); } return excludedEndpointProperties; } 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 42f158b..8e08704 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,7 +39,6 @@ public final class MvelHelper { } final String escapedCurlyBrackets = CURLY_BRACKET_ESCAPE.matcher(raw).replaceAll("\\\\$1\\}"); - final String escapedUrls = URL_ESCAPE.matcher(escapedCurlyBrackets).replaceAll("\\\\$1"); return URL_ESCAPE.matcher(escapedCurlyBrackets).replaceAll("\\\\$1"); } 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 8d5d18e..15b7977 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 @@ -825,7 +825,6 @@ public class PrepareCatalogMojo extends AbstractMojo { missing.clear(); for (String other : others) { - String name = other; if (!docs.contains(other)) { missing.add(other); 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 67dc018..f67ff93 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 @@ -52,19 +52,24 @@ public final class DslHelper { 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; } 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 bd18f99..96d50cf 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 @@ -44,8 +44,6 @@ public class OwbTypeVariableImpl { return (TypeVariable)Proxy.newProxyInstance(OwbTypeVariableImpl.class.getClassLoader(), TYPE_VARIABLE_TYPES, new OwbTypeVariableInvocationHandler(typeVariable, bounds)); - - return tv; } public static class OwbTypeVariableInvocationHandler implements InvocationHandler {
