Update of /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2537/components/http/impl/src/java/org/jicarilla/http
Modified Files:
HTTPFileReaderImpl.java HTTPMessageGenerator.java
HTTPMessageWriterImpl.java HTTPParserImpl.java
NoopMessageReceivedListener.java
Log Message:
Ran some code analysis tools on the code and changed approximately 200 small things based on that. Nothing shocking (I hope!)
Index: HTTPFileReaderImpl.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/HTTPFileReaderImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HTTPFileReaderImpl.java 26 Feb 2004 15:15:23 -0000 1.1
+++ HTTPFileReaderImpl.java 26 Feb 2004 16:51:55 -0000 1.2
@@ -18,7 +18,7 @@
private Filesystem m_filesystem;
- public HTTPFileReaderImpl( Filesystem fs )
+ public HTTPFileReaderImpl( final Filesystem fs )
{
setFilesystem( fs );
}
@@ -28,20 +28,20 @@
return m_filesystem;
}
- public void setFilesystem( Filesystem filesystem )
+ public void setFilesystem( final Filesystem filesystem )
{
m_filesystem = filesystem;
}
- public int readFile( String file, HTTPMessage res )
+ public int readFile( final String file, final HTTPMessage res )
throws IOException
{
- ReadableByteChannel rbc = getFilesystem().getFile( file );
+ final ReadableByteChannel rbc = getFilesystem().getFile( file );
int size = 0;
while(true)
{
- ByteBuffer buf = ByteBuffer.allocate( BUFFER_SIZE );
- int read = rbc.read( buf );
+ final ByteBuffer buf = ByteBuffer.allocate( BUFFER_SIZE );
+ final int read = rbc.read( buf );
if( read < 0 )
break;
if( read == 0 )
Index: HTTPMessageGenerator.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/HTTPMessageGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- HTTPMessageGenerator.java 25 Jan 2004 22:12:17 -0000 1.4
+++ HTTPMessageGenerator.java 26 Feb 2004 16:51:55 -0000 1.5
@@ -55,8 +55,8 @@
// ----------------------------------------------------------------------
// Constructors
// ----------------------------------------------------------------------
- public HTTPMessageGenerator( ExceptionListener exceptionListener,
- MessageReceivedListener messageListener, ObjectPool messagePool )
+ public HTTPMessageGenerator( final ExceptionListener exceptionListener,
+ final MessageReceivedListener messageListener, final ObjectPool messagePool )
{
Assert.assertNotNull( "exceptionListener argument may not be null",
exceptionListener );
@@ -73,7 +73,7 @@
// ----------------------------------------------------------------------
// Getters/Setters
// ----------------------------------------------------------------------
- public void setMessage( HTTPMessage message )
+ public void setMessage( final HTTPMessage message )
{
m_message = message;
}
@@ -82,7 +82,7 @@
return m_message;
}
- public void setMessageType( boolean isRequest )
+ public void setMessageType( final boolean isRequest )
{
checkState();
m_message.setMessageType( isRequest );
@@ -99,7 +99,7 @@
return m_headerNameCache;
}
- protected void setHeaderNameCache( ByteBuffer headerNameCache )
+ protected void setHeaderNameCache( final ByteBuffer headerNameCache )
{
m_headerNameCache = headerNameCache;
}
@@ -109,7 +109,7 @@
return m_exceptionListener;
}
- protected void setExceptionListener( ExceptionListener exceptionListener )
+ protected void setExceptionListener( final ExceptionListener exceptionListener )
{
m_exceptionListener = exceptionListener;
}
@@ -119,7 +119,7 @@
return m_messageListener;
}
- protected void setMessageListener( MessageReceivedListener messageListener )
+ protected void setMessageListener( final MessageReceivedListener messageListener )
{
m_messageListener = messageListener;
}
@@ -129,7 +129,7 @@
return m_messagePool;
}
- protected void setMessagePool( ObjectPool messagePool )
+ protected void setMessagePool( final ObjectPool messagePool )
{
m_messagePool = messagePool;
}
@@ -161,7 +161,7 @@
public int getBodySize()
{
checkState();
- int type = getBodyType();
+ final int type = getBodyType();
switch( type )
{
case HTTPParser.BODY_TYPE_NONE:
@@ -189,49 +189,49 @@
}
}
- public void foundStartLineFirstField( ByteBuffer firstField )
+ public void foundStartLineFirstField( final ByteBuffer firstField )
{
checkState();
getMessage().setField1( firstField );
}
- public void foundStartLineSecondField( ByteBuffer secondField )
+ public void foundStartLineSecondField( final ByteBuffer secondField )
{
checkState();
getMessage().setField2( secondField );
}
- public void foundStartLineThirdField( ByteBuffer thirdField )
+ public void foundStartLineThirdField( final ByteBuffer thirdField )
{
checkState();
getMessage().setField3( thirdField );
}
- public void foundHeaderName( ByteBuffer header )
+ public void foundHeaderName( final ByteBuffer header )
{
checkState();
setHeaderNameCache( header );
}
- public void foundHeaderValue( ByteBuffer value )
+ public void foundHeaderValue( final ByteBuffer value )
{
checkState();
getMessage().addHeader( getHeaderNameCache(), value );
setHeaderNameCache( null );
}
- public void foundBody( ByteBuffer buffer )
+ public void foundBody( final ByteBuffer buffer )
{
checkState();
getMessage().addBodyPart( buffer );
}
- public void foundFooterName( ByteBuffer footer )
+ public void foundFooterName( final ByteBuffer footer )
{
foundHeaderName( footer );
}
- public void foundFooterValue( ByteBuffer value )
+ public void foundFooterValue( final ByteBuffer value )
{
foundHeaderValue( value );
}
@@ -247,7 +247,7 @@
// Work Interface: HTTPErrorHandler
// ----------------------------------------------------------------------
- public void exceptionOccurred( HTTPException he )
+ public void exceptionOccurred( final HTTPException he )
throws HTTPException
{
m_exceptionListener.exceptionOccurred( he );
@@ -264,22 +264,23 @@
getMessage() );
}
- protected int getTypeFromMessageProperties( int fallbackType )
+ protected int getTypeFromMessageProperties( final int fallbackType )
{
int type = fallbackType;
if(!getMessage().getMessageType())
{
// handle response defaults
- int statuscode = getMessage().getStatusCode();
- if( (statuscode >= 100 && statuscode < 200) ||
- statuscode == 204 ||
- statuscode == 304 )
+ final int statuscode = getMessage().getStatusCode();
+ if( (statuscode >= HTTPEncoding.STATUS_100_Continue &&
+ statuscode < HTTPEncoding.STATUS_200_OK) ||
+ statuscode == HTTPEncoding.STATUS_204_No_Content ||
+ statuscode == HTTPEncoding.STATUS_304_Not_Modified )
type = HTTPParser.BODY_TYPE_NONE;
}
else
{
// handle request defaults
- String method = getMessage().getField1String();
+ final String method = getMessage().getField1String();
if( HTTPEncoding.METHOD_GET.equals( method ) ||
HTTPEncoding.METHOD_HEAD.equals( method ) ||
HTTPEncoding.METHOD_OPTIONS.equals( method ) ||
@@ -294,7 +295,7 @@
protected int getTypeFromHeaders( final int fallbackType )
{
int type = fallbackType;
- Iterator it = getMessage().getHeaders().iterator();
+ final Iterator it = getMessage().getHeaders().iterator();
while( it.hasNext() )
{
// modify based on headers
@@ -317,7 +318,7 @@
protected int getNormalBodySize()
{
// -1 will result in exception!
- Iterator it = getMessage().getHeaders().iterator();
+ final Iterator it = getMessage().getHeaders().iterator();
while( it.hasNext() )
{
Index: HTTPMessageWriterImpl.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/HTTPMessageWriterImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- HTTPMessageWriterImpl.java 19 Jan 2004 22:20:48 -0000 1.3
+++ HTTPMessageWriterImpl.java 26 Feb 2004 16:51:55 -0000 1.4
@@ -61,13 +61,13 @@
// Work Interface: HTTPMessageWriter
// ----------------------------------------------------------------------
- public void write( HTTPMessage m, WritableByteChannel c )
+ public void write( final HTTPMessage m, final WritableByteChannel c )
throws HTTPException, IOException
{
write( m, c, false );
}
- public void write( HTTPMessage m, WritableByteChannel c, boolean close )
+ public void write( final HTTPMessage m, final WritableByteChannel c, final boolean close )
throws HTTPException, IOException
{
writeStartLine( c, m );
@@ -80,7 +80,7 @@
// Helper methods
// ----------------------------------------------------------------------
- protected static void writeStartLine( WritableByteChannel c, HTTPMessage m )
+ protected static void writeStartLine( final WritableByteChannel c, final HTTPMessage m )
throws IOException
{
c.write( m.getField1() );
@@ -94,13 +94,13 @@
c.write( CRLF );
}
- protected static void writeHeaders( HTTPMessage m, WritableByteChannel c )
+ protected static void writeHeaders( final HTTPMessage m, final WritableByteChannel c )
throws IOException
{
- Iterator it = m.getHeaders().iterator();
+ final Iterator it = m.getHeaders().iterator();
while( it.hasNext() )
{
- HTTPField field = (HTTPField)it.next();
+ final HTTPField field = (HTTPField)it.next();
c.write( field.getName() );
COLON_SP.rewind();
@@ -113,10 +113,10 @@
c.write( CRLF );
}
- protected static void writeBody( HTTPMessage m, WritableByteChannel c )
+ protected static void writeBody( final HTTPMessage m, final WritableByteChannel c )
throws IOException
{
- ByteBuffer[] bp = m.getBodyParts();
+ final ByteBuffer[] bp = m.getBodyParts();
for( int i = 0; i < bp.length; i++ )
{
bp[i].rewind();
@@ -124,7 +124,7 @@
}
}
- protected static void closeChannel( boolean close, WritableByteChannel c )
+ protected static void closeChannel( final boolean close, final WritableByteChannel c )
{
if( close )
{
Index: HTTPParserImpl.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/HTTPParserImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- HTTPParserImpl.java 19 Feb 2004 17:28:43 -0000 1.5
+++ HTTPParserImpl.java 26 Feb 2004 16:51:55 -0000 1.6
@@ -89,7 +89,7 @@
// ----------------------------------------------------------------------
// Constructor
// ----------------------------------------------------------------------
- public HTTPParserImpl( HTTPHandler handler, HTTPErrorHandler errorHandler )
+ public HTTPParserImpl( final HTTPHandler handler, final HTTPErrorHandler errorHandler )
{
setHandler( handler );
setErrorHandler( errorHandler );
@@ -105,7 +105,7 @@
return m_handler;
}
- public void setHandler( HTTPHandler handler )
+ public void setHandler( final HTTPHandler handler )
{
Assert.assertNotNull( handler );
m_handler = handler;
@@ -116,7 +116,7 @@
return m_errorHandler;
}
- public void setErrorHandler( HTTPErrorHandler errorHandler )
+ public void setErrorHandler( final HTTPErrorHandler errorHandler )
{
Assert.assertNotNull( errorHandler );
m_errorHandler = errorHandler;
@@ -127,9 +127,9 @@
return c;
}
- protected void setContext( Context c )
+ protected void setContext( final Context context )
{
- this.c = c;
+ this.c = context;
}
// ----------------------------------------------------------------------
@@ -145,14 +145,14 @@
getContext().recycle();
}
- public void parse( ByteBuffer source )
+ public void parse( final ByteBuffer source )
throws HTTPException
{
Assert.assertNotNull( source );
parse( source, source.limit() );
}
- public void parse( ByteBuffer source, int limit )
+ public void parse( final ByteBuffer source, final int limit )
throws HTTPException
{
// validate arguments
@@ -170,7 +170,7 @@
// Parser Core
// ----------------------------------------------------------------------
- protected void doPreParsingSetup( ByteBuffer source, int limit )
+ protected void doPreParsingSetup( final ByteBuffer source, final int limit )
throws HTTPException
{
// set up per-invocation state
@@ -512,7 +512,7 @@
protected void foundHeaderValue()
{
- int newLimit = getContext().source.position() -
+ final int newLimit = getContext().source.position() -
getContext().slice - 3;
getContext().view.limit( newLimit );
@@ -562,7 +562,7 @@
// "multipart/byteranges",
// perhaps
// TODO: support byteranges
- HTTPException ex = new HTTPException(
+ final HTTPException ex = new HTTPException(
HTTPEncoding.STATUS_411_Length_Required );
m_errorHandler.exceptionOccurred( ex );
@@ -635,7 +635,7 @@
protected void gotoBodyState()
{
- int bodyType = getHandler().getBodyType();
+ final int bodyType = getHandler().getBodyType();
Assert.assertTrue(
bodyType == BODY_TYPE_NONE ||
bodyType == BODY_TYPE_CHUNKING ||
@@ -716,7 +716,7 @@
*/
public ByteBuffer leftovers;
- public Context()
+ protected Context()
{
recycle();
}
@@ -748,7 +748,7 @@
/** retrieves expectingToSkipLF and sets it to false. */
public boolean doSkipLF()
{
- boolean tmp = expectingToSkipLF;
+ final boolean tmp = expectingToSkipLF;
expectingToSkipLF = false;
if(tmp)
@@ -854,7 +854,7 @@
if( leftovers == null )
return false;
- int leftoversize = leftovers.limit();
+ final int leftoversize = leftovers.limit();
//if( leftoversize <= 0 )
//{
// newView();
@@ -864,7 +864,7 @@
// make stuff don't get outta hand
checkAgainstReallyBigBuffers( leftoversize );
- int sourcesize = source.limit();
+ final int sourcesize = source.limit();
//if( sourcesize <= 0 )
//{
// source = leftovers;
@@ -873,14 +873,14 @@
// return true;
//}
- int mark = leftoversize;
+ final int mark = leftoversize;
- ByteBuffer union = ByteBuffer.allocate( leftoversize + sourcesize );
+ final ByteBuffer union = ByteBuffer.allocate( leftoversize + sourcesize );
union.put( leftovers );
union.put( source );
union.rewind();
source = union;
- limit = limit + mark;
+ limit += mark;
leftovers = null;
newView();
@@ -898,7 +898,7 @@
*/
public ByteBuffer getAndUnsetView()
{
- ByteBuffer tmp = view;
+ final ByteBuffer tmp = view;
view = null;
return tmp;
}
@@ -911,7 +911,7 @@
*/
public ByteBuffer getAndResetView()
{
- ByteBuffer tmp = view;
+ final ByteBuffer tmp = view;
newView();
return tmp;
}
@@ -932,7 +932,7 @@
leftovers = null;
}
- protected void checkAgainstReallyBigBuffers( int bufferSize )
+ private void checkAgainstReallyBigBuffers( final int bufferSize )
throws HTTPException
{
if( state < LOOKING_FOR_BODY )
Index: NoopMessageReceivedListener.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/NoopMessageReceivedListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NoopMessageReceivedListener.java 4 Jan 2004 16:10:17 -0000 1.2
+++ NoopMessageReceivedListener.java 26 Feb 2004 16:51:55 -0000 1.3
@@ -65,5 +65,5 @@
*/
public class NoopMessageReceivedListener implements MessageReceivedListener
{
- public void messageReceived( HTTPMessage message ) {}
+ public void messageReceived( final HTTPMessage message ) {}
}
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.