Merge pull request #174 from NiteshKant/master

Fixes issue #150 #175

rx-netty/src/main/java/io/reactivex/netty/channel/SingleNioLoopProvider.java

@@ -87,7 +87,7 @@ public Future<?> shutdownGracefully(long quietPeriod, long timeout, TimeUnit uni
         }
 
         @Override
-        @SuppressWarnings("deprecation")
+        @Deprecated
         public void shutdown() {
             if (0 == release()) {
                 super.shutdown();

rx-netty/src/main/java/io/reactivex/netty/client/AbstractClientBuilder.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.reactivex.netty.client;
 
 import io.netty.bootstrap.Bootstrap;
@@ -149,12 +150,6 @@ public B withNoIdleConnectionCleanup() {
         return returnBuilder();
     }
 
-    @Deprecated
-    public B withPoolStatsProvider(PoolStatsProvider statsProvider) {
-        getPoolBuilder(true).withPoolStatsProvider(statsProvider);
-        return returnBuilder();
-    }
-
     public PipelineConfigurator<O, I> getPipelineConfigurator() {
         return pipelineConfigurator;
     }

rx-netty/src/main/java/io/reactivex/netty/client/CompositePoolLimitDeterminationStrategy.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.reactivex.netty.client;
 
 import java.util.concurrent.TimeUnit;
@@ -36,12 +37,6 @@ public CompositePoolLimitDeterminationStrategy(PoolLimitDeterminationStrategy...
         this.strategies = strategies;
     }
 
-    @Override
-    @Deprecated
-    public boolean acquireCreationPermit() {
-        return acquireCreationPermit(System.currentTimeMillis(), TimeUnit.MILLISECONDS);
-    }
-
     @Override
     public boolean acquireCreationPermit(long acquireStartTime, TimeUnit timeUnit) {
         for (int i = 0; i < strategies.length; i++) {
@@ -97,19 +92,4 @@ public void onSubscribe() {
             strategy.onCompleted();
         }
     }
-
-    @Override
-    public void onError(Throwable e) {
-        for (PoolLimitDeterminationStrategy strategy : strategies) {
-            strategy.onError(e);
-        }
-    }
-
-    @Override
-    @Deprecated
-    public void onNext(PoolInsightProvider.PoolStateChangeEvent stateChangeEvent) {
-        for (PoolLimitDeterminationStrategy strategy : strategies) {
-            strategy.onNext(stateChangeEvent);
-        }
-    }
 }

rx-netty/src/main/java/io/reactivex/netty/client/ConnectionPool.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.reactivex.netty.client;
 
 import io.reactivex.netty.channel.ObservableConnection;
@@ -24,8 +25,7 @@
  *
  * @author Nitesh Kant
  */
-@SuppressWarnings("deprecation")
-public interface ConnectionPool<I, O> extends PoolInsightProvider, MetricEventsPublisher<ClientMetricsEvent<?>> {
+public interface ConnectionPool<I, O> extends MetricEventsPublisher<ClientMetricsEvent<?>> {
 
     Observable<ObservableConnection<I, O>> acquire();
 

rx-netty/src/main/java/io/reactivex/netty/client/ConnectionPoolBuilder.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.reactivex.netty.client;
 
 import io.reactivex.netty.channel.RxDefaultThreadFactory;
@@ -38,7 +39,6 @@ public class ConnectionPoolBuilder<I, O> {
     private PoolLimitDeterminationStrategy limitDeterminationStrategy = new MaxConnectionsBasedStrategy();
     private ScheduledExecutorService poolIdleCleanupScheduler = SHARED_IDLE_CLEANUP_SCHEDULER;
     private long idleConnectionsTimeoutMillis = PoolConfig.DEFAULT_CONFIG.getMaxIdleTimeMillis();
-    @SuppressWarnings("deprecation") private PoolStatsProvider statsProvider = new PoolStatsImpl();
 
     public ConnectionPoolBuilder(RxClient.ServerInfo serverInfo, ClientChannelFactory<I, O> channelFactory,
                                  MetricEventsSubject<ClientMetricsEvent<?>> eventsSubject) {
@@ -89,11 +89,6 @@ public ConnectionPoolBuilder<I, O> withNoIdleConnectionCleanup() {
         return this;
     }
 
-    public ConnectionPoolBuilder<I, O> withPoolStatsProvider(@SuppressWarnings("deprecation") PoolStatsProvider statsProvider) {
-        this.statsProvider = statsProvider;
-        return this;
-    }
-
     public ConnectionPoolBuilder<I, O> withChannelFactory(ClientChannelFactory<I, O> factory) {
         channelFactory = factory;
         return this;
@@ -121,14 +116,13 @@ public ConnectionPool<I, O> build() {
         PoolConfig poolConfig = new PoolConfig(idleConnectionsTimeoutMillis);
 
         return new ConnectionPoolImpl<I, O>(serverInfo, poolConfig, limitDeterminationStrategy, poolIdleCleanupScheduler,
-                                            statsProvider, connectionFactory, channelFactory, eventsSubject);
+                                            connectionFactory, channelFactory, eventsSubject);
     }
 
     public ConnectionPoolBuilder<I, O> copy(RxClient.ServerInfo serverInfo) {
         ConnectionPoolBuilder<I, O> copy = new ConnectionPoolBuilder<I, O>(serverInfo, channelFactory, connectionFactory,
                                                                            eventsSubject);
         copy.withIdleConnectionsTimeoutMillis(idleConnectionsTimeoutMillis)
-            .withPoolStatsProvider(statsProvider)
             .withPoolIdleCleanupScheduler(poolIdleCleanupScheduler)
             .withConnectionPoolLimitStrategy(limitDeterminationStrategy);
 
@@ -146,9 +140,4 @@ public PoolLimitDeterminationStrategy getLimitDeterminationStrategy() {
     public ScheduledExecutorService getPoolIdleCleanupScheduler() {
         return poolIdleCleanupScheduler;
     }
-
-    @SuppressWarnings("deprecation")
-    public PoolStatsProvider getStatsProvider() {
-        return statsProvider;
-    }
 }