Merge pull request #250 from rabbitmq/rabbitmq-java-client-212

Remove deprecated interfaces and classes

Author: michaelklishin

src/main/java/com/rabbitmq/client/Channel.java

@@ -84,14 +84,6 @@ public interface Channel extends ShutdownNotifier {
      */
     void close(int closeCode, String closeMessage) throws IOException, TimeoutException;
 
-    /**
-     * Deprecated, superseded by TCP back pressure.
-     * Will be removed in next major release.
-     * @deprecated
-     * @see <a href="http://www.rabbitmq.com/alarms.html">Resource-driven alarms</a>
-     */
-    boolean flowBlocked();
-
     /**
      * Abort this channel with the {@link com.rabbitmq.client.AMQP#REPLY_SUCCESS} close code
      * and message 'OK'.
@@ -128,37 +120,6 @@ public interface Channel extends ShutdownNotifier {
      */
     void clearReturnListeners();
 
-    /**
-     * Add a {@link FlowListener}.
-     * Deprecated, superseded by TCP back pressure.
-     * Will be removed in next major release.
-     * @deprecated
-     * @see <a href="http://www.rabbitmq.com/alarms.html">Resource-driven alarms</a>
-     * @param listener the listener to add
-     */
-    void addFlowListener(FlowListener listener);
-
-    /**
-     * Remove a {@link FlowListener}.
-     * Deprecated, superseded by TCP back pressure.
-     * Will be removed in next major release.
-     * @deprecated
-     * @see <a href="http://www.rabbitmq.com/alarms.html">Resource-driven alarms</a>
-     * @param listener the listener to remove
-     * @return <code><b>true</b></code> if the listener was found and removed,
-     * <code><b>false</b></code> otherwise
-     */
-    boolean removeFlowListener(FlowListener listener);
-
-    /**
-     * Remove all {@link FlowListener}s.
-     * Deprecated, superseded by TCP back pressure.
-     * Will be removed in next major release.
-     * @deprecated
-     * @see <a href="http://www.rabbitmq.com/alarms.html">Resource-driven alarms</a>
-     */
-    void clearFlowListeners();
-
     /**
      * Add a {@link ConfirmListener}.
      * @param listener the listener to add

src/main/java/com/rabbitmq/client/ExceptionHandler.java

@@ -38,16 +38,6 @@ public interface ExceptionHandler {
      */
     void handleReturnListenerException(Channel channel, Throwable exception);
 
-    /**
-     * Perform any required exception processing for the situation
-     * when the driver thread for the connection has called a
-     * FlowListener's handleFlow method, and that method has
-     * thrown an exception.
-     * @param channel the ChannelN that held the FlowListener
-     * @param exception the exception thrown by FlowListener.handleFlow
-     */
-    void handleFlowListenerException(Channel channel, Throwable exception);
-
     /**
      * Perform any required exception processing for the situation
      * when the driver thread for the connection has called a

src/main/java/com/rabbitmq/client/FlowListener.java

@@ -64,8 +64,6 @@ public class ChannelN extends AMQChannel implements com.rabbitmq.client.Channel
     /* All listeners collections are in CopyOnWriteArrayList objects */
     /** The ReturnListener collection. */
     private final Collection<ReturnListener> returnListeners = new CopyOnWriteArrayList<ReturnListener>();
-    /** The FlowListener collection. */
-    private final Collection<FlowListener> flowListeners = new CopyOnWriteArrayList<FlowListener>();
     /** The ConfirmListener collection. */
     private final Collection<ConfirmListener> confirmListeners = new CopyOnWriteArrayList<ConfirmListener>();
 
@@ -147,24 +145,6 @@ public void clearReturnListeners() {
         returnListeners.clear();
     }
 
-    @Override
-    @Deprecated
-    public void addFlowListener(FlowListener listener) {
-        flowListeners.add(listener);
-    }
-
-    @Override
-    @Deprecated
-    public boolean removeFlowListener(FlowListener listener) {
-        return flowListeners.remove(listener);
-    }
-
-    @Override
-    @Deprecated
-    public void clearFlowListeners() {
-        flowListeners.clear();
-    }
-
     @Override
     public void addConfirmListener(ConfirmListener listener) {
         confirmListeners.add(listener);
@@ -353,7 +333,6 @@ private void releaseChannel() {
                     transmit(new Channel.FlowOk(!_blockContent));
                     _channelMutex.notifyAll();
                 }
-                callFlowListeners(command, channelFlow);
                 return true;
             } else if (method instanceof Basic.Ack) {
                 Basic.Ack ack = (Basic.Ack) method;
@@ -469,16 +448,6 @@ private void callReturnListeners(Command command, Basic.Return basicReturn) {
         }
     }
 
-    private void callFlowListeners(@SuppressWarnings("unused") Command command, Channel.Flow channelFlow) {
-        try {
-            for (FlowListener l : this.flowListeners) {
-                l.handleFlow(channelFlow.getActive());
-            }
-        } catch (Throwable ex) {
-            getConnection().getExceptionHandler().handleFlowListenerException(this, ex);
-        }
-    }
-
     private void callConfirmListeners(@SuppressWarnings("unused") Command command, Basic.Ack ack) {
         try {
             for (ConfirmListener l : this.confirmListeners) {
@@ -1337,13 +1306,6 @@ public Confirm.SelectOk confirmSelect()
 
     }
 
-    /** Public API - {@inheritDoc} */
-    @Override
-    @Deprecated
-    public boolean flowBlocked() {
-        return _blockContent;
-    }
-
     /** Public API - {@inheritDoc} */
     @Override
     public long getNextPublishSeqNo() {

src/main/java/com/rabbitmq/client/NullTrustManager.java

@@ -41,11 +41,6 @@ public void handleReturnListenerException(Channel channel, Throwable exception)
         handleChannelKiller(channel, exception, "ReturnListener.handleReturn");
     }
 
-    @Override
-    public void handleFlowListenerException(Channel channel, Throwable exception) {
-        handleChannelKiller(channel, exception, "FlowListener.handleFlow");
-    }
-
     @Override
     public void handleConfirmListenerException(Channel channel, Throwable exception) {
         handleChannelKiller(channel, exception, "ConfirmListener.handle{N,A}ck");

src/main/java/com/rabbitmq/client/impl/ChannelN.java

@@ -35,11 +35,6 @@ public void handleReturnListenerException(Channel channel, Throwable exception)
         handleChannelKiller(channel, exception, "ReturnListener.handleReturn");
     }
 
-    @Override
-    public void handleFlowListenerException(Channel channel, Throwable exception) {
-        handleChannelKiller(channel, exception, "FlowListener.handleFlow");
-    }
-
     @Override
     public void handleConfirmListenerException(Channel channel, Throwable exception) {
         handleChannelKiller(channel, exception, "ConfirmListener.handle{N,A}ck");

src/main/java/com/rabbitmq/client/impl/ForgivingExceptionHandler.java

@@ -36,7 +36,6 @@ public class AutorecoveringChannel implements RecoverableChannel {
     private final List<RecoveryListener> recoveryListeners = new CopyOnWriteArrayList<RecoveryListener>();
     private final List<ReturnListener> returnListeners = new CopyOnWriteArrayList<ReturnListener>();
     private final List<ConfirmListener> confirmListeners = new CopyOnWriteArrayList<ConfirmListener>();
-    private final List<FlowListener> flowListeners = new CopyOnWriteArrayList<FlowListener>();
     private final Set<String> consumerTags = Collections.synchronizedSet(new HashSet<String>());
     private int prefetchCountConsumer;
     private int prefetchCountGlobal;
@@ -83,12 +82,6 @@ public void close(int closeCode, String closeMessage) throws IOException, Timeou
         }
     }
 
-    @Override
-    @Deprecated
-    public boolean flowBlocked() {
-        return delegate.flowBlocked();
-    }
-
     @Override
     public void abort() throws IOException {
         delegate.abort();
@@ -117,27 +110,6 @@ public void clearReturnListeners() {
         delegate.clearReturnListeners();
     }
 
-    @Override
-    @Deprecated
-    public void addFlowListener(FlowListener listener) {
-        this.flowListeners.add(listener);
-        delegate.addFlowListener(listener);
-    }
-
-    @Override
-    @Deprecated
-    public boolean removeFlowListener(FlowListener listener) {
-        this.flowListeners.remove(listener);
-        return delegate.removeFlowListener(listener);
-    }
-
-    @Override
-    @Deprecated
-    public void clearFlowListeners() {
-        this.flowListeners.clear();
-        delegate.clearFlowListeners();
-    }
-
     @Override
     public void addConfirmListener(ConfirmListener listener) {
         this.confirmListeners.add(listener);
@@ -607,7 +579,6 @@ public void automaticallyRecover(AutorecoveringConnection connection, Connection
         this.recoverShutdownListeners();
         this.recoverReturnListeners();
         this.recoverConfirmListeners();
-        this.recoverFlowListeners();
         this.recoverState();
         this.notifyRecoveryListenersComplete();
     }
@@ -630,13 +601,6 @@ private void recoverConfirmListeners() {
         }
     }
 
-    @Deprecated
-    private void recoverFlowListeners() {
-        for(FlowListener fl : this.flowListeners) {
-            this.delegate.addFlowListener(fl);
-        }
-    }
-
     private void recoverState() throws IOException {
         if (this.prefetchCountConsumer != 0) {
             basicQos(this.prefetchCountConsumer, false);