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

Eliminate Google Guava dependency #383

Merged
merged 3 commits into from
Jan 8, 2024

Conversation

dbwiddis
Copy link
Member

@dbwiddis dbwiddis commented Jan 8, 2024

Description

-    implementation "com.google.guava:guava:33.0.0-jre"

Issues Resolved

Fixes #328

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.

@amitgalitz
Copy link
Member

I see there is a good amount of failed tests in CI, was this occurring locally too?

@dbwiddis
Copy link
Member Author

dbwiddis commented Jan 8, 2024

I see there is a good amount of failed tests in CI, was this occurring locally too?

Tests were passing locally on my personal laptop where I submitted this. Let me investigate.

@dbwiddis dbwiddis marked this pull request as draft January 8, 2024 17:08
@dbwiddis
Copy link
Member Author

dbwiddis commented Jan 8, 2024

Failures are caused by not finding the json files:

java.io.FileNotFoundException: Resource [mappings/global-context.json] not found in classpath

But they are present in src/main/resources

Screenshot 2024-01-08 at 9 20 59 AM

Possible classloader issue from the class loading the stream, will try to fix...

@dbwiddis dbwiddis marked this pull request as ready for review January 8, 2024 17:41
@dbwiddis
Copy link
Member Author

dbwiddis commented Jan 8, 2024

Fixed. Was using relative classpath which worked with my other laptop config but apparently wasn't portable.

Signed-off-by: Daniel Widdis <[email protected]>
Copy link

codecov bot commented Jan 8, 2024

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (e0f5a2a) 72.52% compared to head (8771dc1) 72.36%.

Files Patch % Lines
.../org/opensearch/flowframework/util/ParseUtils.java 66.66% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main     #383      +/-   ##
============================================
- Coverage     72.52%   72.36%   -0.17%     
  Complexity      600      600              
============================================
  Files            76       76              
  Lines          3014     3018       +4     
  Branches        234      235       +1     
============================================
- Hits           2186     2184       -2     
- Misses          725      731       +6     
  Partials        103      103              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dbwiddis dbwiddis merged commit fea3e6e into opensearch-project:main Jan 8, 2024
21 checks passed
@dbwiddis dbwiddis deleted the no-guava branch January 8, 2024 23:57
@opensearch-trigger-bot
Copy link

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/flow-framework/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/flow-framework/backport-2.x
# Create a new branch
git switch --create backport/backport-383-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fea3e6e3711017b4b19fd61e4c2318fe51f7dd45
# Push it to GitHub
git push --set-upstream origin backport/backport-383-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/flow-framework/backport-2.x

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

dbwiddis added a commit to dbwiddis/flow-framework that referenced this pull request Jan 9, 2024
* Eliminate Google Guava dependency

Signed-off-by: Daniel Widdis <[email protected]>

* Fix classpath

Signed-off-by: Daniel Widdis <[email protected]>

---------

Signed-off-by: Daniel Widdis <[email protected]>
Co-authored-by: Owais Kazi <[email protected]>
joshpalis pushed a commit that referenced this pull request Jan 9, 2024
Eliminate Google Guava dependency (#383)

* Eliminate Google Guava dependency



* Fix classpath



---------

Signed-off-by: Daniel Widdis <[email protected]>
Co-authored-by: Owais Kazi <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport PRs to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEATURE] Eliminate all use of Google Guava
3 participants