Package Organization (.lease, .rx)

benjchristensen · benjchristensen · commit 42a23e80db82 · 2015-09-21T20:20:24.000-07:00
diff --git a/src/main/java/io/reactivesocket/DuplexConnection.java b/src/main/java/io/reactivesocket/DuplexConnection.java
@@ -19,7 +19,8 @@
 
 import org.reactivestreams.Publisher;
 
-import io.reactivesocket.observable.Observable;
+import io.reactivesocket.rx.Completable;
+import io.reactivesocket.rx.Observable;
 
 /**
  * Represents a connection with input/output that the protocol uses. 
diff --git a/src/main/java/io/reactivesocket/LeaseGovernor.java b/src/main/java/io/reactivesocket/LeaseGovernor.java
@@ -1,6 +1,8 @@
 package io.reactivesocket;
 
 import io.reactivesocket.internal.Responder;
+import io.reactivesocket.lease.NullLeaseGovernor;
+import io.reactivesocket.lease.UnlimitedLeaseGovernor;
 
 public interface LeaseGovernor {
     public static final LeaseGovernor NULL_LEASE_GOVERNOR = new NullLeaseGovernor();
diff --git a/src/main/java/io/reactivesocket/ReactiveSocket.java b/src/main/java/io/reactivesocket/ReactiveSocket.java
@@ -30,9 +30,10 @@
 import io.reactivesocket.internal.Responder;
 import io.reactivesocket.internal.rx.CompositeCompletable;
 import io.reactivesocket.internal.rx.CompositeDisposable;
-import io.reactivesocket.observable.Disposable;
-import io.reactivesocket.observable.Observable;
-import io.reactivesocket.observable.Observer;
+import io.reactivesocket.rx.Completable;
+import io.reactivesocket.rx.Disposable;
+import io.reactivesocket.rx.Observable;
+import io.reactivesocket.rx.Observer;
 import uk.co.real_logic.agrona.BitUtil;
 
 /**
diff --git a/src/main/java/io/reactivesocket/internal/Requester.java b/src/main/java/io/reactivesocket/internal/Requester.java
@@ -29,7 +29,6 @@
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
-import io.reactivesocket.Completable;
 import io.reactivesocket.ConnectionSetupPayload;
 import io.reactivesocket.DuplexConnection;
 import io.reactivesocket.Frame;
@@ -42,8 +41,9 @@
 import io.reactivesocket.internal.rx.BackpressureUtils;
 import io.reactivesocket.internal.rx.EmptyDisposable;
 import io.reactivesocket.internal.rx.EmptySubscription;
-import io.reactivesocket.observable.Disposable;
-import io.reactivesocket.observable.Observer;
+import io.reactivesocket.rx.Completable;
+import io.reactivesocket.rx.Disposable;
+import io.reactivesocket.rx.Observer;
 import uk.co.real_logic.agrona.collections.Int2ObjectHashMap;
 
 /**
diff --git a/src/main/java/io/reactivesocket/internal/Responder.java b/src/main/java/io/reactivesocket/internal/Responder.java
@@ -31,8 +31,9 @@
 import io.reactivesocket.internal.frame.SetupFrameFlyweight;
 import io.reactivesocket.internal.rx.EmptyDisposable;
 import io.reactivesocket.internal.rx.EmptySubscription;
-import io.reactivesocket.observable.Disposable;
-import io.reactivesocket.observable.Observer;
+import io.reactivesocket.rx.Completable;
+import io.reactivesocket.rx.Disposable;
+import io.reactivesocket.rx.Observer;
 import uk.co.real_logic.agrona.collections.Int2ObjectHashMap;
 
 /**
diff --git a/src/main/java/io/reactivesocket/internal/rx/BooleanDisposable.java b/src/main/java/io/reactivesocket/internal/rx/BooleanDisposable.java
@@ -2,7 +2,7 @@
 
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
-import io.reactivesocket.observable.Disposable;
+import io.reactivesocket.rx.Disposable;
 
 public final class BooleanDisposable implements Disposable {
     volatile Runnable run;
diff --git a/src/main/java/io/reactivesocket/internal/rx/CompositeCompletable.java b/src/main/java/io/reactivesocket/internal/rx/CompositeCompletable.java
@@ -3,7 +3,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import io.reactivesocket.Completable;
+import io.reactivesocket.rx.Completable;
 
 /**
  * A Completable container that can hold onto multiple other Completables.
diff --git a/src/main/java/io/reactivesocket/internal/rx/CompositeDisposable.java b/src/main/java/io/reactivesocket/internal/rx/CompositeDisposable.java
@@ -3,8 +3,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import io.reactivesocket.Completable;
-import io.reactivesocket.observable.Disposable;
+import io.reactivesocket.rx.Completable;
+import io.reactivesocket.rx.Disposable;
 
 /**
  * A Disposable container that can hold onto multiple other Disposables.
diff --git a/src/main/java/io/reactivesocket/internal/rx/EmptyDisposable.java b/src/main/java/io/reactivesocket/internal/rx/EmptyDisposable.java
@@ -15,7 +15,7 @@
  */
 package io.reactivesocket.internal.rx;
 
-import io.reactivesocket.observable.Disposable;
+import io.reactivesocket.rx.Disposable;
 
 public class EmptyDisposable implements Disposable
 {
diff --git a/src/main/java/io/reactivesocket/lease/FairLeaseGovernor.java b/src/main/java/io/reactivesocket/lease/FairLeaseGovernor.java
@@ -1,5 +1,7 @@
-package io.reactivesocket;
+package io.reactivesocket.lease;
 
+import io.reactivesocket.Frame;
+import io.reactivesocket.LeaseGovernor;
 import io.reactivesocket.internal.Responder;
 
 import java.util.HashMap;
diff --git a/src/main/java/io/reactivesocket/lease/NullLeaseGovernor.java b/src/main/java/io/reactivesocket/lease/NullLeaseGovernor.java
@@ -1,5 +1,7 @@
-package io.reactivesocket;
+package io.reactivesocket.lease;
 
+import io.reactivesocket.Frame;
+import io.reactivesocket.LeaseGovernor;
 import io.reactivesocket.internal.Responder;
 
 public class NullLeaseGovernor implements LeaseGovernor {
diff --git a/src/main/java/io/reactivesocket/lease/UnlimitedLeaseGovernor.java b/src/main/java/io/reactivesocket/lease/UnlimitedLeaseGovernor.java
@@ -1,5 +1,7 @@
-package io.reactivesocket;
+package io.reactivesocket.lease;
 
+import io.reactivesocket.Frame;
+import io.reactivesocket.LeaseGovernor;
 import io.reactivesocket.internal.Responder;
 
 public class UnlimitedLeaseGovernor implements LeaseGovernor {
diff --git a/src/main/java/io/reactivesocket/rx/Completable.java b/src/main/java/io/reactivesocket/rx/Completable.java
@@ -1,4 +1,4 @@
-package io.reactivesocket;
+package io.reactivesocket.rx;
 
 public interface Completable {
 
diff --git a/src/main/java/io/reactivesocket/rx/Disposable.java b/src/main/java/io/reactivesocket/rx/Disposable.java
@@ -1,4 +1,4 @@
-package io.reactivesocket.observable;
+package io.reactivesocket.rx;
 
 public interface Disposable {
 
diff --git a/src/main/java/io/reactivesocket/rx/Observable.java b/src/main/java/io/reactivesocket/rx/Observable.java
@@ -1,4 +1,4 @@
-package io.reactivesocket.observable;
+package io.reactivesocket.rx;
 
 public interface Observable<T> {
 
diff --git a/src/main/java/io/reactivesocket/rx/Observer.java b/src/main/java/io/reactivesocket/rx/Observer.java
@@ -1,4 +1,4 @@
-package io.reactivesocket.observable;
+package io.reactivesocket.rx;
 
 public interface Observer<T> {
 
diff --git a/src/main/java/io/reactivesocket/rx/README.md b/src/main/java/io/reactivesocket/rx/README.md
@@ -1,3 +1,3 @@
 Interfaces for `Observable` that does not support backpressure.
 
-TODO: Decide if we just use concrete types from RxJava 2 once this type exists. (Flowable vs Observable)
+TODO: Decide if we just use concrete types from RxJava 2 once this type exists. (Flowable vs Observable) (BenC would prefer this package go away)
diff --git a/src/perf/java/io/reactivesocket/ReactiveSocketPerf.java b/src/perf/java/io/reactivesocket/ReactiveSocketPerf.java
@@ -18,6 +18,7 @@
 
 import io.reactivesocket.internal.PublisherUtils;
 import io.reactivesocket.perfutil.PerfTestConnection;
+import io.reactivesocket.rx.Completable;
 
 @BenchmarkMode(Mode.Throughput)
 @OutputTimeUnit(TimeUnit.SECONDS)
diff --git a/src/perf/java/io/reactivesocket/perfutil/PerfTestConnection.java b/src/perf/java/io/reactivesocket/perfutil/PerfTestConnection.java
@@ -21,10 +21,10 @@
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
-import io.reactivesocket.Completable;
 import io.reactivesocket.DuplexConnection;
 import io.reactivesocket.Frame;
-import io.reactivesocket.observable.Observable;
+import io.reactivesocket.rx.Completable;
+import io.reactivesocket.rx.Observable;
 
 public class PerfTestConnection implements DuplexConnection {
 
diff --git a/src/perf/java/io/reactivesocket/perfutil/PerfUnicastSubjectNoBackpressure.java b/src/perf/java/io/reactivesocket/perfutil/PerfUnicastSubjectNoBackpressure.java
@@ -17,9 +17,9 @@
 
 import java.util.function.Consumer;
 
-import io.reactivesocket.observable.Disposable;
-import io.reactivesocket.observable.Observable;
-import io.reactivesocket.observable.Observer;
+import io.reactivesocket.rx.Disposable;
+import io.reactivesocket.rx.Observable;
+import io.reactivesocket.rx.Observer;
 
 /**
  * The difference between this and the real UnicastSubject is in the `onSubscribe` method where it calls requestN. Not sure that behavior should exist in the producton code. 
diff --git a/src/test/java/io/reactivesocket/LatchedCompletable.java b/src/test/java/io/reactivesocket/LatchedCompletable.java
@@ -18,6 +18,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import io.reactivesocket.rx.Completable;
+
 public class LatchedCompletable implements Completable {
 
     	final CountDownLatch latch;
diff --git a/src/test/java/io/reactivesocket/ReactiveSocketTest.java b/src/test/java/io/reactivesocket/ReactiveSocketTest.java
@@ -35,6 +35,7 @@
 import org.reactivestreams.Publisher;
 
 import io.reactivesocket.internal.PublisherUtils;
+import io.reactivesocket.lease.FairLeaseGovernor;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.observables.ConnectableObservable;
 import io.reactivex.subscribers.TestSubscriber;
diff --git a/src/test/java/io/reactivesocket/SerializedEventBus.java b/src/test/java/io/reactivesocket/SerializedEventBus.java
@@ -18,7 +18,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Consumer;
 
-import io.reactivesocket.observable.Observer;
+import io.reactivesocket.rx.Observer;
 import io.reactivex.subjects.PublishSubject;
 import io.reactivex.subjects.Subject;
 
@@ -66,7 +66,7 @@ public void onComplete() {
 			}
 
 			@Override
-			public void onSubscribe(io.reactivesocket.observable.Disposable d) {
+			public void onSubscribe(io.reactivesocket.rx.Disposable d) {
 				// TODO Auto-generated method stub
 
 			}
diff --git a/src/test/java/io/reactivesocket/TestConnection.java b/src/test/java/io/reactivesocket/TestConnection.java
@@ -21,7 +21,8 @@
 
 import org.reactivestreams.Publisher;
 
-import io.reactivesocket.observable.Observer;
+import io.reactivesocket.rx.Completable;
+import io.reactivesocket.rx.Observer;
 import io.reactivex.Observable;
 import io.reactivex.Scheduler.Worker;
 import io.reactivex.schedulers.Schedulers;
@@ -42,14 +43,14 @@ public void addOutput(Publisher<Frame> o, Completable callback) {
 	}
 
 	@Override
-	public io.reactivesocket.observable.Observable<Frame> getInput() {
-		return new io.reactivesocket.observable.Observable<Frame>() {
+	public io.reactivesocket.rx.Observable<Frame> getInput() {
+		return new io.reactivesocket.rx.Observable<Frame>() {
 
 			@Override
 			public void subscribe(Observer<Frame> o) {
 				toInput.add(o);
 				// we are okay with the race of sending data and cancelling ... since this is "hot" by definition and unsubscribing is a race.
-				o.onSubscribe(new io.reactivesocket.observable.Disposable() {
+				o.onSubscribe(new io.reactivesocket.rx.Disposable() {
 
 					@Override
 					public void dispose() {
diff --git a/src/test/java/io/reactivesocket/TestConnectionWithControlledRequestN.java b/src/test/java/io/reactivesocket/TestConnectionWithControlledRequestN.java
@@ -24,6 +24,8 @@
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
+import io.reactivesocket.rx.Completable;
+
 /**
  * Connection that by defaults only calls request(1) on a Publisher to addOutput. Any further must be done via requestMore(n)
  * <p>
diff --git a/src/test/java/io/reactivesocket/TestTransportRequestN.java b/src/test/java/io/reactivesocket/TestTransportRequestN.java
@@ -30,6 +30,7 @@
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
+import io.reactivesocket.lease.FairLeaseGovernor;
 import io.reactivex.subscribers.TestSubscriber;
 
 /**
diff --git a/src/test/java/io/reactivesocket/internal/RequesterTest.java b/src/test/java/io/reactivesocket/internal/RequesterTest.java
@@ -28,13 +28,13 @@
 
 import org.junit.Test;
 
-import io.reactivesocket.Completable;
 import io.reactivesocket.ConnectionSetupPayload;
 import io.reactivesocket.Frame;
 import io.reactivesocket.FrameType;
 import io.reactivesocket.LatchedCompletable;
 import io.reactivesocket.Payload;
 import io.reactivesocket.TestConnection;
+import io.reactivesocket.rx.Completable;
 import io.reactivex.subscribers.TestSubscriber;
 import io.reactivex.Observable;
 import io.reactivex.subjects.ReplaySubject;

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`	`package io.reactivesocket.internal.rx;`
`17`	`17`
`18`		`-import io.reactivesocket.observable.Disposable;`
	`18`	`+import io.reactivesocket.rx.Disposable;`
`19`	`19`
`20`	`20`	`public class EmptyDisposable implements Disposable`
`21`	`21`	`{`