You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/02/11 13:51:34 UTC
[camel] branch main updated (ad0be74b -> 3337bf4)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from ad0be74b (chores) ci: experimental support for automated PR analysis with SonarCloud
new d4fc4cc (chores) camel-maven-package-plugin: use final variables and fields when possible
new b0bc076 (chores) camel-maven-package-plugin: consolidate duplicated logic
new eff3488 (chores) camel-maven-package-plugin: removed redundant calls to toString()
new 69ac29d (chores) camel-maven-package-plugin: consolidate duplicated logic
new d886a86 (chores) camel-maven-package-plugin: use more performant methods when possible
new 9b1b907 (chores) camel-maven-package-plugin: use modern Java language features when possible
new 0ca0bd4 (chores) camel-maven-package-plugin: removed unused and/or dead code
new 6be8e98 (chores) camel-maven-package-plugin: consolidate duplicated logic
new 3337bf4 (chores) camel-maven-package-plugin: remove unused and/or dead code
The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../packaging/AbstractGenerateConfigurerMojo.java | 9 +-
.../maven/packaging/AbstractGenerateMojo.java | 26 ++---
.../maven/packaging/AbstractGeneratorMojo.java | 2 +-
.../camel/maven/packaging/EndpointDslMojo.java | 19 +---
.../packaging/EndpointSchemaGeneratorMojo.java | 9 +-
.../packaging/EndpointUriFactoryGenerator.java | 4 +-
.../apache/camel/maven/packaging/MvelHelper.java | 3 +-
.../packaging/PackageArchetypeCatalogMojo.java | 12 +--
.../maven/packaging/PackageDataFormatMojo.java | 6 +-
.../camel/maven/packaging/PrepareAssemblyMojo.java | 6 +-
.../camel/maven/packaging/PrepareCatalogMojo.java | 7 +-
.../camel/maven/packaging/PrepareExampleMojo.java | 3 +-
.../maven/packaging/PrepareParentPomMojo.java | 4 +-
.../packaging/PropertyConfigurerGenerator.java | 4 +-
.../camel/maven/packaging/SchemaGeneratorMojo.java | 2 +-
.../camel/maven/packaging/UpdateReadmeMojo.java | 6 +-
.../camel/maven/packaging/XRefCheckMojo.java | 4 +-
.../camel/maven/packaging/dsl/DslHelper.java | 70 ++++---------
.../ComponentDslBuilderFactoryGenerator.java | 2 +-
.../ComponentDslInnerImplBuilderGenerator.java | 2 +-
.../ComponentsBuilderFactoryGenerator.java | 2 +-
.../component/ComponentsDslMetadataRegistry.java | 6 +-
.../camel/maven/packaging/generics/ClassUtil.java | 2 +-
.../maven/packaging/generics/GenericsUtil.java | 112 ---------------------
.../generics/OwbGenericArrayTypeImpl.java | 2 +-
.../packaging/generics/OwbTypeVariableImpl.java | 11 +-
.../packaging/generics/OwbWildcardTypeImpl.java | 4 +-
27 files changed, 83 insertions(+), 256 deletions(-)
[camel] 09/09: (chores) camel-maven-package-plugin: remove unused and/or dead code
Posted by or...@apache.org.
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 3337bf43ab961752a16ea5afe545e1c8bbdd804f
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Feb 11 12:52:26 2022 +0100
(chores) camel-maven-package-plugin: remove unused and/or dead code
---
.../maven/packaging/generics/GenericsUtil.java | 112 ---------------------
1 file changed, 112 deletions(-)
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 7cc64e0..443634f 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 final class GenericsUtil {
}
- public static boolean containTypeVariable(Collection<? extends Type> types) {
- return containTypeVariable(types.toArray(new Type[types.size()]));
- }
-
public static boolean containTypeVariable(Type[] types) {
for (Type type : types) {
if (containsTypeVariable(type)) {
@@ -416,30 +362,6 @@ public final class GenericsUtil {
}
/**
- * @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
*/
public static Type resolveType(Class<?> subclass, Field field) {
@@ -447,21 +369,6 @@ public final class GenericsUtil {
}
/**
- * 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 final class GenericsUtil {
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<TypeVariable<?>> seen) {
- return resolveType(type, subclass, seen);
- }
-
public static Type resolveType(Type type, Type actualType, Collection<TypeVariable<?>> seen) {
if (type instanceof Class) {
return type;
@@ -535,10 +431,6 @@ public final class GenericsUtil {
return resolvedTypeArguments;
}
- public static Set<Type> getTypeClosure(Class<?> type) {
- return getTypeClosure(type, type);
- }
-
public static Set<Type> getTypeClosure(Type actualType) {
return getTypeClosure(actualType, actualType);
}
@@ -895,8 +787,4 @@ public final class GenericsUtil {
return new OwbGenericArrayTypeImpl(componentType);
}
}
-
- public static Type resolveType(ParameterizedType parameterizedType, Type metadataType) {
- return resolveType(parameterizedType, metadataType, newSeenList());
- }
}
[camel] 08/09: (chores) camel-maven-package-plugin: consolidate duplicated logic
Posted by or...@apache.org.
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 6be8e9843e5dc42e5b6b8ca2ac83e40fccbd084e
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Feb 11 12:10:17 2022 +0100
(chores) camel-maven-package-plugin: consolidate duplicated logic
---
.../java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java | 2 +-
.../src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java | 1 -
2 files changed, 1 insertion(+), 2 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 3ec494f..4dbe09c 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
@@ -117,7 +117,7 @@ public abstract class AbstractGenerateMojo extends AbstractMojo {
try {
Path cacheData = getIncrementalDataPath(project);
final String prvdata = getPreviousRunData(cacheData);
- if (prvdata.isEmpty()) {
+ if (INCREMENTAL_DATA.equals(prvdata)) {
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/dsl/DslHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/DslHelper.java
index e68ccf9..5c10174 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
@@ -80,7 +80,6 @@ public final class DslHelper {
return desc;
}
-
public static String generateComponentBuilderClassName(final ComponentModel componentModel, final String suffix) {
return StringUtils.capitalize(toCamelCaseLower(componentModel.getScheme()))
+ "Component" + suffix;
[camel] 02/09: (chores) camel-maven-package-plugin: consolidate duplicated logic
Posted by or...@apache.org.
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 <an...@gmail.com>
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;
[camel] 06/09: (chores) camel-maven-package-plugin: use modern Java language features when possible
Posted by or...@apache.org.
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 <an...@gmail.com>
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();
}
}
[camel] 04/09: (chores) camel-maven-package-plugin: consolidate duplicated logic
Posted by or...@apache.org.
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 <an...@gmail.com>
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 {
[camel] 01/09: (chores) camel-maven-package-plugin: use final variables and fields when possible
Posted by or...@apache.org.
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 d4fc4cc3798e7debd45b2ebe48f18c6669efbaae
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Feb 11 11:39:09 2022 +0100
(chores) camel-maven-package-plugin: use final variables and fields when possible
---
.../java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 2 +-
.../dsl/component/ComponentDslBuilderFactoryGenerator.java | 2 +-
.../packaging/dsl/component/ComponentsBuilderFactoryGenerator.java | 2 +-
.../packaging/dsl/component/ComponentsDslMetadataRegistry.java | 6 +++---
.../camel/maven/packaging/generics/OwbGenericArrayTypeImpl.java | 2 +-
.../apache/camel/maven/packaging/generics/OwbTypeVariableImpl.java | 6 +++---
.../apache/camel/maven/packaging/generics/OwbWildcardTypeImpl.java | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
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 3aa2f12..1c06890 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<Path> allJsonFiles;
private Collection<Path> allPropertiesFiles;
- private Map<Path, BaseModel<?>> allModels = new HashMap<>();
+ private final Map<Path, BaseModel<?>> allModels = new HashMap<>();
private static String asComponentName(Path file) {
String name = file.getFileName().toString();
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 4e58672..e377880 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/ComponentsBuilderFactoryGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java
index e7df1ee..284e9b5 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<ComponentModel> componentModels;
- private JavaClass javaClass;
+ private final JavaClass javaClass;
private ComponentsBuilderFactoryGenerator(final Set<ComponentModel> 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 ab73b57..7f9bc62 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 @@ import static org.apache.camel.tooling.util.PackageHelper.loadText;
*/
public class ComponentsDslMetadataRegistry {
- private Map<String, ComponentModel> componentsCache;
- private Set<String> componentsDslFactories;
- private File metadataFile;
+ private final Map<String, ComponentModel> componentsCache;
+ private final Set<String> 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/OwbGenericArrayTypeImpl.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbGenericArrayTypeImpl.java
index 501580d..47fa6d2 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 @@ import java.lang.reflect.Type;
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 f3c73eb..93af431 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
@@ -49,9 +49,9 @@ public class OwbTypeVariableImpl {
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 14bb1de..458d7e5 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 @@ import java.lang.reflect.WildcardType;
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();
[camel] 05/09: (chores) camel-maven-package-plugin: use more performant methods when possible
Posted by or...@apache.org.
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 d886a866ca2df80c4423fbe5516dd90b2d2ca2dc
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Feb 11 11:54:45 2022 +0100
(chores) camel-maven-package-plugin: use more performant methods when possible
---
.../main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java | 2 +-
.../apache/camel/maven/packaging/EndpointUriFactoryGenerator.java | 2 +-
.../org/apache/camel/maven/packaging/PackageDataFormatMojo.java | 6 +++---
.../java/org/apache/camel/maven/packaging/PrepareAssemblyMojo.java | 6 +++---
.../java/org/apache/camel/maven/packaging/PrepareParentPomMojo.java | 4 ++--
.../apache/camel/maven/packaging/PropertyConfigurerGenerator.java | 4 ++--
.../java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java | 2 +-
.../dsl/component/ComponentDslInnerImplBuilderGenerator.java | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
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 89b6728..893e17b 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
@@ -952,7 +952,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
if (option.isDeprecated()) {
descSb.append(" <strong>deprecated</strong>");
}
- 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/EndpointUriFactoryGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
index afdf8c8..dcd5260 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 final class EndpointUriFactoryGenerator {
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");
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 bc0ccc8..461861f 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.io.StringWriter;
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 class PackageDataFormatMojo extends AbstractGeneratorMojo {
.collect(Collectors.toSet());
List<DataFormatOptionModel> 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 59becdd..5a2291e 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 @@ public class PrepareAssemblyMojo extends AbstractMojo {
StringBuilder sb = new StringBuilder();
for (String aid : artifactIds) {
sb.append(" <dependency>\n");
- sb.append(" <groupId>" + groupId + "</groupId>\n");
- sb.append(" <artifactId>" + aid + "</artifactId>\n");
+ sb.append(" <groupId>").append(groupId).append("</groupId>\n");
+ sb.append(" <artifactId>").append(aid).append("</artifactId>\n");
sb.append(" <version>${project.version}</version>\n");
sb.append(" </dependency>\n");
}
@@ -130,7 +130,7 @@ public class PrepareAssemblyMojo extends AbstractMojo {
// update common-bin.xml
sb = new StringBuilder();
for (String aid : artifactIds) {
- sb.append(" <include>" + groupId + ":" + aid + "</include>\n");
+ sb.append(" <include>").append(groupId).append(":").append(aid).append("</include>\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/PrepareParentPomMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareParentPomMojo.java
index 40c6cc1..2f17ec5 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 @@ public class PrepareParentPomMojo extends AbstractMojo {
StringBuilder sb = new StringBuilder();
for (String aid : artifactIds) {
sb.append(" <dependency>\n");
- sb.append(" <groupId>" + groupId + "</groupId>\n");
- sb.append(" <artifactId>" + aid + "</artifactId>\n");
+ sb.append(" <groupId>").append(groupId).append("</groupId>\n");
+ sb.append(" <artifactId>").append(aid).append("</artifactId>\n");
sb.append(" <version>${project.version}</version>\n");
sb.append(" </dependency>\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 b0a3257..9b0e104 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 @@ public final class PropertyConfigurerGenerator {
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 d4af088..513ff7c 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 @@ public class SchemaGeneratorMojo extends AbstractGeneratorMojo {
// 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/dsl/component/ComponentDslInnerImplBuilderGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerImplBuilderGenerator.java
index f2f5d10..20275be 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 @@ public final class ComponentDslInnerImplBuilderGenerator {
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);
[camel] 03/09: (chores) camel-maven-package-plugin: removed redundant calls to toString()
Posted by or...@apache.org.
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 eff3488a7b50fd1aeac3668e261d4810e2f7e78a
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Feb 11 11:39:32 2022 +0100
(chores) camel-maven-package-plugin: removed redundant calls to toString()
---
.../java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java | 4 ++--
.../org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java | 2 +-
.../org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java | 2 +-
.../src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java | 2 +-
4 files changed, 5 insertions(+), 5 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 6f9f9dd..0f9d995 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
@@ -64,7 +64,7 @@ public abstract class AbstractGenerateMojo extends AbstractMojo {
writeIncrementalInfo(project);
}
} catch (Exception e) {
- throw new MojoFailureException("Error generating data " + e.toString(), e);
+ throw new MojoFailureException("Error generating data " + e, e);
}
}
@@ -178,7 +178,7 @@ public abstract class AbstractGenerateMojo extends AbstractMojo {
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/EndpointSchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index db6b4d3..cfad994 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
@@ -339,7 +339,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
}
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 24e2aa8..afdf8c8 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
@@ -213,7 +213,7 @@ public final class EndpointUriFactoryGenerator {
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/XRefCheckMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/XRefCheckMojo.java
index 0cac411..7f145ef 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
@@ -116,7 +116,7 @@ public class XRefCheckMojo extends AbstractMojo {
.filter(Files::isRegularFile)
.forEach(page -> {
Path rel = pagesDir.relativize(page);
- pages.put(component + ":" + m + ":" + rel.toString(), page);
+ pages.put(component + ":" + m + ":" + rel, page);
});
});
}
[camel] 07/09: (chores) camel-maven-package-plugin: removed unused and/or dead code
Posted by or...@apache.org.
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 0ca0bd4b5072e1f68aa70748f16ad8cb83a5e1e0
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Feb 11 11:56:40 2022 +0100
(chores) camel-maven-package-plugin: removed unused and/or dead code
---
.../camel/maven/packaging/dsl/DslHelper.java | 38 ----------------------
1 file changed, 38 deletions(-)
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 f67ff93..e68ccf9 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<File> loadAllJavaFiles(final File dir, final String targetJavaPackageName) {
- final File allComponentsDslEndpointFactory = new File(dir, targetJavaPackageName.replace('.', '/'));
- return loadAllJavaFiles(allComponentsDslEndpointFactory);
- }
-
public static List<File> loadAllJavaFiles(final File dir) {
final File[] files = dir.listFiles();
@@ -85,42 +80,9 @@ public final class DslHelper {
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: <code>" + componentModel.getSyntax() + "</code>";
-
- 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 += " <strong>deprecated</strong>";
- }
- 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<String> enumValues) {
- // comma to space so we can wrap words (which uses space)
- return String.join(", ", enumValues);
- }
}