Correct a handful of compiler warnings

Author: chadlwilson

src/main/java/cd/go/authorization/okta/annotation/MetadataHelper.java

@@ -18,13 +18,14 @@
 
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class MetadataHelper {
 
-    public static List<ProfileMetadata> getMetadata(Class<?> clazz) {
+    public static List<ProfileMetadata<FieldMetadata>> getMetadata(Class<?> clazz) {
         Field[] fields = clazz.getDeclaredFields();
-        List<ProfileMetadata> metadata = new ArrayList<>();
+        List<ProfileMetadata<FieldMetadata>> metadata = new ArrayList<>();
         for (Field field : fields) {
             ProfileField profileField = field.getAnnotation(ProfileField.class);
             if (profileField != null) {

src/main/java/cd/go/authorization/okta/executors/GetAuthConfigMetadataRequestExecutor.java

@@ -16,6 +16,7 @@
 
 package cd.go.authorization.okta.executors;
 
+import cd.go.authorization.okta.annotation.FieldMetadata;
 import cd.go.authorization.okta.annotation.MetadataHelper;
 import cd.go.authorization.okta.annotation.ProfileMetadata;
 import cd.go.authorization.okta.models.OktaConfiguration;
@@ -30,7 +31,7 @@ public class GetAuthConfigMetadataRequestExecutor implements RequestExecutor {
     private static final Gson GSON = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
 
     public GoPluginApiResponse execute() throws Exception {
-        final List<ProfileMetadata> authConfigMetadata = MetadataHelper.getMetadata(OktaConfiguration.class);
-        return DefaultGoPluginApiResponse.success( GSON.toJson(authConfigMetadata));
+        final List<ProfileMetadata<FieldMetadata>> authConfigMetadata = MetadataHelper.getMetadata(OktaConfiguration.class);
+        return DefaultGoPluginApiResponse.success(GSON.toJson(authConfigMetadata));
     }
 }

src/main/java/cd/go/authorization/okta/executors/GetRoleConfigMetadataRequestExecutor.java

@@ -16,6 +16,7 @@
 
 package cd.go.authorization.okta.executors;
 
+import cd.go.authorization.okta.annotation.FieldMetadata;
 import cd.go.authorization.okta.annotation.MetadataHelper;
 import cd.go.authorization.okta.annotation.ProfileMetadata;
 import cd.go.authorization.okta.models.OktaRoleConfiguration;
@@ -30,7 +31,7 @@ public class GetRoleConfigMetadataRequestExecutor implements RequestExecutor {
     private static final Gson GSON = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
 
     public GoPluginApiResponse execute() throws Exception {
-        final List<ProfileMetadata> authConfigMetadata = MetadataHelper.getMetadata(OktaRoleConfiguration.class);
+        final List<ProfileMetadata<FieldMetadata>> authConfigMetadata = MetadataHelper.getMetadata(OktaRoleConfiguration.class);
         return DefaultGoPluginApiResponse.success(GSON.toJson(authConfigMetadata));
     }
 }

src/test/java/cd/go/authorization/okta/executors/GetAuthConfigMetadataRequestExecutorTest.java

@@ -16,9 +16,12 @@
 
 package cd.go.authorization.okta.executors;
 
+import cd.go.authorization.okta.annotation.FieldMetadata;
 import cd.go.authorization.okta.annotation.MetadataHelper;
+import cd.go.authorization.okta.annotation.ProfileMetadata;
 import cd.go.authorization.okta.models.OktaConfiguration;
 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;
@@ -34,7 +37,7 @@ public class GetAuthConfigMetadataRequestExecutorTest {
     @Test
     public void shouldSerializeAllFields() throws Exception {
         GoPluginApiResponse response = new GetAuthConfigMetadataRequestExecutor().execute();
-        List list = new Gson().fromJson(response.responseBody(), List.class);
+        List<ProfileMetadata<FieldMetadata>> list = new Gson().fromJson(response.responseBody(),  new TypeToken<List<ProfileMetadata<FieldMetadata>>>() {}.getType());
         assertEquals(list.size(), MetadataHelper.getMetadata(OktaConfiguration.class).size());
     }
 

src/test/java/cd/go/authorization/okta/executors/GetAuthConfigViewRequestExecutorTest.java

@@ -16,15 +16,16 @@
 
 package cd.go.authorization.okta.executors;
 
+import cd.go.authorization.okta.annotation.FieldMetadata;
 import cd.go.authorization.okta.annotation.MetadataHelper;
 import cd.go.authorization.okta.annotation.ProfileMetadata;
 import cd.go.authorization.okta.models.OktaConfiguration;
 import cd.go.authorization.okta.utils.Util;
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
 import org.junit.Test;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import static org.hamcrest.Matchers.*;
@@ -36,15 +37,15 @@ public class GetAuthConfigViewRequestExecutorTest {
     public void shouldRenderTheTemplateInJSON() throws Exception {
         GoPluginApiResponse response = new GetAuthConfigViewRequestExecutor().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("/auth-config.template.html")));
     }
 
     @Test
     public void allFieldsShouldBePresentInView() throws Exception {
         String template = Util.readResource("/auth-config.template.html");
 
-        for (ProfileMetadata field : MetadataHelper.getMetadata(OktaConfiguration.class)) {
+        for (ProfileMetadata<FieldMetadata> field : MetadataHelper.getMetadata(OktaConfiguration.class)) {
             assertThat(template, containsString("ng-model=\"" + field.getKey() + "\""));
             assertThat(template, containsString("<span class=\"form_error form-error\" ng-class=\"{'is-visible': GOINPUTNAME[" +
                     field.getKey() + "].$error.server}\" ng-show=\"GOINPUTNAME[" +

src/test/java/cd/go/authorization/okta/executors/GetPluginIconRequestExecutorTest.java

@@ -18,10 +18,11 @@
 
 import cd.go.authorization.okta.utils.Util;
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
 import org.junit.Test;
 
-import java.util.HashMap;
+import java.util.Map;
 
 import static java.util.Base64.getDecoder;
 import static org.hamcrest.CoreMatchers.is;
@@ -32,7 +33,7 @@ public class GetPluginIconRequestExecutorTest {
     @Test
     public void rendersIconInBase64() throws Exception {
         GoPluginApiResponse response = new GetPluginIconRequestExecutor().execute();
-        HashMap<String, String> hashMap = new Gson().fromJson(response.responseBody(), HashMap.class);
+        Map<String, String> hashMap = new Gson().fromJson(response.responseBody(), new TypeToken<Map<String, String>>() {}.getType());
         assertThat(hashMap.size(), is(2));
         assertThat(hashMap.get("content_type"), is("image/png"));
         assertThat(Util.readResourceBytes("/okta-logo.png"), is(getDecoder().decode(hashMap.get("data"))));

src/test/java/cd/go/authorization/okta/executors/GetRoleConfigViewRequestExecutorTest.java

@@ -16,18 +16,19 @@
 
 package cd.go.authorization.okta.executors;
 
+import cd.go.authorization.okta.annotation.FieldMetadata;
 import cd.go.authorization.okta.annotation.MetadataHelper;
 import cd.go.authorization.okta.annotation.ProfileMetadata;
 import cd.go.authorization.okta.models.OktaRoleConfiguration;
 import cd.go.authorization.okta.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.List;
 import java.util.Map;
 
@@ -41,8 +42,8 @@ public void allFieldsShouldBePresentInView() throws Exception {
         String template = Util.readResource("/role-config.template.html");
         final Document document = Jsoup.parse(template);
 
-        final List<ProfileMetadata> metadataList = MetadataHelper.getMetadata(OktaRoleConfiguration.class);
-        for (ProfileMetadata field : metadataList) {
+        final List<ProfileMetadata<FieldMetadata>> metadataList = MetadataHelper.getMetadata(OktaRoleConfiguration.class);
+        for (ProfileMetadata<FieldMetadata> field : metadataList) {
             final Elements inputFieldForKey = document.getElementsByAttributeValue("ng-model", field.getKey());
             assertThat(inputFieldForKey, hasSize(1));
 
@@ -60,7 +61,7 @@ public void allFieldsShouldBePresentInView() throws Exception {
     public void shouldRenderTheTemplateInJSON() throws Exception {
         GoPluginApiResponse response = new GetRoleConfigViewRequestExecutor().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("/role-config.template.html")));
     }
 }