Package shift from .rxjava3 to .rxjava4

Author: akarnokd

README.md

@@ -1,15 +1,18 @@
 # RxJava: Reactive Extensions for the JVM
 
 <a href='https://github.com/ReactiveX/RxJava/actions?query=workflow%3ASnapshot'><img src='https://github.com/ReactiveX/RxJava/workflows/Snapshot/badge.svg'></a>
-[![codecov.io](http://codecov.io/github/ReactiveX/RxJava/coverage.svg?branch=3.x)](https://codecov.io/gh/ReactiveX/RxJava/branch/3.x)
-[![Maven Central](https://maven-badges.sml.io/sonatype-central/io.reactivex.rxjava3/rxjava/badge.svg)](https://maven-badges.sml.io/sonatype-central/io.reactivex.rxjava3/rxjava)
-[![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/ReactiveX/RxJava)
+[![codecov.io](http://codecov.io/github/ReactiveX/RxJava/coverage.svg?branch=4.x)](https://codecov.io/gh/ReactiveX/RxJava/branch/4.x)
+[![Maven Central](https://maven-badges.sml.io/sonatype-central/io.reactivex.rxjava4/rxjava/badge.svg)](https://maven-badges.sml.io/sonatype-central/io.reactivex.rxjava4/rxjava)
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/ReactiveX/RxJava/badge)](https://securityscorecards.dev/viewer/?uri=github.com/ReactiveX/RxJava)
 
 RxJava is a Java VM implementation of [Reactive Extensions](http://reactivex.io): a library for composing asynchronous and event-based programs by using observable sequences.
 
 It extends the [observer pattern](http://en.wikipedia.org/wiki/Observer_pattern) to support sequences of data/events and adds operators that allow you to compose sequences together declaratively while abstracting away concerns about things like low-level threading, synchronization, thread-safety and concurrent data structures.
 
+#### Version 3.x ([Javadoc](http://reactivex.io/RxJava/4.x/javadoc/))
+
+- TBD
+
 #### Version 3.x ([Javadoc](http://reactivex.io/RxJava/3.x/javadoc/))
 
 - Single dependency: [Reactive-Streams](https://github.com/reactive-streams/reactive-streams-jvm).
@@ -42,7 +45,7 @@ The [1.x version](https://github.com/ReactiveX/RxJava/tree/1.x) is end-of-life a
 
 ### Setting up the dependency
 
-The first step is to include RxJava 3 into your project, for example, as a Gradle compile dependency:
+The first step is to include RxJava 4 into your project, for example, as a Gradle compile dependency:
 
 ```groovy
 implementation "io.reactivex.rxjava3:rxjava:3.x.y"
@@ -58,7 +61,7 @@ The second is to write the **Hello World** program:
 ```java
 package rxjava.examples;
 
-import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava4.core.*;
 
 public class HelloWorld {
     public static void main(String[] args) {
@@ -67,17 +70,17 @@ public class HelloWorld {
 }
 ```
 
-Note that RxJava 3 components now live under `io.reactivex.rxjava3` and the base classes and interfaces live under `io.reactivex.rxjava3.core`.
+Note that RxJava 3 components now live under `io.reactivex.rxjava3` and the base classes and interfaces live under `io.reactivex.rxjava4.core`.
 
 ### Base classes
 
 RxJava 3 features several base classes you can discover operators on:
 
-  - [`io.reactivex.rxjava3.core.Flowable`](http://reactivex.io/RxJava/3.x/javadoc/io/reactivex/rxjava3/core/Flowable.html): 0..N flows, supporting Reactive-Streams and backpressure
-  - [`io.reactivex.rxjava3.core.Observable`](http://reactivex.io/RxJava/3.x/javadoc/io/reactivex/rxjava3/core/Observable.html): 0..N flows, no backpressure,
-  - [`io.reactivex.rxjava3.core.Single`](http://reactivex.io/RxJava/3.x/javadoc/io/reactivex/rxjava3/core/Single.html): a flow of exactly 1 item or an error,
-  - [`io.reactivex.rxjava3.core.Completable`](http://reactivex.io/RxJava/3.x/javadoc/io/reactivex/rxjava3/core/Completable.html): a flow without items but only a completion or error signal,
-  - [`io.reactivex.rxjava3.core.Maybe`](http://reactivex.io/RxJava/3.x/javadoc/io/reactivex/rxjava3/core/Maybe.html): a flow with no items, exactly one item or an error.
+  - [`io.reactivex.rxjava4.core.Flowable`](http://reactivex.io/RxJava/3.x/javadoc/io/reactivex/rxjava3/core/Flowable.html): 0..N flows, supporting Reactive-Streams and backpressure
+  - [`io.reactivex.rxjava4.core.Observable`](http://reactivex.io/RxJava/3.x/javadoc/io/reactivex/rxjava3/core/Observable.html): 0..N flows, no backpressure,
+  - [`io.reactivex.rxjava4.core.Single`](http://reactivex.io/RxJava/3.x/javadoc/io/reactivex/rxjava3/core/Single.html): a flow of exactly 1 item or an error,
+  - [`io.reactivex.rxjava4.core.Completable`](http://reactivex.io/RxJava/3.x/javadoc/io/reactivex/rxjava3/core/Completable.html): a flow without items but only a completion or error signal,
+  - [`io.reactivex.rxjava4.core.Maybe`](http://reactivex.io/RxJava/3.x/javadoc/io/reactivex/rxjava3/core/Maybe.html): a flow with no items, exactly one item or an error.
 
 ### Some terminology
 
@@ -160,7 +163,7 @@ Practically, this is when the body of the given example above executes.
 One of the common use cases for RxJava is to run some computation, network request on a background thread and show the results (or error) on the UI thread:
 
 ```java
-import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava4.schedulers.Schedulers;
 
 Flowable.fromCallable(() -> {
     Thread.sleep(1000); //  imitate expensive computation
@@ -533,9 +536,9 @@ APIs marked with the [`@Experimental`][experimental source link] annotation at t
 
 APIs marked with the `@Deprecated` annotation at the class or method level will remain supported until the next major release, but it is recommended to stop using them. 
 
-#### io.reactivex.rxjava3.internal.*
+#### io.reactivex.rxjava4.internal.*
 
-All code inside the `io.reactivex.rxjava3.internal.*` packages are considered private API and should not be relied upon at all. It can change at any time. 
+All code inside the `io.reactivex.rxjava4.internal.*` packages are considered private API and should not be relied upon at all. It can change at any time. 
 
 ## Full Documentation
 

build.gradle

@@ -142,8 +142,8 @@ tasks.register('bundle', Bundle) {
         bnd('Import-Package': '!org.junit,!junit.framework,!org.mockito.*,!org.testng.*,*')
         bnd('Bundle-DocURL': 'https://github.com/ReactiveX/RxJava')
         bnd('Eclipse-ExtensibleAPI': 'true')
-        bnd('Export-Package': '!io.reactivex.rxjava3.internal.*,io.reactivex.rxjava3.*')
-        bnd('Bundle-SymbolicName': 'io.reactivex.rxjava3.rxjava')
+        bnd('Export-Package': '!io.reactivex.rxjava4.internal.*,io.reactivex.rxjava4.*')
+        bnd('Bundle-SymbolicName': 'io.reactivex.rxjava4.rxjava')
         bnd('Multi-Release': 'true')
     }
 }

config/checkstyle/checkstyle.xml

@@ -5,7 +5,7 @@
     This configuration file was written by the eclipse-cs plugin configuration editor
 -->
 <!--
-    Checkstyle-Configuration: rxjava
+    Checkstyle-Configuration: local
     Description: none
 -->
 <module name="Checker">
@@ -27,7 +27,6 @@
     <property name="headerFile" value="${checkstyle.header.file}"/>
   </module>
   <module name="BeforeExecutionExclusionFileFilter">
-    <property name="severity" value="ignore"/>
     <property name="fileNamePattern" value="module\-info\.java$"/>
   </module>
 </module>

config/checkstyle/suppressions.xml

@@ -6,8 +6,8 @@
 
 <suppressions>
 
-  <suppress checks="MissingJavadocMethod" files="[\\/]main[\\/]java[\\/]io[\\/]reactivex[\\/]rxjava3[\\/]internal[\\/]"/>
-  <suppress checks="MissingJavadocMethod" files="[\\/]jmh[\\/]java[\\/]io[\\/]reactivex[\\/]rxjava3[\\/]"/>
-  <suppress checks="MissingJavadocMethod" files="[\\/]test[\\/]java[\\/]io[\\/]reactivex[\\/]rxjava3[\\/]"/>
+  <suppress checks="MissingJavadocMethod,JavadocMethod" files="src/main/java/io/reactivex/rxjava4/internal/.*\.java$"/>
+  <suppress checks="MissingJavadocMethod,JavadocMethod" files="src/test/java/.*\.java$"/>
+  <suppress checks="MissingJavadocMethod,JavadocMethod" files="src/jmh/java/.*\.java$"/>
 
 </suppressions>

gradle/javadoc_cleanup.gradle

@@ -46,25 +46,25 @@ def fixJavadocFile(file) {
     fileContents = fileContents.replaceAll("@Nullable</a>\\s{4,}", "@Nullable</a> ")
 
     // javadoc bug: duplicates the link to @NonNull for some reason
-    def nonNullText1 = "<a href=\"../annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@NonNull</a>"
+    def nonNullText1 = "<a href=\"../annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava4.annotations\">@NonNull</a>"
 
     fileContents = fileContents.replace(nonNullText1 + " " + nonNullText1, nonNullText1)
     fileContents = fileContents.replace(nonNullText1 + "\n " + nonNullText1, nonNullText1)
     fileContents = fileContents.replace(nonNullText1 + "\r\n " + nonNullText1, nonNullText1)
 
-    def nonNullText2 = "<a href=\"../../../../io/reactivex/rxjava3/annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@NonNull</a>"
+    def nonNullText2 = "<a href=\"../../../../io/reactivex/rxjava3/annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava4.annotations\">@NonNull</a>"
     fileContents = fileContents.replace(nonNullText2 + " " + nonNullText2, nonNullText2)
     fileContents = fileContents.replace(nonNullText2 + "\n " + nonNullText2, nonNullText2)
     fileContents = fileContents.replace(nonNullText2 + "\r\n " + nonNullText2, nonNullText2)
 
     // javadoc bug: duplicates the link to @Nullable for some reason
-    def nullableText1 = "<a href=\"../annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@Nullable</a>"
+    def nullableText1 = "<a href=\"../annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava4.annotations\">@Nullable</a>"
 
     fileContents = fileContents.replace(nullableText1 + " " + nullableText1, nullableText1)
     fileContents = fileContents.replace(nullableText1 + "\n " + nullableText1, nullableText1)
     fileContents = fileContents.replace(nullableText1 + "\r\n " + nullableText1, nullableText1)
 
-    def nullableText2 = "<a href=\"../../../../io/reactivex/rxjava3/annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@Nullable</a>"
+    def nullableText2 = "<a href=\"../../../../io/reactivex/rxjava3/annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava4.annotations\">@Nullable</a>"
 
     fileContents = fileContents.replace(nullableText2 + " " + nullableText2, nullableText2)
     fileContents = fileContents.replace(nullableText2 + "\n " + nullableText2, nullableText2)

…ivex/rxjava3/core/BinaryFlatMapPerf.java …ivex/rxjava4/core/BinaryFlatMapPerf.javasrc/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java renamed to src/jmh/java/io/reactivex/rxjava4/core/BinaryFlatMapPerf.java src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java renamed to src/jmh/java/io/reactivex/rxjava4/core/BinaryFlatMapPerf.java

@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.rxjava3.core;
+package io.reactivex.rxjava4.core;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -20,7 +20,7 @@
 import org.openjdk.jmh.infra.Blackhole;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava4.functions.Function;
 
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)

…ctivex/rxjava3/core/BlockingGetPerf.java …ctivex/rxjava4/core/BlockingGetPerf.javasrc/jmh/java/io/reactivex/rxjava3/core/BlockingGetPerf.java renamed to src/jmh/java/io/reactivex/rxjava4/core/BlockingGetPerf.java src/jmh/java/io/reactivex/rxjava3/core/BlockingGetPerf.java renamed to src/jmh/java/io/reactivex/rxjava4/core/BlockingGetPerf.java

@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.rxjava3.core;
+package io.reactivex.rxjava4.core;
 
 import java.util.concurrent.TimeUnit;
 

…reactivex/rxjava3/core/BlockingPerf.java …reactivex/rxjava4/core/BlockingPerf.javasrc/jmh/java/io/reactivex/rxjava3/core/BlockingPerf.java renamed to src/jmh/java/io/reactivex/rxjava4/core/BlockingPerf.java src/jmh/java/io/reactivex/rxjava3/core/BlockingPerf.java renamed to src/jmh/java/io/reactivex/rxjava4/core/BlockingPerf.java

@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.rxjava3.core;
+package io.reactivex.rxjava4.core;
 
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;

…ivex/rxjava3/core/CallableAsyncPerf.java …ivex/rxjava4/core/CallableAsyncPerf.javasrc/jmh/java/io/reactivex/rxjava3/core/CallableAsyncPerf.java renamed to src/jmh/java/io/reactivex/rxjava4/core/CallableAsyncPerf.java src/jmh/java/io/reactivex/rxjava3/core/CallableAsyncPerf.java renamed to src/jmh/java/io/reactivex/rxjava4/core/CallableAsyncPerf.java

@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.rxjava3.core;
+package io.reactivex.rxjava4.core;
 
 import java.util.concurrent.*;
 
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 
-import io.reactivex.rxjava3.internal.schedulers.SingleScheduler;
-import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava4.internal.schedulers.SingleScheduler;
+import io.reactivex.rxjava4.schedulers.Schedulers;
 
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)

…ex/rxjava3/core/EachTypeFlatMapPerf.java …ex/rxjava4/core/EachTypeFlatMapPerf.javasrc/jmh/java/io/reactivex/rxjava3/core/EachTypeFlatMapPerf.java renamed to src/jmh/java/io/reactivex/rxjava4/core/EachTypeFlatMapPerf.java src/jmh/java/io/reactivex/rxjava3/core/EachTypeFlatMapPerf.java renamed to src/jmh/java/io/reactivex/rxjava4/core/EachTypeFlatMapPerf.java

@@ -11,15 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.rxjava3.core;
+package io.reactivex.rxjava4.core;
 
 import java.util.concurrent.TimeUnit;
 
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 import org.reactivestreams.Publisher;
 
-import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava4.functions.Function;
 
 @BenchmarkMode(Mode.Throughput)
 @Warmup(iterations = 5)