Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed TODOs that will not be done.

This commit is contained in:
Greg Wilkins 2023-02-06 17:05:01 +11:00
parent 39c0c09fec
commit d5866d3521
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ContextHandler.java
View File

@ -121,7 +121,6 @@ import org.slf4j.LoggerFactory;
* this alias checker is not required, then {@link #clearAliasChecks()} or {@link #setAliasChecks(List)} should be called.
* </p>
*/
// TODO make this work
@ManagedObject("EE9 Context")
public class ContextHandler extends ScopedHandler implements Attributes, Graceful, Supplier<Handler>
{
@ -282,18 +281,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
return _coreContextHandler.getAllowNullPathInContext();
}
// TODO this is a thought bubble
public void setCanonicalEncodingURIs(boolean encoding)
{
_canonicalEncodingURIs = encoding;
}
// TODO this is a thought bubble
public boolean isCanonicalEncodingURIs()
{
return _canonicalEncodingURIs;
}
/**
* @param allowNullPathInfo true if /context is not redirected to /context/
*/
@ -1653,7 +1640,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
baseRequest.onDispatch(uri, pathInContext);
if (baseUri.getQuery() != null && baseRequest.getQueryString() != null)
// TODO why can't the old map be passed?
baseRequest.mergeQueryParameters(oldUri.getQuery(), baseRequest.getQueryString());
}
@ -2063,7 +2049,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
return _extendedListenerTypes;
}
// TODO Empty implementations - should we merge in ServletContextHandler?
@Override
public RequestDispatcher getNamedDispatcher(String name)
{

4
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/Request.java
View File

@ -1521,9 +1521,7 @@ public class Request implements HttpServletRequest
_uri = coreRequest.getHttpURI();
String pathInContext = org.eclipse.jetty.server.Request.getPathInContext(coreRequest);
_pathInContext = _context.getContextHandler().isCanonicalEncodingURIs()
? pathInContext
: URIUtil.decodePath(pathInContext);
_pathInContext = URIUtil.decodePath(pathInContext);
_httpFields = coreRequest.getHeaders();
setSecure(coreRequest.isSecure());

3
jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/DefaultServlet.java
View File

@ -449,8 +449,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory, Welc
*/
protected Resource resolve(String subUriPath)
{
if (!_contextHandler.isCanonicalEncodingURIs())
subUriPath = URIUtil.encodePath(subUriPath);
subUriPath = URIUtil.encodePath(subUriPath);
Resource r = null;
if (_relativeBaseResource != null)