Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable testing for ExtensiblePlugins using classpath plugins #16908

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Enable testing for ExtensiblePlugins using classpath plugins #16908

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
44154b5
Make extended plugins optional
cwperks Oct 15, 2024
9501854
Make extended plugins optional
cwperks Oct 15, 2024
9b3f406
Merge branch 'main' into optional-extended-plugins
cwperks Dec 13, 2024
44a4042
Load extensions for classpath plugins
cwperks Dec 14, 2024
7b4d7d7
Ensure only single instance for each classpath extension
cwperks Dec 14, 2024
1614706
Add test for classpath plugin extended plugin loading
cwperks Dec 22, 2024
4176c46
Enable testing for ExtensiblePlugins using classpath plugins
cwperks Dec 23, 2024
ef041b0
Merge branch 'main' into extend-classpath-plugins
cwperks Dec 24, 2024
09d1c82
Merge branch 'main' into extend-classpath-plugins
cwperks Dec 31, 2024
f840850
Add to CHANGELOG
cwperks Dec 31, 2024
69ceaab
Merge branch 'main' into extend-classpath-plugins
cwperks Jan 3, 2025
0fbe489
Merge branch 'main' into extend-classpath-plugins
cwperks Jan 6, 2025
7a07307
Merge branch 'extend-classpath-plugins' of https://github.com/cwperks…
cwperks Jan 6, 2025
7ddd9a3
Define PluginInfos from test files for classpath plugins
cwperks Jan 8, 2025
07df814
Merge branch 'main' into extend-classpath-plugins
cwperks Jan 21, 2025
df48c29
Add testing constructor for PluginsService
cwperks Jan 21, 2025
a4937bd
Single call to loadExtensions
cwperks Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Load extensions for classpath plugins 
Signed-off-by: Craig Perkins <cwperx@amazon.com>
  • Loading branch information
@cwperks
cwperks committed Dec 14, 2024
commit 44a404281375cc6cb1752e7d4a56f53ec7cee68b
3 changes: 2 additions & 1 deletion server/src/main/java/org/opensearch/plugins/PluginsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public PluginsService(
"1.8",
pluginClass.getName(),
null,
Collections.emptyList(),
classpathPlugins.stream().map(Class::getName).filter(cp -> !pluginClass.getName().equals(cp)).collect(Collectors.toList()),
false
);
if (logger.isTraceEnabled()) {
Expand All @@ -159,6 +159,7 @@ public PluginsService(
pluginsLoaded.add(new Tuple<>(pluginInfo, plugin));
pluginsList.add(pluginInfo);
pluginsNames.add(pluginInfo.getName());
loadExtensions(pluginsLoaded);
}

Set<Bundle> seenBundles = new LinkedHashSet<>();
Expand Down