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

Clean up miscellaneous code smells, eliminate most Guava use #327

Merged
merged 1 commit into from
Dec 28, 2023

Conversation

dbwiddis
Copy link
Member

@dbwiddis dbwiddis commented Dec 27, 2023

Description

Eliminated unnecessary throwing of IOException on workflow steps execution, left over from when we did more parsing in the steps.

Used a linter based on SonarQube analysis and fixed up lots of little things.

  • Used inline replacements for the logger rather than concatenation
  • Better handling of conditionals
  • Avoiding variable name collisions
  • Replacing functional interfaces with shorter syntax (mostly () -> context.restore() to context::restore)

Eliminated most use of Google Guava, which have been mostly useless since Java 9, specifically:

  • ImmutableList.of replaced by Java's List.of or Collections.emptyList() when empty
  • ImmutableMap.of replaced by Java's Map.of for 2 elements and Map.ofEntries for more than one pair, or Collections.emptyMap() if empty.
  • Charset replaced by Java's StandardCharsets
  • Did not remove the Resource.toString() yet as it's a bit more complex and should be handled in a separate PR. See issue [FEATURE] Eliminate all use of Google Guava #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.

Copy link
Member

@ohltyler ohltyler left a comment

Choose a reason for hiding this comment

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

LGTM, nice cleanup!

@dbwiddis dbwiddis merged commit 89c03f9 into opensearch-project:main Dec 28, 2023
20 checks passed
@dbwiddis dbwiddis deleted the misc-improvements branch December 28, 2023 00:35
@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-327-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 89c03f9dd094f37575ad43ae8d57fc8b5982329c
# Push it to GitHub
git push --set-upstream origin backport/backport-327-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-327-to-2.x.

dbwiddis added a commit to dbwiddis/flow-framework that referenced this pull request Dec 28, 2023
…rch-project#327)

Clean up misc. code smells, eliminate most Guava use

Signed-off-by: Daniel Widdis <[email protected]>
dbwiddis added a commit that referenced this pull request Dec 28, 2023
…va use (#327) (#332)

Clean up miscellaneous code smells, eliminate most Guava use (#327)

Clean up misc. code smells, eliminate most Guava use

Signed-off-by: Daniel Widdis <[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.

2 participants