From 81fe206b423a9ec9930b8dbe75580b718a178bd6 Mon Sep 17 00:00:00 2001 From: Kunshuai Zhu Date: Wed, 14 Sep 2022 15:57:11 +0800 Subject: [PATCH] Move reactive-triple to a stand-alone module (#10605) * Remove reactive-triple to a stand-alone module * fix * move dependency to dubbo-dependencies-bom * move to dubbo-plugin --- .../ReactorDubbo3TripleStub.mustache | 10 ++-- dubbo-dependencies-bom/pom.xml | 13 +++++ dubbo-distribution/dubbo-all/pom.xml | 8 +++ dubbo-distribution/dubbo-bom/pom.xml | 5 ++ dubbo-plugin/dubbo-reactive/pom.xml | 51 +++++++++++++++++++ .../AbstractTripleReactorPublisher.java | 2 +- .../AbstractTripleReactorSubscriber.java | 2 +- .../ClientTripleReactorPublisher.java | 2 +- .../ClientTripleReactorSubscriber.java | 2 +- .../ServerTripleReactorPublisher.java | 2 +- .../ServerTripleReactorSubscriber.java | 4 +- .../reactive/calls/ReactorClientCalls.java | 6 +-- .../reactive/calls/ReactorServerCalls.java | 6 +-- .../handler/ManyToManyMethodHandler.java | 4 +- .../handler/ManyToOneMethodHandler.java | 4 +- .../handler/OneToManyMethodHandler.java | 4 +- .../handler/OneToOneMethodHandler.java | 4 +- .../reactive/ManyToManyMethodHandlerTest.java | 4 +- .../reactive/ManyToOneMethodHandlerTest.java | 4 +- .../reactive/OneToManyMethodHandlerTest.java | 4 +- .../reactive/OneToOneMethodHandlerTest.java | 4 +- dubbo-plugin/pom.xml | 1 + dubbo-rpc/dubbo-rpc-triple/pom.xml | 18 +++---- 23 files changed, 118 insertions(+), 46 deletions(-) create mode 100644 dubbo-plugin/dubbo-reactive/pom.xml rename {dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo}/reactive/AbstractTripleReactorPublisher.java (99%) rename {dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo}/reactive/AbstractTripleReactorSubscriber.java (98%) rename {dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo}/reactive/ClientTripleReactorPublisher.java (97%) rename {dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo}/reactive/ClientTripleReactorSubscriber.java (96%) rename {dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo}/reactive/ServerTripleReactorPublisher.java (96%) rename {dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo}/reactive/ServerTripleReactorSubscriber.java (95%) rename {dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo}/reactive/calls/ReactorClientCalls.java (96%) rename {dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo}/reactive/calls/ReactorServerCalls.java (96%) rename {dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo}/reactive/handler/ManyToManyMethodHandler.java (92%) rename {dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo}/reactive/handler/ManyToOneMethodHandler.java (93%) rename {dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo}/reactive/handler/OneToManyMethodHandler.java (92%) rename {dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo}/reactive/handler/OneToOneMethodHandler.java (92%) rename {dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo}/reactive/ManyToManyMethodHandlerTest.java (95%) rename {dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo}/reactive/ManyToOneMethodHandlerTest.java (96%) rename {dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo}/reactive/OneToManyMethodHandlerTest.java (96%) rename {dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri => dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo}/reactive/OneToOneMethodHandlerTest.java (91%) diff --git a/dubbo-compiler/src/main/resources/ReactorDubbo3TripleStub.mustache b/dubbo-compiler/src/main/resources/ReactorDubbo3TripleStub.mustache index 43b715e697..afc799b072 100644 --- a/dubbo-compiler/src/main/resources/ReactorDubbo3TripleStub.mustache +++ b/dubbo-compiler/src/main/resources/ReactorDubbo3TripleStub.mustache @@ -30,11 +30,11 @@ import org.apache.dubbo.rpc.model.MethodDescriptor; import org.apache.dubbo.rpc.model.ServiceDescriptor; import org.apache.dubbo.rpc.model.StubMethodDescriptor; import org.apache.dubbo.rpc.model.StubServiceDescriptor; -import org.apache.dubbo.rpc.protocol.tri.reactive.handler.ManyToManyMethodHandler; -import org.apache.dubbo.rpc.protocol.tri.reactive.handler.ManyToOneMethodHandler; -import org.apache.dubbo.rpc.protocol.tri.reactive.handler.OneToManyMethodHandler; -import org.apache.dubbo.rpc.protocol.tri.reactive.calls.ReactorClientCalls; -import org.apache.dubbo.rpc.protocol.tri.reactive.handler.OneToOneMethodHandler; +import org.apache.dubbo.reactive.handler.ManyToManyMethodHandler; +import org.apache.dubbo.reactive.handler.ManyToOneMethodHandler; +import org.apache.dubbo.reactive.handler.OneToManyMethodHandler; +import org.apache.dubbo.reactive.calls.ReactorClientCalls; +import org.apache.dubbo.reactive.handler.OneToOneMethodHandler; import org.apache.dubbo.rpc.stub.StubInvoker; import org.apache.dubbo.rpc.stub.StubMethodHandler; diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 34d116c82f..2b231b6997 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -133,6 +133,8 @@ 1.7.4 3.3 0.10.0 + 1.0.4 + 3.4.19 2.0 3.0.19.Final @@ -802,6 +804,17 @@ simpleclient_pushgateway ${prometheus_client.version} + + + org.reactivestreams + reactive-streams + ${reactive.version} + + + io.projectreactor + reactor-core + ${reactor.version} + diff --git a/dubbo-distribution/dubbo-all/pom.xml b/dubbo-distribution/dubbo-all/pom.xml index e01555d3c5..09d4ef8a99 100644 --- a/dubbo-distribution/dubbo-all/pom.xml +++ b/dubbo-distribution/dubbo-all/pom.xml @@ -325,6 +325,13 @@ compile true + + org.apache.dubbo + dubbo-reactive + ${project.version} + compile + true + @@ -432,6 +439,7 @@ org.apache.dubbo:dubbo-native org.apache.dubbo:dubbo-plugin org.apache.dubbo:dubbo-qos + org.apache.dubbo:dubbo-reactive org.apache.dubbo:dubbo-registry-api org.apache.dubbo:dubbo-registry-multicast org.apache.dubbo:dubbo-registry-multiple diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml index b32d60a983..013d842f75 100644 --- a/dubbo-distribution/dubbo-bom/pom.xml +++ b/dubbo-distribution/dubbo-bom/pom.xml @@ -173,6 +173,11 @@ dubbo-container-spring ${project.version} + + org.apache.dubbo + dubbo-reactive + ${project.version} + diff --git a/dubbo-plugin/dubbo-reactive/pom.xml b/dubbo-plugin/dubbo-reactive/pom.xml new file mode 100644 index 0000000000..9ac35a68a8 --- /dev/null +++ b/dubbo-plugin/dubbo-reactive/pom.xml @@ -0,0 +1,51 @@ + + + + org.apache.dubbo + dubbo-plugin + ${revision} + ../pom.xml + + 4.0.0 + + dubbo-reactive + jar + + + false + + + + + org.apache.dubbo + dubbo-rpc-triple + ${project.version} + + + org.reactivestreams + reactive-streams + + + io.projectreactor + reactor-core + + + + diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/AbstractTripleReactorPublisher.java b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/AbstractTripleReactorPublisher.java similarity index 99% rename from dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/AbstractTripleReactorPublisher.java rename to dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/AbstractTripleReactorPublisher.java index 9eab281828..0328c59d8f 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/AbstractTripleReactorPublisher.java +++ b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/AbstractTripleReactorPublisher.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive; +package org.apache.dubbo.reactive; import org.apache.dubbo.rpc.protocol.tri.CancelableStreamObserver; import org.apache.dubbo.rpc.protocol.tri.observer.CallStreamObserver; diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/AbstractTripleReactorSubscriber.java b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/AbstractTripleReactorSubscriber.java similarity index 98% rename from dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/AbstractTripleReactorSubscriber.java rename to dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/AbstractTripleReactorSubscriber.java index 40acec2e9b..96fa64866c 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/AbstractTripleReactorSubscriber.java +++ b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/AbstractTripleReactorSubscriber.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive; +package org.apache.dubbo.reactive; import org.apache.dubbo.rpc.protocol.tri.observer.CallStreamObserver; import org.reactivestreams.Subscriber; diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/ClientTripleReactorPublisher.java b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/ClientTripleReactorPublisher.java similarity index 97% rename from dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/ClientTripleReactorPublisher.java rename to dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/ClientTripleReactorPublisher.java index 1deab5ac0b..1233dd8a54 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/ClientTripleReactorPublisher.java +++ b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/ClientTripleReactorPublisher.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive; +package org.apache.dubbo.reactive; import org.apache.dubbo.rpc.protocol.tri.observer.CallStreamObserver; import org.apache.dubbo.rpc.protocol.tri.observer.ClientCallToObserverAdapter; diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/ClientTripleReactorSubscriber.java b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/ClientTripleReactorSubscriber.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/ClientTripleReactorSubscriber.java rename to dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/ClientTripleReactorSubscriber.java index 3d5936d61f..7d59244d3d 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/ClientTripleReactorSubscriber.java +++ b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/ClientTripleReactorSubscriber.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive; +package org.apache.dubbo.reactive; import org.apache.dubbo.rpc.protocol.tri.observer.ClientCallToObserverAdapter; diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/ServerTripleReactorPublisher.java b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/ServerTripleReactorPublisher.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/ServerTripleReactorPublisher.java rename to dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/ServerTripleReactorPublisher.java index 33addf5d65..8f5382e169 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/ServerTripleReactorPublisher.java +++ b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/ServerTripleReactorPublisher.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive; +package org.apache.dubbo.reactive; import org.apache.dubbo.rpc.protocol.tri.observer.CallStreamObserver; diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/ServerTripleReactorSubscriber.java b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/ServerTripleReactorSubscriber.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/ServerTripleReactorSubscriber.java rename to dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/ServerTripleReactorSubscriber.java index 32453ac372..1e8ef5e37f 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/ServerTripleReactorSubscriber.java +++ b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/ServerTripleReactorSubscriber.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive; +package org.apache.dubbo.reactive; import org.apache.dubbo.rpc.CancellationContext; import org.apache.dubbo.rpc.protocol.tri.CancelableStreamObserver; @@ -24,7 +24,7 @@ import org.apache.dubbo.rpc.protocol.tri.observer.CallStreamObserver; /** * The Subscriber in server to passing the data produced by user publisher to responseStream. */ -public class ServerTripleReactorSubscriber extends AbstractTripleReactorSubscriber{ +public class ServerTripleReactorSubscriber extends AbstractTripleReactorSubscriber { @Override public void subscribe(CallStreamObserver downstream) { diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/calls/ReactorClientCalls.java b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/calls/ReactorClientCalls.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/calls/ReactorClientCalls.java rename to dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/calls/ReactorClientCalls.java index 4ae6d45755..c23e9874b9 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/calls/ReactorClientCalls.java +++ b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/calls/ReactorClientCalls.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive.calls; +package org.apache.dubbo.reactive.calls; import org.apache.dubbo.common.stream.StreamObserver; +import org.apache.dubbo.reactive.ClientTripleReactorPublisher; +import org.apache.dubbo.reactive.ClientTripleReactorSubscriber; import org.apache.dubbo.rpc.Invoker; import org.apache.dubbo.rpc.model.StubMethodDescriptor; import org.apache.dubbo.rpc.protocol.tri.observer.CallStreamObserver; -import org.apache.dubbo.rpc.protocol.tri.reactive.ClientTripleReactorPublisher; -import org.apache.dubbo.rpc.protocol.tri.reactive.ClientTripleReactorSubscriber; import org.apache.dubbo.rpc.stub.StubInvocationUtil; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/calls/ReactorServerCalls.java b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/calls/ReactorServerCalls.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/calls/ReactorServerCalls.java rename to dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/calls/ReactorServerCalls.java index 6454d26ba3..33c54d1496 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/calls/ReactorServerCalls.java +++ b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/calls/ReactorServerCalls.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive.calls; +package org.apache.dubbo.reactive.calls; import org.apache.dubbo.common.stream.StreamObserver; +import org.apache.dubbo.reactive.ServerTripleReactorPublisher; +import org.apache.dubbo.reactive.ServerTripleReactorSubscriber; import org.apache.dubbo.rpc.protocol.tri.observer.CallStreamObserver; import org.apache.dubbo.rpc.protocol.tri.observer.ServerCallToObserverAdapter; -import org.apache.dubbo.rpc.protocol.tri.reactive.ServerTripleReactorPublisher; -import org.apache.dubbo.rpc.protocol.tri.reactive.ServerTripleReactorSubscriber; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/handler/ManyToManyMethodHandler.java b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/handler/ManyToManyMethodHandler.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/handler/ManyToManyMethodHandler.java rename to dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/handler/ManyToManyMethodHandler.java index df583f6711..72f9b50905 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/handler/ManyToManyMethodHandler.java +++ b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/handler/ManyToManyMethodHandler.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive.handler; +package org.apache.dubbo.reactive.handler; import org.apache.dubbo.common.stream.StreamObserver; +import org.apache.dubbo.reactive.calls.ReactorServerCalls; import org.apache.dubbo.rpc.protocol.tri.observer.CallStreamObserver; -import org.apache.dubbo.rpc.protocol.tri.reactive.calls.ReactorServerCalls; import org.apache.dubbo.rpc.stub.StubMethodHandler; import reactor.core.publisher.Flux; diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/handler/ManyToOneMethodHandler.java b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/handler/ManyToOneMethodHandler.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/handler/ManyToOneMethodHandler.java rename to dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/handler/ManyToOneMethodHandler.java index 133f92a29b..d74a9ab118 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/handler/ManyToOneMethodHandler.java +++ b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/handler/ManyToOneMethodHandler.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive.handler; +package org.apache.dubbo.reactive.handler; import org.apache.dubbo.common.stream.StreamObserver; +import org.apache.dubbo.reactive.calls.ReactorServerCalls; import org.apache.dubbo.rpc.protocol.tri.observer.CallStreamObserver; -import org.apache.dubbo.rpc.protocol.tri.reactive.calls.ReactorServerCalls; import org.apache.dubbo.rpc.stub.StubMethodHandler; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/handler/OneToManyMethodHandler.java b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/handler/OneToManyMethodHandler.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/handler/OneToManyMethodHandler.java rename to dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/handler/OneToManyMethodHandler.java index ef94d6d80e..a672c5b852 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/handler/OneToManyMethodHandler.java +++ b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/handler/OneToManyMethodHandler.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive.handler; +package org.apache.dubbo.reactive.handler; import org.apache.dubbo.common.stream.StreamObserver; -import org.apache.dubbo.rpc.protocol.tri.reactive.calls.ReactorServerCalls; +import org.apache.dubbo.reactive.calls.ReactorServerCalls; import org.apache.dubbo.rpc.stub.StubMethodHandler; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/handler/OneToOneMethodHandler.java b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/handler/OneToOneMethodHandler.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/handler/OneToOneMethodHandler.java rename to dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/handler/OneToOneMethodHandler.java index 0a8b0a7191..f20a3ece5e 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/reactive/handler/OneToOneMethodHandler.java +++ b/dubbo-plugin/dubbo-reactive/src/main/java/org/apache/dubbo/reactive/handler/OneToOneMethodHandler.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive.handler; +package org.apache.dubbo.reactive.handler; import org.apache.dubbo.common.stream.StreamObserver; -import org.apache.dubbo.rpc.protocol.tri.reactive.calls.ReactorServerCalls; +import org.apache.dubbo.reactive.calls.ReactorServerCalls; import org.apache.dubbo.rpc.stub.FutureToObserverAdaptor; import org.apache.dubbo.rpc.stub.StubMethodHandler; import reactor.core.publisher.Mono; diff --git a/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/reactive/ManyToManyMethodHandlerTest.java b/dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo/reactive/ManyToManyMethodHandlerTest.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/reactive/ManyToManyMethodHandlerTest.java rename to dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo/reactive/ManyToManyMethodHandlerTest.java index 6669eaa7d9..bf80ca94ec 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/reactive/ManyToManyMethodHandlerTest.java +++ b/dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo/reactive/ManyToManyMethodHandlerTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive; +package org.apache.dubbo.reactive; import org.apache.dubbo.common.stream.StreamObserver; +import org.apache.dubbo.reactive.handler.ManyToManyMethodHandler; import org.apache.dubbo.rpc.protocol.tri.observer.ServerCallToObserverAdapter; -import org.apache.dubbo.rpc.protocol.tri.reactive.handler.ManyToManyMethodHandler; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/reactive/ManyToOneMethodHandlerTest.java b/dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo/reactive/ManyToOneMethodHandlerTest.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/reactive/ManyToOneMethodHandlerTest.java rename to dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo/reactive/ManyToOneMethodHandlerTest.java index 6cdde8d251..e3e3302c7b 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/reactive/ManyToOneMethodHandlerTest.java +++ b/dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo/reactive/ManyToOneMethodHandlerTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive; +package org.apache.dubbo.reactive; import org.apache.dubbo.common.stream.StreamObserver; +import org.apache.dubbo.reactive.handler.ManyToOneMethodHandler; import org.apache.dubbo.rpc.protocol.tri.observer.ServerCallToObserverAdapter; -import org.apache.dubbo.rpc.protocol.tri.reactive.handler.ManyToOneMethodHandler; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/reactive/OneToManyMethodHandlerTest.java b/dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo/reactive/OneToManyMethodHandlerTest.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/reactive/OneToManyMethodHandlerTest.java rename to dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo/reactive/OneToManyMethodHandlerTest.java index 42b64536f1..ac0c8d975f 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/reactive/OneToManyMethodHandlerTest.java +++ b/dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo/reactive/OneToManyMethodHandlerTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive; +package org.apache.dubbo.reactive; +import org.apache.dubbo.reactive.handler.OneToManyMethodHandler; import org.apache.dubbo.rpc.protocol.tri.observer.ServerCallToObserverAdapter; -import org.apache.dubbo.rpc.protocol.tri.reactive.handler.OneToManyMethodHandler; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/reactive/OneToOneMethodHandlerTest.java b/dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo/reactive/OneToOneMethodHandlerTest.java similarity index 91% rename from dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/reactive/OneToOneMethodHandlerTest.java rename to dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo/reactive/OneToOneMethodHandlerTest.java index 5ba898ca8d..6d6a2fcde8 100644 --- a/dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/reactive/OneToOneMethodHandlerTest.java +++ b/dubbo-plugin/dubbo-reactive/src/test/java/org/apache/dubbo/reactive/OneToOneMethodHandlerTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.dubbo.rpc.protocol.tri.reactive; +package org.apache.dubbo.reactive; -import org.apache.dubbo.rpc.protocol.tri.reactive.handler.OneToOneMethodHandler; +import org.apache.dubbo.reactive.handler.OneToOneMethodHandler; import org.junit.jupiter.api.Test; import java.util.concurrent.CompletableFuture; diff --git a/dubbo-plugin/pom.xml b/dubbo-plugin/pom.xml index ed77204583..2df28c30a6 100644 --- a/dubbo-plugin/pom.xml +++ b/dubbo-plugin/pom.xml @@ -31,6 +31,7 @@ dubbo-qos dubbo-auth + dubbo-reactive false diff --git a/dubbo-rpc/dubbo-rpc-triple/pom.xml b/dubbo-rpc/dubbo-rpc-triple/pom.xml index 81e46d1cda..17f141a845 100644 --- a/dubbo-rpc/dubbo-rpc-triple/pom.xml +++ b/dubbo-rpc/dubbo-rpc-triple/pom.xml @@ -34,18 +34,6 @@ 3.4.19 - - org.reactivestreams - reactive-streams - ${reactive.version} - provided - - - io.projectreactor - reactor-core - ${reactor.version} - provided - org.apache.dubbo dubbo-rpc-api @@ -92,6 +80,12 @@ org.xerial.snappy snappy-java + + io.projectreactor + reactor-core + ${reactor.version} + test +