You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/04/10 05:06:33 UTC
[camel] branch main updated: Fixed results of inspection "redundant local variable" for tooling (#9831)
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 ed3457e3015 Fixed results of inspection "redundant local variable" for tooling (#9831)
ed3457e3015 is described below
commit ed3457e3015b784147a0bdf6c91d9dfdf9ecea36
Author: dk2k <dk...@users.noreply.github.com>
AuthorDate: Mon Apr 10 08:06:25 2023 +0300
Fixed results of inspection "redundant local variable" for tooling (#9831)
* Fixed results of inspection "redundant local variable". Inlining of variables is the solution. PR for tooling
* fix for review comment
---------
Co-authored-by: dk2k <dk...@ya.ru>
---
.../main/java/org/apache/camel/tooling/maven/support/DIRegistry.java | 3 +--
.../src/main/java/org/apache/camel/tooling/util/Version.java | 3 +--
.../org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java | 3 +--
.../main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java | 3 +--
.../java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java | 3 +--
5 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/support/DIRegistry.java b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/support/DIRegistry.java
index afababa029f..db7af48cb0a 100644
--- a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/support/DIRegistry.java
+++ b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/support/DIRegistry.java
@@ -110,8 +110,7 @@ public class DIRegistry extends SupplierRegistry {
if (isNamedAnnotation(a)) {
String s = a.toString();
// @javax.inject.Named("valueHere")
- String name = StringHelper.between(s, "(\"", "\")");
- return name;
+ return StringHelper.between(s, "(\"", "\")");
}
}
diff --git a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/Version.java b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/Version.java
index 6d02b032b6d..18cfd0d9c8c 100644
--- a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/Version.java
+++ b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/Version.java
@@ -81,8 +81,7 @@ public final class Version implements Comparable<Version> {
minor -= 1;
}
- String prev = major + "." + minor + "." + patch;
- return prev;
+ return major + "." + minor + "." + patch;
}
@Override
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 b80cf506e17..39851d81687 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
@@ -1123,7 +1123,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
}
private List<Method> findCandidateClassMethods(Class<?> classElement) {
- List<Method> methods = Stream.of(classElement.getDeclaredMethods()).filter(method -> {
+ return Stream.of(classElement.getDeclaredMethods()).filter(method -> {
Metadata metadata = method.getAnnotation(Metadata.class);
String methodName = method.getName();
if (metadata != null && metadata.skip()) {
@@ -1151,7 +1151,6 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
}
return true;
}).collect(Collectors.toList());
- return methods;
}
private void processMetadataClassAnnotation(ComponentModel componentModel, Class<?> classElement, Set<String> excludes) {
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 650e6d39734..3d4746822c3 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
@@ -795,8 +795,7 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo {
}
private OtherModel generateOtherModel(String json) {
- OtherModel other = JsonMapper.generateOtherModel(json);
- return other;
+ return JsonMapper.generateOtherModel(json);
}
private DataFormatModel generateDataFormatModel(String json) {
diff --git a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java
index 027d035361b..442a8c45594 100644
--- a/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java
+++ b/tooling/openapi-rest-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java
@@ -168,8 +168,7 @@ public class RestDslYamlGenerator extends RestDslGenerator<RestDslYamlGenerator>
}
ObjectMapper mapper = new ObjectMapper(new YAMLFactory().disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER));
- String yaml = mapper.writeValueAsString(node);
- return yaml;
+ return mapper.writeValueAsString(node);
}
private static JsonNode fixRootNode(XmlMapper xmlMapper, JsonNode node) {