Tidy up styx-api module. (#267)

* Move Clock and Clocks classes to styx-common. * Move Announcer class into `extension` package. * Restrict `FlowControlDisableOperator` class visibility to package private. * Remove HttpSupport class from styx-api module.
ExpediaGroup · Sep 6, 2018 · c506b27 · c506b27
1 parent 2075eff
commit c506b27
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 55 deletions.
diff --git a/components/api/src/main/java/com/hotels/styx/api/FlowControlDisableOperator.java b/components/api/src/main/java/com/hotels/styx/api/FlowControlDisableOperator.java
@@ -24,7 +24,7 @@
  *
  * @param <E> event type
  */
-public final class FlowControlDisableOperator<E> implements Observable.Operator<E, E> {
+final class FlowControlDisableOperator<E> implements Observable.Operator<E, E> {
     public static <T> FlowControlDisableOperator<T> disableFlowControl() {
         return new FlowControlDisableOperator<T>();
     }

diff --git a/components/api/src/main/java/com/hotels/styx/api/HttpSupport.java b/components/api/src/main/java/com/hotels/styx/api/HttpSupport.java
diff --git a/...n/java/com/hotels/styx/api/Announcer.java → .../hotels/styx/api/extension/Announcer.java b/...n/java/com/hotels/styx/api/Announcer.java → .../hotels/styx/api/extension/Announcer.java
@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  */
-package com.hotels.styx.api;
+package com.hotels.styx.api.extension;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

diff --git a/components/api/src/main/java/com/hotels/styx/api/extension/service/spi/AbstractRegistry.java b/components/api/src/main/java/com/hotels/styx/api/extension/service/spi/AbstractRegistry.java
@@ -17,7 +17,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.MapDifference;
-import com.hotels.styx.api.Announcer;
+import com.hotels.styx.api.extension.Announcer;
 import com.hotels.styx.api.Id;
 import com.hotels.styx.api.Identifiable;
 import org.slf4j.Logger;

diff --git a/...va/com/hotels/styx/api/AnnouncerTest.java → ...els/styx/api/extension/AnnouncerTest.java b/...va/com/hotels/styx/api/AnnouncerTest.java → ...els/styx/api/extension/AnnouncerTest.java
@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  */
-package com.hotels.styx.api;
+package com.hotels.styx.api.extension;
 
 import org.testng.annotations.Test;
 

diff --git a/components/client/src/main/java/com/hotels/styx/client/OriginsInventory.java b/components/client/src/main/java/com/hotels/styx/client/OriginsInventory.java
@@ -21,7 +21,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
-import com.hotels.styx.api.Announcer;
+import com.hotels.styx.api.extension.Announcer;
 import com.hotels.styx.api.HttpHandler;
 import com.hotels.styx.api.Id;
 import com.hotels.styx.api.extension.ActiveOrigins;

diff --git a/...ient/src/main/java/com/hotels/styx/client/connectionpool/stubs/StubConnectionFactory.java b/...ient/src/main/java/com/hotels/styx/client/connectionpool/stubs/StubConnectionFactory.java
@@ -15,7 +15,7 @@
  */
 package com.hotels.styx.client.connectionpool.stubs;
 
-import com.hotels.styx.api.Announcer;
+import com.hotels.styx.api.extension.Announcer;
 import com.hotels.styx.api.HttpRequest;
 import com.hotels.styx.api.HttpResponse;
 import com.hotels.styx.client.Connection;

diff --git a/.../java/com/hotels/styx/client/healthcheck/monitors/ScheduledOriginHealthStatusMonitor.java b/.../java/com/hotels/styx/client/healthcheck/monitors/ScheduledOriginHealthStatusMonitor.java
@@ -16,7 +16,7 @@
 package com.hotels.styx.client.healthcheck.monitors;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.hotels.styx.api.Announcer;
+import com.hotels.styx.api.extension.Announcer;
 import com.hotels.styx.api.extension.Origin;
 import com.hotels.styx.api.extension.service.spi.AbstractStyxService;
 import com.hotels.styx.client.healthcheck.OriginHealthCheckFunction;

diff --git a/...nts/client/src/main/java/com/hotels/styx/client/netty/connectionpool/NettyConnection.java b/...nts/client/src/main/java/com/hotels/styx/client/netty/connectionpool/NettyConnection.java
@@ -16,7 +16,7 @@
 package com.hotels.styx.client.netty.connectionpool;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.hotels.styx.api.Announcer;
+import com.hotels.styx.api.extension.Announcer;
 import com.hotels.styx.api.HttpRequest;
 import com.hotels.styx.api.HttpResponse;
 import com.hotels.styx.client.Connection;

diff --git a/.../main/java/com/hotels/styx/api/Clock.java → .../main/java/com/hotels/styx/api/Clock.java b/.../main/java/com/hotels/styx/api/Clock.java → .../main/java/com/hotels/styx/api/Clock.java
diff --git a/...main/java/com/hotels/styx/api/Clocks.java → ...main/java/com/hotels/styx/api/Clocks.java b/...main/java/com/hotels/styx/api/Clocks.java → ...main/java/com/hotels/styx/api/Clocks.java