Only optional extended plugins

Signed-off-by: Craig Perkins <[email protected]>
opensearch-project · Dec 24, 2024 · 29ff5b0 · 29ff5b0
1 parent 13c7bee
commit 29ff5b0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 71 deletions.
diff --git a/server/src/internalClusterTest/java/org/opensearch/plugins/ClasspathPluginIT.java b/server/src/internalClusterTest/java/org/opensearch/plugins/ClasspathPluginIT.java
diff --git a/...Test/resources/META-INF/services/org.opensearch.plugins.ClasspathPluginIT$SampleExtension b/...Test/resources/META-INF/services/org.opensearch.plugins.ClasspathPluginIT$SampleExtension
diff --git a/server/src/main/java/org/opensearch/plugins/PluginsService.java b/server/src/main/java/org/opensearch/plugins/PluginsService.java
@@ -150,7 +150,7 @@ public PluginsService(
                 "1.8",
                 pluginClass.getName(),
                 null,
-                classpathPlugins.stream().map(Class::getName).filter(cp -> !pluginClass.getName().equals(cp)).collect(Collectors.toList()),
+                Collections.emptyList(),
                 false
             );
             if (logger.isTraceEnabled()) {
@@ -160,7 +160,6 @@ public PluginsService(
             pluginsList.add(pluginInfo);
             pluginsNames.add(pluginInfo.getName());
         }
-        loadExtensions(pluginsLoaded);
 
         Set<Bundle> seenBundles = new LinkedHashSet<>();
         List<PluginInfo> modulesList = new ArrayList<>();
@@ -571,17 +570,9 @@ private static void loadExtensionsForPlugin(ExtensiblePlugin extensiblePlugin, L
         ExtensiblePlugin.ExtensionLoader extensionLoader = new ExtensiblePlugin.ExtensionLoader() {
             @Override
             public <T> List<T> loadExtensions(Class<T> extensionPointType) {
-                Set<Class<?>> seenClasses = new LinkedHashSet<>();
                 List<T> result = new ArrayList<>();
-
                 for (Plugin extendingPlugin : extendingPlugins) {
-                    List<? extends T> extensions = createExtensions(extensionPointType, extendingPlugin);
-                    for (T extension : extensions) {
-                        // Only add if we haven't seen this class before, needed for classpath extensions for testing
-                        if (seenClasses.add(extension.getClass())) {
-                            result.add(extension);
-                        }
-                    }
+                    result.addAll(createExtensions(extensionPointType, extendingPlugin));
                 }
                 return Collections.unmodifiableList(result);
             }