Fixes Spotless errors

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
opensearch-project · Oct 14, 2022 · 162b4ab · 162b4ab
1 parent 01faecd
commit 162b4ab
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 16 deletions.
diff --git a/sandbox/libs/authn/src/main/java/org/opensearch/authn/Principals.java b/sandbox/libs/authn/src/main/java/org/opensearch/authn/Principals.java
@@ -4,11 +4,6 @@
  */
 
 package org.opensearch.authn;
-<<<<<<< HEAD
-=======
-
-import org.opensearch.authn.StringPrincipal;
->>>>>>> a4c957e6722 (Integrate new changes with existing identity classes)
 
 import java.security.Principal;
 

diff --git a/sandbox/libs/authn/src/main/java/org/opensearch/authn/realm/InternalUsersStore.java b/sandbox/libs/authn/src/main/java/org/opensearch/authn/realm/InternalUsersStore.java
@@ -59,7 +59,7 @@ public static ConcurrentMap<String, User> readInternalSubjectsAsMap(String pathT
                         throw new RuntimeException(e);
                     }
                 });
-                
+
                 internalUsersMap.put(primaryPrincipal, user);
             }
         } catch (IOException e) {

diff --git a/server/src/main/java/org/opensearch/action/ActionModule.java b/server/src/main/java/org/opensearch/action/ActionModule.java
@@ -268,7 +268,6 @@
 import org.opensearch.action.termvectors.TransportTermVectorsAction;
 import org.opensearch.action.update.TransportUpdateAction;
 import org.opensearch.action.update.UpdateAction;
-import org.opensearch.authn.realm.InternalRealm;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.node.DiscoveryNodes;

diff --git a/server/src/main/java/org/opensearch/rest/SecurityRestFilter.java b/server/src/main/java/org/opensearch/rest/SecurityRestFilter.java
@@ -18,7 +18,6 @@
 
 import static org.opensearch.node.Node.INTERNAL_REALM;
 
-
 /**
  * Adds a wrapper to all rest requests to add authentication mechanism
  *

diff --git a/server/src/main/resources/org/opensearch/bootstrap/security.policy b/server/src/main/resources/org/opensearch/bootstrap/security.policy
@@ -74,12 +74,6 @@ grant codeBase "${codebase.opensearch-plugin-classloader}" {
   permission java.lang.RuntimePermission "createClassLoader";
 };
 
-grant codeBase "${codebase.jackson-databind}" {
-  // needed by jackson-databind ObjectMapper.readValue
-  permission java.lang.RuntimePermission "accessDeclaredMembers";
-  permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-};
-
 grant codeBase "${codebase.jackson-databind}" {
   // needed by jackson-databind ObjectMapper.readValue
   permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
@@ -194,6 +188,4 @@ grant {
   permission java.io.FilePermission "/sys/fs/cgroup/memory", "read";
   permission java.io.FilePermission "/sys/fs/cgroup/memory/-", "read";
 
-  // needed by jackson-databind ObjectMapper.readValue
-  permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
 };
-Original file line number
+Diff line change
@@ Expand Up @@
                             throw new RuntimeException(e);
                         }
                     });
                     internalUsersMap.put(primaryPrincipal, user);
                 }
             } catch (IOException e) {
@@ Expand Down @@