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 b0bc0765e749358fb169414fddc0aae2c0f550b8 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Fri Feb 11 11:39:23 2022 +0100 (chores) camel-maven-package-plugin: consolidate duplicated logic --- .../camel/maven/packaging/AbstractGenerateConfigurerMojo.java | 2 +- .../apache/camel/maven/packaging/AbstractGenerateMojo.java | 11 +++-------- .../java/org/apache/camel/maven/packaging/MvelHelper.java | 2 +- .../org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 4 ++-- .../org/apache/camel/maven/packaging/PrepareExampleMojo.java | 3 +-- .../org/apache/camel/maven/packaging/UpdateReadmeMojo.java | 6 ++---- .../camel/maven/packaging/generics/OwbTypeVariableImpl.java | 3 ++- 7 files changed, 12 insertions(+), 19 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 2846049..c0c8750 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 @@ -407,7 +407,7 @@ public abstract class AbstractGenerateConfigurerMojo extends AbstractGeneratorMo private boolean filterSetter(Method setter) { // special for some - if ("setBindingMode".equals(setter.getName())) { + 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())) { 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 e6b0a67..6f9f9dd 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.apache.maven.project.MavenProjectHelper; 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; @@ -116,14 +117,8 @@ public abstract class AbstractGenerateMojo extends AbstractMojo { private boolean isUpToDate(MavenProject project) throws MojoExecutionException { try { Path cacheData = getIncrementalDataPath(project); - String prvdata; - if (Files.isRegularFile(cacheData)) { - prvdata = new String(Files.readAllBytes(cacheData), StandardCharsets.UTF_8); - } else { - prvdata = null; - } - String curdata = getIncrementalData(); - if (curdata.equals(prvdata)) { + final String prvdata = getPreviousRunData(cacheData); + if (prvdata.isEmpty()) { long lastmod = Files.getLastModifiedTime(cacheData).toMillis(); Set<String> stale = Stream.concat(Stream.concat( project.getCompileSourceRoots().stream().map(File::new), 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 9db78f0..42f158b 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 @@ -41,7 +41,7 @@ public final class MvelHelper { 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/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java index 1c06890..8d5d18e 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 @@ -827,8 +827,8 @@ public class PrepareCatalogMojo extends AbstractMojo { 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 6cd4339..4d2e0e5 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 @@ public class PrepareExampleMojo extends AbstractMojo { Map<String, Object> 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/UpdateReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java index e755cf6..369023b 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 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo { } 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 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo { } 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/generics/OwbTypeVariableImpl.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbTypeVariableImpl.java index 93af431..bd18f99 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,7 +41,8 @@ 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, + + return (TypeVariable)Proxy.newProxyInstance(OwbTypeVariableImpl.class.getClassLoader(), TYPE_VARIABLE_TYPES, new OwbTypeVariableInvocationHandler(typeVariable, bounds)); return tv;
