various code clean-up

Author: Framonti

src/main/java/com/cleafy/elasticsearch/plugins/http/BasicRestFilter.java

@@ -12,7 +12,7 @@
 
 public class BasicRestFilter {
     private final HttpBasicAuthenticator httpBasicAuthenticator;
-    private boolean isUnauthLogEnabled;
+    private final boolean isUnauthLogEnabled;
 
     public BasicRestFilter(final Settings settings) {
         super();

src/main/java/com/cleafy/elasticsearch/plugins/http/HttpBasicServerPlugin.java

@@ -19,7 +19,7 @@
  */
 public class HttpBasicServerPlugin extends Plugin implements ActionPlugin {
 
-    private boolean enabledByDefault = false;
+    private final boolean enabledByDefault = false;
     private final Settings settings;
     BasicRestFilter basicFilter;
 
@@ -40,9 +40,9 @@ public String description() {
     @Override
     public UnaryOperator<RestHandler> getRestHandlerWrapper(final ThreadContext threadContext) {
         if (this.settings.getAsBoolean(Globals.SETTINGS_ENABLED, enabledByDefault)) {
-            return (rh) -> basicFilter.wrap(rh);
+            return rh -> basicFilter.wrap(rh);
         }
-        return (rh) -> rh;
+        return rh -> rh;
     }
 
     @Override
@@ -58,9 +58,8 @@ public Settings additionalSettings() {
 
     @Override
     public List<Setting<?>> getSettings() {
-        List<Setting<?>> settings = new ArrayList<Setting<?>>();
 
-        settings.addAll(super.getSettings());
+        List<Setting<?>> settings = new ArrayList<>(super.getSettings());
 
         settings.add(Setting.boolSetting(Globals.SETTINGS_ENABLED, enabledByDefault, Setting.Property.NodeScope, Setting.Property.Filtered));
         settings.add(Setting.simpleString(Globals.SETTINGS_USERNAME, Setting.Property.NodeScope, Setting.Property.Filtered));

src/main/java/com/cleafy/elasticsearch/plugins/http/auth/AuthCredentials.java

@@ -11,7 +11,7 @@ public class AuthCredentials {
     private final String username;
     private byte[] password;
     private Object nativeCredentials;
-    private final Set<String> backendRoles = new HashSet<String>();
+    private final Set<String> backendRoles = new HashSet<>();
     private boolean complete;
     private final byte[] internalPasswordHash;
     private final Map<String, String> attributes = new HashMap<>();
@@ -116,11 +116,8 @@ public boolean equals(Object obj) {
         if (internalPasswordHash == null || other.internalPasswordHash == null || !MessageDigest.isEqual(internalPasswordHash, other.internalPasswordHash))
             return false;
         if (username == null) {
-            if (other.username != null)
-                return false;
-        } else if (!username.equals(other.username))
-            return false;
-        return true;
+            return other.username == null;
+        } else return username.equals(other.username);
     }
 
     @Override
@@ -133,7 +130,7 @@ public String toString() {
      * @return Defensive copy of the roles this user is member of.
      */
     public Set<String> getBackendRoles() {
-        return new HashSet<String>(backendRoles);
+        return new HashSet<>(backendRoles);
     }
 
     public boolean isComplete() {

src/main/java/com/cleafy/elasticsearch/plugins/http/auth/HttpBasicAuthenticator.java

@@ -4,7 +4,7 @@
 import org.elasticsearch.rest.RestRequest;
 
 public class HttpBasicAuthenticator extends Authenticator {
-    private AuthCredentials credentials;
+    private final AuthCredentials credentials;
 
     public HttpBasicAuthenticator(Settings settings, AuthCredentials credentials) {
         super(settings);
@@ -13,10 +13,7 @@ public HttpBasicAuthenticator(Settings settings, AuthCredentials credentials) {
 
     @Override
     public boolean authenticate(RestRequest request) {
-        if (this.extractCredentials(request).equals(credentials)) {
-            return true;
-        }
-        return false;
+        return this.extractCredentials(request).equals(credentials);
     }
 
     private AuthCredentials extractCredentials(final RestRequest request) {