diff options
Diffstat (limited to 'jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java')
| -rw-r--r-- | jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java | 122 |
1 files changed, 36 insertions, 86 deletions
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java b/jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java index d884a3de42..e9d4f3bfcb 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java @@ -32,14 +32,14 @@ import org.eclipse.jetty.util.log.Logger; /* ------------------------------------------------------------ */ -/** +/** */ public class PushBuilderImpl implements PushBuilder -{ +{ private static final Logger LOG = Log.getLogger(PushBuilderImpl.class); private final static HttpField JettyPush = new HttpField("x-http2-push","PushBuilder"); - + private final Request _request; private final HttpFields _fields; private String _method; @@ -49,7 +49,7 @@ public class PushBuilderImpl implements PushBuilder private String _path; private String _etag; private String _lastModified; - + public PushBuilderImpl(Request request, HttpFields fields, String method, String queryString, String sessionId, boolean conditional) { super(); @@ -65,124 +65,88 @@ public class PushBuilderImpl implements PushBuilder } /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#getMethod() - */ @Override public String getMethod() { return _method; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#method(java.lang.String) - */ @Override public PushBuilder method(String method) { _method = method; return this; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#getQueryString() - */ @Override public String getQueryString() { return _queryString; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#queryString(java.lang.String) - */ @Override public PushBuilder queryString(String queryString) { _queryString = queryString; return this; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#getSessionId() - */ @Override public String getSessionId() { return _sessionId; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#sessionId(java.lang.String) - */ @Override public PushBuilder sessionId(String sessionId) { _sessionId = sessionId; return this; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#isConditional() - */ @Override public boolean isConditional() { return _conditional; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#conditional(boolean) - */ @Override public PushBuilder conditional(boolean conditional) { _conditional = conditional; return this; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#getHeaderNames() - */ @Override public Set<String> getHeaderNames() { return _fields.getFieldNamesCollection(); } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#getHeader(java.lang.String) - */ @Override public String getHeader(String name) { return _fields.get(name); } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#setHeader(java.lang.String, java.lang.String) - */ @Override public PushBuilder setHeader(String name,String value) { _fields.put(name,value); return this; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#addHeader(java.lang.String, java.lang.String) - */ @Override public PushBuilder addHeader(String name,String value) { @@ -190,11 +154,15 @@ public class PushBuilderImpl implements PushBuilder return this; } - /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#getPath() - */ + @Override + public PushBuilder removeHeader(String name) + { + _fields.remove(name); + return this; + } + + /* ------------------------------------------------------------ */ @Override public String getPath() { @@ -202,9 +170,6 @@ public class PushBuilderImpl implements PushBuilder } /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#path(java.lang.String) - */ @Override public PushBuilder path(String path) { @@ -213,9 +178,6 @@ public class PushBuilderImpl implements PushBuilder } /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#getEtag() - */ @Override public String getEtag() { @@ -223,9 +185,6 @@ public class PushBuilderImpl implements PushBuilder } /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#etag(java.lang.String) - */ @Override public PushBuilder etag(String etag) { @@ -234,9 +193,6 @@ public class PushBuilderImpl implements PushBuilder } /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#getLastModified() - */ @Override public String getLastModified() { @@ -244,9 +200,6 @@ public class PushBuilderImpl implements PushBuilder } /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#lastModified(java.lang.String) - */ @Override public PushBuilder lastModified(String lastModified) { @@ -255,40 +208,36 @@ public class PushBuilderImpl implements PushBuilder } /* ------------------------------------------------------------ */ - /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#push() - */ @Override public void push() { if (HttpMethod.POST.is(_method) || HttpMethod.PUT.is(_method)) throw new IllegalStateException("Bad Method "+_method); - + if (_path==null || _path.length()==0) throw new IllegalStateException("Bad Path "+_path); - + String path=_path; String query=_queryString; int q=path.indexOf('?'); if (q>=0) { - query=(query!=null && query.length()>0)?(_path.substring(q+1)+'&'+query):_path.substring(q+1); - path=_path.substring(0,q); + query=(query!=null && query.length()>0)?(path.substring(q+1)+'&'+query):path.substring(q+1); + path=path.substring(0,q); } - + if (!path.startsWith("/")) path=URIUtil.addPaths(_request.getContextPath(),path); - + String param=null; if (_sessionId!=null) { if (_request.isRequestedSessionIdFromURL()) param="jsessionid="+_sessionId; - // TODO else + // TODO else // _fields.add("Cookie","JSESSIONID="+_sessionId); } - + if (_conditional) { if (_etag!=null) @@ -296,16 +245,17 @@ public class PushBuilderImpl implements PushBuilder else if (_lastModified!=null) _fields.add(HttpHeader.IF_MODIFIED_SINCE,_lastModified); } - - HttpURI uri = HttpURI.createHttpURI(_request.getScheme(),_request.getServerName(),_request.getServerPort(),_path,param,query,null); + + HttpURI uri = HttpURI.createHttpURI(_request.getScheme(),_request.getServerName(),_request.getServerPort(),path,param,query,null); MetaData.Request push = new MetaData.Request(_method,uri,_request.getHttpVersion(),_fields); - + if (LOG.isDebugEnabled()) LOG.debug("Push {} {} inm={} ims={}",_method,uri,_fields.get(HttpHeader.IF_NONE_MATCH),_fields.get(HttpHeader.IF_MODIFIED_SINCE)); - + _request.getHttpChannel().getHttpTransport().push(push); _path=null; _etag=null; _lastModified=null; } + } |