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.

Sign up for GitHub

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

Remove previously deprecated methods and types #2277

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
204bcd1
Remove previously deprecated methods and types
bsideup Jul 20, 2020
20f13a5
un-deprecate some methods, remove unused classes
bsideup Jul 21, 2020
f3fb770
add japicmp exclusions
bsideup Jul 21, 2020
62f227d
exclude `onLastAssembly` from japicmp
bsideup Jul 21, 2020
aa5b06a
remove `expectNoEvent`
bsideup Jul 21, 2020
b02c0f1
downgrade to japicmp 0.2.6
bsideup Jul 21, 2020
097b048
merge `{Flux,Mono}{RetryPredicate,When}Test`s
bsideup Jul 21, 2020
2e77722
remove html japicmp reports
bsideup Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Contributor

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

id "de.undercouch.download" version "3.4.3"
id "org.unbroken-dome.test-sets" version "3.0.0" apply false
//note: build scan plugin now must be applied in settings.gradle
Expand Down
38 changes: 36 additions & 2 deletions reactor-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,47 @@ task japicmp(type: JapicmpTask) {
failOnModification = true
failOnSourceIncompatibility = true
txtOutputFile = file("${project.buildDir}/reports/japi.txt")
htmlOutputFile = file("${project.buildDir}/reports/japi.html")
ignoreMissingClasses = true
includeSynthetic = true

//TODO after a release, bump the gradle.properties baseline
//TODO after a release, remove the reactor-core exclusions below if any
classExcludes = ["reactor.core.publisher.TopicProcessor", "reactor.core.publisher.WorkQueueProcessor", 'reactor.core.publisher.EventLoopProcessor$Slot']
// methodExcludes = ["reactor.core.Scannable#operatorName()"]
classExcludes = [
"reactor.core.publisher.TopicProcessor",
"reactor.core.publisher.WorkQueueProcessor",
'reactor.core.publisher.EventLoopProcessor$Slot',
'reactor.util.concurrent.WaitStrategy',
]
methodExcludes = [
'reactor.core.publisher.Flux#onLastAssembly(reactor.core.publisher.Flux)',
'reactor.core.publisher.Flux#compose(java.util.function.Function)',
'reactor.core.publisher.Flux#retry(java.util.function.Predicate)',
'reactor.core.publisher.Flux#retry(long, java.util.function.Predicate)',
'reactor.core.publisher.Flux#retryBackoff(long, java.time.Duration)',
'reactor.core.publisher.Flux#retryBackoff(long, java.time.Duration, java.time.Duration)',
'reactor.core.publisher.Flux#retryBackoff(long, java.time.Duration, java.time.Duration, reactor.core.scheduler.Scheduler)',
'reactor.core.publisher.Flux#retryBackoff(long, java.time.Duration, java.time.Duration, double)',
'reactor.core.publisher.Flux#retryBackoff(long, java.time.Duration, java.time.Duration, double, reactor.core.scheduler.Scheduler)',
'reactor.core.publisher.Flux#retryWhen(java.util.function.Function)',
'reactor.core.publisher.Flux#usingWhen(org.reactivestreams.Publisher, java.util.function.Function, java.util.function.Function, java.util.function.Function)',
'reactor.core.publisher.Flux#usingWhen(org.reactivestreams.Publisher, java.util.function.Function, java.util.function.Function, java.util.function.Function, java.util.function.Function)',

'reactor.core.publisher.Mono#onLastAssembly(reactor.core.publisher.Mono)',
'reactor.core.publisher.Mono#compose(java.util.function.Function)',
'reactor.core.publisher.Mono#retry(java.util.function.Predicate)',
'reactor.core.publisher.Mono#retry(long, java.util.function.Predicate)',
'reactor.core.publisher.Mono#retryBackoff(long, java.time.Duration)',
'reactor.core.publisher.Mono#retryBackoff(long, java.time.Duration, java.time.Duration)',
'reactor.core.publisher.Mono#retryBackoff(long, java.time.Duration, java.time.Duration, reactor.core.scheduler.Scheduler)',
'reactor.core.publisher.Mono#retryBackoff(long, java.time.Duration, java.time.Duration, double)',
'reactor.core.publisher.Mono#retryBackoff(long, java.time.Duration, java.time.Duration, double, reactor.core.scheduler.Scheduler)',
'reactor.core.publisher.Mono#retryWhen(java.util.function.Function)',
'reactor.core.publisher.Mono#usingWhen(org.reactivestreams.Publisher, java.util.function.Function, java.util.function.Function, java.util.function.Function)',
'reactor.core.publisher.Mono#usingWhen(org.reactivestreams.Publisher, java.util.function.Function, java.util.function.Function, java.util.function.Function, java.util.function.Function)',

'reactor.core.publisher.ParallelFlux#composeGroup(java.util.function.Function)',
]
}

//complements the javadoc.gradle common configuration
Expand Down
458 changes: 0 additions & 458 deletions reactor-core/src/main/java/reactor/core/publisher/Flux.java
View file
Open in desktop

Large diffs are not rendered by default.

142 changes: 0 additions & 142 deletions reactor-core/src/main/java/reactor/core/publisher/FluxRetryPredicate.java
View file
Open in desktop

This file was deleted.

Loading