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

Adapt the plugin to be compatable with future versions of Guava #196

Merged
merged 3 commits into from
Jun 8, 2021

Conversation

jtnord
Copy link
Member

@jtnord jtnord commented Jun 7, 2021

mostly by replacing all guava occurences with non guava as it is not
needed at all.
However the Multimap usage remains as there is no corresponding
equivallent and this API is not going to change between guava 11 and
guava 31.

for details see https://groups.google.com/g/jenkinsci-dev/c/aYUJ4VuOuVc/m/I9IEEzovAgAJ

@olamy

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your master branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests - that demonstrates feature works or fixes the issue

mostly by replacing all guava occurences with non guava as it is not
needed at all.
However the Multimap usage remains as there is no corresponding
equivallent and this API is not going to change between guava 11 and
guava 31.
Comment on lines 25 to 26
List<T> list = new ArrayList<>(collection);
list.addAll(Arrays.asList(ts));
Copy link
Member

Choose a reason for hiding this comment

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

Same here

Suggested change
List<T> list = new ArrayList<>(collection);
list.addAll(Arrays.asList(ts));
List<T> list = new ArrayList<>(collection.size() + ts.length);
list.addAll(collection);
list.addAll(Arrays.asList(ts));

Copy link
Member

@olamy olamy left a comment

Choose a reason for hiding this comment

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

LGTM (very nitpicking comments for test classes and not mandatory to change)

@jtnord
Copy link
Member Author

jtnord commented Jun 8, 2021

@olamy I have addressed the 2 comments. Would you be able to merge and release this when the build passes?

Thanks!

@olamy olamy merged commit 76a55a0 into jenkinsci:master Jun 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants