Skip to content

Commit

Permalink
3.x: Refactor to io.reactivex.rxjava3.** (#6621)
Browse files Browse the repository at this point in the history 
* 3.x: Refactor to io.reactivex.rxjava3.**

* fix javadoc cleanup gradle

* javadoc gradle again

* Fix package location in text
  • Loading branch information
@akarnokd
akarnokd authored Aug 16, 2019
1 parent f8841c7 commit a1693ec
Show file tree
Hide file tree
Showing 1,671 changed files with 10,655 additions and 10,728 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,4 @@ bin/
# PMD files
.pmd
.ruleset
test-output/
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ targetCompatibility = JavaVersion.VERSION_1_6
// ---------------------------------------

def junitVersion = "4.12"
def reactiveStreamsVersion = "1.0.2"
def reactiveStreamsVersion = "1.0.3-RC1"
def mockitoVersion = "2.1.0"
def jmhLibVersion = "1.20"
def testNgVersion = "6.11"
Expand Down
22 changes: 11 additions & 11 deletions gradle/javadoc_cleanup.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
// remove the excessive whitespaces between method arguments in the javadocs
task javadocCleanup(dependsOn: "javadoc") doLast {
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/Flowable.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/Observable.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/Single.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/Maybe.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/Completable.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Flowable.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Observable.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Single.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Maybe.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Completable.html'));

fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/flowables/ConnectableFlowable.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/observables/ConnectableObservable.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/flowables/ConnectableFlowable.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/observables/ConnectableObservable.html'));

fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/subjects/ReplaySubject.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/processors/ReplayProcessor.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/plugins/RxJavaPlugins.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/subjects/ReplaySubject.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/processors/ReplayProcessor.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/plugins/RxJavaPlugins.html'));

fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/parallel/ParallelFlowable.html'));
fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/parallel/ParallelFlowable.html'));
}

def fixJavadocFile(file) {
Expand Down
5 changes: 2 additions & 3 deletions .../java/io/reactivex/BinaryFlatMapPerf.java → ...tivex/rxjava3/core/BinaryFlatMapPerf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* the License for the specific language governing permissions and limitations under the License.
*/

package io.reactivex;
package io.reactivex.rxjava3.core;

import java.util.*;
import java.util.concurrent.TimeUnit;
Expand All @@ -20,8 +20,7 @@
import org.openjdk.jmh.infra.Blackhole;
import org.reactivestreams.Publisher;

import io.reactivex.Observable;
import io.reactivex.functions.Function;
import io.reactivex.rxjava3.functions.Function;

@BenchmarkMode(Mode.Throughput)
@Warmup(iterations = 5)
Expand Down
2 changes: 1 addition & 1 deletion ...mh/java/io/reactivex/BlockingGetPerf.java → ...activex/rxjava3/core/BlockingGetPerf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* the License for the specific language governing permissions and limitations under the License.
*/

package io.reactivex;
package io.reactivex.rxjava3.core;

import java.util.concurrent.TimeUnit;

Expand Down
2 changes: 1 addition & 1 deletion src/jmh/java/io/reactivex/BlockingPerf.java → .../reactivex/rxjava3/core/BlockingPerf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* the License for the specific language governing permissions and limitations under the License.
*/

package io.reactivex;
package io.reactivex.rxjava3.core;

import java.util.Arrays;
import java.util.concurrent.TimeUnit;
Expand Down
6 changes: 3 additions & 3 deletions .../java/io/reactivex/CallableAsyncPerf.java → ...tivex/rxjava3/core/CallableAsyncPerf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
* the License for the specific language governing permissions and limitations under the License.
*/

package io.reactivex;
package io.reactivex.rxjava3.core;

import java.util.concurrent.*;

import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.infra.Blackhole;

import io.reactivex.internal.schedulers.SingleScheduler;
import io.reactivex.schedulers.Schedulers;
import io.reactivex.rxjava3.internal.schedulers.SingleScheduler;
import io.reactivex.rxjava3.schedulers.Schedulers;

@BenchmarkMode(Mode.Throughput)
@Warmup(iterations = 5)
Expand Down
4 changes: 2 additions & 2 deletions ...ava/io/reactivex/EachTypeFlatMapPerf.java → ...vex/rxjava3/core/EachTypeFlatMapPerf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
* the License for the specific language governing permissions and limitations under the License.
*/

package io.reactivex;
package io.reactivex.rxjava3.core;

import java.util.concurrent.TimeUnit;

import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.infra.Blackhole;
import org.reactivestreams.Publisher;

import io.reactivex.functions.Function;
import io.reactivex.rxjava3.functions.Function;

@BenchmarkMode(Mode.Throughput)
@Warmup(iterations = 5)
Expand Down
4 changes: 2 additions & 2 deletions ...mh/java/io/reactivex/FlatMapJustPerf.java → ...activex/rxjava3/core/FlatMapJustPerf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
* the License for the specific language governing permissions and limitations under the License.
*/

package io.reactivex;
package io.reactivex.rxjava3.core;

import java.util.concurrent.TimeUnit;

import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.infra.Blackhole;
import org.reactivestreams.Publisher;

import io.reactivex.functions.Function;
import io.reactivex.rxjava3.functions.Function;

@BenchmarkMode(Mode.Throughput)
@Warmup(iterations = 5)
Expand Down
6 changes: 3 additions & 3 deletions ...ava/io/reactivex/FlattenCrossMapPerf.java → ...vex/rxjava3/core/FlattenCrossMapPerf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
* the License for the specific language governing permissions and limitations under the License.
*/

package io.reactivex;
package io.reactivex.rxjava3.core;

import java.util.*;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;

import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.infra.Blackhole;

import io.reactivex.functions.Function;
import io.reactivex.rxjava3.functions.Function;

@BenchmarkMode(Mode.Throughput)
@Warmup(iterations = 5)
Expand Down
4 changes: 2 additions & 2 deletions ...mh/java/io/reactivex/FlattenJustPerf.java → ...activex/rxjava3/core/FlattenJustPerf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
* the License for the specific language governing permissions and limitations under the License.
*/

package io.reactivex;
package io.reactivex.rxjava3.core;

import java.util.*;
import java.util.concurrent.TimeUnit;

import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.infra.Blackhole;

import io.reactivex.functions.Function;
import io.reactivex.rxjava3.functions.Function;

@BenchmarkMode(Mode.Throughput)
@Warmup(iterations = 5)
Expand Down
6 changes: 3 additions & 3 deletions ...h/java/io/reactivex/FlattenRangePerf.java → ...ctivex/rxjava3/core/FlattenRangePerf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
* the License for the specific language governing permissions and limitations under the License.
*/

package io.reactivex;
package io.reactivex.rxjava3.core;

import java.util.*;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;

import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.infra.Blackhole;

import io.reactivex.functions.Function;
import io.reactivex.rxjava3.functions.Function;

@BenchmarkMode(Mode.Throughput)
@Warmup(iterations = 5)
Expand Down
8 changes: 4 additions & 4 deletions .../FlowableFlatMapCompletableAsyncPerf.java → .../FlowableFlatMapCompletableAsyncPerf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
* the License for the specific language governing permissions and limitations under the License.
*/

package io.reactivex;
package io.reactivex.rxjava3.core;

import java.util.Arrays;
import java.util.concurrent.TimeUnit;

import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.infra.Blackhole;

import io.reactivex.functions.Action;
import io.reactivex.internal.functions.Functions;
import io.reactivex.schedulers.Schedulers;
import io.reactivex.rxjava3.functions.Action;
import io.reactivex.rxjava3.internal.functions.Functions;
import io.reactivex.rxjava3.schedulers.Schedulers;

@BenchmarkMode(Mode.Throughput)
@Warmup(iterations = 5)
Expand Down
4 changes: 2 additions & 2 deletions ...x/FlowableFlatMapCompletableSyncPerf.java → ...e/FlowableFlatMapCompletableSyncPerf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
* the License for the specific language governing permissions and limitations under the License.
*/

package io.reactivex;
package io.reactivex.rxjava3.core;

import java.util.Arrays;
import java.util.concurrent.TimeUnit;

import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.infra.Blackhole;

import io.reactivex.internal.functions.Functions;
import io.reactivex.rxjava3.internal.functions.Functions;

@BenchmarkMode(Mode.Throughput)
@Warmup(iterations = 5)
Expand Down
6 changes: 3 additions & 3 deletions ...activex/InputWithIncrementingInteger.java → ...a3/core/InputWithIncrementingInteger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
* the License for the specific language governing permissions and limitations under the License.
*/

package io.reactivex;
package io.reactivex.rxjava3.core;

import java.util.Iterator;

import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.infra.Blackhole;
import org.reactivestreams.*;

import io.reactivex.internal.subscriptions.EmptySubscription;
import io.reactivex.subscribers.DefaultSubscriber;
import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription;
import io.reactivex.rxjava3.subscribers.DefaultSubscriber;

/**
* Exposes an Observable and Observer that increments n Integers and consumes them in a Blackhole.
Expand Down
6 changes: 3 additions & 3 deletions src/jmh/java/io/reactivex/JustAsyncPerf.java → ...reactivex/rxjava3/core/JustAsyncPerf.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
* the License for the specific language governing permissions and limitations under the License.
*/

package io.reactivex;
package io.reactivex.rxjava3.core;

import java.util.concurrent.TimeUnit;

import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.infra.Blackhole;

import io.reactivex.internal.schedulers.SingleScheduler;
import io.reactivex.schedulers.Schedulers;
import io.reactivex.rxjava3.internal.schedulers.SingleScheduler;
import io.reactivex.rxjava3.schedulers.Schedulers;

@BenchmarkMode(Mode.Throughput)
@Warmup(iterations = 5)
Expand Down
4 changes: 2 additions & 2 deletions ...a/io/reactivex/LatchedSingleObserver.java → ...x/rxjava3/core/LatchedSingleObserver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
* the License for the specific language governing permissions and limitations under the License.
*/

package io.reactivex;
package io.reactivex.rxjava3.core;

import java.util.concurrent.CountDownLatch;

import org.openjdk.jmh.infra.Blackhole;

import io.reactivex.disposables.Disposable;
import io.reactivex.rxjava3.disposables.Disposable;

public final class LatchedSingleObserver<T> implements SingleObserver<T> {
final CountDownLatch cdl;
Expand Down
Loading

0 comments on commit a1693ec

Please sign in to comment.