Replace com.google.common.base.Function (partly) #2121

pks-1981 · 2023-03-31T05:22:22Z

Replace com.google.common.base.Function (partly)

timtebeek · 2023-03-31T07:43:21Z

Are you making these changes by hand @pks-1981 ? You might want to have a look at these Guava recipes. I'm in the process of covering Optional there as well.

pks-1981 · 2023-03-31T07:56:33Z

Are you making these changes by hand @pks-1981 ? You might want to have a look at these Guava recipes. I'm in the process of covering Optional there as well.

Yes, only with my hands) I'm have more fun in doing it myself...

timtebeek · 2023-03-31T08:16:49Z

Are you making these changes by hand @pks-1981 ? You might want to have a look at these Guava recipes. I'm in the process of covering Optional there as well.

Yes, only with my hands) I'm have more fun in doing it myself...

That's fine as well; even more appreciative of contributions made that way; Let's hope it's merged quickly without conflicts then!

pks-1981 · 2023-04-01T18:19:59Z

src/main/java/com/github/tomakehurst/wiremock/stubbing/Scenario.java

+    requiredStates.addAll(
+        stubMappings.stream().map(StubMapping::getNewScenarioState).collect(Collectors.toList()));
+
+    return requiredStates.stream().filter(Objects::nonNull).collect(Collectors.toSet());


Unfortunately, small changes in the order of the final collection.

AdminApiTest -> void getScenarios()

assertThat(body, jsonPartEquals("scenarios[0].possibleStates", asList("2", "3", "Started")));

assertThat(body, jsonPartEquals("scenarios[0].possibleStates", asList("Started", "2", "3")));

pks-1981 · 2023-04-02T06:04:02Z

@timtebeek @tomakehurst waiting for review)

pks-1981 · 2023-04-06T17:07:44Z

@tomakehurst
maybe I'll merge my two MR?
if you're not planning merge soon...

tomakehurst · 2023-04-06T18:24:24Z

@pks-1981 I'm on holiday this week, so please bear with me. Appreciate you opening these, and I plan to review them soon.

# Conflicts: # src/main/java/com/github/tomakehurst/wiremock/verification/diff/JUnitStyleDiffRenderer.java

# Conflicts: # src/main/java/com/github/tomakehurst/wiremock/standalone/JsonFileMappingsSource.java

oleg-nenashev

All changes look good to me though I mostly rely on CI

oleg-nenashev · 2023-05-06T07:20:56Z

One test fails in a single configuration, likely to be a flaky one

ProxyAcceptanceTest > fixedDelaysAreAddedToProxiedResponses() FAILED
    java.lang.AssertionError: 
    Expected: a value equal to or greater than <300L>
         but: <299L> was less than <300L>
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:6)
        at com.github.tomakehurst.wiremock.ProxyAcceptanceTest.fixedDelaysAreAddedToProxiedResponses(ProxyAcceptanceTest.java:558)
WARNING: An illegal reflective access operation has occurred
WARNING: Illegal reflective access by com.github.tomakehurst.wiremock.common.xml.Xml (file:/D:/a/wiremock/wiremock/build/classes/java/main/) to constructor com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl()
WARNING: Please consider reporting this to the maintainers of com.github.tomakehurst.wiremock.common.xml.Xml
WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations
WARNING: All illegal access operations will be denied in a future release

pks-1981 · 2023-05-06T07:30:13Z

One test fails in a single configuration, likely to be a flaky one

ProxyAcceptanceTest > fixedDelaysAreAddedToProxiedResponses() FAILED
    java.lang.AssertionError: 
    Expected: a value equal to or greater than <300L>
         but: <299L> was less than <300L>
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:6)
        at com.github.tomakehurst.wiremock.ProxyAcceptanceTest.fixedDelaysAreAddedToProxiedResponses(ProxyAcceptanceTest.java:558)
WARNING: An illegal reflective access operation has occurred
WARNING: Illegal reflective access by com.github.tomakehurst.wiremock.common.xml.Xml (file:/D:/a/wiremock/wiremock/build/classes/java/main/) to constructor com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl()
WARNING: Please consider reporting this to the maintainers of com.github.tomakehurst.wiremock.common.xml.Xml
WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations
WARNING: All illegal access operations will be denied in a future release

"blinking" test?
Checked on my Windows 11.

Kirill Peshin added 8 commits March 30, 2023 16:01

Replace com.google.common.base.Function

f8abc66

Replace com.google.common.base.Function

14002ce

Replace com.google.common.base.Function

4374cd1

Replace com.google.common.base.Function

c03057d

Replace com.google.common.base.Function

d275672

Replace com.google.common.base.Function

a4c87b0

Replace com.google.common.base.Function

143bb99

Replace com.google.common.base.Function

4a79493

pks-1981 mentioned this pull request Mar 31, 2023

Replace Guava classes Optional, Predicate and Function with JDK replacements in JDK #2111

Closed

Replace com.google.common.base.Function

42715c7

Kirill Peshin added 6 commits March 31, 2023 13:40

Replace com.google.common.base.Function

f837a56

Replace com.google.common.base.Function

27dc180

Replace com.google.common.base.Function

24a396e

Replace com.google.common.base.Function

8e6b603

Replace com.google.common.base.Function

e2ab670

Replace com.google.common.base.Function

6938ff1

pks-1981 commented Apr 1, 2023

View reviewed changes

Kirill Peshin added 3 commits April 2, 2023 07:18

Replace com.google.common.base.Function

e06fefc

Replace com.google.common.base.Function

6fb3273

Replace com.google.common.base.*

6b26e1d

oleg-nenashev added the chore Maintenance label Apr 11, 2023

pks-1981 mentioned this pull request Apr 23, 2023

Replace anonymous types with lambdas and method references #2141

Closed

Kirill Peshin added 2 commits April 23, 2023 11:02

Merge branch 'master' into function

b653459

# Conflicts: # src/main/java/com/github/tomakehurst/wiremock/verification/diff/JUnitStyleDiffRenderer.java

Replace com.google.common.base.*

8ad7cf7

Kirill Peshin added 3 commits April 24, 2023 20:00

Merge branch 'master' into function

240266c

# Conflicts: # src/main/java/com/github/tomakehurst/wiremock/standalone/JsonFileMappingsSource.java

Replace com.google.common.base.*

3378bf3

Merge branch 'master' into function

2becd3c

oleg-nenashev requested review from tomakehurst and oleg-nenashev May 5, 2023 20:44

oleg-nenashev approved these changes May 6, 2023

View reviewed changes

oleg-nenashev added the needs-tom Tom's Train Project :) label May 6, 2023

tomakehurst merged commit bc09611 into wiremock:master May 31, 2023
7 checks passed

pks-1981 deleted the function branch June 1, 2023 03:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace com.google.common.base.Function (partly) #2121

Replace com.google.common.base.Function (partly) #2121

pks-1981 commented Mar 31, 2023 •

edited

timtebeek commented Mar 31, 2023

pks-1981 commented Mar 31, 2023

timtebeek commented Mar 31, 2023

pks-1981 Apr 1, 2023

pks-1981 commented Apr 2, 2023

pks-1981 commented Apr 6, 2023

tomakehurst commented Apr 6, 2023

oleg-nenashev left a comment

oleg-nenashev commented May 6, 2023

pks-1981 commented May 6, 2023

Replace com.google.common.base.Function (partly) #2121

Replace com.google.common.base.Function (partly) #2121

Conversation

pks-1981 commented Mar 31, 2023 • edited

timtebeek commented Mar 31, 2023

pks-1981 commented Mar 31, 2023

timtebeek commented Mar 31, 2023

pks-1981 Apr 1, 2023

Choose a reason for hiding this comment

pks-1981 commented Apr 2, 2023

pks-1981 commented Apr 6, 2023

tomakehurst commented Apr 6, 2023

oleg-nenashev left a comment

Choose a reason for hiding this comment

oleg-nenashev commented May 6, 2023

pks-1981 commented May 6, 2023

pks-1981 commented Mar 31, 2023 •

edited