Skip to content

Commit

Permalink
Remove endpoint specific Handler interfaces since they are no longer
Browse files Browse the repository at this point in the history 
required.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1713250 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
asf-sync-process committed Nov 8, 2015
1 parent 0011784 commit 12b7c66
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 142 deletions.
10 changes: 8 additions & 2 deletions java/org/apache/coyote/ajp/AbstractAjpProtocol.java
View file
Expand Up @@ -21,6 +21,7 @@
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;
Expand Down Expand Up @@ -161,12 +162,12 @@ protected void configureProcessor(AjpProcessor processor) {
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;
}

Expand All @@ -191,5 +192,10 @@ protected AjpProcessor createUpgradeProcessor(SocketWrapperBase<?> socket,
// TODO should fail - throw IOE
return null;
}

@Override
protected Log getLog() {
return proto.getLog();
}
}
}
18 changes: 1 addition & 17 deletions java/org/apache/coyote/ajp/AjpAprProtocol.java
View file
Expand Up @@ -44,7 +44,7 @@ public boolean isAprRequired() {

public AjpAprProtocol() {
super(new AprEndpoint());
AjpConnectionHandler cHandler = new AjpConnectionHandler(this);
AjpConnectionHandler<Long> cHandler = new AjpConnectionHandler<>(this);
setHandler(cHandler);
((AprEndpoint) getEndpoint()).setHandler(cHandler);
}
Expand All @@ -62,20 +62,4 @@ public AjpAprProtocol() {
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;
}
}
}
21 changes: 1 addition & 20 deletions java/org/apache/coyote/ajp/AjpNio2Protocol.java
View file
Expand Up @@ -20,7 +20,6 @@
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;


/**
Expand All @@ -38,7 +37,7 @@ public class AjpNio2Protocol extends AbstractAjpProtocol<Nio2Channel> {

public AjpNio2Protocol() {
super(new Nio2Endpoint());
AjpConnectionHandler cHandler = new AjpConnectionHandler(this);
AjpConnectionHandler<Nio2Channel> cHandler = new AjpConnectionHandler<>(this);
setHandler(cHandler);
((Nio2Endpoint) getEndpoint()).setHandler(cHandler);
}
Expand All @@ -50,22 +49,4 @@ public AjpNio2Protocol() {
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;
}
}
}
20 changes: 1 addition & 19 deletions java/org/apache/coyote/ajp/AjpNioProtocol.java
View file
Expand Up @@ -20,7 +20,6 @@
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.
Expand All @@ -37,7 +36,7 @@ public class AjpNioProtocol extends AbstractAjpProtocol<NioChannel> {

public AjpNioProtocol() {
super(new NioEndpoint());
AjpConnectionHandler cHandler = new AjpConnectionHandler(this);
AjpConnectionHandler<NioChannel> cHandler = new AjpConnectionHandler<>(this);
setHandler(cHandler);
((NioEndpoint) getEndpoint()).setHandler(cHandler);
}
Expand All @@ -49,21 +48,4 @@ public AjpNioProtocol() {
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;
}
}
}
11 changes: 9 additions & 2 deletions java/org/apache/coyote/http11/AbstractHttp11Protocol.java
View file
Expand Up @@ -38,6 +38,7 @@
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;
Expand Down Expand Up @@ -631,13 +632,13 @@ protected void configureProcessor(Http11Processor processor) {
}


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;
}

Expand Down Expand Up @@ -672,5 +673,11 @@ protected Processor createUpgradeProcessor(
return new UpgradeProcessorExternal(socket, leftoverInput, upgradeToken);
}
}


@Override
protected Log getLog() {
return proto.getLog();
}
}
}
18 changes: 1 addition & 17 deletions java/org/apache/coyote/http11/Http11AprProtocol.java
View file
Expand Up @@ -35,7 +35,7 @@ public class Http11AprProtocol extends AbstractHttp11Protocol<Long> {

public Http11AprProtocol() {
super(new AprEndpoint());
Http11ConnectionHandler cHandler = new Http11ConnectionHandler(this);
Http11ConnectionHandler<Long> cHandler = new Http11ConnectionHandler<>(this);
setHandler(cHandler);
((AprEndpoint) getEndpoint()).setHandler(cHandler);
}
Expand Down Expand Up @@ -71,20 +71,4 @@ protected String getNamePrefix() {
return ("http-apr");
}
}


// -------------------- Connection handler --------------------

protected static class Http11ConnectionHandler
extends AbstractHttp11ConnectionHandler<Long> {

Http11ConnectionHandler(Http11AprProtocol proto) {
super(proto);
}

@Override
protected Log getLog() {
return log;
}
}
}
20 changes: 1 addition & 19 deletions java/org/apache/coyote/http11/Http11Nio2Protocol.java
View file
Expand Up @@ -20,7 +20,6 @@
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;


/**
Expand All @@ -33,7 +32,7 @@ public class Http11Nio2Protocol extends AbstractHttp11JsseProtocol<Nio2Channel>

public Http11Nio2Protocol() {
super(new Nio2Endpoint());
Http11ConnectionHandler cHandler = new Http11ConnectionHandler(this);
Http11ConnectionHandler<Nio2Channel> cHandler = new Http11ConnectionHandler<>(this);
setHandler(cHandler);
((Nio2Endpoint) getEndpoint()).setHandler(cHandler);
}
Expand All @@ -53,21 +52,4 @@ protected String getNamePrefix() {
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;
}
}
}
20 changes: 1 addition & 19 deletions java/org/apache/coyote/http11/Http11NioProtocol.java
View file
Expand Up @@ -20,7 +20,6 @@
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;


/**
Expand All @@ -38,7 +37,7 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol<NioChannel> {

public Http11NioProtocol() {
super(new NioEndpoint());
Http11ConnectionHandler cHandler = new Http11ConnectionHandler(this);
Http11ConnectionHandler<NioChannel> cHandler = new Http11ConnectionHandler<>(this);
setHandler(cHandler);
((NioEndpoint) getEndpoint()).setHandler(cHandler);
}
Expand Down Expand Up @@ -85,21 +84,4 @@ protected String getNamePrefix() {
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;
}
}
}
16 changes: 3 additions & 13 deletions java/org/apache/tomcat/util/net/Nio2Endpoint.java
View file
Expand Up @@ -109,10 +109,10 @@ public Nio2Endpoint() {
/**
* 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) {
Expand Down Expand Up @@ -1590,16 +1590,6 @@ public void doClientAuth(SSLSupport sslSupport) {
}


// ------------------------------------------------ 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);
}
Expand Down
18 changes: 4 additions & 14 deletions java/org/apache/tomcat/util/net/NioEndpoint.java
View file
Expand Up @@ -142,10 +142,10 @@ public boolean setProperty(String name, String value) {
/**
* 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; }


/**
Expand Down Expand Up @@ -1455,18 +1455,8 @@ public <A> CompletionState write(ByteBuffer[] srcs, int offset,
}


// ------------------------------------------------ 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.
Expand Down

0 comments on commit 12b7c66

Please sign in to comment.