Fixed compilation warnings

Author: bdpiprava

src/main/java/cd/go/contrib/elasticagent/utils/Util.java

@@ -16,15 +16,12 @@
 
 package cd.go.contrib.elasticagent.utils;
 
-import cd.go.contrib.elasticagent.executors.GetViewRequestExecutor;
-import com.google.common.io.ByteStreams;
-import com.google.common.io.CharStreams;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
 import java.text.DecimalFormat;
@@ -45,21 +42,27 @@ public static SimpleDateFormat getSimpleDateFormat() {
     }
 
     public static String readResource(String resourceFile) {
-        try (InputStreamReader reader = new InputStreamReader(GetViewRequestExecutor.class.getResourceAsStream(resourceFile), StandardCharsets.UTF_8)) {
-            return CharStreams.toString(reader);
-        } catch (IOException e) {
-            throw new RuntimeException("Could not find resource " + resourceFile, e);
-        }
+        return new String(readResourceBytes(resourceFile), StandardCharsets.UTF_8);
     }
 
     public static byte[] readResourceBytes(String resourceFile) {
-        try (InputStream in = GetViewRequestExecutor.class.getResourceAsStream(resourceFile)) {
-            return ByteStreams.toByteArray(in);
+        try (InputStream is = Util.class.getResourceAsStream(resourceFile)) {
+            return readFully(is);
         } catch (IOException e) {
             throw new RuntimeException("Could not find resource " + resourceFile, e);
         }
     }
 
+    private static byte[] readFully(InputStream input) throws IOException {
+        byte[] buffer = new byte[8192];
+        int bytesRead;
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        while ((bytesRead = input.read(buffer)) != -1) {
+            output.write(buffer, 0, bytesRead);
+        }
+        return output.toByteArray();
+    }
+
     public static String pluginId() {
         String s = readResource("/plugin.properties");
         try {

src/test/java/cd/go/contrib/elasticagent/executors/GetPluginConfigurationExecutorTest.java

@@ -33,7 +33,7 @@ public class GetPluginConfigurationExecutorTest {
     @Test
     public void shouldSerializeAllFields() {
         GoPluginApiResponse response = new GetPluginConfigurationExecutor().execute();
-        Map hashMap = new Gson().fromJson(response.responseBody(), new TypeToken<Map<String, Object>>() {
+        Map<String, Object> hashMap = new Gson().fromJson(response.responseBody(), new TypeToken<Map<String, Object>>() {
         }.getType());
         assertEquals("Are you using anonymous inner classes — see https://github.com/google/gson/issues/298",
                 hashMap.size(),

src/test/java/cd/go/contrib/elasticagent/executors/GetViewRequestExecutorTest.java

@@ -19,14 +19,14 @@
 import cd.go.contrib.elasticagent.model.Field;
 import cd.go.contrib.elasticagent.utils.Util;
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
 import org.hamcrest.Matchers;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;
 import org.junit.Test;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import static org.hamcrest.Matchers.hasSize;
@@ -38,7 +38,8 @@ public class GetViewRequestExecutorTest {
     public void shouldRenderTheTemplateInJSON() throws Exception {
         GoPluginApiResponse response = new GetViewRequestExecutor().execute();
         assertThat(response.responseCode(), is(200));
-        Map<String, String> hashSet = new Gson().fromJson(response.responseBody(), HashMap.class);
+        Map<String, String> hashSet = new Gson().fromJson(response.responseBody(), new TypeToken<Map<String, String>>() {
+        }.getType());
         assertThat(hashSet, Matchers.hasEntry("template", Util.readResource("/plugin-settings.template.html")));
     }
 

src/test/java/cd/go/contrib/elasticagent/executors/ServerPingRequestExecutorTest.java

@@ -51,7 +51,7 @@ public class ServerPingRequestExecutorTest extends BaseTest {
     @Mock
     private Pod mockedPod;
     @Mock
-    private PodResource podResource;
+    private PodResource<Pod, DoneablePod> podResource;
     private ObjectMeta objectMetadata;
 
     @Before