-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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.
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
[JPMS Support] Refactor the codebase to eliminate top level split packages #17153
Conversation
Adding @msfroh @reta @andrross to please take a look and your thoughts. |
❌ Gradle check result for 464104d: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
464104d
to
588bd0d
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #17153 +/- ##
============================================
- Coverage 72.34% 72.26% -0.08%
+ Complexity 65481 65462 -19
============================================
Files 5300 5300
Lines 304330 304525 +195
Branches 44141 44174 +33
============================================
- Hits 220158 220062 -96
- Misses 66093 66415 +322
+ Partials 18079 18048 -31 ☔ View full report in Codecov by Sentry. |
Looking through a lot of these CLI commands, I think we should move them out of My intuition is as follows:
That's where it becomes clear that we have a lot more detangling to do (as highlighted on the linked issue). Can we at least try to move |
Thanks @msfroh, when we try to pull the |
Let me explore and see the refactoring (moving) the |
588bd0d
to
9c20d11
Compare
❌ Gradle check result for 9c20d11: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
9c20d11
to
0a8b149
Compare
@msfroh while working on moving |
❌ Gradle check result for 0a8b149: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
0a8b149
to
93882d4
Compare
Added missing Javadoc for |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is about as good as we're going to get without a lot more refactoring, and is IMO a great start. Thanks @prudhvigodithi !
...ols/keystore-cli/src/main/java/org/opensearch/tools/cli/keystore/UpgradeKeyStoreCommand.java
Outdated
Show resolved
Hide resolved
800ee86
to
9e44d7c
Compare
server/src/main/java/org/opensearch/plugins/PluginsService.java
Outdated
Show resolved
Hide resolved
1124769
to
882473e
Compare
...-classloader/src/main/java/org/opensearch/plugin_classloader/ExtendedPluginsClassLoader.java
Outdated
Show resolved
Hide resolved
882473e
to
6a60d4f
Compare
❌ Gradle check result for 6a60d4f: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
6a60d4f
to
c5453ad
Compare
❌ Gradle check result for c5453ad: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
c5453ad
to
bae133d
Compare
bae133d
to
e9fc941
Compare
e9fc941
to
8ee2a72
Compare
❌ Gradle check result for 8ee2a72: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
8ee2a72
to
b60cdc9
Compare
Signed-off-by: Prudhvi Godithi <[email protected]>
b60cdc9
to
cd7e3b3
Compare
:server
module cli
package to eliminate top level split packages
Description
For Phase 0 - JPMS Support, refactor
:server
modulecli
package to eliminate top level split packages.The
:libs:opensearch-cli
and:server
module both hasorg.opensearch.cli
. Updated the:server
org.opensearch.cli
toorg.opensearch.common.cli
(part of:server
).Deleted the class
server/src/main/java/org/opensearch/cli/LoggingAwareCommand.java
which is not used.Moved the common existing cli tests from
:server
to:libs
(libs/cli/src/test/java/cli/
).This change requires a simple refactor to eliminate the top level split package issue for
org.opensearch.cli
.Fix
:distribution:tools:keystore-cli
split level package problemorg.opensearch.common.settings
. Modify toorg.opensearch.cli.keystore
.Removed the
libs/plugin-classloader
and refactored theExtendedPluginsClassLoader
to:server
.Moved some of the
InstallPluginCommand
andRemovePluginCommand
logic toPluginsService
itself, this way theBundle
,plugin
and some of its methods that instantiatesBundle
can be private (fromPluginsService
).Related Issues
Part of #8110
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.