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/09 05:40:47 UTC
[camel] branch main updated: Fixed results of inspection "redundant local variable". Inlining of variables is the solution. PR for dsl (#9833)
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 cc856bd49cf Fixed results of inspection "redundant local variable". Inlining of variables is the solution. PR for dsl (#9833)
cc856bd49cf is described below
commit cc856bd49cf9f34ff852e1b3ad10689848520c5e
Author: dk2k <dk...@users.noreply.github.com>
AuthorDate: Sun Apr 9 08:40:40 2023 +0300
Fixed results of inspection "redundant local variable". Inlining of variables is the solution. PR for dsl (#9833)
Co-authored-by: dk2k <dk...@ya.ru>
---
.../org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java | 3 +--
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java | 3 +--
.../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 3 +--
.../org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java | 3 +--
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java | 3 +--
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java | 3 +--
.../camel/dsl/jbang/core/commands/process/AvailablePortFinder.java | 3 +--
.../apache/camel/main/download/KnownKameletRoutesBuilderLoader.java | 3 +--
.../java/org/apache/camel/dsl/yaml/common/YamlDeserializerSupport.java | 3 +--
9 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java b/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
index f2f008919e7..63895a4532a 100644
--- a/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
+++ b/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
@@ -63,8 +63,7 @@ public class AbstractEndpointBuilder {
Map<String, Object> remaining = new LinkedHashMap<>();
// we should not bind complex objects to registry as we create the endpoint via the properties as-is
NormalizedEndpointUri uri = computeUri(remaining, context, false, true);
- CamelContext ecc = context;
- Endpoint endpoint = ecc.getCamelContextExtension().getEndpoint(uri, properties);
+ Endpoint endpoint = context.getCamelContextExtension().getEndpoint(uri, properties);
if (endpoint == null) {
throw new NoSuchEndpointException(uri.getUri());
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
index 06e981f4f31..b2bb634aef6 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
@@ -210,8 +210,7 @@ public class Bind extends CamelCommand {
static class FileConsumer extends ParameterConsumer<Bind> {
@Override
protected void doConsumeParameters(Stack<String> args, Bind cmd) {
- String arg = args.pop();
- cmd.file = arg;
+ cmd.file = args.pop();
}
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index 0e7b2bacdc2..367f6f83a47 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -237,8 +237,7 @@ abstract class ExportBaseCommand extends CamelCommand {
run.profile = profile;
run.localKameletDir = localKameletDir;
run.dependencies = dependencies;
- Integer code = run.runSilent();
- return code;
+ return run.runSilent();
}
protected Set<String> resolveDependencies(File settings, File profile) throws Exception {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index 9a6dd438afa..322a015e9a9 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -171,9 +171,8 @@ class ExportSpringBoot extends Export {
String properties = Arrays.stream(additionalProperties.split(","))
.map(property -> {
String[] keyValueProperty = property.split("=");
- String mavenProperty = String.format("\t\t<%s>%s</%s>", keyValueProperty[0], keyValueProperty[1],
+ return String.format("\t\t<%s>%s</%s>", keyValueProperty[0], keyValueProperty[1],
keyValueProperty[0]);
- return mavenProperty;
})
.map(property -> property + System.lineSeparator())
.collect(Collectors.joining());
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
index 05faeec8995..5a09b908d21 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
@@ -234,8 +234,7 @@ public class Init extends CamelCommand {
static class FileConsumer extends ParameterConsumer<Init> {
@Override
protected void doConsumeParameters(Stack<String> args, Init cmd) {
- String arg = args.pop();
- cmd.file = arg;
+ cmd.file = args.pop();
}
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java
index b0a16f905f2..636f6cb474e 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java
@@ -89,8 +89,7 @@ public class Pipe extends CamelCommand {
static class FileConsumer extends ParameterConsumer<Pipe> {
@Override
protected void doConsumeParameters(Stack<String> args, Pipe cmd) {
- String arg = args.pop();
- cmd.file = arg;
+ cmd.file = args.pop();
}
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/AvailablePortFinder.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/AvailablePortFinder.java
index d42ee748add..a8f10df6978 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/AvailablePortFinder.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/AvailablePortFinder.java
@@ -103,8 +103,7 @@ class AvailablePortFinder {
try (ServerSocket ss = new ServerSocket()) {
ss.setReuseAddress(true);
ss.bind(new InetSocketAddress((InetAddress) null, port), 1);
- int probedPort = ss.getLocalPort();
- return probedPort;
+ return ss.getLocalPort();
} catch (IOException e) {
throw new IllegalStateException("Cannot find free port", e);
}
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownKameletRoutesBuilderLoader.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownKameletRoutesBuilderLoader.java
index 6f957cb1ce5..709f9ea5652 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownKameletRoutesBuilderLoader.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownKameletRoutesBuilderLoader.java
@@ -68,8 +68,7 @@ public class KnownKameletRoutesBuilderLoader extends KameletRoutesBuilderLoader
if (clazz != null) {
Object catalog = getCamelContext().getInjector().newInstance(clazz);
Method m = ReflectionHelper.findMethod(clazz, "getKameletsName");
- List<String> names = (List<String>) ObjectHelper.invokeMethod(m, catalog);
- return names;
+ return (List<String>) ObjectHelper.invokeMethod(m, catalog);
}
} catch (Exception e) {
// ignore
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlDeserializerSupport.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlDeserializerSupport.java
index 0b2bfe8ebd6..9ebe2cc4a56 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlDeserializerSupport.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlDeserializerSupport.java
@@ -389,8 +389,7 @@ public class YamlDeserializerSupport {
public static Map<String, Object> parseParameters(NodeTuple node) {
Node value = node.getValueNode();
final YamlDeserializationContext dc = getDeserializationContext(value);
- Map<String, Object> answer = asScalarMap(value);
- return answer;
+ return asScalarMap(value);
}
public static void setSteps(Block target, Node node) {