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 index a8c3ef6fe6..03ef3684dd 100644 --- 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 event type */ -public final class FlowControlDisableOperator implements Observable.Operator { +final class FlowControlDisableOperator implements Observable.Operator { public static FlowControlDisableOperator disableFlowControl() { return new FlowControlDisableOperator(); } 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 deleted file mode 100644 index cfbda90220..0000000000 --- a/components/api/src/main/java/com/hotels/styx/api/HttpSupport.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - Copyright (C) 2013-2018 Expedia Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ -package com.hotels.styx.api; - -import io.netty.buffer.ByteBuf; -import rx.Observable; - -import java.util.function.Function; - -import static rx.Observable.empty; -import static rx.Observable.just; - -/** - * Common logic for new HTTP message classes. - */ -final class HttpSupport { - private HttpSupport() { - } - - /** - * Encodes a body of arbitrary type, returning an empty observable if the body is null or an empty string - * and otherwise creating an observable of buffers using the provided encoder. - * - * @param body body - * @param encoder encoder - * @param body type - * @return an observable of buffers, may be empty - */ - static Observable encodeBody(T body, Function encoder) { - return body == null || "".equals(body) - ? empty() - : just(encoder.apply(body)); - } -} diff --git a/components/api/src/main/java/com/hotels/styx/api/Announcer.java b/components/api/src/main/java/com/hotels/styx/api/extension/Announcer.java similarity index 98% rename from components/api/src/main/java/com/hotels/styx/api/Announcer.java rename to components/api/src/main/java/com/hotels/styx/api/extension/Announcer.java index 778a37c36d..22103c25fd 100644 --- a/components/api/src/main/java/com/hotels/styx/api/Announcer.java +++ b/components/api/src/main/java/com/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 index 8f84fdc82a..83a149252e 100644 --- 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/components/api/src/test/java/com/hotels/styx/api/AnnouncerTest.java b/components/api/src/test/java/com/hotels/styx/api/extension/AnnouncerTest.java similarity index 98% rename from components/api/src/test/java/com/hotels/styx/api/AnnouncerTest.java rename to components/api/src/test/java/com/hotels/styx/api/extension/AnnouncerTest.java index d353e6e296..b51e6ca853 100644 --- a/components/api/src/test/java/com/hotels/styx/api/AnnouncerTest.java +++ b/components/api/src/test/java/com/hotels/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 index 72ce9ca3a1..2dfab34be9 100644 --- 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/components/client/src/main/java/com/hotels/styx/client/connectionpool/stubs/StubConnectionFactory.java b/components/client/src/main/java/com/hotels/styx/client/connectionpool/stubs/StubConnectionFactory.java index a23ebf46da..724e71871e 100644 --- a/components/client/src/main/java/com/hotels/styx/client/connectionpool/stubs/StubConnectionFactory.java +++ b/components/client/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/components/client/src/main/java/com/hotels/styx/client/healthcheck/monitors/ScheduledOriginHealthStatusMonitor.java b/components/client/src/main/java/com/hotels/styx/client/healthcheck/monitors/ScheduledOriginHealthStatusMonitor.java index cdc33174d6..213f0514ca 100644 --- a/components/client/src/main/java/com/hotels/styx/client/healthcheck/monitors/ScheduledOriginHealthStatusMonitor.java +++ b/components/client/src/main/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/components/client/src/main/java/com/hotels/styx/client/netty/connectionpool/NettyConnection.java b/components/client/src/main/java/com/hotels/styx/client/netty/connectionpool/NettyConnection.java index 4282a6bcdd..949513637b 100644 --- a/components/client/src/main/java/com/hotels/styx/client/netty/connectionpool/NettyConnection.java +++ b/components/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/components/api/src/main/java/com/hotels/styx/api/Clock.java b/components/common/src/main/java/com/hotels/styx/api/Clock.java similarity index 100% rename from components/api/src/main/java/com/hotels/styx/api/Clock.java rename to components/common/src/main/java/com/hotels/styx/api/Clock.java diff --git a/components/api/src/main/java/com/hotels/styx/api/Clocks.java b/components/common/src/main/java/com/hotels/styx/api/Clocks.java similarity index 100% rename from components/api/src/main/java/com/hotels/styx/api/Clocks.java rename to components/common/src/main/java/com/hotels/styx/api/Clocks.java