Issue #207 - remove IncomingFrames#incomingError(throwable)

jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/IncomingFrames.java

@@ -25,9 +25,6 @@ import org.eclipse.jetty.websocket.api.FrameCallback;
  */
 public interface IncomingFrames
 {
-    @Deprecated
-    void incomingError(Throwable t);
-
     /**
      * Process the incoming frame.
      * <p>

jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/AbstractExtension.java

@@ -126,12 +126,6 @@ public abstract class AbstractExtension extends AbstractLifeCycle implements Dum
         return policy;
     }
 
-    @Override
-    public void incomingError(Throwable e)
-    {
-        nextIncomingError(e);
-    }
-
     /**
      * Used to indicate that the extension makes use of the RSV1 bit of the base websocket framing.
      * <p>
@@ -171,11 +165,6 @@ public abstract class AbstractExtension extends AbstractLifeCycle implements Dum
         return false;
     }
 
-    protected void nextIncomingError(Throwable e)
-    {
-        this.nextIncoming.incomingError(e);
-    }
-
     protected void nextIncomingFrame(Frame frame, FrameCallback callback)
     {
         log.debug("nextIncomingFrame({})",frame);

jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/ExtensionStack.java

@@ -208,12 +208,6 @@ public class ExtensionStack extends ContainerLifeCycle implements IncomingFrames
         return (this.extensions != null) && (this.extensions.size() > 0);
     }
 
-    @Override
-    public void incomingError(Throwable e)
-    {
-        nextIncoming.incomingError(e);
-    }
-
     @Override
     public void incomingFrame(Frame frame, FrameCallback callback)
     {

jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/identity/IdentityExtension.java

@@ -42,13 +42,6 @@ public class IdentityExtension extends AbstractExtension
         return "identity";
     }
 
-    @Override
-    public void incomingError(Throwable e)
-    {
-        // pass through
-        nextIncomingError(e);
-    }
-
     @Override
     public void incomingFrame(Frame frame, FrameCallback callback)
     {

jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java

@@ -574,7 +574,7 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp
 
     private void notifyError(Throwable cause)
     {
-        extensionStack.incomingError(cause);
+        // FIXME need to forward error to Session (or those interested)
     }
 
     @Override

jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/DummyIncomingFrames.java

@@ -37,12 +37,6 @@ public class DummyIncomingFrames implements IncomingFrames
         this.id = id;
     }
 
-    @Override
-    public void incomingError(Throwable e)
-    {
-        LOG.debug("incomingError()",e);
-    }
-
     @Override
     public void incomingFrame(Frame frame, FrameCallback callback)
     {

jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java

@@ -434,11 +434,6 @@ public class DeflateFrameExtensionTest extends AbstractExtensionTest
                     throw new RuntimeIOException(x);
                 }
             }
-
-            @Override
-            public void incomingError(Throwable t)
-            {
-            }
         });
 
         BinaryFrame frame = new BinaryFrame();

jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/BlockheadClient.java

@@ -97,7 +97,6 @@ public class BlockheadClient implements OutgoingFrames, ConnectionStateListener,
         public long totalParseOps = 0;
 
         public EventQueue<WebSocketFrame> frames = new EventQueue<>();
-        public EventQueue<Throwable> errors = new EventQueue<>();
 
         @Override
         public void run()
@@ -152,7 +151,6 @@ public class BlockheadClient implements OutgoingFrames, ConnectionStateListener,
             StringBuilder str = new StringBuilder();
             str.append("FrameReadingThread[");
             str.append(",frames=" + frames.size());
-            str.append(",errors=" + errors.size());
             str.append(String.format(",totalBytes=%,d",totalBytes));
             str.append(String.format(",totalReadOps=%,d",totalReadOps));
             str.append(String.format(",totalParseOps=%,d",totalParseOps));
@@ -160,12 +158,6 @@ public class BlockheadClient implements OutgoingFrames, ConnectionStateListener,
             return str.toString();
         }
 
-        @Override
-        public synchronized void incomingError(Throwable t)
-        {
-            this.errors.add(t);
-        }
-
         @Override
         public synchronized void incomingFrame(Frame frame, FrameCallback callback)
         {
@@ -175,7 +167,6 @@ public class BlockheadClient implements OutgoingFrames, ConnectionStateListener,
         public synchronized void clear()
         {
             this.frames.clear();
-            this.errors.clear();
         }
     }
 

jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/BlockheadServerConnection.java

@@ -214,12 +214,6 @@ public class BlockheadServerConnection implements IncomingFrames, OutgoingFrames
         return policy;
     }
 
-    @Override
-    public void incomingError(Throwable e)
-    {
-        incomingFrames.incomingError(e);
-    }
-
     @Override
     public void incomingFrame(Frame frame, FrameCallback callback)
     {

jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/IncomingFramesCapture.java

@@ -145,12 +145,6 @@ public class IncomingFramesCapture implements Parser.Handler, IncomingFrames
         return frames;
     }
     
-    @Override
-    public void incomingError(Throwable t)
-    {
-        errors.add(t);
-    }
-    
     @Override
     public void incomingFrame(Frame frame, FrameCallback callback)
     {