Skip to content

2.x: Reduce the visibility of internal methods. #4128

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

Merged
merged 1 commit into from
Jun 26, 2016
Merged

2.x: Reduce the visibility of internal methods. #4128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/main/java/io/reactivex/Completable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ public static Completable merge(Publisher<? extends CompletableConsumable> sourc
* @throws NullPointerException if sources is null
* @throws IllegalArgumentException if maxConcurrency is less than 1
*/
protected static Completable merge0(Publisher<? extends CompletableConsumable> sources, int maxConcurrency, boolean delayErrors) {
private static Completable merge0(Publisher<? extends CompletableConsumable> sources, int maxConcurrency, boolean delayErrors) {
Objects.requireNonNull(sources, "sources is null");
if (maxConcurrency < 1) {
throw new IllegalArgumentException("maxConcurrency > 0 required but it was " + maxConcurrency);
Expand Down Expand Up @@ -469,7 +469,7 @@ public static Completable timer(final long delay, final TimeUnit unit, final Sch
* @param ex the Throwable instance to use as cause, not null (not verified)
* @return the created NullPointerException
*/
static NullPointerException toNpe(Throwable ex) {
private static NullPointerException toNpe(Throwable ex) {
NullPointerException npe = new NullPointerException("Actually not, but can't pass out an exception otherwise...");
npe.initCause(ex);
return npe;
Expand Down Expand Up @@ -671,7 +671,7 @@ public final Completable doOnError(Consumer<? super Throwable> onError) {
* @return the new Completable instance
*/
@SchedulerSupport(SchedulerSupport.NONE)
protected final Completable doOnLifecycle(
private Completable doOnLifecycle(
final Consumer<? super Disposable> onSubscribe,
final Consumer<? super Throwable> onError,
final Runnable onComplete,
Expand Down Expand Up @@ -1199,7 +1199,7 @@ public final Completable timeout(long timeout, TimeUnit unit, Scheduler schedule
* @throws NullPointerException if unit or scheduler
*/
@SchedulerSupport(SchedulerSupport.CUSTOM)
public final Completable timeout0(long timeout, TimeUnit unit, Scheduler scheduler, CompletableConsumable other) {
private Completable timeout0(long timeout, TimeUnit unit, Scheduler scheduler, CompletableConsumable other) {
Objects.requireNonNull(unit, "unit is null");
Objects.requireNonNull(scheduler, "scheduler is null");
return new CompletableTimeout(this, timeout, unit, scheduler, other);
Expand Down