Update of /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/plumbing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2537/components/http/impl/src/java/org/jicarilla/http/plumbing
Modified Files:
AbstractStage.java BeanshellHTTPChannelFactory.java
BenchmarkStage.java EchoStage.java FilesystemStage.java
GeneralAndResponseHeadersStage.java HTTPEvent.java
HTTPScreenerBuilderImpl.java HTTPSelector.java
JettyChannelFactory.java JettyStage.java ParsingStage.java
ResponseCompletionStage.java WritingStage.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: AbstractStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/plumbing/AbstractStage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- AbstractStage.java 24 Jan 2004 19:58:15 -0000 1.5
+++ AbstractStage.java 26 Feb 2004 16:51:55 -0000 1.6
@@ -54,15 +54,15 @@
public final static String EXCEPTION_CONTEXT_KEY = "urn:jicarilla:http:context-key:" +
AbstractStage.class.getPackage().getName() + "exception";
- public AbstractStage( Channel channel,
- Sink errorHandler )
+ protected AbstractStage( final Channel channel,
+ final Sink errorHandler )
{
super( channel, errorHandler );
}
- public void put( Object o ) throws InterruptedException
+ public void put( final Object o ) throws InterruptedException
{
- HTTPEvent e = (HTTPEvent)o;
+ final HTTPEvent e = (HTTPEvent)o;
try
{
process( e );
@@ -80,13 +80,13 @@
}
}
- public boolean offer( Object o, long l ) throws InterruptedException
+ public boolean offer( final Object o, final long l ) throws InterruptedException
{
- HTTPEvent e = (HTTPEvent)o;
+ final HTTPEvent e = (HTTPEvent)o;
try
{
process( e );
- boolean result = super.offer( e, l );
+ final boolean result = super.offer( e, l );
return result;
}
catch( HTTPException he )
@@ -103,29 +103,29 @@
return true;
}
- protected void process( HTTPEvent event )
- throws HTTPException, IOException {};
+ protected void process( final HTTPEvent event )
+ throws HTTPException, IOException {}
- public void handleException( HTTPEvent event, Throwable t )
+ public void handleException( final HTTPEvent event, final Throwable t )
throws InterruptedException
{
Assert.assertNotNull( event );
ensureContext( event );
- Map m = event.getContext();
+ final Map m = event.getContext();
if( !m.containsKey( EXCEPTION_CONTEXT_KEY ) )
{
m.put( EXCEPTION_CONTEXT_KEY, t );
if( t instanceof HTTPException )
{
- HTTPException he = (HTTPException)t;
+ final HTTPException he = (HTTPException)t;
event.getHTTPResponse().setStatusCode( he.getCode() );
}
}
handleError( event );
}
- protected static void ensureContext( Event event )
+ protected static void ensureContext( final Event event )
{
Assert.assertNotNull( event );
@@ -133,24 +133,24 @@
event.setContext( new HashMap() );
}
- public static boolean checkExceptionOccured( Event event )
+ public static boolean checkExceptionOccured( final Event event )
{
Assert.assertNotNull( event );
//ensureContext( event );
- Map m = event.getContext();
+ final Map m = event.getContext();
if( m != null && m.containsKey( EXCEPTION_CONTEXT_KEY ) )
return true;
return false;
}
- public static Throwable getThrowable( Event event )
+ public static Throwable getThrowable( final Event event )
{
Assert.assertNotNull( event );
//ensureContext( event );
- Map m = event.getContext();
+ final Map m = event.getContext();
if( m != null && m.containsKey( EXCEPTION_CONTEXT_KEY ) )
return (Throwable)m.get( EXCEPTION_CONTEXT_KEY );
Index: BeanshellHTTPChannelFactory.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/plumbing/BeanshellHTTPChannelFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- BeanshellHTTPChannelFactory.java 25 Jan 2004 22:12:31 -0000 1.5
+++ BeanshellHTTPChannelFactory.java 26 Feb 2004 16:51:55 -0000 1.6
@@ -60,32 +60,32 @@
public Stage createPipeline()
{
- PostProcessor processor = new PostProcessor(
+ final PostProcessor processor = new PostProcessor(
new LinkedQueue(),
new NoopSink()
)
{
- public void put( Object o ) throws InterruptedException
+ public void put( final Object o ) throws InterruptedException
{
- HTTPEvent e = getEvent( o );
+ final HTTPEvent e = getEvent( o );
super.put( e );
}
- public boolean offer( Object o, long l ) throws InterruptedException
+ public boolean offer( final Object o, final long l ) throws InterruptedException
{
- HTTPEvent e = getEvent( o );
+ final HTTPEvent e = getEvent( o );
return super.offer( e, l );
}
- protected HTTPEvent getEvent( Object o )
+ protected HTTPEvent getEvent( final Object o )
{
Assert.assertTrue( o instanceof Event );
if( o instanceof HTTPEvent )
return (HTTPEvent)o;
- Event ev = (Event)o;
- HTTPEvent e = new HTTPEvent();
+ final Event ev = (Event)o;
+ final HTTPEvent e = new HTTPEvent();
e.setChannel( ev.getChannel() );
e.setContext( ev.getContext() );
return e;
Index: BenchmarkStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/plumbing/BenchmarkStage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BenchmarkStage.java 11 Jan 2004 12:28:11 -0000 1.3
+++ BenchmarkStage.java 26 Feb 2004 16:51:55 -0000 1.4
@@ -39,6 +39,8 @@
*/
public class BenchmarkStage extends AbstractStage
{
+ public final static double MILLISECONDS_IN_A_SECOND = 1000.0;
+
public final static String BENCHMARK_STARTED_CONTEXT_KEY =
"urn:jicarilla:http:context-key:" +
BenchmarkStage.class.getPackage().getName() + "benchmark-started";
@@ -46,26 +48,26 @@
"urn:jicarilla:http:context-key:" +
BenchmarkStage.class.getPackage().getName() + "benchmark-start";
- public BenchmarkStage( Channel queue, Sink errorHandler )
+ public BenchmarkStage( final Channel queue, final Sink errorHandler )
{
super( queue, errorHandler );
}
- protected void process( HTTPEvent e )
+ protected void process( final HTTPEvent e )
throws HTTPException, IOException
{
if( !e.getContext().containsKey( BENCHMARK_START_CONTEXT_KEY ) )
{
- long startTime = System.currentTimeMillis();
+ final long startTime = System.currentTimeMillis();
e.getContext().put( BENCHMARK_START_CONTEXT_KEY, new Long( startTime ) );
}
else
{
- long startTime = ((Long)e.getContext().get( BENCHMARK_START_CONTEXT_KEY )).longValue();
+ final long startTime = ((Long)e.getContext().get( BENCHMARK_START_CONTEXT_KEY )).longValue();
e.getHTTPResponse().addHeader(
"Debug-Time-Taken",
- ""+(System.currentTimeMillis() - startTime)/1000.0
+ ""+(System.currentTimeMillis() - startTime)/MILLISECONDS_IN_A_SECOND
);
/*e.getHTTPResponse().addBodyPart(
Index: EchoStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/plumbing/EchoStage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- EchoStage.java 24 Jan 2004 19:58:34 -0000 1.4
+++ EchoStage.java 26 Feb 2004 16:51:55 -0000 1.5
@@ -46,16 +46,16 @@
*/
public class EchoStage extends AbstractStage
{
- public EchoStage( Channel queue, Sink errorHandler )
+ public EchoStage( final Channel queue, final Sink errorHandler )
{
super( queue, errorHandler );
}
- protected void process( HTTPEvent e )
+ protected void process( final HTTPEvent e )
throws HTTPException, IOException
{
- HTTPMessage req = e.getHTTPRequest();
- HTTPMessage res = e.getHTTPResponse();
+ final HTTPMessage req = e.getHTTPRequest();
+ final HTTPMessage res = e.getHTTPResponse();
res.setField1( HTTPEncoding.VERSION_10 );
res.setStatusCode( HTTPEncoding.STATUS_200_OK );
@@ -70,11 +70,11 @@
res.addBodyPart( req.getField3() );
res.addBodyPart( HTTPMessageWriterImpl.CRLF );
- Iterator it = req.getHeaders().iterator();
+ final Iterator it = req.getHeaders().iterator();
while( it.hasNext() )
{
- HTTPField field = (HTTPField)it.next();
+ final HTTPField field = (HTTPField)it.next();
res.addBodyPart( field.getName() );
res.addBodyPart( HTTPMessageWriterImpl.COLON_SP );
@@ -83,7 +83,7 @@
}
res.addBodyPart( HTTPMessageWriterImpl.CRLF );
- ByteBuffer[] bp = req.getBodyParts();
+ final ByteBuffer[] bp = req.getBodyParts();
res.addBodyParts( bp );
e.getContext().put( WritingStage.CLOSE_AFTER_WRITE_CONTEXT_KEY,
Index: FilesystemStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/plumbing/FilesystemStage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- FilesystemStage.java 20 Feb 2004 14:18:49 -0000 1.4
+++ FilesystemStage.java 26 Feb 2004 16:51:55 -0000 1.5
@@ -31,11 +31,8 @@
import org.jicarilla.http.HTTPException;
import org.jicarilla.http.HTTPMessage;
import org.jicarilla.http.HTTPFileReader;
-import org.jicarilla.io.Filesystem;
import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.ReadableByteChannel;
/**
*
@@ -47,7 +44,7 @@
{
protected HTTPFileReader m_fileReader;
- public FilesystemStage( Channel queue, Sink errorHandler, HTTPFileReader fr )
+ public FilesystemStage( final Channel queue, final Sink errorHandler, final HTTPFileReader fr )
{
super( queue, errorHandler );
@@ -59,7 +56,7 @@
return m_fileReader;
}
- public void setFileReader( HTTPFileReader fileReader )
+ public void setFileReader( final HTTPFileReader fileReader )
{
m_fileReader = fileReader;
}
@@ -67,15 +64,15 @@
/**
* @todo: processing of the URL to extract the filename
*/
- protected void process( HTTPEvent e )
+ protected void process( final HTTPEvent e )
throws HTTPException, IOException
{
- HTTPMessage req = e.getHTTPRequest();
- HTTPMessage res = e.getHTTPResponse();
+ final HTTPMessage req = e.getHTTPRequest();
+ final HTTPMessage res = e.getHTTPResponse();
- String file = req.getField2String();
+ final String file = req.getField2String();
- int size = m_fileReader.readFile( file, res );
+ final int size = m_fileReader.readFile( file, res );
res.addHeader( HTTPEncoding.HEADER_CONTENT_LENGTH,
""+size );
Index: GeneralAndResponseHeadersStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/plumbing/GeneralAndResponseHeadersStage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- GeneralAndResponseHeadersStage.java 24 Jan 2004 19:58:34 -0000 1.1
+++ GeneralAndResponseHeadersStage.java 26 Feb 2004 16:51:55 -0000 1.2
@@ -42,8 +42,8 @@
{
protected String m_serverIdentification;
- public GeneralAndResponseHeadersStage( Channel channel, Sink errorHandler,
- String serverIdentification )
+ public GeneralAndResponseHeadersStage( final Channel channel, final Sink errorHandler,
+ final String serverIdentification )
{
super( channel, errorHandler );
Assert.assertNotNull( "serverIdentification argument may not be null",
@@ -51,9 +51,9 @@
m_serverIdentification = serverIdentification;
}
- protected void process( HTTPEvent event )
+ protected void process( final HTTPEvent event )
{
- HTTPMessage res = event.getHTTPResponse();
+ final HTTPMessage res = event.getHTTPResponse();
res.addHeader( "Server", m_serverIdentification );
res.addHeader( "Connection", "close" );
Index: HTTPEvent.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/plumbing/HTTPEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- HTTPEvent.java 4 Jan 2004 16:10:17 -0000 1.2
+++ HTTPEvent.java 26 Feb 2004 16:51:55 -0000 1.3
@@ -40,7 +40,7 @@
{
if( getRequest() == null )
{
- HTTPMessage msg = new HTTPMessage();
+ final HTTPMessage msg = new HTTPMessage();
msg.setMessageType( HTTPMessage.TYPE_REQUEST );
setRequest( msg );
}
@@ -50,7 +50,7 @@
{
if( getResponse() == null )
{
- HTTPMessage msg = new HTTPMessage();
+ final HTTPMessage msg = new HTTPMessage();
msg.setMessageType( HTTPMessage.TYPE_RESPONSE );
setResponse( msg );
}
Index: HTTPScreenerBuilderImpl.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/plumbing/HTTPScreenerBuilderImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HTTPScreenerBuilderImpl.java 20 Feb 2004 14:21:41 -0000 1.1
+++ HTTPScreenerBuilderImpl.java 26 Feb 2004 16:51:55 -0000 1.2
@@ -45,37 +45,39 @@
*/
public class HTTPScreenerBuilderImpl implements HTTPScreenerBuilder
{
- List sinks = new ArrayList();
+ protected List sinks = new ArrayList();
public Screener create() throws Exception
{
- Screener s = new SimpleScreener();
+ final Screener s = new SimpleScreener();
populate( s );
return s;
}
- public HTTPScreenerBuilder addStage( Object selectionCriterion,
- Sink sink )
+ public HTTPScreenerBuilder addStage( final Object selectionCriterion,
+ final Sink sink )
{
sinks.add( new Entry( selectionCriterion, sink ) );
return this;
}
- protected void populate( Screener s )
+ protected void populate( final Screener s )
{
- Iterator it = sinks.iterator();
+ final Iterator it = sinks.iterator();
while( it.hasNext() )
{
- Entry entry = (Entry)it.next();
+ final Entry entry = (Entry)it.next();
if( entry.criterion instanceof HTTPSelector )
{
s.addSink( (Selector)entry.criterion, entry.sink );
continue;
}
+ final HTTPSelector selector;
+
if( entry.criterion instanceof Pattern )
{
- HTTPSelector selector = new HTTPSelector();
+ selector = new HTTPSelector();
selector.addURLPattern( (Pattern)entry.criterion );
s.addSink( selector, entry.sink );
continue;
@@ -83,7 +85,7 @@
if( entry.criterion instanceof InetAddress )
{
- HTTPSelector selector = new HTTPSelector();
+ selector = new HTTPSelector();
selector.addVirtualHost( (InetAddress)entry.criterion );
s.addSink( selector, entry.sink );
continue;
@@ -96,14 +98,14 @@
public Object criterion;
public Sink sink;
- public Entry( Object criterion, Sink sink )
+ protected Entry( final Object aCriterion, final Sink aSink )
{
Assert.assertNotNull( "criterion argument may not be null",
criterion );
Assert.assertNotNull( "sink argument may not be null", sink );
- this.criterion = criterion;
- this.sink = sink;
+ criterion = aCriterion;
+ sink = aSink;
}
}
}
Index: HTTPSelector.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/plumbing/HTTPSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- HTTPSelector.java 20 Feb 2004 14:21:41 -0000 1.1
+++ HTTPSelector.java 26 Feb 2004 16:51:55 -0000 1.2
@@ -27,7 +27,6 @@
import org.jicarilla.framework.Selector;
import org.jicarilla.framework.RegexpSelector;
-import org.jicarilla.framework.EquivalenceSelector;
import org.jicarilla.http.HTTPMessage;
import org.jicarilla.http.HTTPField;
@@ -61,13 +60,13 @@
protected boolean m_bodySelectorPolicy = POLICY_AND;
protected boolean m_globalPolicy = POLICY_AND;
- public boolean select( Object object )
+ public boolean select( final Object object )
{
if(! (object instanceof HTTPEvent) )
return false;
- HTTPEvent event = (HTTPEvent)object;
- HTTPMessage request = event.getHTTPRequest();
+ final HTTPEvent event = (HTTPEvent)object;
+ final HTTPMessage request = event.getHTTPRequest();
if( m_globalPolicy == POLICY_AND )
return selectStartLine(request) &&
@@ -80,22 +79,22 @@
selectBody(request);
}
- public void addURLPattern( Pattern pattern )
+ public void addURLPattern( final Pattern pattern )
{
- Selector s = new RegexpSelector( pattern );
+ final Selector s = new RegexpSelector( pattern );
m_uriSelectors.add( s );
}
- public void addVirtualHost( InetAddress host )
+ public void addVirtualHost( final InetAddress host )
{
- String hostname = host.getHostName();
- Pattern pattern = Pattern.compile( "Host:[ \\t]*" + hostname,
+ final String hostname = host.getHostName();
+ final Pattern pattern = Pattern.compile( "Host:[ \\t]*" + hostname,
Pattern.CASE_INSENSITIVE );
- Selector s = new RegexpSelector( pattern );
+ final Selector s = new RegexpSelector( pattern );
m_uriSelectors.add( s );
}
- protected boolean selectStartLine( HTTPMessage request )
+ protected boolean selectStartLine( final HTTPMessage request )
{
if( m_globalPolicy == POLICY_AND )
return selectMethod(request) &&
@@ -108,46 +107,46 @@
selectVersion(request);
}
- protected boolean selectMethod( HTTPMessage request )
+ protected boolean selectMethod( final HTTPMessage request )
{
if( m_methodSelectors.size() == 0 )
return true;
- String method = request.getField1String();
+ final String method = request.getField1String();
return select( method, m_methodSelectors, m_methodSelectorPolicy );
}
- protected boolean selectURI( HTTPMessage request )
+ protected boolean selectURI( final HTTPMessage request )
{
if( m_uriSelectors.size() == 0 )
return true;
- String uri = request.getField2String();
+ final String uri = request.getField2String();
return select( uri, m_uriSelectors, m_uriSelectorPolicy );
}
- protected boolean selectVersion( HTTPMessage request )
+ protected boolean selectVersion( final HTTPMessage request )
{
if( m_versionSelectors.size() == 0 )
return true;
- String version = request.getField3String();
+ final String version = request.getField3String();
return select( version, m_methodSelectors, m_methodSelectorPolicy );
}
- protected boolean selectHeaders( HTTPMessage request )
+ protected boolean selectHeaders( final HTTPMessage request )
{
if( m_versionSelectors.size() == 0 )
return true;
- List headers = request.getHeaders();
- Iterator it = headers.iterator();
+ final List headers = request.getHeaders();
+ final Iterator it = headers.iterator();
if( m_headerSelectorPolicy == POLICY_AND )
{
while( it.hasNext() )
{
- HTTPField header = (HTTPField)it.next();
- String headerString = header.toExternalForm();
+ final HTTPField header = (HTTPField)it.next();
+ final String headerString = header.toExternalForm();
if(!selectHeader( headerString, m_headerSelectors, m_headerSelectorPolicy ) )
return false;
}
@@ -157,8 +156,8 @@
{
while( it.hasNext() )
{
- HTTPField header = (HTTPField)it.next();
- String headerString = header.toExternalForm();
+ final HTTPField header = (HTTPField)it.next();
+ final String headerString = header.toExternalForm();
if(selectHeader( headerString, m_headerSelectors, m_headerSelectorPolicy ) )
return true;
}
@@ -166,7 +165,7 @@
}
}
- protected boolean selectBody( HTTPMessage request )
+ protected boolean selectBody( final HTTPMessage request )
{
if( m_bodySelectors.size() == 0 )
return true;
@@ -174,14 +173,14 @@
return select( request.getBodyAsString(), m_bodySelectors, m_bodySelectorPolicy );
}
- protected boolean select( String field, List selectors, boolean policy )
+ protected boolean select( final String field, final List selectors, final boolean policy )
{
- Iterator it = selectors.iterator();
+ final Iterator it = selectors.iterator();
if( policy == POLICY_AND )
{
while( it.hasNext() )
{
- Selector selector = (Selector)it.next();
+ final Selector selector = (Selector)it.next();
if( !selector.select( field ) )
return false;
}
@@ -192,7 +191,7 @@
// POLICY_OR
while( it.hasNext() )
{
- Selector selector = (Selector)it.next();
+ final Selector selector = (Selector)it.next();
if( selector.select( field ) )
return true;
}
@@ -200,12 +199,12 @@
}
}
- protected boolean selectHeader( String header, List selectors, boolean policy )
+ protected boolean selectHeader( final String header, final List selectors, final boolean policy )
{
- Iterator it = selectors.iterator();
+ final Iterator it = selectors.iterator();
while( it.hasNext() )
{
- Selector selector = (Selector)it.next();
+ final Selector selector = (Selector)it.next();
if( selector.select( header ) )
return true;
}
Index: JettyChannelFactory.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/plumbing/JettyChannelFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- JettyChannelFactory.java 25 Jan 2004 22:12:32 -0000 1.1
+++ JettyChannelFactory.java 26 Feb 2004 16:51:55 -0000 1.2
@@ -27,7 +27,6 @@
import org.jicarilla.framework.plumbing.NoopSink;
import org.jicarilla.framework.plumbing.Stage;
-import org.jicarilla.framework.plumbing.PostProcessor;
import org.jicarilla.framework.RecyclingObjectFactory;
import org.jicarilla.framework.Assert;
import org.jicarilla.net.Event;
@@ -50,7 +49,7 @@
protected Stage m_stage;
protected Stage m_processor;
- public JettyChannelFactory( HttpServer delegate, InetAddress address )
+ public JettyChannelFactory( final HttpServer delegate, final InetAddress address )
{
m_delegate = delegate;
m_address = address;
@@ -72,27 +71,27 @@
{
return new Stage()
{
- public void put( Object o ) throws InterruptedException
+ public void put( final Object o ) throws InterruptedException
{
- HTTPEvent e = getEvent( o );
+ final HTTPEvent e = getEvent( o );
m_stage.put( e );
}
- public boolean offer( Object o, long l ) throws InterruptedException
+ public boolean offer( final Object o, final long l ) throws InterruptedException
{
- HTTPEvent e = getEvent( o );
+ final HTTPEvent e = getEvent( o );
return m_stage.offer( e, l );
}
- protected HTTPEvent getEvent( Object o )
+ protected HTTPEvent getEvent( final Object o )
{
Assert.assertTrue( o instanceof Event );
if( o instanceof HTTPEvent )
return (HTTPEvent)o;
- Event ev = (Event)o;
- HTTPEvent e = new HTTPEvent();
+ final Event ev = (Event)o;
+ final HTTPEvent e = new HTTPEvent();
e.setChannel( ev.getChannel() );
e.setContext( ev.getContext() );
return e;
@@ -103,7 +102,7 @@
return m_stage.take();
}
- public Object poll( long l ) throws InterruptedException
+ public Object poll( final long l ) throws InterruptedException
{
return m_stage.poll( l );
}
Index: JettyStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/plumbing/JettyStage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- JettyStage.java 25 Jan 2004 22:12:33 -0000 1.1
+++ JettyStage.java 26 Feb 2004 16:51:55 -0000 1.2
@@ -51,11 +51,13 @@
*/
public class JettyStage extends AbstractStage
{
+ public final static int DEFAULT_BUFFER_SIZE = 8096;
+
protected HttpServer m_delegate;
protected InetAddress m_address;
- public JettyStage( HttpServer delegate, InetAddress address,
- Channel channel, Sink errorHandler )
+ public JettyStage( final HttpServer delegate, final InetAddress address,
+ final Channel channel, final Sink errorHandler )
{
super( channel, errorHandler );
@@ -65,16 +67,16 @@
m_address = address;
}
- protected void process( HTTPEvent e )
+ protected void process( final HTTPEvent e )
throws HTTPException, IOException
{
- SocketChannel channel = e.getChannel();
- InputStream request = channel.socket().getInputStream();
- OutputStream response = channel.socket().getOutputStream();
+ final SocketChannel channel = e.getChannel();
+ final InputStream request = channel.socket().getInputStream();
+ final OutputStream response = channel.socket().getOutputStream();
- Listener listener = new Listener();
+ final Listener listener = new Listener();
- HttpConnection con = new HttpConnection( listener, m_address, request,
+ final HttpConnection con = new HttpConnection( listener, m_address, request,
response, channel.socket() );
con.handle();
@@ -85,7 +87,7 @@
protected HttpServer m_server = m_delegate;
protected String m_host = m_address.getHostName();
protected int m_port = 0;
- protected int m_bufferSize = 8096;
+ protected int m_bufferSize = DEFAULT_BUFFER_SIZE;
protected int m_bufferReserve = 10;
protected String m_defaultScheme = HttpMessage.__SCHEME;
protected boolean m_lowOnResources = false;
@@ -95,12 +97,12 @@
protected String m_confidentialScheme = HttpMessage.__SSL_SCHEME;
protected int m_confidentialPort = 0;
- public Listener() {}
+ protected Listener() {}
- public Listener( HttpServer server, String host, int port, int bufferSize,
- int bufferReserve, String defaultScheme, boolean lowOnResources,
- boolean outOfResources, String integralScheme, int integralPort,
- String confidentialScheme, int confidentialPort )
+ protected Listener( final HttpServer server, final String host, final int port, final int bufferSize,
+ final int bufferReserve, final String defaultScheme, final boolean lowOnResources,
+ final boolean outOfResources, final String integralScheme, final int integralPort,
+ final String confidentialScheme, final int confidentialPort )
{
m_server = server;
m_host = host;
@@ -119,7 +121,7 @@
// ----------------------------------------------------------------------
// Getters/Setters
// ----------------------------------------------------------------------
- public void setHttpServer( HttpServer server )
+ public void setHttpServer( final HttpServer server )
{
m_server = server;
}
@@ -134,7 +136,7 @@
return m_port;
}
- public void setPort( int port )
+ public void setPort( final int port )
{
m_port = port;
}
@@ -144,7 +146,7 @@
return m_bufferSize;
}
- public void setBufferSize( int bufferSize )
+ public void setBufferSize( final int bufferSize )
{
m_bufferSize = bufferSize;
}
@@ -154,7 +156,7 @@
return m_bufferReserve;
}
- public void setBufferReserve( int bufferReserve )
+ public void setBufferReserve( final int bufferReserve )
{
m_bufferReserve = bufferReserve;
}
@@ -164,7 +166,7 @@
return m_defaultScheme;
}
- public void setDefaultScheme( String defaultScheme )
+ public void setDefaultScheme( final String defaultScheme )
{
m_defaultScheme = defaultScheme;
}
@@ -174,7 +176,7 @@
return m_lowOnResources;
}
- public void setLowOnResources( boolean lowOnResources )
+ public void setLowOnResources( final boolean lowOnResources )
{
m_lowOnResources = lowOnResources;
}
@@ -184,7 +186,7 @@
return m_outOfResources;
}
- public void setOutOfResources( boolean outOfResources )
+ public void setOutOfResources( final boolean outOfResources )
{
m_outOfResources = outOfResources;
}
@@ -194,7 +196,7 @@
return m_integralScheme;
}
- public void setIntegralScheme( String integralScheme )
+ public void setIntegralScheme( final String integralScheme )
{
m_integralScheme = integralScheme;
}
@@ -204,7 +206,7 @@
return m_integralPort;
}
- public void setIntegralPort( int integralPort )
+ public void setIntegralPort( final int integralPort )
{
m_integralPort = integralPort;
}
@@ -214,7 +216,7 @@
return m_confidentialScheme;
}
- public void setConfidentialScheme( String confidentialScheme )
+ public void setConfidentialScheme( final String confidentialScheme )
{
m_confidentialScheme = confidentialScheme;
}
@@ -224,12 +226,12 @@
return m_confidentialPort;
}
- public void setConfidentialPort( int confidentialPort )
+ public void setConfidentialPort( final int confidentialPort )
{
m_confidentialPort = confidentialPort;
}
- public void setHost( String host ) throws UnknownHostException
+ public void setHost( final String host ) throws UnknownHostException
{
m_host = host;
}
@@ -242,23 +244,23 @@
// ----------------------------------------------------------------------
// Interface: HttpListener
// ----------------------------------------------------------------------
- public void customizeRequest( HttpConnection connection,
- HttpRequest request )
+ public void customizeRequest( final HttpConnection connection,
+ final HttpRequest request )
{
// no thanks
}
- public void persistConnection( HttpConnection connection )
+ public void persistConnection( final HttpConnection connection )
{
// no thanks
}
- public boolean isIntegral( HttpConnection connection )
+ public boolean isIntegral( final HttpConnection connection )
{
return false;
}
- public boolean isConfidential( HttpConnection connection )
+ public boolean isConfidential( final HttpConnection connection )
{
return false;
}
Index: ParsingStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/plumbing/ParsingStage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ParsingStage.java 25 Jan 2004 22:12:33 -0000 1.4
+++ ParsingStage.java 26 Feb 2004 16:51:55 -0000 1.5
@@ -59,7 +59,7 @@
protected HTTPMessageGenerator m_generator;
protected Listener m_listener;
- public ParsingStage( Channel queue, Sink errorHandler )
+ public ParsingStage( final Channel queue, final Sink errorHandler )
{
super( queue, errorHandler );
@@ -85,7 +85,7 @@
return m_listener;
}
- protected void setListener( Listener listener )
+ protected void setListener( final Listener listener )
{
m_listener = listener;
}
@@ -95,7 +95,7 @@
return m_generator;
}
- protected void setGenerator( HTTPMessageGenerator generator )
+ protected void setGenerator( final HTTPMessageGenerator generator )
{
m_generator = generator;
}
@@ -105,26 +105,26 @@
return m_parser;
}
- protected void setParser( HTTPParserImpl parser )
+ protected void setParser( final HTTPParserImpl parser )
{
m_parser = parser;
}
- protected void process( HTTPEvent e )
+ protected void process( final HTTPEvent e )
throws HTTPException, IOException
{
try
{
// todo: robustness
- SocketChannel c = e.getChannel();
+ final SocketChannel c = e.getChannel();
HTTPException ex = null;
while( true )
{
if( getListener().message != null )
break;
- ByteBuffer buf = ByteBuffer.allocate( BUFFER_SIZE );
- int read = c.read( buf );
+ final ByteBuffer buf = ByteBuffer.allocate( BUFFER_SIZE );
+ final int read = c.read( buf );
if( read < 0 )
break;
@@ -170,22 +170,23 @@
{
public HTTPMessage message = null;
- public void messageReceived( HTTPMessage m )
+ public void messageReceived( final HTTPMessage m )
{
message = m;
}
- public void exceptionOccurred( Throwable t )
+ public void exceptionOccurred( final Throwable t )
{
// todo improve
final HTTPMessage exMessage = new HTTPMessage();
exMessage.setMessageType( HTTPMessage.TYPE_RESPONSE );
exMessage.setField1( HTTPEncoding.VERSION_10 );
- exMessage.setStatusCode( 500 );
+ exMessage.setStatusCode(
+ HTTPEncoding.STATUS_500_Internal_Server_Error );
exMessage.setField3( "Internal Server Error" );
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
+ final StringWriter sw = new StringWriter();
+ final PrintWriter pw = new PrintWriter(sw);
t.printStackTrace(pw);
exMessage.addHeader( "Content-Type", "text/html");
Index: ResponseCompletionStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/plumbing/ResponseCompletionStage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ResponseCompletionStage.java 25 Jan 2004 22:12:34 -0000 1.1
+++ ResponseCompletionStage.java 26 Feb 2004 16:51:55 -0000 1.2
@@ -43,18 +43,18 @@
*/
public class ResponseCompletionStage extends AbstractStage
{
- public ResponseCompletionStage( Channel channel, Sink errorHandler )
+ public ResponseCompletionStage( final Channel channel, final Sink errorHandler )
{
super( channel, errorHandler );
}
- protected void process( HTTPEvent e )
+ protected void process( final HTTPEvent e )
{
ensureStartLine( e );
ensureContentLengthHeader( e );
}
- protected void ensureStartLine( HTTPEvent e )
+ protected void ensureStartLine( final HTTPEvent e )
{
final HTTPMessage res = e.getHTTPResponse();
@@ -66,7 +66,7 @@
res.setField3( HTTPEncoding.STATUS_MSG[res.getStatusCode()] );
}
- protected void ensureContentLengthHeader( HTTPEvent e )
+ protected void ensureContentLengthHeader( final HTTPEvent e )
{
final HTTPMessage req = e.getHTTPRequest();
final HTTPMessage res = e.getHTTPResponse();
@@ -79,7 +79,7 @@
if( nonIdentifyTransferCodingPresent( req, res ) )
return;
- ByteBuffer[] body = res.getBodyParts();
+ final ByteBuffer[] body = res.getBodyParts();
if( body.length == 0 )
{
res.addHeader(
@@ -92,7 +92,7 @@
int size = 0;
for( int i = 0; i < body.length; i++ )
{
- ByteBuffer byteBuffer = body[i];
+ final ByteBuffer byteBuffer = body[i];
size += byteBuffer.remaining();
}
@@ -104,14 +104,14 @@
}
}
- private boolean noBodySoNoContentLengthHeader( HTTPMessage req,
- HTTPMessage res )
+ private boolean noBodySoNoContentLengthHeader( final HTTPMessage req,
+ final HTTPMessage res )
{
if( HTTPEncoding.METHOD_HEAD.equals( req.getField1String() ) )
return true;
final int responseCode = res.getStatusCode();
- if( (99 < responseCode && responseCode < 200) ||
+ if( (HTTPEncoding.STATUS_100_Continue <= responseCode && responseCode < HTTPEncoding.STATUS_200_OK) ||
responseCode == HTTPEncoding.STATUS_204_No_Content ||
responseCode == HTTPEncoding.STATUS_304_Not_Modified )
return true;
@@ -119,32 +119,29 @@
return false;
}
- protected boolean nonIdentifyTransferCodingPresent( HTTPMessage req,
- HTTPMessage res )
+ protected boolean nonIdentifyTransferCodingPresent( final HTTPMessage req,
+ final HTTPMessage res )
{
- Iterator it = res.getHeaders().iterator();
+ final Iterator it = res.getHeaders().iterator();
while( it.hasNext() )
{
- HTTPField field = (HTTPField)it.next();
+ final HTTPField field = (HTTPField)it.next();
if( HTTPEncoding.HEADER_TRANSFER_ENCODING.equals(
field.getNameString() ) )
{
- if( !HTTPEncoding.CONTENT_CODING_IDENTITY.equals(
- field.getNameString() ) )
- return true;
- else
- return false;
+ return !HTTPEncoding.CONTENT_CODING_IDENTITY.equals(
+ field.getNameString() );
}
}
return false;
}
- protected boolean contentLengthNotSet( HTTPMessage response )
+ protected boolean contentLengthNotSet( final HTTPMessage response )
{
- Iterator it = response.getHeaders().iterator();
+ final Iterator it = response.getHeaders().iterator();
while( it.hasNext() )
{
- HTTPField field = (HTTPField)it.next();
+ final HTTPField field = (HTTPField)it.next();
if( field.getName().equals(
HTTPEncoding.HEADER_CONTENT_LENGTH_BUFFER ) )
{
Index: WritingStage.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/components/http/impl/src/java/org/jicarilla/http/plumbing/WritingStage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- WritingStage.java 11 Jan 2004 12:28:11 -0000 1.3
+++ WritingStage.java 26 Feb 2004 16:51:55 -0000 1.4
@@ -48,7 +48,7 @@
private HTTPMessageWriterImpl m_writer;
- public WritingStage( Channel queue, Sink errorHandler )
+ public WritingStage( final Channel queue, final Sink errorHandler )
{
super( queue, errorHandler );
@@ -61,15 +61,15 @@
return m_writer;
}
- protected void setWriter( HTTPMessageWriterImpl writer )
+ protected void setWriter( final HTTPMessageWriterImpl writer )
{
m_writer = writer;
}
- public void process( HTTPEvent e ) throws HTTPException, IOException
+ public void process( final HTTPEvent e ) throws HTTPException, IOException
{
- HTTPMessage m = e.getHTTPResponse();
- SocketChannel c = e.getChannel();
+ final HTTPMessage m = e.getHTTPResponse();
+ final SocketChannel c = e.getChannel();
getWriter().write( m, c,
e.getContext().containsKey( CLOSE_AFTER_WRITE_CONTEXT_KEY ) );
-------------------------------------------------------
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.