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
The following commit(s) were added to refs/heads/main by this push:
new af4a648 (chores) camel-package-maven-plugin: minor cleanups
af4a648 is described below
commit af4a648d0b6295809dc0f3893b21cf9acc0ab740
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Tue Feb 22 07:22:13 2022 +0100
(chores) camel-package-maven-plugin: minor cleanups
- use a cleaner equality check
- camel-package-maven-plugin: simplify
---
.../maven/packaging/AbstractGenerateMojo.java | 4 ++--
.../apache/camel/maven/packaging/SchemaHelper.java | 2 +-
.../component/ComponentsDslMetadataRegistry.java | 2 +-
.../generics/OwbParametrizedTypeImpl.java | 5 +++--
.../packaging/generics/OwbTypeVariableImpl.java | 25 +++++++++++-----------
5 files changed, 20 insertions(+), 18 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 4dbe09c..4111960 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
@@ -127,9 +127,9 @@ public abstract class AbstractGenerateMojo extends
AbstractMojo {
if (!stale.isEmpty()) {
getLog().info("Stale files detected, re-generating.");
if (showStaleFiles) {
- getLog().info("Stale files: " +
stale.stream().collect(Collectors.joining(", ")));
+ getLog().info("Stale files: " + String.join(", ",
stale));
} else if (getLog().isDebugEnabled()) {
- getLog().debug("Stale files: " +
stale.stream().collect(Collectors.joining(", ")));
+ getLog().debug("Stale files: " + String.join(", ",
stale));
}
} else {
// everything is in order, skip
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaHelper.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaHelper.java
index e164643..a076cc7 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaHelper.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaHelper.java
@@ -69,7 +69,7 @@ public final class SchemaHelper {
StringBuilder answer = new StringBuilder();
Character prev = null;
- Character next = null;
+ Character next;
char[] arr = text.toCharArray();
for (int i = 0; i < arr.length; i++) {
char ch = arr[i];
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 7f9bc62..93b79a9 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
@@ -99,7 +99,7 @@ public class ComponentsDslMetadataRegistry {
}
});
- componentsNamesToRemoveFromCache.forEach(componentFactoryName ->
componentsCache.remove(componentFactoryName));
+ componentsNamesToRemoveFromCache.forEach(componentsCache::remove);
}
private boolean writeCacheIntoMetadataFile() {
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbParametrizedTypeImpl.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbParametrizedTypeImpl.java
index 35b3ff9..9d71859 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbParametrizedTypeImpl.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/OwbParametrizedTypeImpl.java
@@ -19,6 +19,7 @@ package org.apache.camel.maven.packaging.generics;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Arrays;
+import java.util.Objects;
/**
* Custom parametrized type implementation.
@@ -89,8 +90,8 @@ public class OwbParametrizedTypeImpl implements
ParameterizedType {
ParameterizedType that = (ParameterizedType) obj;
Type thatOwnerType = that.getOwnerType();
Type thatRawType = that.getRawType();
- return (owner == null ? thatOwnerType == null :
owner.equals(thatOwnerType))
- && (rawType == null ? thatRawType == null :
rawType.equals(thatRawType))
+ return (Objects.equals(owner, thatOwnerType))
+ && (Objects.equals(rawType, thatRawType))
&& Arrays.equals(types, that.getActualTypeArguments());
} else {
return false;
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 96d50cf..f0e2386 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
@@ -65,18 +65,19 @@ public class OwbTypeVariableImpl {
@Override
public Object invoke(Object proxy, Method method, Object[] args)
throws Throwable {
String methodName = method.getName();
- if ("equals".equals(methodName)) {
- return typeVariableEquals(args[0]);
- } else if ("hashCode".equals(methodName)) {
- return typeVariableHashCode();
- } else if ("toString".equals(methodName)) {
- return typeVariableToString();
- } else if ("getName".equals(methodName)) {
- return getName();
- } else if ("getGenericDeclaration".equals(methodName)) {
- return getGenericDeclaration();
- } else if ("getBounds".equals(methodName)) {
- return getBounds();
+ switch (methodName) {
+ case "equals":
+ return typeVariableEquals(args[0]);
+ case "hashCode":
+ return typeVariableHashCode();
+ case "toString":
+ return typeVariableToString();
+ case "getName":
+ return getName();
+ case "getGenericDeclaration":
+ return getGenericDeclaration();
+ case "getBounds":
+ return getBounds();
}
// new method from java8...
