From 6fc871db38f74782133751062086b0553fcac049 Mon Sep 17 00:00:00 2001
From: Kirill Vlasov <kirill.vlasov@devfactory.com>
Date: Thu, 31 Dec 2015 17:08:59 +0500
Subject: [PATCH] Fixing squid:S1488 - Local Variables should not be declared
 and then immediately returned or thrown

---
 .../java/io/swagger/codegen/config/CodegenConfigurator.java    | 3 +--
 .../java/io/swagger/codegen/examples/ExampleGenerator.java     | 3 +--
 .../src/main/java/io/swagger/client/ApiInvoker.java            | 3 +--
 .../java/src/main/java/io/swagger/client/ApiInvoker.java       | 3 +--
 .../src/main/java/io/swagger/configuration/SwaggerConfig.java  | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java
index 8771d10aebe4..cc9b0ab5d8a7 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java
@@ -390,8 +390,7 @@ public class CodegenConfigurator {
 
         if (isNotEmpty(configFile)) {
             try {
-                CodegenConfigurator result = Json.mapper().readValue(new File(configFile), CodegenConfigurator.class);
-                return result;
+                return Json.mapper().readValue(new File(configFile), CodegenConfigurator.class);
             } catch (IOException e) {
                 LOG.error("Unable to deserialize config file: " + configFile, e);
             }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java
index 855739af1fde..6d6062e93c8b 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java
@@ -88,10 +88,9 @@ public class ExampleGenerator {
         } else if (property instanceof ArrayProperty) {
             Property innerType = ((ArrayProperty) property).getItems();
             if (innerType != null) {
-                Object[] output = new Object[]{
+                return new Object[]{
                         resolvePropertyToExample(mediaType, innerType, processedModels)
                 };
-                return output;
             }
         } else if (property instanceof DateProperty) {
             return new java.util.Date(System.currentTimeMillis());
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiInvoker.java
index bae71ce367f9..709be7ccf9b6 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiInvoker.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/ApiInvoker.java
@@ -42,8 +42,7 @@ public class ApiInvoker {
         try {
             if ("List".equals(containerType)) {
                 JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls);
-                List response = (List<?>) JsonUtil.getJsonMapper().readValue(json, typeInfo);
-                return response;
+                return (List<?>) JsonUtil.getJsonMapper().readValue(json, typeInfo);
             } else if (String.class.equals(cls)) {
                 if (json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) {
                     return json.substring(1, json.length() - 2);
diff --git a/samples/client/wordnik/java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/wordnik/java/src/main/java/io/swagger/client/ApiInvoker.java
index f7c547e7ad0c..686b98246fc3 100644
--- a/samples/client/wordnik/java/src/main/java/io/swagger/client/ApiInvoker.java
+++ b/samples/client/wordnik/java/src/main/java/io/swagger/client/ApiInvoker.java
@@ -28,8 +28,7 @@ public class ApiInvoker {
         try {
             if ("List".equals(containerType)) {
                 JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls);
-                List response = (List<?>) JsonUtil.getJsonMapper().readValue(json, typeInfo);
-                return response;
+                return (List<?>) JsonUtil.getJsonMapper().readValue(json, typeInfo);
             } else if (String.class.equals(cls)) {
                 if (json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1) {
                     return json.substring(1, json.length() - 2);
diff --git a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java
index 5f1671629eb4..c5fcff8c9726 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java
@@ -22,7 +22,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 public class SwaggerConfig {
     @Bean
     ApiInfo apiInfo() {
-        ApiInfo apiInfo = new ApiInfo(
+        return new ApiInfo(
         "Swagger Petstore",
         "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters",
         "1.0.0",
@@ -30,7 +30,6 @@ public class SwaggerConfig {
         "apiteam@swagger.io",
         "Apache 2.0",
         "http://www.apache.org/licenses/LICENSE-2.0.html" );
-        return apiInfo;
     }
 
     @Bean