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
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
458 changes: 0 additions & 458 deletions reactor-core/src/main/java/reactor/core/publisher/Flux.java

Large diffs are not rendered by default.

455 changes: 0 additions & 455 deletions reactor-core/src/main/java/reactor/core/publisher/Mono.java

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -307,33 +307,6 @@ public final Mono<List<T>> collectSortedList(Comparator<? super T> comparator,
return merged;
}


/**
* Allows composing operators off the 'rails', as individual {@link GroupedFlux} instances keyed by
* the zero based rail's index. The transformed groups are {@link Flux#parallel parallelized} back
* once the transformation has been applied.
* <p>
* Note that like in {@link #groups()}, requests and cancellation compose through, and
* cancelling only one rail may result in undefined behavior.
*
* @param composer the composition function to apply on each {@link GroupedFlux rail}
* @param <U> the type of the resulting parallelized flux
* @return a {@link ParallelFlux} of the composed groups
* @deprecated will be removed in 3.4.0. Use {@link #transformGroups(Function)} instead
*/
@Deprecated
public final <U> ParallelFlux<U> composeGroup(Function<? super GroupedFlux<Integer, T>,
? extends Publisher<? extends U>> composer) {
if (getPrefetch() > -1) {
return from(groups().flatMap(composer::apply),
parallelism(), getPrefetch(),
Queues.small());
}
else {
return from(groups().flatMap(composer::apply), parallelism());
}
}

/**
* Generates and concatenates Publishers on each 'rail', signalling errors immediately
* and generating 2 publishers upfront.
Expand Down Expand Up @@ -1022,7 +995,7 @@ public final Disposable subscribe(
@Nullable Consumer<? super T> onNext,
@Nullable Consumer<? super Throwable> onError,
@Nullable Runnable onComplete) {
return subscribe(onNext, onError, onComplete, (Context) null);
return this.subscribe(onNext, onError, onComplete, null, (Context) null);
}

@Override
Expand Down Expand Up @@ -1052,25 +1025,6 @@ public final Disposable subscribe(
return this.subscribe(onNext, onError, onComplete, onSubscribe, null);
}

/**
* Subscribes to this {@link ParallelFlux} by providing an onNext, onError and
* onComplete callback as well as an initial {@link Context}, then trigger the execution chain for all
* 'rails'.
*
* @param onNext consumer of onNext signals
* @param onError consumer of error signal
* @param onComplete callback on completion signal
* @param initialContext {@link Context} for the rails
*/
@Deprecated
Copy link
Contributor

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
Contributor

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 🙇

public final Disposable subscribe(
@Nullable Consumer<? super T> onNext,
@Nullable Consumer<? super Throwable> onError,
@Nullable Runnable onComplete,
@Nullable Context initialContext) {
return this.subscribe(onNext, onError, onComplete, null, initialContext);
}

final Disposable subscribe(
@Nullable Consumer<? super T> onNext,
@Nullable Consumer<? super Throwable> onError,
Expand Down Expand Up @@ -1299,27 +1253,6 @@ protected static <T> ParallelFlux<T> onAssembly(ParallelFlux<T> source) {
return source;
}

/**
* Invoke {@link Hooks} pointcut given a {@link ParallelFlux} and returning an
* eventually new {@link ParallelFlux}
*
* @param <T> the value type
* @param source the source to wrap
*
* @return the potentially wrapped source
* @deprecated use {@link Operators#onLastAssembly(CorePublisher)}
*/
@SuppressWarnings("unchecked")
@Deprecated
protected static <T> ParallelFlux<T> onLastAssembly(ParallelFlux<T> source) {
Function<Publisher, Publisher> hook = Hooks.onLastOperatorHook;
if (hook == null) {
return source;
}
return (ParallelFlux<T>) Objects.requireNonNull(hook.apply(source),
"LastOperator hook returned null");
}

@SuppressWarnings("unchecked")
static <T> ParallelFlux<T> doOnSignal(ParallelFlux<T> source,
@Nullable Consumer<? super T> onNext,
Expand Down
Loading