Fix code style warnings

Author: chadlwilson

INSTALL.md

@@ -47,9 +47,9 @@ on Windows.
     1. Specify `id` for auth config
     2. Select `GitHub authorization plugin for GoCD` for **_Plugin id_**
     3. Choose `GitHub` or `GitHub Enterprise` for `Authenticate with`.
-    5. Specify **_Client ID_** and **_Client Secret_**
-    6. Specify **_Personal access token_**
-    7. Save your configuration
+    4. Specify **_Client ID_** and **_Client Secret_**
+    5. Specify **_Personal access token_**
+    6. Save your configuration
 
 ### Create Role Configuration
 

src/main/java/cd/go/authorization/github/annotation/FieldMetadata.java

@@ -29,12 +29,9 @@ public class FieldMetadata implements Metadata {
     @SerializedName("secure")
     private boolean secure;
 
-    private FieldType type;
-
-    public FieldMetadata(boolean required, boolean secure, FieldType type) {
+    public FieldMetadata(boolean required, boolean secure) {
         this.required = required;
         this.secure = secure;
-        this.type = type;
     }
 
     @Override
@@ -46,9 +43,4 @@ public boolean isRequired() {
     public boolean isSecure() {
         return secure;
     }
-
-    @Override
-    public FieldType getType() {
-        return type;
-    }
 }

src/main/java/cd/go/authorization/github/annotation/FieldType.java

@@ -20,6 +20,4 @@ public interface Metadata {
     boolean isRequired();
 
     boolean isSecure();
-
-    FieldType getType();
 }

src/main/java/cd/go/authorization/github/annotation/Metadata.java

@@ -29,7 +29,7 @@ public static List<ProfileMetadata<?>> getMetadata(Class<?> clazz) {
         for (Field field : fields) {
             ProfileField profileField = field.getAnnotation(ProfileField.class);
             if (profileField != null) {
-                final FieldMetadata fieldMetadata = new FieldMetadata(profileField.required(), profileField.secure(), profileField.type());
+                final FieldMetadata fieldMetadata = new FieldMetadata(profileField.required(), profileField.secure());
                 final ProfileMetadata<FieldMetadata> profileMetadata = new ProfileMetadata<>(profileField.key(), fieldMetadata);
                 metadata.add(profileMetadata);
             }

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

@@ -29,6 +29,4 @@
     boolean required();
 
     boolean secure();
-
-    FieldType type() default FieldType.STRING;
 }

src/main/java/cd/go/authorization/github/annotation/ProfileField.java

@@ -19,6 +19,8 @@
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
+import java.util.Objects;
+
 public class ValidationError {
     @Expose
     @SerializedName("key")
@@ -42,19 +44,13 @@ public String message() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-
         ValidationError that = (ValidationError) o;
-
-        if (key != null ? !key.equals(that.key) : that.key != null) return false;
-        return message != null ? message.equals(that.message) : that.message == null;
+        return Objects.equals(key, that.key) && Objects.equals(message, that.message);
     }
 
     @Override
     public int hashCode() {
-        int result = key != null ? key.hashCode() : 0;
-        result = 31 * result + (message != null ? message.hashCode() : 0);
-        return result;
+        return Objects.hash(key, message);
     }
 }

src/main/java/cd/go/authorization/github/annotation/ValidationError.java

@@ -18,7 +18,10 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import static cd.go.authorization.github.utils.Util.GSON;
 
@@ -53,6 +56,6 @@ public boolean hasKey(String key) {
     }
 
     public List<ValidationError> errors() {
-        return Collections.unmodifiableList(new ArrayList<>(errors));
+        return List.copyOf(errors);
     }
 }

src/main/java/cd/go/authorization/github/annotation/ValidationResult.java

@@ -18,7 +18,6 @@
 
 import cd.go.authorization.github.annotation.MetadataValidator;
 import cd.go.authorization.github.annotation.ValidationResult;
-import cd.go.authorization.github.client.GitHubClientBuilder;
 import cd.go.authorization.github.requests.VerifyConnectionRequest;
 import com.thoughtworks.go.plugin.api.response.DefaultGoPluginApiResponse;
 import com.thoughtworks.go.plugin.api.response.GoPluginApiResponse;
@@ -29,15 +28,9 @@
 
 public class VerifyConnectionRequestExecutor implements RequestExecutor {
     private final VerifyConnectionRequest request;
-    private final GitHubClientBuilder providerManager;
 
     public VerifyConnectionRequestExecutor(VerifyConnectionRequest request) {
-        this(request, new GitHubClientBuilder());
-    }
-
-    public VerifyConnectionRequestExecutor(VerifyConnectionRequest request, GitHubClientBuilder providerManager) {
         this.request = request;
-        this.providerManager = providerManager;
     }
 
     @Override

src/main/java/cd/go/authorization/github/executors/VerifyConnectionRequestExecutor.java

@@ -22,20 +22,14 @@
 import java.io.IOException;
 
 public class LoggedInUserInfo {
-    private final GitHub gitHub;
     private final GHMyself gitHubUser;
     private final User user;
 
     public LoggedInUserInfo(GitHub gitHub) throws IOException {
-        this.gitHub = gitHub;
         gitHubUser = gitHub.getMyself();
         user = new User(gitHubUser.getLogin(), gitHubUser.getName(), gitHubUser.getEmail());
     }
 
-    public GitHub getGitHub() {
-        return gitHub;
-    }
-
     public GHMyself getGitHubUser() {
         return gitHubUser;
     }