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

Remove previously deprecated methods and types #2277

Merged
merged 8 commits into from
Jul 22, 2020
Merged

Conversation

bsideup
Copy link
Contributor

@bsideup bsideup commented Jul 20, 2020

No description provided.

@bsideup bsideup added this to the 3.4.0-M2 milestone Jul 20, 2020
@bsideup bsideup requested a review from a team July 20, 2020 15:07
* @param onComplete callback on completion signal
* @param initialContext {@link Context} for the rails
*/
@Deprecated
Copy link
Member

Choose a reason for hiding this comment

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

actually, I don't think this one should be removed :( It looks like it was deprecated by mistake, because ultimately the one we'd want removed is the one with a Consumer<Subscription> (see the TODO on subscribe variant with such a Consumer below)

Copy link
Member

Choose a reason for hiding this comment

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

please revert the removal of that method, and delete the @Deprecated instead 🙇

@@ -41,19 +42,13 @@ public void sourceNull() {
new FluxRetryPredicate<>(null, e -> true);
Copy link
Member

Choose a reason for hiding this comment

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

The implementation FluxRetryPredicate can most likely also be deleted. Please double check remaining relevant tests are either kept in this test class or moved to FluxRetryWhenTest as a @Nested test maybe?

@@ -34,14 +36,14 @@ public void twoRetryNormalSupplier() {

StepVerifier.create(Mono.fromCallable(i::incrementAndGet)
Copy link
Member

Choose a reason for hiding this comment

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

same as for FluxRetryPredicate

@@ -1021,28 +1021,6 @@ default Duration verifyTimeout(Duration duration) {
*/
Step<T> expectNoFusionSupport();

/**
Copy link
Member

Choose a reason for hiding this comment

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

there was no "to be removed" even though this one has been deprecated since 3.3.1... I wonder if there could be anybody out there testing that no onSubscribe happens for a given duration (which would be a legitimate-ish verification). Can restore it for now and open an issue for that specific case to remove the method and add a suitable alternative in a follow-up PR ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

But no onSubscribe after subscribe() would be a spec violation, isn't it?

Copy link
Member

Choose a reason for hiding this comment

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

yes, but a delayed onSubscribe wouldn't.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

right... used to be a gray area. let's remove it then, even though the @Deprecated was intended as a deterrent to using that method without at least thinking about calling expectSubscription().

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, will re-remove it :D 👍

@@ -34,14 +36,14 @@ public void twoRetryNormalSupplier() {

StepVerifier.create(Mono.fromCallable(i::incrementAndGet)
.doOnNext(v -> {
if(v < 4) {
if (v < 4) {
Copy link
Member

Choose a reason for hiding this comment

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

the tests of removed retry operators should either be moved to xxxRetryWhenTest or there should be a comment in that test class pointing to xxxRetryPredicateTest. also there are SuppressWarnings("deprecation") in these tests that are not necessary anymore

build.gradle Outdated
@@ -28,7 +28,7 @@ buildscript {
plugins {
id "com.github.johnrengelman.shadow" version "4.0.2"
id 'org.asciidoctor.convert' version '1.5.11'
id "me.champeau.gradle.japicmp" version "0.2.6"
id "me.champeau.gradle.japicmp" version "0.2.8"
Copy link
Member

Choose a reason for hiding this comment

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

IIRC we're stuck in 0.2.6 because newest japicmp by default reject introducing new default method()s (which we need in 3.4), and the gradle plugin doesn't let us disable that feature.

did you have a strong need for 0.2.8 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, okay. It worked fine so I proceeded. Will revert

@codecov-commenter
Copy link

codecov-commenter commented Jul 21, 2020

Codecov Report

Merging #2277 into master will increase coverage by 1.44%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #2277      +/-   ##
============================================
+ Coverage     82.95%   84.39%   +1.44%     
- Complexity     4509     5226     +717     
============================================
  Files           381      377       -4     
  Lines         31766    32827    +1061     
  Branches       6071     6227     +156     
============================================
+ Hits          26351    27705    +1354     
+ Misses         3791     3487     -304     
- Partials       1624     1635      +11     
Impacted Files Coverage Δ Complexity Δ
...ore/src/main/java/reactor/core/publisher/Flux.java 98.82% <ø> (+2.94%) 930.00 <0.00> (+401.00)
...ore/src/main/java/reactor/core/publisher/Mono.java 94.13% <ø> (+5.41%) 469.00 <0.00> (+193.00)
...main/java/reactor/core/publisher/ParallelFlux.java 97.07% <100.00%> (+4.29%) 97.00 <1.00> (-1.00) ⬆️
...actor-core/src/main/java/reactor/util/Metrics.java 40.00% <0.00%> (-15.56%) 3.00% <0.00%> (+1.00%) ⬇️
...ava/reactor/core/scheduler/ImmediateScheduler.java 74.35% <0.00%> (-1.84%) 11.00% <0.00%> (+5.00%) ⬇️
...ain/java/reactor/core/scheduler/SchedulerTask.java 78.57% <0.00%> (-1.79%) 18.00% <0.00%> (ø%)
...java/reactor/core/publisher/FluxSwitchOnFirst.java 94.20% <0.00%> (-0.78%) 5.00% <0.00%> (ø%)
...c/main/java/reactor/core/publisher/MonoCreate.java 77.37% <0.00%> (-0.73%) 5.00% <0.00%> (ø%)
.../main/java/reactor/core/publisher/FluxFlatMap.java 95.15% <0.00%> (ø) 21.00% <0.00%> (ø%)
... and 22 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update df59775...2e77722. Read the comment docs.

@bsideup bsideup requested a review from simonbasle July 22, 2020 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants