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.

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

Deprecated Spring IoC and using Guice instead #1177

Merged
merged 4 commits into from
Dec 23, 2022

Conversation

penghuo
Copy link
Collaborator

@penghuo penghuo commented Dec 15, 2022

Signed-off-by: Peng Huo [email protected]

Description

  1. Remove the depedency on spring-beans, spring-ontext and spring-test.
  2. Using Guice from OpenSearch instead.

Issues Resolved

#741

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

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.

@penghuo penghuo self-assigned this Dec 15, 2022
@penghuo penghuo added backport 2.x infrastructure Changes to infrastructure, testing, CI/CD, pipelines, etc. labels Dec 15, 2022
@codecov-commenter
Copy link

codecov-commenter commented Dec 15, 2022

Codecov Report

Merging #1177 (ae5570d) into main (5073215) will decrease coverage by 2.50%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #1177      +/-   ##
============================================
- Coverage     98.31%   95.80%   -2.51%     
+ Complexity     3521     3517       -4     
============================================
  Files           342      350       +8     
  Lines          8701     9355     +654     
  Branches        554      673     +119     
============================================
+ Hits           8554     8963     +409     
- Misses          142      334     +192     
- Partials          5       58      +53     
Flag Coverage Δ
query-workbench 62.76% <ø> (?)
sql-engine 98.30% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
workbench/public/components/Main/main.tsx 53.00% <0.00%> (ø)
workbench/public/components/Header/Header.tsx 100.00% <0.00%> (ø)
workbench/public/components/PPLPage/PPLPage.tsx 56.52% <0.00%> (ø)
workbench/public/components/SQLPage/SQLPage.tsx 100.00% <0.00%> (ø)
...ch/public/components/QueryResults/QueryResults.tsx 61.60% <0.00%> (ø)
workbench/public/application.tsx 0.00% <0.00%> (ø)
workbench/public/utils/PanelWrapper.tsx 100.00% <0.00%> (ø)
workbench/public/components/app.tsx 0.00% <0.00%> (ø)
...ublic/components/QueryResults/QueryResultsBody.tsx 68.32% <0.00%> (ø)
...h/public/components/QueryLanguageSwitch/Switch.tsx 85.71% <0.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Signed-off-by: Peng Huo <[email protected]>
@penghuo penghuo marked this pull request as ready for review December 15, 2022 16:51
@penghuo penghuo requested a review from a team as a code owner December 15, 2022 16:51
Signed-off-by: Peng Huo <[email protected]>
Signed-off-by: Peng Huo <[email protected]>
Copy link
Collaborator

@dai-chen dai-chen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for the changes!

@dai-chen dai-chen linked an issue Dec 23, 2022 that may be closed by this pull request
@dai-chen dai-chen merged commit 0a02009 into opensearch-project:main Dec 23, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1177-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0a02009acdbe99806869e9d6bf791bf814846827
# Push it to GitHub
git push --set-upstream origin backport/backport-1177-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1177-to-2.x.

penghuo added a commit to penghuo/os-sql that referenced this pull request Mar 8, 2023
* Deprecated Spring IoC and using Guice instead

Signed-off-by: Peng Huo <[email protected]>

* fix checkstyle issue

Signed-off-by: Peng Huo <[email protected]>

* Pass injector to action

Signed-off-by: Peng Huo <[email protected]>

* update

Signed-off-by: Peng Huo <[email protected]>

Signed-off-by: Peng Huo <[email protected]>
(cherry picked from commit 0a02009)
penghuo added a commit that referenced this pull request Mar 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x infrastructure Changes to infrastructure, testing, CI/CD, pipelines, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEATURE] Proposal for Spring framework dependency maintenance
5 participants