Fix problems identified by SpotBugs fixes #5

grahambrown11 · grahambrown11 · commit a2a12eff4f2f · 2020-02-01T18:38:57.000+02:00
diff --git a/codegen/src/main/java/ch/loway/oss/ari4java/codegen/models/ModelField.java b/codegen/src/main/java/ch/loway/oss/ari4java/codegen/models/ModelField.java
@@ -26,7 +26,13 @@ public String toString() {
         sb.append("  private ").append(typeInterface).append(" ").append(field).append(";\n");
 
         sb.append(getDeclarationGet()).append(" {\n");
-        sb.append("    return ").append(field).append(";\n  }\n");
+        sb.append("    return ");
+        if ("Date".equals(typeConcrete)) {
+            sb.append("new Date(").append(field).append(".getTime())");
+        } else {
+            sb.append(field);
+        }
+        sb.append(";\n  }\n");
 
         if (typeConcrete.startsWith("List")) {
             String innerType = typeConcrete.substring(5, typeConcrete.length() - 1);
@@ -37,7 +43,13 @@ public String toString() {
             sb.append("  @JsonDeserialize( as=").append(typeConcrete).append(".class )\n");
         }
         sb.append(getDeclarationSet()).append("  {\n");
-        sb.append("    ").append(field).append(" = val;\n  }\n\n");
+        sb.append("    ").append(field);
+        if ("Date".equals(typeConcrete)) {
+            sb.append(" = new Date(val.getTime())");
+        } else {
+            sb.append(" = val");
+        }
+        sb.append(";\n  }\n\n");
 
         return sb.toString();
     }
diff --git a/codegen/src/main/java/ch/loway/oss/ari4java/codegen/models/Operation.java b/codegen/src/main/java/ch/loway/oss/ari4java/codegen/models/Operation.java
@@ -142,8 +142,10 @@ public String toString() {
             if (responseInterface.equalsIgnoreCase("byte[]")) {
                 sb.append("    return httpActionSyncAsBytes(build());\n");
             } else {
-                sb.append("    String json = httpActionSync(build());\n");
-                if (!responseInterface.equalsIgnoreCase("void")) {
+                if (responseInterface.equalsIgnoreCase("void")) {
+                    sb.append("    httpActionSync(build());\n");
+                } else {
+                    sb.append("    String json = httpActionSync(build());\n");
                     String deserializationType = responseConcreteClass + ".class";
                     if (responseConcreteClass.startsWith("List<")) {
                         deserializationType = "new TypeReference<" + responseConcreteClass + ">() {}";
diff --git a/src/main/java/ch/loway/oss/ari4java/BUILD.java b/src/main/java/ch/loway/oss/ari4java/BUILD.java
@@ -2,6 +2,7 @@
 package ch.loway.oss.ari4java;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Properties;
 
 /**
@@ -15,12 +16,19 @@ public class BUILD {
 
     static {
         String number = "x";
+        InputStream stream = BUILD.class.getResourceAsStream("build.properties");
         try {
             Properties p = new Properties();
-            p.load(BUILD.class.getResourceAsStream("build.properties"));
+            p.load(stream);
             number = p.getProperty("BUILD_NUMBER");
         } catch (IOException e) {
             // oh well
+        } finally {
+            try {
+                stream.close();
+            } catch (IOException e) {
+                // oh well
+            }
         }
         BUILD_N = number;
     }
diff --git a/src/main/java/ch/loway/oss/ari4java/tools/BaseAriAction.java b/src/main/java/ch/loway/oss/ari4java/tools/BaseAriAction.java
@@ -32,7 +32,7 @@
  */
 public class BaseAriAction {
 
-    public class AriRequest {
+    public static class AriRequest {
         private List<HttpParam> lParamQuery = new ArrayList<HttpParam>();
         private List<HttpParam> lParamForm = new ArrayList<HttpParam>();
         private List<HttpParam> lParamBody = new ArrayList<HttpParam>();
@@ -308,7 +308,7 @@ public synchronized void setForcedResponse(String forcedResponse) {
         this.forcedResponse = forcedResponse;
     }
 
-    public String getForcedResponse() {
+    public synchronized String getForcedResponse() {
         return this.forcedResponse;
     }
 
diff --git a/src/main/java/ch/loway/oss/ari4java/tools/http/NettyHttpClientHandler.java b/src/main/java/ch/loway/oss/ari4java/tools/http/NettyHttpClientHandler.java
@@ -7,6 +7,8 @@
 import io.netty.handler.codec.http.FullHttpResponse;
 import io.netty.handler.codec.http.HttpResponseStatus;
 
+import java.util.Arrays;
+
 /**
  * HttpClientHandler handles the asynchronous response from the remote
  * HTTP server.
@@ -48,7 +50,10 @@ public String getResponseText() {
     }
 
     public byte[] getResponseBytes() {
-        return responseBytes;
+        if (responseBytes == null || responseBytes.length == 0) {
+            return null;
+        }
+        return Arrays.copyOf(responseBytes, responseBytes.length);
     }
 
     public HttpResponseStatus getResponseStatus() {

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`*/`
`33`	`33`	`public class BaseAriAction {`
`34`	`34`
`35`		`- public class AriRequest {`
	`35`	`+ public static class AriRequest {`
`36`	`36`	`private List<HttpParam> lParamQuery = new ArrayList<HttpParam>();`
`37`	`37`	`private List<HttpParam> lParamForm = new ArrayList<HttpParam>();`
`38`	`38`	`private List<HttpParam> lParamBody = new ArrayList<HttpParam>();`
`@@ -308,7 +308,7 @@ public synchronized void setForcedResponse(String forcedResponse) {`
`308`	`308`	`this.forcedResponse = forcedResponse;`
`309`	`309`	`}`
`310`	`310`
`311`		`- public String getForcedResponse() {`
	`311`	`+ public synchronized String getForcedResponse() {`
`312`	`312`	`return this.forcedResponse;`
`313`	`313`	`}`
`314`	`314`