Fixed compilation warnings

bdpiprava · bdpiprava · commit 1a7b935282d1 · 2018-02-14T12:18:39.000+05:30
diff --git a/src/main/java/cd/go/contrib/elasticagent/KubernetesPlugin.java b/src/main/java/cd/go/contrib/elasticagent/KubernetesPlugin.java
@@ -35,7 +35,7 @@ public class KubernetesPlugin implements GoPlugin {
     public static final Logger LOG = Logger.getLoggerFor(KubernetesPlugin.class);
 
     private PluginRequest pluginRequest;
-    private AgentInstances agentInstances;
+    private AgentInstances<KubernetesInstance> agentInstances;
 
     @Override
     public void initializeGoApplicationAccessor(GoApplicationAccessor accessor) {
diff --git a/src/main/java/cd/go/contrib/elasticagent/executors/CreateAgentRequestExecutor.java b/src/main/java/cd/go/contrib/elasticagent/executors/CreateAgentRequestExecutor.java
@@ -17,6 +17,7 @@
 package cd.go.contrib.elasticagent.executors;
 
 import cd.go.contrib.elasticagent.AgentInstances;
+import cd.go.contrib.elasticagent.KubernetesInstance;
 import cd.go.contrib.elasticagent.PluginRequest;
 import cd.go.contrib.elasticagent.RequestExecutor;
 import cd.go.contrib.elasticagent.requests.CreateAgentRequest;
@@ -26,11 +27,11 @@
 import static cd.go.contrib.elasticagent.KubernetesPlugin.LOG;
 
 public class CreateAgentRequestExecutor implements RequestExecutor {
-    private final AgentInstances agentInstances;
+    private final AgentInstances<KubernetesInstance> agentInstances;
     private final PluginRequest pluginRequest;
     private final CreateAgentRequest request;
 
-    public CreateAgentRequestExecutor(CreateAgentRequest request, AgentInstances agentInstances, PluginRequest pluginRequest) {
+    public CreateAgentRequestExecutor(CreateAgentRequest request, AgentInstances<KubernetesInstance> agentInstances, PluginRequest pluginRequest) {
         this.request = request;
         this.agentInstances = agentInstances;
         this.pluginRequest = pluginRequest;
diff --git a/src/main/java/cd/go/contrib/elasticagent/executors/ServerPingRequestExecutor.java b/src/main/java/cd/go/contrib/elasticagent/executors/ServerPingRequestExecutor.java
@@ -26,10 +26,10 @@
 
 public class ServerPingRequestExecutor implements RequestExecutor {
 
-    private final AgentInstances agentInstances;
+    private final AgentInstances<KubernetesInstance> agentInstances;
     private final PluginRequest pluginRequest;
 
-    public ServerPingRequestExecutor(AgentInstances agentInstances, PluginRequest pluginRequest) {
+    public ServerPingRequestExecutor(AgentInstances<KubernetesInstance> agentInstances, PluginRequest pluginRequest) {
         this.agentInstances = agentInstances;
         this.pluginRequest = pluginRequest;
     }
diff --git a/src/main/java/cd/go/contrib/elasticagent/requests/CreateAgentRequest.java b/src/main/java/cd/go/contrib/elasticagent/requests/CreateAgentRequest.java
@@ -16,10 +16,7 @@
 
 package cd.go.contrib.elasticagent.requests;
 
-import cd.go.contrib.elasticagent.AgentInstances;
-import cd.go.contrib.elasticagent.Constants;
-import cd.go.contrib.elasticagent.PluginRequest;
-import cd.go.contrib.elasticagent.RequestExecutor;
+import cd.go.contrib.elasticagent.*;
 import cd.go.contrib.elasticagent.executors.CreateAgentRequestExecutor;
 import cd.go.contrib.elasticagent.model.JobIdentifier;
 import com.google.gson.annotations.Expose;
@@ -82,7 +79,7 @@ public JobIdentifier jobIdentifier() {
         return jobIdentifier;
     }
 
-    public RequestExecutor executor(AgentInstances agentInstances, PluginRequest pluginRequest) {
+    public RequestExecutor executor(AgentInstances<KubernetesInstance> agentInstances, PluginRequest pluginRequest) {
         return new CreateAgentRequestExecutor(this, agentInstances, pluginRequest);
     }
 
diff --git a/src/main/java/cd/go/contrib/elasticagent/requests/ProfileValidateRequest.java b/src/main/java/cd/go/contrib/elasticagent/requests/ProfileValidateRequest.java
@@ -18,7 +18,7 @@
 
 import cd.go.contrib.elasticagent.RequestExecutor;
 import cd.go.contrib.elasticagent.executors.ProfileValidateRequestExecutor;
-import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 
 import java.util.Map;
 
@@ -32,7 +32,8 @@ public ProfileValidateRequest(Map<String, String> properties) {
     }
 
     public static ProfileValidateRequest fromJSON(String json) {
-        return new ProfileValidateRequest(GSON.fromJson(json, Map.class));
+        return new ProfileValidateRequest(GSON.fromJson(json, new TypeToken<Map<String, String>>() {
+        }.getType()));
     }
 
     public Map<String, String> getProperties() {
diff --git a/src/main/java/cd/go/contrib/elasticagent/requests/ShouldAssignWorkRequest.java b/src/main/java/cd/go/contrib/elasticagent/requests/ShouldAssignWorkRequest.java
@@ -16,10 +16,7 @@
 
 package cd.go.contrib.elasticagent.requests;
 
-import cd.go.contrib.elasticagent.Agent;
-import cd.go.contrib.elasticagent.AgentInstances;
-import cd.go.contrib.elasticagent.Request;
-import cd.go.contrib.elasticagent.RequestExecutor;
+import cd.go.contrib.elasticagent.*;
 import cd.go.contrib.elasticagent.executors.ShouldAssignWorkRequestExecutor;
 import cd.go.contrib.elasticagent.model.JobIdentifier;
 import com.google.gson.annotations.Expose;
@@ -75,7 +72,7 @@ public Map<String, String> properties() {
         return properties;
     }
 
-    public RequestExecutor executor(AgentInstances agentInstances) {
+    public RequestExecutor executor(AgentInstances<KubernetesInstance> agentInstances) {
         return new ShouldAssignWorkRequestExecutor(this, agentInstances);
     }
 
diff --git a/src/test/java/cd/go/contrib/elasticagent/executors/CreateAgentRequestExecutorTest.java b/src/test/java/cd/go/contrib/elasticagent/executors/CreateAgentRequestExecutorTest.java
@@ -16,9 +16,7 @@
 
 package cd.go.contrib.elasticagent.executors;
 
-import cd.go.contrib.elasticagent.AgentInstances;
-import cd.go.contrib.elasticagent.PluginRequest;
-import cd.go.contrib.elasticagent.PluginSettings;
+import cd.go.contrib.elasticagent.*;
 import cd.go.contrib.elasticagent.requests.CreateAgentRequest;
 import org.junit.Test;
 
@@ -28,7 +26,7 @@ public class CreateAgentRequestExecutorTest {
     @Test
     public void shouldAskDockerContainersToCreateAnAgent() throws Exception {
         CreateAgentRequest request = new CreateAgentRequest();
-        AgentInstances agentInstances = mock(AgentInstances.class);
+        AgentInstances<KubernetesInstance> agentInstances = mock(KubernetesAgentInstances.class);
         PluginRequest pluginRequest = mock(PluginRequest.class);
         PluginSettings settings = mock(PluginSettings.class);
         when(pluginRequest.getPluginSettings()).thenReturn(settings);
diff --git a/src/test/java/cd/go/contrib/elasticagent/executors/GetPluginConfigurationExecutorTest.java b/src/test/java/cd/go/contrib/elasticagent/executors/GetPluginConfigurationExecutorTest.java
@@ -17,11 +17,12 @@
 package cd.go.contrib.elasticagent.executors;
 
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 
-import java.util.HashMap;
+import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
@@ -30,9 +31,10 @@
 public class GetPluginConfigurationExecutorTest {
 
     @Test
-    public void shouldSerializeAllFields() throws Exception {
+    public void shouldSerializeAllFields() {
         GoPluginApiResponse response = new GetPluginConfigurationExecutor().execute();
-        HashMap hashMap = new Gson().fromJson(response.responseBody(), HashMap.class);
+        Map 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(),
                 GetPluginConfigurationExecutor.FIELDS.size()
diff --git a/src/test/java/cd/go/contrib/elasticagent/executors/GetProfileMetadataExecutorTest.java b/src/test/java/cd/go/contrib/elasticagent/executors/GetProfileMetadataExecutorTest.java
@@ -16,7 +16,9 @@
 
 package cd.go.contrib.elasticagent.executors;
 
+import cd.go.contrib.elasticagent.model.Field;
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -31,7 +33,8 @@ public class GetProfileMetadataExecutorTest {
     @Test
     public void shouldSerializeAllFields() throws Exception {
         GoPluginApiResponse response = new GetProfileMetadataExecutor().execute();
-        List list = new Gson().fromJson(response.responseBody(), List.class);
+        List<Field> list = new Gson().fromJson(response.responseBody(), new TypeToken<List<Field>>() {
+        }.getType());
         assertEquals(list.size(), GetProfileMetadataExecutor.FIELDS.size());
     }
 
diff --git a/src/test/java/cd/go/contrib/elasticagent/executors/GetProfileViewExecutorTest.java b/src/test/java/cd/go/contrib/elasticagent/executors/GetProfileViewExecutorTest.java
@@ -19,13 +19,13 @@
 import cd.go.contrib.elasticagent.model.Metadata;
 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.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.*;
@@ -36,7 +36,8 @@ public class GetProfileViewExecutorTest {
     public void shouldRenderTheTemplateInJSON() throws Exception {
         GoPluginApiResponse response = new GetProfileViewExecutor().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, hasEntry("template", Util.readResource("/profile.template.html")));
     }
 
diff --git a/src/test/java/cd/go/contrib/elasticagent/executors/ServerPingRequestExecutorTest.java b/src/test/java/cd/go/contrib/elasticagent/executors/ServerPingRequestExecutorTest.java
@@ -58,7 +58,7 @@ public class ServerPingRequestExecutorTest extends BaseTest {
     private ObjectMeta objectMetadata;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         initMocks(this);
         when(factory.kubernetes(any(PluginSettings.class))).thenReturn(mockedClient);
         when(mockedClient.pods()).thenReturn(mockedOperation);
@@ -85,7 +85,7 @@ public Pod answer(InvocationOnMock invocation) throws Throwable {
     public void testShouldDisableIdleAgents() throws Exception {
         String agentId = UUID.randomUUID().toString();
         final Agents agents = new Agents(Arrays.asList(new Agent(agentId, Agent.AgentState.Idle, Agent.BuildState.Idle, Agent.ConfigState.Enabled)));
-        AgentInstances agentInstances = new KubernetesAgentInstances(factory);
+        AgentInstances<KubernetesInstance> agentInstances = new KubernetesAgentInstances(factory);
 
         PluginRequest pluginRequest = mock(PluginRequest.class);
         when(pluginRequest.getPluginSettings()).thenReturn(createSettings());
@@ -110,7 +110,7 @@ public boolean matches(Collection<Agent> argument) {
     public void testShouldTerminateDisabledAgents() throws Exception {
         String agentId = UUID.randomUUID().toString();
         final Agents agents = new Agents(Arrays.asList(new Agent(agentId, Agent.AgentState.Idle, Agent.BuildState.Idle, Agent.ConfigState.Disabled)));
-        AgentInstances agentInstances = new KubernetesAgentInstances(factory);
+        AgentInstances<KubernetesInstance> agentInstances = new KubernetesAgentInstances(factory);
 
         PluginRequest pluginRequest = mock(PluginRequest.class);
         when(pluginRequest.getPluginSettings()).thenReturn(createSettings());
@@ -151,7 +151,7 @@ public void shouldDeleteAgentFromConfigWhenCorrespondingContainerIsNotPresent()
         when(pluginRequest.listAgents()).thenReturn(new Agents(Arrays.asList(new Agent("foo", Agent.AgentState.Idle, Agent.BuildState.Idle, Agent.ConfigState.Enabled))));
         verifyNoMoreInteractions(pluginRequest);
 
-        AgentInstances agentInstances = new KubernetesAgentInstances(factory);
+        AgentInstances<KubernetesInstance> agentInstances = new KubernetesAgentInstances(factory);
         ServerPingRequestExecutor serverPingRequestExecutor = new ServerPingRequestExecutor(agentInstances, pluginRequest);
         serverPingRequestExecutor.execute();
     }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`import cd.go.contrib.elasticagent.RequestExecutor;`
`20`	`20`	`import cd.go.contrib.elasticagent.executors.ProfileValidateRequestExecutor;`
`21`		`-import com.google.gson.Gson;`
	`21`	`+import com.google.gson.reflect.TypeToken;`
`22`	`22`
`23`	`23`	`import java.util.Map;`
`24`	`24`
`@@ -32,7 +32,8 @@ public ProfileValidateRequest(Map<String, String> properties) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public static ProfileValidateRequest fromJSON(String json) {`
`35`		`- return new ProfileValidateRequest(GSON.fromJson(json, Map.class));`
	`35`	`+ return new ProfileValidateRequest(GSON.fromJson(json, new TypeToken<Map<String, String>>() {`
	`36`	`+ }.getType()));`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`public Map<String, String> getProperties() {`