[JENKINS-65445] get rid of Guava as much as possible #2163

olamy · 2021-05-05T01:41:09Z

Description

See JENKINS-65445.

Submitter checklist

Link to JIRA ticket in description, if appropriate.
Change is code complete and matches issue description
Appropriate unit or acceptance tests or explanation to why this change has no tests
Reviewer's manual test instructions provided in PR description. See Reviewer's first task below.

Reviewer checklist

Run the changes and verified the change matches the issue description
Reviewed the code
Verified that the appropriate tests have been written or valid explanation given

blueocean-commons/src/main/java/io/jenkins/blueocean/commons/MapsHelper.java

blueocean-commons/src/main/java/io/jenkins/blueocean/commons/ResourcesUtils.java

Signed-off-by: olivier lamy <[email protected]>

acceptance-tests/src/main/java/io/blueocean/ath/ATHJUnitRunner.java

acceptance-tests/src/main/java/io/blueocean/ath/SmartWebElement.java

acceptance-tests/src/main/java/io/blueocean/ath/api/classic/ClassicJobApi.java

acceptance-tests/src/main/java/io/blueocean/ath/model/Folder.java

acceptance-tests/src/main/java/io/blueocean/ath/pages/blue/EditorPage.java

Signed-off-by: olivier lamy <[email protected]>

acceptance-tests/src/main/java/io/blueocean/ath/model/Folder.java

Signed-off-by: olivier lamy <[email protected]>

blueocean-commons/src/main/java/io/jenkins/blueocean/commons/DigestUtils.java

blueocean-rest/src/main/java/io/jenkins/blueocean/rest/pageable/PagedResponse.java

...va/io/jenkins/blueocean/blueocean_bitbucket_pipeline/server/BitbucketServerEndpointTest.java

bitwiseman · 2021-06-04T07:26:29Z

...ins/blueocean/blueocean_bitbucket_pipeline/server/BitbucketServerScmContentProviderTest.java

@@ -249,7 +248,7 @@ private MultiBranchProject mockMbp(String credentialId, User user) {
        when(scmSource.getCredentialsId()).thenReturn(credentialId);
        when(scmSource.getRepoOwner()).thenReturn("TESTP");
        when(scmSource.getRepository()).thenReturn("pipeline-demo-test");
-        when(mbp.getSCMSources()).thenReturn(Lists.<SCMSource>newArrayList(scmSource));
+        when(mbp.getSCMSources()).thenReturn( Collections.singletonList(scmSource));


Suggested change

when(mbp.getSCMSources()).thenReturn( Collections.singletonList(scmSource));

when(mbp.getSCMSources()).thenReturn(Collections.singletonList(scmSource));

blueocean-commons/src/main/java/io/jenkins/blueocean/commons/JsonConverter.java

blueocean-commons/src/main/java/io/jenkins/blueocean/commons/ListsUtils.java

blueocean-events/src/test/java/io/jenkins/blueocean/events/SseEventTest.java

blueocean-commons/src/main/java/io/jenkins/blueocean/commons/IterableUtils.java

acceptance-tests/src/main/java/io/blueocean/ath/ATHJUnitRunner.java

Signed-off-by: olivier lamy <[email protected]>

rsandell

Though I would have liked to see this more divided up into separate changes. One for the logging framework change, one for Guava removal, etc.

...ne/src/main/java/io/jenkins/blueocean/blueocean_bitbucket_pipeline/AbstractBitbucketScm.java

acceptance-tests/src/main/java/io/blueocean/ath/AthModule.java

Co-authored-by: Stefan Spieker <[email protected]>

olamy · 2021-06-04T20:29:46Z

Please note the method name change! isNullOrEmpty vs isBlank ;)

On Sat, 5 Jun 2021 at 6:19 am, Stefan Spieker ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In acceptance-tests/src/main/java/io/blueocean/ath/AthModule.java <#2163 (comment)> : > @@ -79,7 +79,7 @@ protected void configure() { } capability.setCapability("extendedDebugging", "true"); capability.setCapability("initialBrowserUrl", launchUrl); - if (!Strings.isNullOrEmpty(cfg.getString("TUNNEL_IDENTIFIER"))) { + if (StringUtils.isBlank(cfg.getString("TUNNEL_IDENTIFIER"))) { I think this was different before, because there was a ! in front — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2163 (review)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAAE2EHMJFG3QAQHPLU7LMLTREYLDANCNFSM44DYJLSQ> .

-- Olivier Lamy http://twitter.com/olamy | http://linkedin.com/in/olamy

Jacoco is now executed as part the the CI run and basic coverage numbers are reported.

bitwiseman · 2021-06-04T20:52:26Z

@olamy
We were returning true if something was "not null or empty", to maintain equivalent behavior we want to return true if something is "not blank", right?

Signed-off-by: olivier lamy <[email protected]>

olamy · 2021-06-10T07:48:41Z

@kevin-jeff-bot maybe you can create an issue with some details? (if you are not a bot)

basil · 2021-09-12T16:14:48Z

@bitwiseman @car-roll @olamy @rsandell What are the next steps toward getting a "standard" (i.e. non-alpha) release of this? Would be good to get this into broader distribution in advance of the forthcoming core Guava upgrade.

olamy · 2021-09-12T20:53:53Z

sounds good I can cut a release by the end of the week.

olamy added chore dependencies Pull requests that update a dependency file java Pull requests that update Java code labels May 5, 2021

olamy force-pushed the JENKINS-65445-get-rid-guava branch 2 times, most recently from 5441bfc to d6a2334 Compare May 5, 2021 03:06

jtnord reviewed May 5, 2021

View reviewed changes

blueocean-commons/src/main/java/io/jenkins/blueocean/commons/MapsHelper.java Outdated Show resolved Hide resolved

jtnord reviewed May 5, 2021

View reviewed changes

blueocean-commons/src/main/java/io/jenkins/blueocean/commons/ResourcesUtils.java Outdated Show resolved Hide resolved

olamy force-pushed the JENKINS-65445-get-rid-guava branch 3 times, most recently from e2aa6e6 to 5d8d3f5 Compare May 21, 2021 02:11

olamy marked this pull request as ready for review May 21, 2021 03:06

olamy force-pushed the JENKINS-65445-get-rid-guava branch 2 times, most recently from 0479553 to a8860fc Compare May 25, 2021 01:45

[JENKINS-65445] remove usage of guava in blueocean

f98f27b

Signed-off-by: olivier lamy <[email protected]>

olamy force-pushed the JENKINS-65445-get-rid-guava branch from a8860fc to f98f27b Compare May 25, 2021 10:45

olamy requested a review from jtnord May 25, 2021 10:56

batmat requested a review from rsandell May 26, 2021 08:44

rsandell reviewed May 26, 2021

View reviewed changes

acceptance-tests/src/main/java/io/blueocean/ath/ATHJUnitRunner.java Show resolved Hide resolved

rsandell reviewed May 26, 2021

View reviewed changes

acceptance-tests/src/main/java/io/blueocean/ath/SmartWebElement.java Outdated Show resolved Hide resolved

rsandell reviewed May 26, 2021

View reviewed changes

acceptance-tests/src/main/java/io/blueocean/ath/api/classic/ClassicJobApi.java Show resolved Hide resolved

rsandell reviewed May 26, 2021

View reviewed changes

acceptance-tests/src/main/java/io/blueocean/ath/model/Folder.java Outdated Show resolved Hide resolved

rsandell reviewed May 26, 2021

View reviewed changes

acceptance-tests/src/main/java/io/blueocean/ath/pages/blue/EditorPage.java Show resolved Hide resolved

olamy added 3 commits May 31, 2021 11:14

fix bad test change and typo

c6a24fb

Signed-off-by: olivier lamy <[email protected]>

fix test

a0dcc31

Signed-off-by: olivier lamy <[email protected]>

must unmodifiableList

99a6a02

Signed-off-by: olivier lamy <[email protected]>

rsandell reviewed Jun 1, 2021

View reviewed changes

acceptance-tests/src/main/java/io/blueocean/ath/model/Folder.java Outdated Show resolved Hide resolved

olamy added 2 commits June 1, 2021 20:57

simplify this.. as it is used only for test module

8f696ea

Signed-off-by: olivier lamy <[email protected]>

remove unused imports

1f728f7

Signed-off-by: olivier lamy <[email protected]>

rsandell reviewed Jun 1, 2021

View reviewed changes

blueocean-commons/src/main/java/io/jenkins/blueocean/commons/DigestUtils.java Outdated Show resolved Hide resolved

bitwiseman reviewed Jun 3, 2021

View reviewed changes

blueocean-rest/src/main/java/io/jenkins/blueocean/rest/pageable/PagedResponse.java Show resolved Hide resolved

bitwiseman reviewed Jun 4, 2021

View reviewed changes

...va/io/jenkins/blueocean/blueocean_bitbucket_pipeline/server/BitbucketServerEndpointTest.java Outdated Show resolved Hide resolved

bitwiseman reviewed Jun 4, 2021

View reviewed changes

...va/io/jenkins/blueocean/blueocean_bitbucket_pipeline/server/BitbucketServerEndpointTest.java Outdated Show resolved Hide resolved

bitwiseman reviewed Jun 4, 2021

View reviewed changes

blueocean-commons/src/main/java/io/jenkins/blueocean/commons/JsonConverter.java Show resolved Hide resolved

bitwiseman reviewed Jun 4, 2021

View reviewed changes

blueocean-commons/src/main/java/io/jenkins/blueocean/commons/ListsUtils.java Show resolved Hide resolved

bitwiseman reviewed Jun 4, 2021

View reviewed changes

blueocean-commons/src/main/java/io/jenkins/blueocean/commons/ListsUtils.java Show resolved Hide resolved

bitwiseman reviewed Jun 4, 2021

View reviewed changes

blueocean-events/src/test/java/io/jenkins/blueocean/events/SseEventTest.java Show resolved Hide resolved

olamy commented Jun 4, 2021

View reviewed changes

blueocean-commons/src/main/java/io/jenkins/blueocean/commons/IterableUtils.java Show resolved Hide resolved

jtnord reviewed Jun 4, 2021

View reviewed changes

acceptance-tests/src/main/java/io/blueocean/ath/ATHJUnitRunner.java Outdated Show resolved Hide resolved

fix directory creation

a6887f0

Signed-off-by: olivier lamy <[email protected]>

rsandell approved these changes Jun 4, 2021

View reviewed changes

bitwiseman reviewed Jun 4, 2021

View reviewed changes

...ne/src/main/java/io/jenkins/blueocean/blueocean_bitbucket_pipeline/AbstractBitbucketScm.java Outdated Show resolved Hide resolved

bitwiseman added 3 commits June 4, 2021 06:38

Apply formatting suggestions from code review

842700a

Remove collections4 dependency

1bff9a1

Formatting fixes

4045c55

StefanSpieker reviewed Jun 4, 2021

View reviewed changes

acceptance-tests/src/main/java/io/blueocean/ath/AthModule.java Outdated Show resolved Hide resolved

StefanSpieker reviewed Jun 4, 2021

View reviewed changes

acceptance-tests/src/main/java/io/blueocean/ath/AthModule.java Outdated Show resolved Hide resolved

Update acceptance-tests/src/main/java/io/blueocean/ath/AthModule.java

e048dae

Co-authored-by: Stefan Spieker <[email protected]>

bitwiseman added 2 commits June 4, 2021 13:44

Remove guava from pom.xml

8307597

Remove jacoco check

a09008f

Jacoco is now executed as part the the CI run and basic coverage numbers are reported.

bitwiseman and others added 2 commits June 4, 2021 15:56

Fix typo

3e32e35

guava is still needed for test as jira plugin still use it

556139a

Signed-off-by: olivier lamy <[email protected]>

rsandell approved these changes Jun 7, 2021

View reviewed changes

olamy merged commit a7cbc94 into master Jun 7, 2021

olamy deleted the JENKINS-65445-get-rid-guava branch June 7, 2021 10:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[JENKINS-65445] get rid of Guava as much as possible #2163

[JENKINS-65445] get rid of Guava as much as possible #2163

olamy commented May 5, 2021 •

edited

Loading

bitwiseman Jun 4, 2021

rsandell left a comment

olamy commented Jun 4, 2021 via email

bitwiseman commented Jun 4, 2021

olamy commented Jun 10, 2021 •

edited

Loading

basil commented Sep 12, 2021

olamy commented Sep 12, 2021

	when(mbp.getSCMSources()).thenReturn( Collections.singletonList(scmSource));
	when(mbp.getSCMSources()).thenReturn(Collections.singletonList(scmSource));

[JENKINS-65445] get rid of Guava as much as possible #2163

[JENKINS-65445] get rid of Guava as much as possible #2163

Conversation

olamy commented May 5, 2021 • edited Loading

Description

Submitter checklist

Reviewer checklist

bitwiseman Jun 4, 2021

Choose a reason for hiding this comment

rsandell left a comment

Choose a reason for hiding this comment

olamy commented Jun 4, 2021 via email

bitwiseman commented Jun 4, 2021

olamy commented Jun 10, 2021 • edited Loading

basil commented Sep 12, 2021

olamy commented Sep 12, 2021

olamy commented May 5, 2021 •

edited

Loading

olamy commented Jun 10, 2021 •

edited

Loading