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 6da1a81238f (chores) tooling: use final when possible
6da1a81238f is described below
commit 6da1a81238f18f3de1e017e481380a8f2d591914
Author: Otavio R. Piske <[email protected]>
AuthorDate: Sun Sep 24 09:58:12 2023 +0200
(chores) tooling: use final when possible
- use static inner classes
- use chained append calls
- remove unnecessary transient modifier
- remove unnecessary call to toString
- use simpler generics expressions
- use isEmpty instead of checking for length
---
.../java/org/apache/camel/tooling/model/SupportLevel.java | 2 +-
.../java/org/apache/camel/tooling/util/JavadocHelper.java | 2 +-
.../org/apache/camel/tooling/util/srcgen/GenericType.java | 4 ++--
.../java/org/apache/camel/tooling/util/srcgen/JavaClass.java | 2 +-
.../src/main/java/org/apache/camel/util/json/Jsoner.java | 2 +-
.../apache/camel/maven/bom/generator/DependencyMatcher.java | 2 +-
.../src/main/java/org/apache/camel/maven/HashHelper.java | 2 +-
.../main/java/org/apache/camel/maven/JavaSourceParser.java | 6 +++---
.../camel/maven/packaging/AbstractGenerateConfigurerMojo.java | 2 +-
.../org/apache/camel/maven/packaging/EndpointDslMojo.java | 2 +-
.../camel/maven/packaging/ModelWriterGeneratorMojo.java | 6 +++---
.../camel/maven/packaging/ModelXmlParserGeneratorMojo.java | 11 +++++------
.../apache/camel/maven/packaging/PackageDataFormatMojo.java | 2 +-
.../org/apache/camel/maven/packaging/PackageLanguageMojo.java | 2 +-
.../apache/camel/generator/openapi/RestDefinitionEmitter.java | 2 +-
15 files changed, 24 insertions(+), 25 deletions(-)
diff --git
a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/SupportLevel.java
b/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/SupportLevel.java
index 2c1f800a898..c958df5be73 100644
---
a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/SupportLevel.java
+++
b/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/SupportLevel.java
@@ -45,7 +45,7 @@ public enum SupportLevel {
*/
Stable;
- public static SupportLevel baseStability = Stable;
+ public static final SupportLevel baseStability = Stable;
public static SupportLevel safeValueOf(String level) {
if (level == null) {
diff --git
a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
index 9a89dcf5853..e448b48e0ae 100644
---
a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
+++
b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
@@ -76,7 +76,7 @@ public final class JavadocHelper {
boolean empty = isNullOrEmpty(s);
boolean endWithDot = s.endsWith(".");
- boolean haveText = sb.length() > 0;
+ boolean haveText = !sb.isEmpty();
if (haveText && summary && (empty || endWithDot)) {
// if we only want a summary, then skip at first empty line we
encounter, or if the sentence ends with a dot
diff --git
a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/GenericType.java
b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/GenericType.java
index 0009d6b54e7..88990b9ddca 100644
---
a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/GenericType.java
+++
b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/GenericType.java
@@ -42,8 +42,8 @@ public class GenericType {
}
private final Class clazz;
- private GenericType[] parameters;
- private BoundType boundType;
+ private final GenericType[] parameters;
+ private final BoundType boundType;
static {
PRIMITIVE_CLASSES.put("int", int.class);
diff --git
a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/JavaClass.java
b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/JavaClass.java
index ce8370f1903..731df82944e 100644
---
a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/JavaClass.java
+++
b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/srcgen/JavaClass.java
@@ -624,7 +624,7 @@ public class JavaClass {
String rem = text;
if (rem != null) {
- while (rem.length() > 0) {
+ while (!rem.isEmpty()) {
int idx = rem.length() >= len ? rem.substring(0,
len).lastIndexOf(' ') : -1;
int idx2 = rem.indexOf('\n');
if (idx2 >= 0 && (idx < 0 || idx2 < idx || idx2 < len)) {
diff --git
a/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Jsoner.java
b/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Jsoner.java
index 73910be5154..087cc779b34 100644
---
a/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Jsoner.java
+++
b/tooling/camel-util-json/src/main/java/org/apache/camel/util/json/Jsoner.java
@@ -1180,7 +1180,7 @@ public final class Jsoner {
* Notify the caller the cause of failure for the
serialization.
*/
throw new IllegalArgumentException(
- "Encountered a: " +
jsonSerializable.getClass().getName() + " as: " + jsonSerializable.toString()
+ "Encountered a: " +
jsonSerializable.getClass().getName() + " as: " + jsonSerializable
+ " that isn't JSON
serializable.\n Try:\n"
+ " 1) Implementing the
Jsonable interface for the object to return valid JSON. If it already does it
probably has a bug.\n"
+ " 2) If you cannot
edit the source of the object or couple it with this library consider wrapping
it in a class that does implement the Jsonable interface.\n"
diff --git
a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/DependencyMatcher.java
b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/DependencyMatcher.java
index 376f0c12aa2..db8c2231f6c 100644
---
a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/DependencyMatcher.java
+++
b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/DependencyMatcher.java
@@ -34,7 +34,7 @@ public class DependencyMatcher {
private static final Pattern ARTIFACT_PATTERN = Pattern
.compile("(?<groupId>[^:]+):(?<artifactId>[^:]+)(:(?<version>[^:]+))?(:(?<type>[^:]+))?(:(?<classifier>[^:]+))?");
- private Collection<String> selectors;
+ private final Collection<String> selectors;
public DependencyMatcher(Collection<String> selectors) {
this.selectors = selectors;
diff --git
a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/HashHelper.java
b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/HashHelper.java
index 2dcdda75bef..4a966543376 100644
---
a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/HashHelper.java
+++
b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/HashHelper.java
@@ -40,7 +40,7 @@ public class HashHelper {
} else if (f instanceof Boolean) {
hasher.putBoolean((Boolean) f);
} else if (f instanceof Iterable) {
- for (Object a : (Iterable<? extends Object>) f) {
+ for (Object a : (Iterable<?>) f) {
hash(a);
}
} else if (f instanceof ApiMethodAlias) {
diff --git
a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
index 2a14540be35..6fa7f2c19d7 100644
---
a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
+++
b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
@@ -64,10 +64,10 @@ public class JavaSourceParser {
private String errorMessage;
private String classDoc;
- private List<String> methodSignatures = new ArrayList<>();
+ private final List<String> methodSignatures = new ArrayList<>();
private final Map<String, String> methodDocs = new HashMap<>();
- private Map<String, Map<String, String>> parameterTypes = new
LinkedHashMap<>();
- private Map<String, Map<String, String>> parameterDocs = new
LinkedHashMap<>();
+ private final Map<String, Map<String, String>> parameterTypes = new
LinkedHashMap<>();
+ private final Map<String, Map<String, String>> parameterDocs = new
LinkedHashMap<>();
public void parse(InputStream in, String innerClass) throws IOException {
parse(new String(in.readAllBytes()), innerClass);
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 38239ff00d4..5e6eb68deda 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
@@ -92,7 +92,7 @@ public abstract class AbstractGenerateConfigurerMojo extends
AbstractGeneratorMo
public static class ConfigurerOption extends BaseOptionModel {
- private boolean builderMethod;
+ private final boolean builderMethod;
public ConfigurerOption(String name, Class<?> type, String getter,
boolean builderMethod) {
// we just use name, type
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 b2a94b6d20f..55bc352194a 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
@@ -72,7 +72,7 @@ import static
org.apache.camel.tooling.util.PackageHelper.loadText;
@Mojo(name = "generate-endpoint-dsl", threadSafe = true,
requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME,
defaultPhase = LifecyclePhase.PROCESS_CLASSES)
public class EndpointDslMojo extends AbstractGeneratorMojo {
- private static final transient Pattern COMMA_PRESERVER_PATTERN =
Pattern.compile(",(\\S)");
+ private static final Pattern COMMA_PRESERVER_PATTERN =
Pattern.compile(",(\\S)");
/**
* The project build directory
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelWriterGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelWriterGeneratorMojo.java
index 9bc82744eb4..65b8bbf8ae5 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelWriterGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelWriterGeneratorMojo.java
@@ -75,8 +75,8 @@ public abstract class ModelWriterGeneratorMojo extends
AbstractGeneratorMojo {
public static final String MODEL_PACKAGE = "org.apache.camel.model";
- private Map<Class<?>, List<Property>> properties = new
ConcurrentHashMap<>();
- private Map<Class<?>, List<Member>> members = new ConcurrentHashMap<>();
+ private final Map<Class<?>, List<Property>> properties = new
ConcurrentHashMap<>();
+ private final Map<Class<?>, List<Member>> members = new
ConcurrentHashMap<>();
private static Type type(Member member) {
return member instanceof Method
@@ -789,7 +789,7 @@ public abstract class ModelWriterGeneratorMojo extends
AbstractGeneratorMojo {
return fn.substring(0, 1).toLowerCase() + fn.substring(1);
}
- class Property {
+ static class Property {
private final Member field;
private final Member getter;
private final Member setter;
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
index e62eeea9fd4..a0774d07d37 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
@@ -513,15 +513,14 @@ public class ModelXmlParserGeneratorMojo extends
AbstractGeneratorMojo {
String gn = nn[2];
String sn = nn[3];
if (first) {
- sb.append(" if (\"" + nn[1] +
"\".equals(parser.getNamespace())) {\n");
+ sb.append(" if
(\"").append(nn[1]).append("\".equals(parser.getNamespace())) {\n");
first = false;
} else {
- sb.append(" else if (\"" + nn[1] +
"\".equals(parser.getNamespace())) {\n");
+ sb.append(" else if
(\"").append(nn[1]).append("\".equals(parser.getNamespace())) {\n");
}
- sb.append(" Element el = doParseDOMElement(\"" +
nn[0] + "\", \"" + nn[1] + "\", def." + gn
- + "());\n");
+ sb.append(" Element el =
doParseDOMElement(\"").append(nn[0]).append("\", \"").append(nn[1]).append("\",
def.").append(gn).append("());\n");
sb.append(" if (el != null) {\n");
- sb.append(" doAddElement(el, def." + gn + "(),
def::" + sn + ");\n");
+ sb.append(" doAddElement(el,
def.").append(gn).append("(), def::").append(sn).append(");\n");
sb.append(" return true;\n");
sb.append(" }\n");
sb.append(" return false;\n");
@@ -549,7 +548,7 @@ public class ModelXmlParserGeneratorMojo extends
AbstractGeneratorMojo {
+ " }\n" + " " + returnClause + "\n" +
"}";
} else {
StringBuilder sb = new StringBuilder();
- sb.append(" (def, key) -> {\n" + externalElements + "
switch (key) {\n");
+ sb.append(" (def, key) ->
{\n").append(externalElements).append(" switch (key) {\n");
for (Map.Entry<String, String> entry : cases.entrySet()) {
sb.append(" case
\"").append(entry.getKey()).append("\": ").append(entry.getValue())
.append(" break;\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 af8d58e2095..fd1a7a5ee7d 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
@@ -396,7 +396,7 @@ public class PackageDataFormatMojo extends
AbstractGeneratorMojo {
}
String name = file.getName();
if (name.charAt(0) != '.') {
- if (buffer.length() > 0) {
+ if (!buffer.isEmpty()) {
buffer.append(" ");
}
buffer.append(name);
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
index 377e2fd8113..e9bea895dca 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
@@ -266,7 +266,7 @@ public class PackageLanguageMojo extends
AbstractGeneratorMojo {
}
String name = file.getName();
if (name.charAt(0) != '.') {
- if (buffer.length() > 0) {
+ if (!buffer.isEmpty()) {
buffer.append(" ");
}
buffer.append(name);
diff --git
a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDefinitionEmitter.java
b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDefinitionEmitter.java
index 62f92dc350e..d614c7cd154 100644
---
a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDefinitionEmitter.java
+++
b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDefinitionEmitter.java
@@ -39,7 +39,7 @@ class RestDefinitionEmitter implements
CodeEmitter<RestsDefinition> {
@Override
public CodeEmitter<RestsDefinition> emit(final String method, final
Object... args) {
try {
- final Class<? extends Object> type = variable.getClass();
+ final Class<?> type = variable.getClass();
final Object[] arguments = argumentsFor(args);
