Author: markt
Date: Sun Nov 8 16:52:54 2015
New Revision: 1713250
URL: http://svn.apache.org/viewvc?rev=1713250&view=rev
Log:
Remove endpoint specific Handler interfaces since they are no longer
required.
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1713250&r1=1713249&r2=1713250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Sun Nov 8
16:52:54 2015
@@ -21,6 +21,7 @@ import java.nio.ByteBuffer;
import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.UpgradeProtocol;
import org.apache.coyote.UpgradeToken;
+import org.apache.juli.logging.Log;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -161,12 +162,12 @@ public abstract class AbstractAjpProtoco
processor.setClientCertProvider(getClientCertProvider());
}
- protected abstract static class AbstractAjpConnectionHandler<S>
+ protected static class AjpConnectionHandler<S>
extends AbstractConnectionHandler<S,AjpProcessor> {
private final AbstractAjpProtocol<S> proto;
- public AbstractAjpConnectionHandler(AbstractAjpProtocol<S> proto) {
+ public AjpConnectionHandler(AbstractAjpProtocol<S> proto) {
this.proto = proto;
}
@@ -191,5 +192,10 @@ public abstract class AbstractAjpProtoco
// TODO should fail - throw IOE
return null;
}
+
+ @Override
+ protected Log getLog() {
+ return proto.getLog();
+ }
}
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1713250&r1=1713249&r2=1713250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Sun Nov 8
16:52:54 2015
@@ -44,7 +44,7 @@ public class AjpAprProtocol extends Abst
public AjpAprProtocol() {
super(new AprEndpoint());
- AjpConnectionHandler cHandler = new AjpConnectionHandler(this);
+ AjpConnectionHandler<Long> cHandler = new AjpConnectionHandler<>(this);
setHandler(cHandler);
((AprEndpoint) getEndpoint()).setHandler(cHandler);
}
@@ -62,20 +62,4 @@ public class AjpAprProtocol extends Abst
protected String getNamePrefix() {
return ("ajp-apr");
}
-
-
- // -------------------------------------- AjpConnectionHandler Inner Class
-
- protected static class AjpConnectionHandler
- extends AbstractAjpConnectionHandler<Long> {
-
- public AjpConnectionHandler(AjpAprProtocol proto) {
- super(proto);
- }
-
- @Override
- protected Log getLog() {
- return log;
- }
- }
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1713250&r1=1713249&r2=1713250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Sun Nov 8
16:52:54 2015
@@ -20,7 +20,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.Nio2Channel;
import org.apache.tomcat.util.net.Nio2Endpoint;
-import org.apache.tomcat.util.net.Nio2Endpoint.Handler;
/**
@@ -38,7 +37,7 @@ public class AjpNio2Protocol extends Abs
public AjpNio2Protocol() {
super(new Nio2Endpoint());
- AjpConnectionHandler cHandler = new AjpConnectionHandler(this);
+ AjpConnectionHandler<Nio2Channel> cHandler = new
AjpConnectionHandler<>(this);
setHandler(cHandler);
((Nio2Endpoint) getEndpoint()).setHandler(cHandler);
}
@@ -50,22 +49,4 @@ public class AjpNio2Protocol extends Abs
protected String getNamePrefix() {
return ("ajp-nio2");
}
-
-
- // -------------------------------------- AjpConnectionHandler Inner Class
-
- protected static class AjpConnectionHandler
- extends AbstractAjpConnectionHandler<Nio2Channel>
- implements Handler {
-
- public AjpConnectionHandler(AjpNio2Protocol proto) {
- super(proto);
- }
-
-
- @Override
- protected Log getLog() {
- return log;
- }
- }
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1713250&r1=1713249&r2=1713250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Sun Nov 8
16:52:54 2015
@@ -20,7 +20,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.NioChannel;
import org.apache.tomcat.util.net.NioEndpoint;
-import org.apache.tomcat.util.net.NioEndpoint.Handler;
/**
* This the NIO based protocol handler implementation for AJP.
@@ -37,7 +36,7 @@ public class AjpNioProtocol extends Abst
public AjpNioProtocol() {
super(new NioEndpoint());
- AjpConnectionHandler cHandler = new AjpConnectionHandler(this);
+ AjpConnectionHandler<NioChannel> cHandler = new
AjpConnectionHandler<>(this);
setHandler(cHandler);
((NioEndpoint) getEndpoint()).setHandler(cHandler);
}
@@ -49,21 +48,4 @@ public class AjpNioProtocol extends Abst
protected String getNamePrefix() {
return ("ajp-nio");
}
-
-
- // -------------------------------------- AjpConnectionHandler Inner Class
-
- protected static class AjpConnectionHandler
- extends AbstractAjpConnectionHandler<NioChannel>
- implements Handler {
-
- public AjpConnectionHandler(AjpNioProtocol proto) {
- super(proto);
- }
-
- @Override
- protected Log getLog() {
- return log;
- }
- }
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1713250&r1=1713249&r2=1713250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Sun
Nov 8 16:52:54 2015
@@ -38,6 +38,7 @@ import org.apache.coyote.UpgradeToken;
import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
import org.apache.coyote.http11.upgrade.UpgradeProcessorExternal;
import org.apache.coyote.http11.upgrade.UpgradeProcessorInternal;
+import org.apache.juli.logging.Log;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -631,13 +632,13 @@ public abstract class AbstractHttp11Prot
}
- protected abstract static class AbstractHttp11ConnectionHandler<S>
+ protected static class Http11ConnectionHandler<S>
extends AbstractConnectionHandler<S,Http11Processor> {
private final AbstractHttp11Protocol<S> proto;
- protected AbstractHttp11ConnectionHandler(AbstractHttp11Protocol<S>
proto) {
+ protected Http11ConnectionHandler(AbstractHttp11Protocol<S> proto) {
this.proto = proto;
}
@@ -672,5 +673,11 @@ public abstract class AbstractHttp11Prot
return new UpgradeProcessorExternal(socket, leftoverInput,
upgradeToken);
}
}
+
+
+ @Override
+ protected Log getLog() {
+ return proto.getLog();
+ }
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1713250&r1=1713249&r2=1713250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Sun Nov
8 16:52:54 2015
@@ -35,7 +35,7 @@ public class Http11AprProtocol extends A
public Http11AprProtocol() {
super(new AprEndpoint());
- Http11ConnectionHandler cHandler = new Http11ConnectionHandler(this);
+ Http11ConnectionHandler<Long> cHandler = new
Http11ConnectionHandler<>(this);
setHandler(cHandler);
((AprEndpoint) getEndpoint()).setHandler(cHandler);
}
@@ -71,20 +71,4 @@ public class Http11AprProtocol extends A
return ("http-apr");
}
}
-
-
- // -------------------- Connection handler --------------------
-
- protected static class Http11ConnectionHandler
- extends AbstractHttp11ConnectionHandler<Long> {
-
- Http11ConnectionHandler(Http11AprProtocol proto) {
- super(proto);
- }
-
- @Override
- protected Log getLog() {
- return log;
- }
- }
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1713250&r1=1713249&r2=1713250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Sun Nov
8 16:52:54 2015
@@ -20,7 +20,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.Nio2Channel;
import org.apache.tomcat.util.net.Nio2Endpoint;
-import org.apache.tomcat.util.net.Nio2Endpoint.Handler;
/**
@@ -33,7 +32,7 @@ public class Http11Nio2Protocol extends
public Http11Nio2Protocol() {
super(new Nio2Endpoint());
- Http11ConnectionHandler cHandler = new Http11ConnectionHandler(this);
+ Http11ConnectionHandler<Nio2Channel> cHandler = new
Http11ConnectionHandler<>(this);
setHandler(cHandler);
((Nio2Endpoint) getEndpoint()).setHandler(cHandler);
}
@@ -53,21 +52,4 @@ public class Http11Nio2Protocol extends
return ("http-nio2");
}
}
-
-
- // -------------------- Connection handler --------------------
-
- protected static class Http11ConnectionHandler
- extends AbstractHttp11ConnectionHandler<Nio2Channel>
- implements Handler {
-
- Http11ConnectionHandler(Http11Nio2Protocol proto) {
- super(proto);
- }
-
- @Override
- protected Log getLog() {
- return log;
- }
- }
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1713250&r1=1713249&r2=1713250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Sun Nov
8 16:52:54 2015
@@ -20,7 +20,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.NioChannel;
import org.apache.tomcat.util.net.NioEndpoint;
-import org.apache.tomcat.util.net.NioEndpoint.Handler;
/**
@@ -38,7 +37,7 @@ public class Http11NioProtocol extends A
public Http11NioProtocol() {
super(new NioEndpoint());
- Http11ConnectionHandler cHandler = new Http11ConnectionHandler(this);
+ Http11ConnectionHandler<NioChannel> cHandler = new
Http11ConnectionHandler<>(this);
setHandler(cHandler);
((NioEndpoint) getEndpoint()).setHandler(cHandler);
}
@@ -85,21 +84,4 @@ public class Http11NioProtocol extends A
return ("http-nio");
}
}
-
-
- // -------------------- Connection handler --------------------
-
- protected static class Http11ConnectionHandler
- extends AbstractHttp11ConnectionHandler<NioChannel>
- implements Handler {
-
- Http11ConnectionHandler(Http11NioProtocol proto) {
- super(proto);
- }
-
- @Override
- protected Log getLog() {
- return log;
- }
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1713250&r1=1713249&r2=1713250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Sun Nov 8
16:52:54 2015
@@ -109,10 +109,10 @@ public class Nio2Endpoint extends Abstra
/**
* Handling of accepted sockets.
*/
- private Handler handler = null;
- public void setHandler(Handler handler ) { this.handler = handler; }
+ private Handler<Nio2Channel> handler = null;
+ public void setHandler(Handler<Nio2Channel> handler ) { this.handler =
handler; }
@Override
- public Handler getHandler() { return handler; }
+ public Handler<Nio2Channel> getHandler() { return handler; }
public void setSocketProperties(SocketProperties socketProperties) {
@@ -1590,16 +1590,6 @@ public class Nio2Endpoint extends Abstra
}
- // ------------------------------------------------ Handler Inner Interface
-
- /**
- * Bare bones interface used for socket processing. Per thread data is to
be
- * stored in the ThreadWithAttributes extra folders, or alternately in
- * thread local fields.
- */
- public interface Handler extends AbstractEndpoint.Handler<Nio2Channel> {
- }
-
public static void startInline() {
inlineCompletion.set(Boolean.TRUE);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1713250&r1=1713249&r2=1713250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sun Nov 8
16:52:54 2015
@@ -142,10 +142,10 @@ public class NioEndpoint extends Abstrac
/**
* Handling of accepted sockets.
*/
- private Handler handler = null;
- public void setHandler(Handler handler ) { this.handler = handler; }
+ private Handler<NioChannel> handler = null;
+ public void setHandler(Handler<NioChannel> handler ) { this.handler =
handler; }
@Override
- public Handler getHandler() { return handler; }
+ public Handler<NioChannel> getHandler() { return handler; }
/**
@@ -1455,18 +1455,8 @@ public class NioEndpoint extends Abstrac
}
- // ------------------------------------------------ Handler Inner Interface
-
- /**
- * Bare bones interface used for socket processing. Per thread data is to
be
- * stored in the ThreadWithAttributes extra folders, or alternately in
- * thread local fields.
- */
- public interface Handler extends AbstractEndpoint.Handler<NioChannel> {
- }
-
-
// ---------------------------------------------- SocketProcessor Inner
Class
+
/**
* This class is the equivalent of the Worker, but will simply use in an
* external Executor thread pool.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
