From 117671cb3f0654784e05a46f315a83c75eede1c0 Mon Sep 17 00:00:00 2001
From: Darshit Chanpura <dchanp@amazon.com>
Date: Fri, 4 Oct 2024 18:24:05 -0400
Subject: [PATCH] Updates method references to conform to core

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
---
 .../sample/transport/CreateResourceTransportAction.java  | 2 ++
 .../ListAccessibleResourcesTransportAction.java          | 2 +-
 .../sample/transport/ShareResourceTransportAction.java   | 2 ++
 .../opensearch/security/OpenSearchSecurityPlugin.java    | 9 ++-------
 .../security/resources/ResourceAccessHandler.java        | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/sample-resource-plugin/src/main/java/org/opensearch/sample/transport/CreateResourceTransportAction.java b/sample-resource-plugin/src/main/java/org/opensearch/sample/transport/CreateResourceTransportAction.java
index d3bb8f19b2..44d18ef846 100644
--- a/sample-resource-plugin/src/main/java/org/opensearch/sample/transport/CreateResourceTransportAction.java
+++ b/sample-resource-plugin/src/main/java/org/opensearch/sample/transport/CreateResourceTransportAction.java
@@ -23,6 +23,7 @@
 import org.opensearch.action.support.HandledTransportAction;
 import org.opensearch.action.support.WriteRequest;
 import org.opensearch.client.Client;
+import org.opensearch.common.inject.Inject;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.xcontent.ToXContent;
@@ -45,6 +46,7 @@ public class CreateResourceTransportAction extends HandledTransportAction<Create
     private final Client nodeClient;
     private final String resourceIndex;
 
+    @Inject
     public CreateResourceTransportAction(
         TransportService transportService,
         ActionFilters actionFilters,
diff --git a/sample-resource-plugin/src/main/java/org/opensearch/sample/transport/ListAccessibleResourcesTransportAction.java b/sample-resource-plugin/src/main/java/org/opensearch/sample/transport/ListAccessibleResourcesTransportAction.java
index c4734ad928..d56eb6d291 100644
--- a/sample-resource-plugin/src/main/java/org/opensearch/sample/transport/ListAccessibleResourcesTransportAction.java
+++ b/sample-resource-plugin/src/main/java/org/opensearch/sample/transport/ListAccessibleResourcesTransportAction.java
@@ -44,7 +44,7 @@ public ListAccessibleResourcesTransportAction(TransportService transportService,
     protected void doExecute(Task task, ListAccessibleResourcesRequest request, ActionListener<ListAccessibleResourcesResponse> listener) {
         try {
             ResourceService rs = SampleResourcePlugin.GuiceHolder.getResourceService();
-            List<String> resourceIds = rs.getResourceAccessControlPlugin().listAccessibleResourcesForPlugin(RESOURCE_INDEX_NAME);
+            List<String> resourceIds = rs.getResourceAccessControlPlugin().listAccessibleResourcesInPlugin(RESOURCE_INDEX_NAME);
             log.info("Successfully fetched accessible resources for current user");
             listener.onResponse(new ListAccessibleResourcesResponse(resourceIds));
         } catch (Exception e) {
diff --git a/sample-resource-plugin/src/main/java/org/opensearch/sample/transport/ShareResourceTransportAction.java b/sample-resource-plugin/src/main/java/org/opensearch/sample/transport/ShareResourceTransportAction.java
index 0dfab3fade..ff1541773e 100644
--- a/sample-resource-plugin/src/main/java/org/opensearch/sample/transport/ShareResourceTransportAction.java
+++ b/sample-resource-plugin/src/main/java/org/opensearch/sample/transport/ShareResourceTransportAction.java
@@ -19,6 +19,7 @@
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
 import org.opensearch.client.Client;
+import org.opensearch.common.inject.Inject;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.sample.SampleResourcePlugin;
@@ -39,6 +40,7 @@ public class ShareResourceTransportAction extends HandledTransportAction<ShareRe
     private final Client nodeClient;
     private final String resourceIndex;
 
+    @Inject
     public ShareResourceTransportAction(
         TransportService transportService,
         ActionFilters actionFilters,
diff --git a/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java b/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
index 68459694e0..03e54c10e0 100644
--- a/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
+++ b/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
@@ -2217,13 +2217,8 @@ private void tryAddSecurityProvider() {
     }
 
     @Override
-    public Map<String, List<String>> listAccessibleResources() {
-        return this.resourceAccessHandler.listAccessibleResources();
-    }
-
-    @Override
-    public List<String> listAccessibleResourcesForPlugin(String systemIndexName) {
-        return this.resourceAccessHandler.listAccessibleResourcesForPlugin(systemIndexName);
+    public List<String> listAccessibleResourcesInPlugin(String systemIndexName) {
+        return this.resourceAccessHandler.listAccessibleResourcesInPlugin(systemIndexName);
     }
 
     @Override
diff --git a/src/main/java/org/opensearch/security/resources/ResourceAccessHandler.java b/src/main/java/org/opensearch/security/resources/ResourceAccessHandler.java
index 9c26811dc9..838785ee7f 100644
--- a/src/main/java/org/opensearch/security/resources/ResourceAccessHandler.java
+++ b/src/main/java/org/opensearch/security/resources/ResourceAccessHandler.java
@@ -44,7 +44,7 @@ public Map<String, List<String>> listAccessibleResources() {
         return Map.of();
     }
 
-    public List<String> listAccessibleResourcesForPlugin(String systemIndex) {
+    public List<String> listAccessibleResourcesInPlugin(String systemIndex) {
         final User user = threadContext.getTransient(ConfigConstants.OPENDISTRO_SECURITY_USER);
         LOGGER.info("Listing accessible resource within a system index {} for : {}", systemIndex, user.getName());