Merge pull request #45 from salesforce/bugfix/unify-namespaces

Fix common namespaces
salesforce · Feb 2, 2018 · c19b553 · c19b553
2 parents f794454 + 37da0ed
commit c19b553
Show file tree

Hide file tree

Showing 26 changed files with 45 additions and 45 deletions.
diff --git a/...sforce/reactivegrpccommon/BiConsumer.java → ...force/reactivegrpc/common/BiConsumer.java b/...sforce/reactivegrpccommon/BiConsumer.java → ...force/reactivegrpc/common/BiConsumer.java
@@ -5,7 +5,7 @@
  *  For full license text, see LICENSE.txt file in the repo root  or https://opensource.org/licenses/BSD-3-Clause
  */
 
-package com.salesforce.reactivegrpccommon;
+package com.salesforce.reactivegrpc.common;
 
 /**
  * Java6 compatibility.

diff --git a/...grpccommon/CancellableStreamObserver.java → ...rpc/common/CancellableStreamObserver.java b/...grpccommon/CancellableStreamObserver.java → ...rpc/common/CancellableStreamObserver.java
@@ -5,7 +5,7 @@
  *  For full license text, see LICENSE.txt file in the repo root  or https://opensource.org/licenses/BSD-3-Clause
  */
 
-package com.salesforce.reactivegrpccommon;
+package com.salesforce.reactivegrpc.common;
 
 import io.grpc.Status;
 import io.grpc.StatusException;

diff --git a/...lesforce/reactivegrpccommon/Consumer.java → ...esforce/reactivegrpc/common/Consumer.java b/...lesforce/reactivegrpccommon/Consumer.java → ...esforce/reactivegrpc/common/Consumer.java
@@ -5,7 +5,7 @@
  *  For full license text, see LICENSE.txt file in the repo root  or https://opensource.org/licenses/BSD-3-Clause
  */
 
-package com.salesforce.reactivegrpccommon;
+package com.salesforce.reactivegrpc.common;
 
 /**
  * Java6 compatibility.

diff --git a/...lesforce/reactivegrpccommon/Function.java → ...esforce/reactivegrpc/common/Function.java b/...lesforce/reactivegrpccommon/Function.java → ...esforce/reactivegrpc/common/Function.java
@@ -5,7 +5,7 @@
  *  For full license text, see LICENSE.txt file in the repo root  or https://opensource.org/licenses/BSD-3-Clause
  */
 
-package com.salesforce.reactivegrpccommon;
+package com.salesforce.reactivegrpc.common;
 
 /**
  * Java6 compatibility.

diff --git a/...ommon/ReactiveConsumerStreamObserver.java → ...ommon/ReactiveConsumerStreamObserver.java b/...ommon/ReactiveConsumerStreamObserver.java → ...ommon/ReactiveConsumerStreamObserver.java
@@ -5,7 +5,7 @@
  *  For full license text, see LICENSE.txt file in the repo root  or https://opensource.org/licenses/BSD-3-Clause
  */
 
-package com.salesforce.reactivegrpccommon;
+package com.salesforce.reactivegrpc.common;
 
 import com.google.common.base.Preconditions;
 import io.grpc.Status;

diff --git a/.../reactivegrpccommon/ReactiveExecutor.java → ...reactivegrpc/common/ReactiveExecutor.java b/.../reactivegrpccommon/ReactiveExecutor.java → ...reactivegrpc/common/ReactiveExecutor.java
@@ -5,7 +5,7 @@
  *  For full license text, see LICENSE.txt file in the repo root  or https://opensource.org/licenses/BSD-3-Clause
  */
 
-package com.salesforce.reactivegrpccommon;
+package com.salesforce.reactivegrpc.common;
 
 import io.grpc.internal.GrpcUtil;
 import io.grpc.internal.SerializingExecutor;

diff --git a/...activeProducerConsumerStreamObserver.java → ...activeProducerConsumerStreamObserver.java b/...activeProducerConsumerStreamObserver.java → ...activeProducerConsumerStreamObserver.java
@@ -5,7 +5,7 @@
  *  For full license text, see LICENSE.txt file in the repo root  or https://opensource.org/licenses/BSD-3-Clause
  */
 
-package com.salesforce.reactivegrpccommon;
+package com.salesforce.reactivegrpc.common;
 
 import com.google.common.base.Preconditions;
 import io.grpc.stub.ClientCallStreamObserver;

diff --git a/...ommon/ReactiveProducerStreamObserver.java → ...ommon/ReactiveProducerStreamObserver.java b/...ommon/ReactiveProducerStreamObserver.java → ...ommon/ReactiveProducerStreamObserver.java
@@ -5,7 +5,7 @@
  *  For full license text, see LICENSE.txt file in the repo root  or https://opensource.org/licenses/BSD-3-Clause
  */
 
-package com.salesforce.reactivegrpccommon;
+package com.salesforce.reactivegrpc.common;
 
 import com.google.common.base.Preconditions;
 import io.grpc.stub.ClientCallStreamObserver;

diff --git a/...ePublisherBackpressureOnReadyHandler.java → ...ePublisherBackpressureOnReadyHandler.java b/...ePublisherBackpressureOnReadyHandler.java → ...ePublisherBackpressureOnReadyHandler.java
@@ -5,7 +5,7 @@
  *  For full license text, see LICENSE.txt file in the repo root  or https://opensource.org/licenses/BSD-3-Clause
  */
 
-package com.salesforce.reactivegrpccommon;
+package com.salesforce.reactivegrpc.common;
 
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.Runnables;

diff --git a/...mmon/ReactiveStreamObserverPublisher.java → ...mmon/ReactiveStreamObserverPublisher.java b/...mmon/ReactiveStreamObserverPublisher.java → ...mmon/ReactiveStreamObserverPublisher.java
@@ -5,7 +5,7 @@
  *  For full license text, see LICENSE.txt file in the repo root  or https://opensource.org/licenses/BSD-3-Clause
  */
 
-package com.salesforce.reactivegrpccommon;
+package com.salesforce.reactivegrpc.common;
 
 import com.google.common.base.Preconditions;
 import io.grpc.Status;

diff --git a/...common/CancellableStreamObserverTest.java → ...common/CancellableStreamObserverTest.java b/...common/CancellableStreamObserverTest.java → ...common/CancellableStreamObserverTest.java
@@ -5,7 +5,7 @@
  *  For full license text, see LICENSE.txt file in the repo root  or https://opensource.org/licenses/BSD-3-Clause
  */
 
-package com.salesforce.reactivegrpccommon;
+package com.salesforce.reactivegrpc.common;
 
 import io.grpc.Status;
 import io.grpc.stub.ClientResponseObserver;

diff --git a/...lisherBackpressureOnReadyHandlerTest.java → ...lisherBackpressureOnReadyHandlerTest.java b/...lisherBackpressureOnReadyHandlerTest.java → ...lisherBackpressureOnReadyHandlerTest.java
@@ -5,7 +5,7 @@
  *  For full license text, see LICENSE.txt file in the repo root  or https://opensource.org/licenses/BSD-3-Clause
  */
 
-package com.salesforce.reactivegrpccommon;
+package com.salesforce.reactivegrpc.common;
 
 import io.grpc.stub.ClientCallStreamObserver;
 import org.junit.Test;

diff --git a/.../ReactiveStreamObserverPublisherTest.java → .../ReactiveStreamObserverPublisherTest.java b/.../ReactiveStreamObserverPublisherTest.java → .../ReactiveStreamObserverPublisherTest.java
@@ -5,7 +5,7 @@
  *  For full license text, see LICENSE.txt file in the repo root  or https://opensource.org/licenses/BSD-3-Clause
  */
 
-package com.salesforce.reactivegrpccommon;
+package com.salesforce.reactivegrpc.common;
 
 import io.grpc.stub.CallStreamObserver;
 import org.junit.Test;

diff --git a/...egrpcgencommon/ReactiveGrpcGenerator.java → ...activegrpc/gen/ReactiveGrpcGenerator.java b/...egrpcgencommon/ReactiveGrpcGenerator.java → ...activegrpc/gen/ReactiveGrpcGenerator.java
@@ -5,7 +5,7 @@
  *  For full license text, see LICENSE.txt file in the repo root  or https://opensource.org/licenses/BSD-3-Clause
  */
 
-package com.salesforce.reactivegrpcgencommon;
+package com.salesforce.reactivegrpc.gen;
 
 import com.google.common.base.Strings;
 import com.google.common.html.HtmlEscapers;

diff --git a/reactor/reactor-grpc-stub/src/main/java/com/salesforce/reactorgrpc/stub/ClientCalls.java b/reactor/reactor-grpc-stub/src/main/java/com/salesforce/reactorgrpc/stub/ClientCalls.java
@@ -8,8 +8,8 @@
 package com.salesforce.reactorgrpc.stub;
 
 import com.google.common.util.concurrent.Runnables;
-import com.salesforce.reactivegrpccommon.CancellableStreamObserver;
-import com.salesforce.reactivegrpccommon.ReactiveProducerStreamObserver;
+import com.salesforce.reactivegrpc.common.CancellableStreamObserver;
+import com.salesforce.reactivegrpc.common.ReactiveProducerStreamObserver;
 import io.grpc.stub.StreamObserver;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

diff --git a/...rpc-stub/src/main/java/com/salesforce/reactorgrpc/stub/ReactorConsumerStreamObserver.java b/...rpc-stub/src/main/java/com/salesforce/reactorgrpc/stub/ReactorConsumerStreamObserver.java
@@ -7,9 +7,9 @@
 
 package com.salesforce.reactorgrpc.stub;
 
-import com.salesforce.reactivegrpccommon.ReactiveConsumerStreamObserver;
-import com.salesforce.reactivegrpccommon.ReactiveExecutor;
-import com.salesforce.reactivegrpccommon.ReactiveStreamObserverPublisher;
+import com.salesforce.reactivegrpc.common.ReactiveConsumerStreamObserver;
+import com.salesforce.reactivegrpc.common.ReactiveExecutor;
+import com.salesforce.reactivegrpc.common.ReactiveStreamObserverPublisher;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.scheduler.Schedulers;

diff --git a/.../src/main/java/com/salesforce/reactorgrpc/stub/ReactorProducerConsumerStreamObserver.java b/.../src/main/java/com/salesforce/reactorgrpc/stub/ReactorProducerConsumerStreamObserver.java
@@ -7,9 +7,9 @@
 
 package com.salesforce.reactorgrpc.stub;
 
-import com.salesforce.reactivegrpccommon.ReactiveExecutor;
-import com.salesforce.reactivegrpccommon.ReactiveProducerConsumerStreamObserver;
-import com.salesforce.reactivegrpccommon.ReactiveStreamObserverPublisher;
+import com.salesforce.reactivegrpc.common.ReactiveExecutor;
+import com.salesforce.reactivegrpc.common.ReactiveProducerConsumerStreamObserver;
+import com.salesforce.reactivegrpc.common.ReactiveStreamObserverPublisher;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.scheduler.Schedulers;

diff --git a/reactor/reactor-grpc-stub/src/main/java/com/salesforce/reactorgrpc/stub/ServerCalls.java b/reactor/reactor-grpc-stub/src/main/java/com/salesforce/reactorgrpc/stub/ServerCalls.java
@@ -8,9 +8,9 @@
 package com.salesforce.reactorgrpc.stub;
 
 import com.google.common.base.Preconditions;
-import com.salesforce.reactivegrpccommon.ReactiveExecutor;
-import com.salesforce.reactivegrpccommon.ReactivePublisherBackpressureOnReadyHandler;
-import com.salesforce.reactivegrpccommon.ReactiveStreamObserverPublisher;
+import com.salesforce.reactivegrpc.common.ReactiveExecutor;
+import com.salesforce.reactivegrpc.common.ReactivePublisherBackpressureOnReadyHandler;
+import com.salesforce.reactivegrpc.common.ReactiveStreamObserverPublisher;
 import io.grpc.Status;
 import io.grpc.StatusException;
 import io.grpc.StatusRuntimeException;

diff --git a/...st/java/com/salesforce/reactorgrpc/tck/ReactorGrpcSubscriberWhiteboxVerificationTest.java b/...st/java/com/salesforce/reactorgrpc/tck/ReactorGrpcSubscriberWhiteboxVerificationTest.java
@@ -7,7 +7,7 @@
 
 package com.salesforce.reactorgrpc.tck;
 
-import com.salesforce.reactivegrpccommon.ReactivePublisherBackpressureOnReadyHandler;
+import com.salesforce.reactivegrpc.common.ReactivePublisherBackpressureOnReadyHandler;
 import io.grpc.stub.ClientCallStreamObserver;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;

diff --git a/reactor/reactor-grpc/src/main/java/com/salesforce/reactorgrpc/ReactorGrpcGenerator.java b/reactor/reactor-grpc/src/main/java/com/salesforce/reactorgrpc/ReactorGrpcGenerator.java
@@ -8,7 +8,7 @@
 package com.salesforce.reactorgrpc;
 
 import com.salesforce.jprotoc.ProtocPlugin;
-import com.salesforce.reactivegrpcgencommon.ReactiveGrpcGenerator;
+import com.salesforce.reactivegrpc.gen.ReactiveGrpcGenerator;
 
 /**
  * A protoc generator for generating Reactor bindings for gRPC.

diff --git a/rx-java/rxgrpc-stub/src/main/java/com/salesforce/rxgrpc/stub/ClientCalls.java b/rx-java/rxgrpc-stub/src/main/java/com/salesforce/rxgrpc/stub/ClientCalls.java
@@ -8,14 +8,14 @@
 package com.salesforce.rxgrpc.stub;
 
 import com.google.common.util.concurrent.Runnables;
-import com.salesforce.reactivegrpccommon.CancellableStreamObserver;
-import com.salesforce.reactivegrpccommon.ReactiveProducerStreamObserver;
+import com.salesforce.reactivegrpc.common.CancellableStreamObserver;
+import com.salesforce.reactivegrpc.common.ReactiveProducerStreamObserver;
 import io.grpc.stub.StreamObserver;
 import io.reactivex.Flowable;
 import io.reactivex.Single;
 
-import com.salesforce.reactivegrpccommon.BiConsumer;
-import com.salesforce.reactivegrpccommon.Function;
+import com.salesforce.reactivegrpc.common.BiConsumer;
+import com.salesforce.reactivegrpc.common.Function;
 import io.reactivex.SingleEmitter;
 import io.reactivex.SingleOnSubscribe;
 import io.reactivex.functions.Consumer;
@@ -114,13 +114,13 @@ public static <TRequest, TResponse> Single<TResponse> manyToOne(
                     public void subscribe(final SingleEmitter<TResponse> emitter) {
                         final ReactiveProducerStreamObserver<TRequest, TResponse> rxProducerStreamObserver = new ReactiveProducerStreamObserver<TRequest, TResponse>(
                             rxRequest,
-                            new com.salesforce.reactivegrpccommon.Consumer<TResponse>() {
+                            new com.salesforce.reactivegrpc.common.Consumer<TResponse>() {
                                 @Override
                                 public void accept(TResponse t) {
                                     emitter.onSuccess(t);
                                 }
                             },
-                            new com.salesforce.reactivegrpccommon.Consumer<Throwable>() {
+                            new com.salesforce.reactivegrpc.common.Consumer<Throwable>() {
                                 @Override
                                 public void accept(Throwable t) {
                                     emitter.onError(t);

diff --git a/rx-java/rxgrpc-stub/src/main/java/com/salesforce/rxgrpc/stub/RxConsumerStreamObserver.java b/rx-java/rxgrpc-stub/src/main/java/com/salesforce/rxgrpc/stub/RxConsumerStreamObserver.java
@@ -7,9 +7,9 @@
 
 package com.salesforce.rxgrpc.stub;
 
-import com.salesforce.reactivegrpccommon.ReactiveConsumerStreamObserver;
-import com.salesforce.reactivegrpccommon.ReactiveExecutor;
-import com.salesforce.reactivegrpccommon.ReactiveStreamObserverPublisher;
+import com.salesforce.reactivegrpc.common.ReactiveConsumerStreamObserver;
+import com.salesforce.reactivegrpc.common.ReactiveExecutor;
+import com.salesforce.reactivegrpc.common.ReactiveStreamObserverPublisher;
 import io.reactivex.Flowable;
 import io.reactivex.schedulers.Schedulers;
 import org.reactivestreams.Publisher;

diff --git a/...xgrpc-stub/src/main/java/com/salesforce/rxgrpc/stub/RxProducerConsumerStreamObserver.java b/...xgrpc-stub/src/main/java/com/salesforce/rxgrpc/stub/RxProducerConsumerStreamObserver.java
@@ -7,9 +7,9 @@
 
 package com.salesforce.rxgrpc.stub;
 
-import com.salesforce.reactivegrpccommon.ReactiveExecutor;
-import com.salesforce.reactivegrpccommon.ReactiveProducerConsumerStreamObserver;
-import com.salesforce.reactivegrpccommon.ReactiveStreamObserverPublisher;
+import com.salesforce.reactivegrpc.common.ReactiveExecutor;
+import com.salesforce.reactivegrpc.common.ReactiveProducerConsumerStreamObserver;
+import com.salesforce.reactivegrpc.common.ReactiveStreamObserverPublisher;
 import io.reactivex.Flowable;
 import io.reactivex.schedulers.Schedulers;
 import org.reactivestreams.Publisher;

diff --git a/rx-java/rxgrpc-stub/src/main/java/com/salesforce/rxgrpc/stub/ServerCalls.java b/rx-java/rxgrpc-stub/src/main/java/com/salesforce/rxgrpc/stub/ServerCalls.java
@@ -8,10 +8,10 @@
 package com.salesforce.rxgrpc.stub;
 
 import com.google.common.base.Preconditions;
-import com.salesforce.reactivegrpccommon.Function;
-import com.salesforce.reactivegrpccommon.ReactiveExecutor;
-import com.salesforce.reactivegrpccommon.ReactivePublisherBackpressureOnReadyHandler;
-import com.salesforce.reactivegrpccommon.ReactiveStreamObserverPublisher;
+import com.salesforce.reactivegrpc.common.Function;
+import com.salesforce.reactivegrpc.common.ReactiveExecutor;
+import com.salesforce.reactivegrpc.common.ReactivePublisherBackpressureOnReadyHandler;
+import com.salesforce.reactivegrpc.common.ReactiveStreamObserverPublisher;
 import io.grpc.Status;
 import io.grpc.StatusException;
 import io.grpc.StatusRuntimeException;

diff --git a/...tck/src/test/java/com/salesforce/rxgrpc/tck/RxGrpcSubscriberWhiteboxVerificationTest.java b/...tck/src/test/java/com/salesforce/rxgrpc/tck/RxGrpcSubscriberWhiteboxVerificationTest.java
@@ -7,7 +7,7 @@
 
 package com.salesforce.rxgrpc.tck;
 
-import com.salesforce.reactivegrpccommon.ReactivePublisherBackpressureOnReadyHandler;
+import com.salesforce.reactivegrpc.common.ReactivePublisherBackpressureOnReadyHandler;
 import io.grpc.stub.ClientCallStreamObserver;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;

diff --git a/rx-java/rxgrpc/src/main/java/com/salesforce/rxgrpc/RxGrpcGenerator.java b/rx-java/rxgrpc/src/main/java/com/salesforce/rxgrpc/RxGrpcGenerator.java
@@ -8,7 +8,7 @@
 package com.salesforce.rxgrpc;
 
 import com.salesforce.jprotoc.ProtocPlugin;
-import com.salesforce.reactivegrpcgencommon.ReactiveGrpcGenerator;
+import com.salesforce.reactivegrpc.gen.ReactiveGrpcGenerator;
 
 /**
  * A protoc generator for generating ReactiveX 2.0 bindings for gRPC.