More side-effects from making endpoints generic

markt-asf · markt-asf · commit 781411fd1ef1 · 2013-09-03T10:03:22.000Z
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1519627 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org/apache/coyote/AbstractProcessor.java b/java/org/apache/coyote/AbstractProcessor.java
@@ -34,7 +34,7 @@ public abstract class AbstractProcessor<S> implements ActionHook, Processor<S> {
 
     protected Adapter adapter;
     protected final AsyncStateMachine<S> asyncStateMachine;
-    protected final AbstractEndpoint endpoint;
+    protected final AbstractEndpoint<S> endpoint;
     protected final Request request;
     protected final Response response;
     protected SocketWrapper<S> socketWrapper = null;
@@ -51,7 +51,7 @@ protected AbstractProcessor() {
         response = null;
     }
 
-    public AbstractProcessor(AbstractEndpoint endpoint) {
+    public AbstractProcessor(AbstractEndpoint<S> endpoint) {
         this.endpoint = endpoint;
         asyncStateMachine = new AsyncStateMachine<>(this);
 
@@ -66,7 +66,7 @@ public AbstractProcessor(AbstractEndpoint endpoint) {
     /**
      * The endpoint receiving connections that are handled by this processor.
      */
-    protected AbstractEndpoint getEndpoint() {
+    protected AbstractEndpoint<S> getEndpoint() {
         return endpoint;
     }
 
diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java
@@ -43,7 +43,7 @@
 import org.apache.tomcat.util.net.SocketWrapper;
 import org.apache.tomcat.util.res.StringManager;
 
-public abstract class AbstractProtocol implements ProtocolHandler,
+public abstract class AbstractProtocol<S> implements ProtocolHandler,
         MBeanRegistration {
 
     /**
@@ -85,7 +85,7 @@ public abstract class AbstractProtocol implements ProtocolHandler,
      * ProtocolHandler implementation (ProtocolHandler using BIO, requires BIO
      * Endpoint etc.).
      */
-    protected AbstractEndpoint endpoint = null;
+    protected AbstractEndpoint<S> endpoint = null;
 
 
     // ----------------------------------------------- Generic property handling
@@ -573,7 +573,7 @@ protected abstract static class AbstractConnectionHandler<S,P extends Processor<
                 new RecycledProcessors<>(this);
 
 
-        protected abstract AbstractProtocol getProtocol();
+        protected abstract AbstractProtocol<S> getProtocol();
 
 
         @Override
diff --git a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
@@ -237,7 +237,7 @@ public abstract class AbstractAjpProcessor<S> extends AbstractProcessor<S> {
 
     // ------------------------------------------------------------ Constructor
 
-    public AbstractAjpProcessor(int packetSize, AbstractEndpoint endpoint) {
+    public AbstractAjpProcessor(int packetSize, AbstractEndpoint<S> endpoint) {
 
         super(endpoint);
 
diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -23,7 +23,7 @@
 import org.apache.tomcat.util.net.SocketWrapper;
 import org.apache.tomcat.util.res.StringManager;
 
-public abstract class AbstractAjpProtocol extends AbstractProtocol {
+public abstract class AbstractAjpProtocol<S> extends AbstractProtocol<S> {
 
     /**
      * The string manager for this package.
diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java b/java/org/apache/coyote/ajp/AjpAprProtocol.java
@@ -34,7 +34,7 @@
  * @author Remy Maucherat
  * @author Costin Manolache
  */
-public class AjpAprProtocol extends AbstractAjpProtocol {
+public class AjpAprProtocol extends AbstractAjpProtocol<Long> {
 
 
     private static final Log log = LogFactory.getLog(AjpAprProtocol.class);
@@ -113,7 +113,7 @@ public AjpConnectionHandler(AjpAprProtocol proto) {
         }
 
         @Override
-        protected AbstractProtocol getProtocol() {
+        protected AbstractProtocol<Long> getProtocol() {
             return proto;
         }
 
diff --git a/java/org/apache/coyote/ajp/AjpNioProtocol.java b/java/org/apache/coyote/ajp/AjpNioProtocol.java
@@ -38,7 +38,7 @@
  * Processor is single threaded and specific to stream-based protocols,
  * will not fit Jk protocols like JNI.
  */
-public class AjpNioProtocol extends AbstractAjpProtocol {
+public class AjpNioProtocol extends AbstractAjpProtocol<NioChannel> {
 
 
     private static final Log log = LogFactory.getLog(AjpNioProtocol.class);
@@ -99,7 +99,7 @@ public AjpConnectionHandler(AjpNioProtocol proto) {
         }
 
         @Override
-        protected AbstractProtocol getProtocol() {
+        protected AbstractProtocol<NioChannel> getProtocol() {
             return proto;
         }
 
diff --git a/java/org/apache/coyote/ajp/AjpProtocol.java b/java/org/apache/coyote/ajp/AjpProtocol.java
@@ -37,7 +37,7 @@
  * @author Remy Maucherat
  * @author Costin Manolache
  */
-public class AjpProtocol extends AbstractAjpProtocol {
+public class AjpProtocol extends AbstractAjpProtocol<Socket> {
 
 
     private static final Log log = LogFactory.getLog(AjpProtocol.class);
@@ -96,7 +96,7 @@ public AjpConnectionHandler(AjpProtocol proto) {
         }
 
         @Override
-        protected AbstractProtocol getProtocol() {
+        protected AbstractProtocol<Socket> getProtocol() {
             return proto;
         }
 
diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
@@ -239,7 +239,7 @@ public abstract class AbstractHttp11Processor<S> extends AbstractProcessor<S> {
     protected HttpUpgradeHandler httpUpgradeHandler = null;
 
 
-    public AbstractHttp11Processor(AbstractEndpoint endpoint) {
+    public AbstractHttp11Processor(AbstractEndpoint<S> endpoint) {
         super(endpoint);
         userDataHelper = new UserDataHelper(getLog());
     }
diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
@@ -19,7 +19,7 @@
 
 import org.apache.coyote.AbstractProtocol;
 
-public abstract class AbstractHttp11Protocol<S> extends AbstractProtocol {
+public abstract class AbstractHttp11Protocol<S> extends AbstractProtocol<S> {
 
     @Override
     protected String getProtocolName() {
diff --git a/java/org/apache/coyote/http11/AbstractInputBuffer.java b/java/org/apache/coyote/http11/AbstractInputBuffer.java
@@ -242,7 +242,7 @@ public abstract boolean parseRequestLine(boolean useAvailableDataOnly)
     protected abstract boolean fill(boolean block) throws IOException;
 
     protected abstract void init(SocketWrapper<S> socketWrapper,
-            AbstractEndpoint endpoint) throws IOException;
+            AbstractEndpoint<S> endpoint) throws IOException;
 
     protected abstract Log getLog();
 
diff --git a/java/org/apache/coyote/http11/AbstractOutputBuffer.java b/java/org/apache/coyote/http11/AbstractOutputBuffer.java
@@ -386,7 +386,7 @@ public void endRequest() throws IOException {
 
 
     public abstract void init(SocketWrapper<S> socketWrapper,
-            AbstractEndpoint endpoint) throws IOException;
+            AbstractEndpoint<S> endpoint) throws IOException;
 
     public abstract void sendAck() throws IOException;
 
diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java
@@ -223,7 +223,7 @@ protected static class Http11ConnectionHandler
         }
 
         @Override
-        protected AbstractProtocol getProtocol() {
+        protected AbstractProtocol<Long> getProtocol() {
             return proto;
         }
 
diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -157,7 +157,7 @@ protected static class Http11ConnectionHandler
         }
 
         @Override
-        protected AbstractProtocol getProtocol() {
+        protected AbstractProtocol<NioChannel> getProtocol() {
             return proto;
         }
 
diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java
@@ -120,7 +120,7 @@ protected static class Http11ConnectionHandler
         }
 
         @Override
-        protected AbstractProtocol getProtocol() {
+        protected AbstractProtocol<Socket> getProtocol() {
             return proto;
         }
 
diff --git a/java/org/apache/coyote/http11/InternalAprInputBuffer.java b/java/org/apache/coyote/http11/InternalAprInputBuffer.java
@@ -546,7 +546,7 @@ public int doRead(ByteChunk chunk, Request req)
 
     @Override
     protected void init(SocketWrapper<Long> socketWrapper,
-            AbstractEndpoint endpoint) throws IOException {
+            AbstractEndpoint<Long> endpoint) throws IOException {
 
         socket = socketWrapper.getSocket().longValue();
         wrapper = socketWrapper;
diff --git a/java/org/apache/coyote/http11/InternalAprOutputBuffer.java b/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
@@ -83,14 +83,14 @@ public InternalAprOutputBuffer(Response response, int headerBufferSize) {
     private volatile boolean flipped = false;
 
 
-    private AbstractEndpoint endpoint;
+    private AbstractEndpoint<Long> endpoint;
 
 
     // --------------------------------------------------------- Public Methods
 
     @Override
     public void init(SocketWrapper<Long> socketWrapper,
-            AbstractEndpoint endpoint) throws IOException {
+            AbstractEndpoint<Long> endpoint) throws IOException {
 
         wrapper = socketWrapper;
         socket = socketWrapper.getSocket().longValue();
diff --git a/java/org/apache/coyote/http11/InternalInputBuffer.java b/java/org/apache/coyote/http11/InternalInputBuffer.java
@@ -466,7 +466,7 @@ public void recycle() {
 
     @Override
     protected void init(SocketWrapper<Socket> socketWrapper,
-            AbstractEndpoint endpoint) throws IOException {
+            AbstractEndpoint<Socket> endpoint) throws IOException {
         inputStream = socketWrapper.getSocket().getInputStream();
     }
 
diff --git a/java/org/apache/coyote/http11/InternalNioInputBuffer.java b/java/org/apache/coyote/http11/InternalNioInputBuffer.java
@@ -755,7 +755,7 @@ public void recycle() {
 
     @Override
     protected void init(SocketWrapper<NioChannel> socketWrapper,
-            AbstractEndpoint endpoint) throws IOException {
+            AbstractEndpoint<NioChannel> endpoint) throws IOException {
 
         socket = socketWrapper.getSocket();
         if (socket == null) {
diff --git a/java/org/apache/coyote/http11/InternalNioOutputBuffer.java b/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
@@ -73,7 +73,7 @@ public InternalNioOutputBuffer(Response response, int headerBufferSize) {
 
     @Override
     public void init(SocketWrapper<NioChannel> socketWrapper,
-            AbstractEndpoint endpoint) throws IOException {
+            AbstractEndpoint<NioChannel> endpoint) throws IOException {
 
         socket = socketWrapper.getSocket();
         pool = ((NioEndpoint)endpoint).getSelectorPool();
diff --git a/java/org/apache/coyote/http11/InternalOutputBuffer.java b/java/org/apache/coyote/http11/InternalOutputBuffer.java
@@ -87,7 +87,7 @@ public void setSocketBuffer(int socketBufferSize) {
 
     @Override
     public void init(SocketWrapper<Socket> socketWrapper,
-            AbstractEndpoint endpoint) throws IOException {
+            AbstractEndpoint<Socket> endpoint) throws IOException {
 
         outputStream = socketWrapper.getSocket().getOutputStream();
     }
diff --git a/java/org/apache/coyote/http11/NpnHandler.java b/java/org/apache/coyote/http11/NpnHandler.java
@@ -46,7 +46,7 @@ public interface NpnHandler<S> {
      * @param sslContext
      * @param adapter
      */
-    public void init(final AbstractEndpoint ep, long sslContext, Adapter adapter);
+    public void init(final AbstractEndpoint<S> ep, long sslContext, Adapter adapter);
 
     /**
      * Called when a SSLSocket or SSLEngine are first used, to initialize
diff --git a/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java b/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java
@@ -65,7 +65,7 @@ public class SpdyAprNpnHandler implements NpnHandler<Long> {
     private SpdyContext spdyContext;
 
     @Override
-    public void init(final AbstractEndpoint ep, long sslContext,
+    public void init(final AbstractEndpoint<Long> ep, long sslContext,
             final Adapter adapter) {
         spdyContext = new SpdyContext();
         if (sslContext == 0) {
@@ -82,7 +82,7 @@ public void init(final AbstractEndpoint ep, long sslContext,
             @Override
             public void onStream(SpdyConnection con, SpdyStream ch)
                     throws IOException {
-                SpdyProcessor sp = new SpdyProcessor(con, ep);
+                SpdyProcessor<Long> sp = new SpdyProcessor<>(con, ep);
                 sp.setAdapter(adapter);
                 sp.onSynStream(ch);
             }
diff --git a/java/org/apache/coyote/spdy/SpdyProcessor.java b/java/org/apache/coyote/spdy/SpdyProcessor.java
@@ -54,7 +54,7 @@
  *
  * Based on the AJP processor.
  */
-public class SpdyProcessor extends AbstractProcessor<Object> implements
+public class SpdyProcessor<S> extends AbstractProcessor<S> implements
         Runnable {
 
     // TODO: handle input
@@ -80,7 +80,7 @@ public class SpdyProcessor extends AbstractProcessor<Object> implements
 
     private boolean outCommit = false;
 
-    public SpdyProcessor(SpdyConnection spdy, AbstractEndpoint endpoint) {
+    public SpdyProcessor(SpdyConnection spdy, AbstractEndpoint<S> endpoint) {
         super(endpoint);
 
         this.spdy = spdy;
@@ -469,7 +469,7 @@ public boolean isComet() {
     }
 
     @Override
-    public SocketState process(SocketWrapper<Object> socket)
+    public SocketState process(SocketWrapper<S> socket)
             throws IOException {
         throw new IOException("Unimplemented");
     }
diff --git a/java/org/apache/coyote/spdy/SpdyProxyProtocol.java b/java/org/apache/coyote/spdy/SpdyProxyProtocol.java
@@ -49,7 +49,7 @@
  * TODO: if spdy->spdy proxy, info about original spdy stream for pushes.
  *
  */
-public class SpdyProxyProtocol extends AbstractProtocol {
+public class SpdyProxyProtocol extends AbstractProtocol<Socket> {
     private static final Log log = LogFactory.getLog(SpdyProxyProtocol.class);
 
     private final JIoEndpoint.Handler cHandler = new TomcatJioHandler();
@@ -93,7 +93,7 @@ public void start() throws Exception {
         spdyContext.setHandler(new SpdyHandler() {
             @Override
             public void onStream(SpdyConnection con, SpdyStream ch) throws IOException {
-                SpdyProcessor sp = new SpdyProcessor(con, endpoint);
+                SpdyProcessor<Socket> sp = new SpdyProcessor<>(con, endpoint);
                 sp.setAdapter(getAdapter());
                 sp.onSynStream(ch);
             }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`* @author Remy Maucherat`
`35`	`35`	`* @author Costin Manolache`
`36`	`36`	`*/`
`37`		`-public class AjpAprProtocol extends AbstractAjpProtocol {`
	`37`	`+public class AjpAprProtocol extends AbstractAjpProtocol<Long> {`
`38`	`38`
`39`	`39`
`40`	`40`	`private static final Log log = LogFactory.getLog(AjpAprProtocol.class);`
`@@ -113,7 +113,7 @@ public AjpConnectionHandler(AjpAprProtocol proto) {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`@Override`
`116`		`- protected AbstractProtocol getProtocol() {`
	`116`	`+ protected AbstractProtocol<Long> getProtocol() {`
`117`	`117`	`return proto;`
`118`	`118`	`}`
`119`	`119`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`* Processor is single threaded and specific to stream-based protocols,`
`39`	`39`	`* will not fit Jk protocols like JNI.`
`40`	`40`	`*/`
`41`		`-public class AjpNioProtocol extends AbstractAjpProtocol {`
	`41`	`+public class AjpNioProtocol extends AbstractAjpProtocol<NioChannel> {`
`42`	`42`
`43`	`43`
`44`	`44`	`private static final Log log = LogFactory.getLog(AjpNioProtocol.class);`
`@@ -99,7 +99,7 @@ public AjpConnectionHandler(AjpNioProtocol proto) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`@Override`
`102`		`- protected AbstractProtocol getProtocol() {`
	`102`	`+ protected AbstractProtocol<NioChannel> getProtocol() {`
`103`	`103`	`return proto;`
`104`	`104`	`}`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`* @author Remy Maucherat`
`38`	`38`	`* @author Costin Manolache`
`39`	`39`	`*/`
`40`		`-public class AjpProtocol extends AbstractAjpProtocol {`
	`40`	`+public class AjpProtocol extends AbstractAjpProtocol<Socket> {`
`41`	`41`
`42`	`42`
`43`	`43`	`private static final Log log = LogFactory.getLog(AjpProtocol.class);`
`@@ -96,7 +96,7 @@ public AjpConnectionHandler(AjpProtocol proto) {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`@Override`
`99`		`- protected AbstractProtocol getProtocol() {`
	`99`	`+ protected AbstractProtocol<Socket> getProtocol() {`
`100`	`100`	`return proto;`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ public abstract class AbstractHttp11Processor<S> extends AbstractProcessor<S> {`
`239`	`239`	`protected HttpUpgradeHandler httpUpgradeHandler = null;`
`240`	`240`
`241`	`241`
`242`		`- public AbstractHttp11Processor(AbstractEndpoint endpoint) {`
	`242`	`+ public AbstractHttp11Processor(AbstractEndpoint<S> endpoint) {`
`243`	`243`	`super(endpoint);`
`244`	`244`	`userDataHelper = new UserDataHelper(getLog());`
`245`	`245`	`}`