Skip to content

Commit

Permalink
Code cleanups.
Browse files Browse the repository at this point in the history 
Removed obsolete oej.server.HttpTransport.
Cleaned up ConnectionMetaData.Wrapper.
Simplified ee10 DefaultServlet.ServletCoreRequest.
Other minor cleanups.

Signed-off-by: Simone Bordet <[email protected]>
  • Loading branch information
@sbordet
sbordet committed Oct 24, 2022
1 parent b627814 commit 660093f
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 189 deletions.
30 changes: 14 additions & 16 deletions jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ConnectionMetaData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,83 +78,81 @@ static HostPort getServerAuthority(HttpConfiguration httpConfiguration, Connecti

class Wrapper extends Attributes.Wrapper implements ConnectionMetaData
{
private final ConnectionMetaData _wrapped;

public Wrapper(ConnectionMetaData wrapped)
{
super(wrapped);
_wrapped = wrapped;
}

protected ConnectionMetaData getWrappedConnectionMetaData()
@Override
public ConnectionMetaData getWrapped()
{
return _wrapped;
return (ConnectionMetaData)super.getWrapped();
}

@Override
public String getId()
{
return _wrapped.getId();
return getWrapped().getId();
}

@Override
public HttpConfiguration getHttpConfiguration()
{
return _wrapped.getHttpConfiguration();
return getWrapped().getHttpConfiguration();
}

@Override
public HttpVersion getHttpVersion()
{
return _wrapped.getHttpVersion();
return getWrapped().getHttpVersion();
}

@Override
public String getProtocol()
{
return _wrapped.getProtocol();
return getWrapped().getProtocol();
}

@Override
public Connection getConnection()
{
return _wrapped.getConnection();
return getWrapped().getConnection();
}

@Override
public Connector getConnector()
{
return _wrapped.getConnector();
return getWrapped().getConnector();
}

@Override
public boolean isPersistent()
{
return _wrapped.isPersistent();
return getWrapped().isPersistent();
}

@Override
public boolean isSecure()
{
return _wrapped.isSecure();
return getWrapped().isSecure();
}

@Override
public SocketAddress getRemoteSocketAddress()
{
return _wrapped.getRemoteSocketAddress();
return getWrapped().getRemoteSocketAddress();
}

@Override
public SocketAddress getLocalSocketAddress()
{
return _wrapped.getLocalSocketAddress();
return getWrapped().getLocalSocketAddress();
}

@Override
public HostPort getServerAuthority()
{
return _wrapped.getServerAuthority();
return getWrapped().getServerAuthority();
}
}
}
2 changes: 1 addition & 1 deletion ...-core/jetty-server/src/main/java/org/eclipse/jetty/server/ForwardedRequestCustomizer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ public String toString()
getId(),
remote,
authority,
getWrappedConnectionMetaData()
getWrapped()
);
}
};
Expand Down
71 changes: 0 additions & 71 deletions jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HttpTransport.java
View file

This file was deleted.

8 changes: 4 additions & 4 deletions ...y-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ public Request getLoggedRequest()
return _loggedRequest == null ? this : _loggedRequest;
}

HttpStream getStream()
HttpStream getHttpStream()
{
return getHttpChannel()._stream;
}
Expand Down Expand Up @@ -1013,7 +1013,7 @@ public boolean isPushSupported()
@Override
public void push(MetaData.Request request)
{
getStream().push(request);
getHttpStream().push(request);
}

@Override
Expand Down Expand Up @@ -1047,7 +1047,7 @@ public boolean addErrorListener(Predicate<Throwable> onError)
@Override
public TunnelSupport getTunnelSupport()
{
return getStream().getTunnelSupport();
return getHttpStream().getTunnelSupport();
}

@Override
Expand Down Expand Up @@ -1468,7 +1468,7 @@ private boolean lockedOnComplete()
public InvocationType getInvocationType()
{
// TODO review this as it is probably not correct
return _request.getStream().getInvocationType();
return _request.getHttpStream().getInvocationType();
}
}

Expand Down
86 changes: 3 additions & 83 deletions ...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/DefaultServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,13 @@
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpHeaderValue;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.http.HttpURI;
import org.eclipse.jetty.http.MetaData;
import org.eclipse.jetty.http.MimeTypes;
import org.eclipse.jetty.io.ByteBufferInputStream;
import org.eclipse.jetty.io.Content;
import org.eclipse.jetty.server.Components;
import org.eclipse.jetty.server.ConnectionMetaData;
import org.eclipse.jetty.server.Context;
import org.eclipse.jetty.server.HttpStream;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.ResourceContentFactory;
import org.eclipse.jetty.server.ResourceService;
import org.eclipse.jetty.server.Response;
import org.eclipse.jetty.server.TunnelSupport;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.util.Blocker;
import org.eclipse.jetty.util.BufferUtil;
Expand Down Expand Up @@ -372,7 +365,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
if (coreResponse.isCommitted())
{
if (LOG.isDebugEnabled())
LOG.debug("Response already committed for {}", coreRequest._request.getHttpURI());
LOG.debug("Response already committed for {}", coreRequest.getHttpURI());
return;
}

Expand Down Expand Up @@ -419,19 +412,18 @@ protected void doHead(HttpServletRequest req, HttpServletResponse resp) throws S
doGet(req, resp);
}

private static class ServletCoreRequest implements Request
private static class ServletCoreRequest extends Request.Wrapper
{
// TODO fully implement this class and move it to the top level
// TODO Some methods are directed to core that probably should be intercepted

private final HttpServletRequest _servletRequest;
private final Request _request;
private final HttpFields _httpFields;

ServletCoreRequest(HttpServletRequest request)
{
super(ServletContextRequest.getServletContextRequest(request));
_servletRequest = request;
_request = ServletContextRequest.getServletContextRequest(request);

HttpFields.Mutable fields = HttpFields.build();

Expand All @@ -455,108 +447,36 @@ public HttpFields getHeaders()
return _httpFields;
}

@Override
public HttpFields getTrailers()
{
return _request.getTrailers();
}

@Override
public HttpURI getHttpURI()
{
return _request.getHttpURI();
}

@Override
public String getPathInContext()
{
return URIUtil.addPaths(_servletRequest.getServletPath(), _servletRequest.getPathInfo());
}

@Override
public void demand(Runnable demandCallback)
{
_request.demand(demandCallback);
}

@Override
public void fail(Throwable failure)
{
_request.fail(failure);
}

@Override
public String getId()
{
return _servletRequest.getRequestId();
}

@Override
public Components getComponents()
{
return _request.getComponents();
}

@Override
public ConnectionMetaData getConnectionMetaData()
{
return _request.getConnectionMetaData();
}

@Override
public String getMethod()
{
return _servletRequest.getMethod();
}

@Override
public Context getContext()
{
return _request.getContext();
}

@Override
public long getTimeStamp()
{
return _request.getTimeStamp();
}

@Override
public boolean isSecure()
{
return _servletRequest.isSecure();
}

@Override
public Content.Chunk read()
{
return _request.read();
}

@Override
public boolean isPushSupported()
{
return _request.isPushSupported();
}

@Override
public void push(MetaData.Request request)
{
this._request.push(request);
}

@Override
public boolean addErrorListener(Predicate<Throwable> onError)
{
return false;
}

@Override
public TunnelSupport getTunnelSupport()
{
return _request.getTunnelSupport();
}

@Override
public void addHttpStreamWrapper(Function<HttpStream, HttpStream.Wrapper> wrapper)
{
Expand Down
2 changes: 0 additions & 2 deletions ...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -838,8 +838,6 @@ protected void execute(Runnable task)
/**
* If a write or similar operation to this channel fails,
* then this method should be called.
* <p>
* The standard implementation calls {@code HttpTransport#abort(Throwable)}.
*
* @param failure the failure that caused the abort.
*/
Expand Down
Loading

0 comments on commit 660093f

Please sign in to comment.