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:39 UTC
[camel] 05/09: (chores) camel-maven-package-plugin: use more performant methods when possible
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);