[camel] branch main updated: Revert "(chores) camel-rest-swagger: fixing a few code violations from SonarCloud (#8554)"

[da...@apache.org]

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 343d0556693 Revert "(chores) camel-rest-swagger: fixing a few code violations from SonarCloud (#8554)"
343d0556693 is described below

commit 343d0556693a7c4b499e135f6b4525446a6671ea
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Oct 17 13:15:02 2022 +0200

    Revert "(chores) camel-rest-swagger: fixing a few code violations from SonarCloud (#8554)"
    
    This reverts commit 0f43718043bfb0ff12bc82d87e72a06a7abe5f9b.
---
 .../rest/swagger/RestSwaggerEndpoint.java          | 46 +++++++++-------------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java b/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java
index 9e2694883b1..c04b4a3c4e4 100644
--- a/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java
+++ b/components/camel-rest-swagger/src/main/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpoint.java
@@ -308,24 +308,14 @@ public final class RestSwaggerEndpoint extends DefaultEndpoint {
         return (RestSwaggerComponent) getComponent();
     }
 
-    @Override
-    public boolean equals(Object object) {
-        return super.equals(object);
-    }
-
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
-
     Producer createProducerFor(
             final Swagger swagger, final Operation operation, final String method,
             final String uriTemplate)
             throws Exception {
-        final String producerBasePath = determineBasePath(swagger);
+        final String basePath = determineBasePath(swagger);
 
         final StringBuilder componentEndpointUri = new StringBuilder(200).append("rest:").append(method).append(":")
-                .append(producerBasePath).append(":").append(uriTemplate);
+                .append(basePath).append(":").append(uriTemplate);
 
         final CamelContext camelContext = getCamelContext();
 
@@ -383,16 +373,16 @@ public final class RestSwaggerEndpoint extends DefaultEndpoint {
     }
 
     Map<String, Object> determineEndpointParameters(final Swagger swagger, final Operation operation) {
-        final Map<String, Object> endpointParameters = new HashMap<>();
+        final Map<String, Object> parameters = new HashMap<>();
 
-        final String producerComponentName = determineComponentName();
-        if (producerComponentName != null) {
-            endpointParameters.put("producerComponentName", producerComponentName);
+        final String componentName = determineComponentName();
+        if (componentName != null) {
+            parameters.put("producerComponentName", componentName);
         }
 
-        final String endpointHost = determineHost(swagger);
-        if (endpointHost != null) {
-            endpointParameters.put("host", endpointHost);
+        final String host = determineHost(swagger);
+        if (host != null) {
+            parameters.put("host", host);
         }
 
         final RestSwaggerComponent component = component();
@@ -403,7 +393,7 @@ public final class RestSwaggerEndpoint extends DefaultEndpoint {
                 component.getConsumes(), consumes);
 
         if (isNotEmpty(determinedConsumes)) {
-            endpointParameters.put("consumes", determinedConsumes);
+            parameters.put("consumes", determinedConsumes);
         }
 
         // what we produce is what the API defined by Swagger specification
@@ -412,13 +402,13 @@ public final class RestSwaggerEndpoint extends DefaultEndpoint {
                 component.getProduces(), produces);
 
         if (isNotEmpty(determinedProduces)) {
-            endpointParameters.put("produces", determinedProduces);
+            parameters.put("produces", determinedProduces);
         }
 
         final String queryParameters = determineQueryParameters(swagger, operation).map(this::queryParameter)
                 .collect(Collectors.joining("&"));
         if (isNotEmpty(queryParameters)) {
-            endpointParameters.put("queryParameters", queryParameters);
+            parameters.put("queryParameters", queryParameters);
         }
 
         // pass properties that might be applied if the delegate component is
@@ -436,18 +426,18 @@ public final class RestSwaggerEndpoint extends DefaultEndpoint {
 
         final Map<Object, Object> nestedParameters = new HashMap<>();
         if (!componentParameters.isEmpty()) {
-            // we're trying to set RestEndpoint.endpointParameters['component']
+            // we're trying to set RestEndpoint.parameters['component']
             nestedParameters.put("component", componentParameters);
         }
 
-        // Add rest endpoint endpointParameters
+        // Add rest endpoint parameters
         addRestEndpointParameters(operation, nestedParameters);
 
         if (!nestedParameters.isEmpty()) {
-            endpointParameters.put("endpointParameters", nestedParameters);
+            parameters.put("parameters", nestedParameters);
         }
 
-        return endpointParameters;
+        return parameters;
     }
 
     private void addRestEndpointParameters(Operation operation, Map<Object, Object> nestedParameters) {
@@ -517,7 +507,9 @@ public final class RestSwaggerEndpoint extends DefaultEndpoint {
         final String name = parameter.getName();
 
         final String valueStr = String.valueOf(parameters.get(name));
-        return UnsafeUriCharactersEncoder.encode(valueStr);
+        final String encoded = UnsafeUriCharactersEncoder.encode(valueStr);
+
+        return encoded;
     }
 
     String literalQueryParameterValue(final Parameter parameter) {