Clean up branch

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Jan 9, 2025 · 8095b67 · 8095b67
1 parent 68f6fdb
commit 8095b67
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 207 deletions.
diff --git a/...n-plugin/src/main/java/org/opensearch/security/sampleextension/SampleExtensionPlugin.java b/...n-plugin/src/main/java/org/opensearch/security/sampleextension/SampleExtensionPlugin.java
@@ -50,9 +50,7 @@
 import org.opensearch.security.sampleextension.actions.update.UpdateSampleResourceAction;
 import org.opensearch.security.sampleextension.actions.update.UpdateSampleResourceRestAction;
 import org.opensearch.security.sampleextension.actions.update.UpdateSampleResourceTransportAction;
-import org.opensearch.security.sampleextension.resource.SampleResourceSharingServiceProvider;
 import org.opensearch.security.spi.ResourceSharingExtension;
-import org.opensearch.security.spi.ResourceSharingService;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.watcher.ResourceWatcherService;
 
@@ -84,10 +82,7 @@ public Collection<Object> createComponents(
         Supplier<RepositoriesService> repositoriesServiceSupplier
     ) {
         this.client = client;
-        System.out.println(
-            "SampleResourceSharingServiceProvider.getInstance(): " + SampleResourceSharingServiceProvider.getInstance().get()
-        );
-        return List.of(SampleResourceSharingServiceProvider.getInstance());
+        return List.of();
     }
 
     @Override
@@ -133,10 +128,4 @@ public String getResourceType() {
     public String getResourceIndex() {
         return RESOURCE_INDEX_NAME;
     }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void assignResourceSharingService(ResourceSharingService service) {
-        SampleResourceSharingServiceProvider.getInstance().set(service);
-    }
 }
diff --git a/...org/opensearch/security/sampleextension/actions/get/GetSampleResourceTransportAction.java b/...org/opensearch/security/sampleextension/actions/get/GetSampleResourceTransportAction.java
@@ -17,7 +17,6 @@
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.security.sampleextension.resource.SampleResource;
 import org.opensearch.security.sampleextension.resource.SampleResourceParser;
-import org.opensearch.security.sampleextension.resource.SampleResourceSharingServiceProvider;
 import org.opensearch.security.spi.actions.resource.get.GetResourceTransportAction;
 import org.opensearch.transport.TransportService;
 
@@ -33,7 +32,6 @@ public class GetSampleResourceTransportAction extends GetResourceTransportAction
     public GetSampleResourceTransportAction(
         TransportService transportService,
         ActionFilters actionFilters,
-        SampleResourceSharingServiceProvider resourceSharingService,
         Client client,
         NamedXContentRegistry xContentRegistry
     ) {
@@ -42,7 +40,6 @@ public GetSampleResourceTransportAction(
             actionFilters,
             GetSampleResourceAction.NAME,
             RESOURCE_INDEX_NAME,
-            resourceSharingService.get(),
             new SampleResourceParser(),
             client,
             xContentRegistry

diff --git a/...g/opensearch/security/sampleextension/actions/list/ListSampleResourceTransportAction.java b/...g/opensearch/security/sampleextension/actions/list/ListSampleResourceTransportAction.java
@@ -17,7 +17,6 @@
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.security.sampleextension.resource.SampleResource;
 import org.opensearch.security.sampleextension.resource.SampleResourceParser;
-import org.opensearch.security.sampleextension.resource.SampleResourceSharingServiceProvider;
 import org.opensearch.security.spi.actions.resource.list.ListResourceTransportAction;
 import org.opensearch.transport.TransportService;
 
@@ -33,7 +32,6 @@ public class ListSampleResourceTransportAction extends ListResourceTransportActi
     public ListSampleResourceTransportAction(
         TransportService transportService,
         ActionFilters actionFilters,
-        SampleResourceSharingServiceProvider resourceSharingService,
         NamedXContentRegistry xContentRegistry,
         Client client
     ) {
@@ -42,7 +40,6 @@ public ListSampleResourceTransportAction(
             actionFilters,
             ListSampleResourceAction.NAME,
             RESOURCE_INDEX_NAME,
-            resourceSharingService.get(),
             new SampleResourceParser(),
             client,
             xContentRegistry

diff --git a/...rg/opensearch/security/sampleextension/resource/SampleResourceSharingServiceProvider.java b/...rg/opensearch/security/sampleextension/resource/SampleResourceSharingServiceProvider.java
diff --git a/spi/src/main/java/org/opensearch/security/spi/NoopResourceSharingService.java b/spi/src/main/java/org/opensearch/security/spi/NoopResourceSharingService.java
diff --git a/spi/src/main/java/org/opensearch/security/spi/ResourceDocVersion.java b/spi/src/main/java/org/opensearch/security/spi/ResourceDocVersion.java
diff --git a/spi/src/main/java/org/opensearch/security/spi/ResourceSharingExtension.java b/spi/src/main/java/org/opensearch/security/spi/ResourceSharingExtension.java
@@ -21,6 +21,4 @@ public interface ResourceSharingExtension {
      * @return resource index name.
      */
     String getResourceIndex();
-
-    void assignResourceSharingService(ResourceSharingService service);
 }
diff --git a/spi/src/main/java/org/opensearch/security/spi/ResourceSharingService.java b/spi/src/main/java/org/opensearch/security/spi/ResourceSharingService.java
diff --git a/...ain/java/org/opensearch/security/spi/actions/resource/get/GetResourceTransportAction.java b/...ain/java/org/opensearch/security/spi/actions/resource/get/GetResourceTransportAction.java
@@ -28,7 +28,6 @@
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.security.spi.ResourceParser;
-import org.opensearch.security.spi.ResourceSharingService;
 import org.opensearch.security.spi.SharableResource;
 import org.opensearch.tasks.Task;
 import org.opensearch.transport.TransportService;
@@ -41,8 +40,6 @@ public class GetResourceTransportAction<T extends SharableResource> extends Hand
     GetResourceResponse<T>> {
     private static final Logger log = LogManager.getLogger(GetResourceTransportAction.class);
 
-    private final ResourceSharingService resourceSharingService;
-
     private final ResourceParser<T> resourceParser;
 
     private final String resourceIndex;
@@ -56,13 +53,11 @@ public GetResourceTransportAction(
         ActionFilters actionFilters,
         String actionName,
         String resourceIndex,
-        ResourceSharingService resourceSharingService,
         ResourceParser<T> resourceParser,
         Client client,
         NamedXContentRegistry xContentRegistry
     ) {
         super(actionName, transportService, actionFilters, GetResourceRequest::new);
-        this.resourceSharingService = resourceSharingService;
         Objects.requireNonNull(resourceParser);
         this.resourceParser = resourceParser;
         this.resourceIndex = resourceIndex;

diff --git a/...n/java/org/opensearch/security/spi/actions/resource/list/ListResourceTransportAction.java b/...n/java/org/opensearch/security/spi/actions/resource/list/ListResourceTransportAction.java
@@ -29,9 +29,7 @@
 import org.opensearch.index.query.MatchAllQueryBuilder;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.builder.SearchSourceBuilder;
-import org.opensearch.security.spi.NoopResourceSharingService;
 import org.opensearch.security.spi.ResourceParser;
-import org.opensearch.security.spi.ResourceSharingService;
 import org.opensearch.security.spi.SharableResource;
 import org.opensearch.tasks.Task;
 import org.opensearch.transport.TransportService;
@@ -42,7 +40,6 @@
 public class ListResourceTransportAction<T extends SharableResource> extends HandledTransportAction<
     ListResourceRequest,
     ListResourceResponse<T>> {
-    private final ResourceSharingService resourceSharingService;
 
     private final ResourceParser<T> resourceParser;
 
@@ -57,14 +54,12 @@ public ListResourceTransportAction(
         ActionFilters actionFilters,
         String actionName,
         String resourceIndex,
-        ResourceSharingService resourceSharingService,
         ResourceParser<T> resourceParser,
         Client client,
         NamedXContentRegistry xContentRegistry
     ) {
         super(actionName, transportService, actionFilters, ListResourceRequest::new);
         this.client = client;
-        this.resourceSharingService = resourceSharingService != null ? resourceSharingService : new NoopResourceSharingService();
         this.resourceIndex = resourceIndex;
         this.xContentRegistry = xContentRegistry;
         Objects.requireNonNull(resourceParser);
@@ -97,7 +92,6 @@ public void onResponse(SearchResponse searchResponse) {
 
                     for (SearchHit hit : hits) {
                         System.out.println("hit: " + hit.getSourceAsMap());
-                        System.out.println("hit score: " + hit.getScore());
                         try {
                             XContentParser parser = XContentHelper.createParser(
                                 xContentRegistry,