Spotless and missing merge conflict

Signed-off-by: Derek Ho <dxho@amazon.com>
derek-ho · Dec 16, 2024 · fddd37c · fddd37c
1 parent 2152448
commit fddd37c
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 9 deletions.
diff --git a/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java b/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
@@ -636,11 +636,7 @@ public List<RestHandler> getRestHandlers(
                     )
                 );
                 handlers.add(new CreateOnBehalfOfTokenAction(tokenManager));
-<<<<<<< HEAD
-                handlers.add(new ApiTokenAction(cs, localClient, settings));
-=======
                 handlers.add(new ApiTokenAction(cs, threadPool, localClient));
->>>>>>> 3177c349d27b0a3758dfdbba417def1b85902ed1
                 handlers.addAll(
                     SecurityRestApiActions.getHandler(
                         settings,

diff --git a/src/main/java/org/opensearch/security/action/apitokens/ApiTokenAction.java b/src/main/java/org/opensearch/security/action/apitokens/ApiTokenAction.java
@@ -55,7 +55,6 @@ public class ApiTokenAction extends BaseRestHandler {
         )
     );
 
-
     public ApiTokenAction(ClusterService clusterService, ThreadPool threadPool, Client client) {
         this.apiTokenRepository = new ApiTokenRepository(client, clusterService);
     }
@@ -146,8 +145,6 @@ private RestChannelConsumer handlePost(RestRequest request, NodeClient client) {
         };
     }
 
-
-
     /**
      * Extracts cluster permissions from the request body
      */
@@ -177,7 +174,6 @@ ApiToken.IndexPermission createIndexPermission(Map<String, Object> indexPerm) {
 
         List<String> allowedActions = safeStringList(indexPerm.get(ALLOWED_ACTIONS_FIELD), ALLOWED_ACTIONS_FIELD);
 
-
         return new ApiToken.IndexPermission(indexPatterns, allowedActions);
     }
 

diff --git a/src/main/java/org/opensearch/security/action/apitokens/ApiTokenIndexHandler.java b/src/main/java/org/opensearch/security/action/apitokens/ApiTokenIndexHandler.java
@@ -108,7 +108,6 @@ public void deleteToken(String name) throws ApiTokenException {
         }
     }
 
-
     public Map<String, ApiToken> getTokenMetadatas() {
         final var originalUserAndRemoteAddress = Utils.userAndRemoteAddressFrom(client.threadPool().getThreadContext());
         try (final ThreadContext.StoredContext ctx = client.threadPool().getThreadContext().stashContext()) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,6 @@ public class ApiTokenAction extends BaseRestHandler { @@
             )
         );
         public ApiTokenAction(ClusterService clusterService, ThreadPool threadPool, Client client) {
             this.apiTokenRepository = new ApiTokenRepository(client, clusterService);
         }
@@ Expand Down Expand Up @@
             };
         }
         /**
          * Extracts cluster permissions from the request body
          */
@@ Expand Down Expand Up @@
             List<String> allowedActions = safeStringList(indexPerm.get(ALLOWED_ACTIONS_FIELD), ALLOWED_ACTIONS_FIELD);
             return new ApiToken.IndexPermission(indexPatterns, allowedActions);
         }
@@ Expand Down @@