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

Jetty9 - Cleaned up warnings and dead code.

This commit is contained in:
Simone Bordet 2012-08-08 13:39:57 +02:00
parent fe99631069
commit c2a62962fc
1 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
View File

@ -33,21 +33,21 @@ public class HttpGenerator
public static final ResponseInfo CONTINUE_100_INFO = new ResponseInfo(HttpVersion.HTTP_1_1,null,-1,100,null,false); public static final ResponseInfo CONTINUE_100_INFO = new ResponseInfo(HttpVersion.HTTP_1_1,null,-1,100,null,false);
public static final ResponseInfo PROGRESS_102_INFO = new ResponseInfo(HttpVersion.HTTP_1_1,null,-1,102,null,false); public static final ResponseInfo PROGRESS_102_INFO = new ResponseInfo(HttpVersion.HTTP_1_1,null,-1,102,null,false);
public final static ResponseInfo RESPONSE_500_INFO = public final static ResponseInfo RESPONSE_500_INFO =
new ResponseInfo(HttpVersion.HTTP_1_1,new HttpFields(){{put(HttpHeader.CONNECTION,HttpHeaderValue.CLOSE);}},0,HttpStatus.INTERNAL_SERVER_ERROR_500,null,false); new ResponseInfo(HttpVersion.HTTP_1_1,new HttpFields(){{put(HttpHeader.CONNECTION,HttpHeaderValue.CLOSE);}},0,HttpStatus.INTERNAL_SERVER_ERROR_500,null,false);
// states // states
public enum Action { FLUSH, COMPLETE, PREPARE }; public enum Action { FLUSH, COMPLETE, PREPARE }
public enum State { START, COMMITTING, COMMITTING_COMPLETING, COMMITTED, COMPLETING, COMPLETING_1XX, END }; public enum State { START, COMMITTING, COMMITTING_COMPLETING, COMMITTED, COMPLETING, COMPLETING_1XX, END }
public enum Result { NEED_CHUNK,NEED_INFO,NEED_HEADER,NEED_BUFFER,FLUSH,FLUSH_CONTENT,OK,SHUTDOWN_OUT}; public enum Result { NEED_CHUNK,NEED_INFO,NEED_HEADER,NEED_BUFFER,FLUSH,FLUSH_CONTENT,OK,SHUTDOWN_OUT}
// other statics // other statics
public static final int CHUNK_SIZE = 12; public static final int CHUNK_SIZE = 12;
private State _state = State.START; private State _state = State.START;
private EndOfContent _content = EndOfContent.UNKNOWN_CONTENT; private EndOfContent _content = EndOfContent.UNKNOWN_CONTENT;
private int _largeContent=4096; private int _largeContent=4096;
private long _contentPrepared = 0; private long _contentPrepared = 0;
private boolean _noContent = false; private boolean _noContent = false;
@ -60,7 +60,7 @@ public class HttpGenerator
{ {
SERVER=StringUtil.getBytes("Server: Jetty("+version+")\015\012"); SERVER=StringUtil.getBytes("Server: Jetty("+version+")\015\012");
} }
/* ------------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------------- */
// data // data
private boolean _needCRLF = false; private boolean _needCRLF = false;
@ -69,7 +69,7 @@ public class HttpGenerator
public HttpGenerator() public HttpGenerator()
{ {
} }
/* ------------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------------- */
public void reset() public void reset()
{ {
@ -105,13 +105,13 @@ public class HttpGenerator
{ {
return _state == state; return _state == state;
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public boolean isIdle() public boolean isIdle()
{ {
return _state == State.START; return _state == State.START;
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public boolean isComplete() public boolean isComplete()
{ {
@ -162,7 +162,7 @@ public class HttpGenerator
{ {
return _contentPrepared>0; return _contentPrepared>0;
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public long getContentPrepared() public long getContentPrepared()
{ {
@ -282,7 +282,7 @@ public class HttpGenerator
{ {
if (info==null) if (info==null)
return Result.NEED_INFO; return Result.NEED_INFO;
if (info instanceof RequestInfo) if (info instanceof RequestInfo)
{ {
if (header==null || header.capacity()<=CHUNK_SIZE) if (header==null || header.capacity()<=CHUNK_SIZE)
@ -424,11 +424,9 @@ public class HttpGenerator
case COMPLETING_1XX: case COMPLETING_1XX:
reset(); reset();
return Result.OK; return Result.OK;
case END: case END:
if (!Boolean.TRUE.equals(_persistent)) return Boolean.TRUE.equals(_persistent) ? Result.OK : Result.SHUTDOWN_OUT;
result=Result.SHUTDOWN_OUT;
return Result.OK;
default: default:
throw new IllegalStateException(); throw new IllegalStateException();
@ -561,7 +559,7 @@ public class HttpGenerator
{ {
final RequestInfo _request=(_info instanceof RequestInfo)?(RequestInfo)_info:null; final RequestInfo _request=(_info instanceof RequestInfo)?(RequestInfo)_info:null;
final ResponseInfo _response=(_info instanceof ResponseInfo)?(ResponseInfo)_info:null; final ResponseInfo _response=(_info instanceof ResponseInfo)?(ResponseInfo)_info:null;
// default field values // default field values
boolean has_server = false; boolean has_server = false;
HttpFields.Field transfer_encoding=null; HttpFields.Field transfer_encoding=null;
@ -739,7 +737,7 @@ public class HttpGenerator
// we have seen all the _content there is, so we can be content-length limited. // we have seen all the _content there is, so we can be content-length limited.
_content=EndOfContent.CONTENT_LENGTH; _content=EndOfContent.CONTENT_LENGTH;
long content_length = _contentPrepared+BufferUtil.length(content); long content_length = _contentPrepared+BufferUtil.length(content);
// Do we need to tell the headers about it // Do we need to tell the headers about it
if ((_response!=null || content_length>0 || content_type ) && !_noContent) if ((_response!=null || content_length>0 || content_type ) && !_noContent)
{ {
@ -770,7 +768,7 @@ public class HttpGenerator
header.put(HttpTokens.CRLF); header.put(HttpTokens.CRLF);
} }
break; break;
case NO_CONTENT: case NO_CONTENT:
if (_response!=null && status >= 200 && status != 204 && status != 304) if (_response!=null && status >= 200 && status != 204 && status != 304)
header.put(CONTENT_LENGTH_0); header.put(CONTENT_LENGTH_0);
@ -870,7 +868,7 @@ public class HttpGenerator
getClass().getSimpleName(), getClass().getSimpleName(),
_state); _state);
} }
/* ------------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------------- */
@ -884,8 +882,7 @@ public class HttpGenerator
private static final byte[] CRLF = StringUtil.getBytes("\015\012"); private static final byte[] CRLF = StringUtil.getBytes("\015\012");
private static final byte[] TRANSFER_ENCODING_CHUNKED = StringUtil.getBytes("Transfer-Encoding: chunked\015\012"); private static final byte[] TRANSFER_ENCODING_CHUNKED = StringUtil.getBytes("Transfer-Encoding: chunked\015\012");
private static byte[] SERVER = StringUtil.getBytes("Server: Jetty(7.0.x)\015\012"); private static byte[] SERVER = StringUtil.getBytes("Server: Jetty(7.0.x)\015\012");
private static final byte[] NO_BYTES = {};
/* ------------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------------- */
@ -933,14 +930,14 @@ public class HttpGenerator
final HttpVersion _httpVersion; final HttpVersion _httpVersion;
final HttpFields _httpFields; final HttpFields _httpFields;
final long _contentLength; final long _contentLength;
private Info(HttpVersion httpVersion, HttpFields httpFields, long contentLength) private Info(HttpVersion httpVersion, HttpFields httpFields, long contentLength)
{ {
_httpVersion = httpVersion; _httpVersion = httpVersion;
_httpFields = httpFields; _httpFields = httpFields;
_contentLength = contentLength; _contentLength = contentLength;
} }
public HttpVersion getHttpVersion() public HttpVersion getHttpVersion()
{ {
return _httpVersion; return _httpVersion;
@ -954,42 +951,42 @@ public class HttpGenerator
return _contentLength; return _contentLength;
} }
} }
public static class RequestInfo extends Info public static class RequestInfo extends Info
{ {
private final String _method; private final String _method;
private final String _uri; private final String _uri;
public RequestInfo(HttpVersion httpVersion, HttpFields httpFields, long contentLength, String method, String uri) public RequestInfo(HttpVersion httpVersion, HttpFields httpFields, long contentLength, String method, String uri)
{ {
super(httpVersion,httpFields,contentLength); super(httpVersion,httpFields,contentLength);
_method = method; _method = method;
_uri = uri; _uri = uri;
} }
public String getMethod() public String getMethod()
{ {
return _method; return _method;
} }
public String getUri() public String getUri()
{ {
return _uri; return _uri;
} }
@Override @Override
public String toString() public String toString()
{ {
return String.format("RequestInfo{%s %s %s,%d}",_method,_uri,_httpVersion,_contentLength); return String.format("RequestInfo{%s %s %s,%d}",_method,_uri,_httpVersion,_contentLength);
} }
} }
public static class ResponseInfo extends Info public static class ResponseInfo extends Info
{ {
private final int _status; private final int _status;
private final String _reason; private final String _reason;
private final boolean _head; private final boolean _head;
public ResponseInfo(HttpVersion httpVersion, HttpFields httpFields, long contentLength, int status, String reason, boolean head) public ResponseInfo(HttpVersion httpVersion, HttpFields httpFields, long contentLength, int status, String reason, boolean head)
{ {
super(httpVersion,httpFields,contentLength); super(httpVersion,httpFields,contentLength);
@ -997,28 +994,28 @@ public class HttpGenerator
_reason = reason; _reason = reason;
_head = head; _head = head;
} }
public boolean isInformational() public boolean isInformational()
{ {
return _status>=100 && _status<200; return _status>=100 && _status<200;
} }
public int getStatus() public int getStatus()
{ {
return _status; return _status;
} }
public String getReason() public String getReason()
{ {
return _reason; return _reason;
} }
public boolean isHead() public boolean isHead()
{ {
return _head; return _head;
} }
@Override @Override
public String toString() public String toString()
{ {
return String.format("ResponseInfo{%s %s %s,%d,%b}",_httpVersion,_status,_reason,_contentLength,_head); return String.format("ResponseInfo{%s %s %s,%d,%b}",_httpVersion,_status,_reason,_contentLength,_head);