andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tabs to spaces

Browse Source
This commit is contained in:
Trustin Lee 2011-05-11 18:11:36 +09:00
parent 9db6bba913
commit 15792da167
8 changed files with 262 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerHandler.java
View File

@ -313,7 +313,7 @@ public class HttpStaticFileServerHandler extends SimpleChannelUpstreamHandler {
* file to extract content type * file to extract content type
*/ */
private void setContentTypeHeader(HttpResponse response, File file) { private void setContentTypeHeader(HttpResponse response, File file) {
MimetypesFileTypeMap mimeTypesMap = new MimetypesFileTypeMap(); MimetypesFileTypeMap mimeTypesMap = new MimetypesFileTypeMap();
response.setHeader(HttpHeaders.Names.CONTENT_TYPE, mimeTypesMap.getContentType(file.getPath())); response.setHeader(HttpHeaders.Names.CONTENT_TYPE, mimeTypesMap.getContentType(file.getPath()));
} }

36
src/main/java/org/jboss/netty/example/http/upload/HttpClient.java
View File

@ -128,17 +128,17 @@ public class HttpClient {
// Simple Get form: no factory used (not usable) // Simple Get form: no factory used (not usable)
List<Entry<String,String>> headers = List<Entry<String,String>> headers =
formget(bootstrap, host, port, get, uriSimple); formget(bootstrap, host, port, get, uriSimple);
if (headers == null) { if (headers == null) {
factory.cleanAllHttpDatas(); factory.cleanAllHttpDatas();
return; return;
} }
// Simple Post form: factory used for big attributes // Simple Post form: factory used for big attributes
List<InterfaceHttpData> bodylist = List<InterfaceHttpData> bodylist =
formpost(bootstrap, host, port, uriSimple, file, factory, headers); formpost(bootstrap, host, port, uriSimple, file, factory, headers);
if (bodylist == null) { if (bodylist == null) {
factory.cleanAllHttpDatas(); factory.cleanAllHttpDatas();
return; return;
} }
// Multipart Post form: factory used // Multipart Post form: factory used
formpostmultipart(bootstrap, host, port, uriFile, file, factory, headers, bodylist); formpostmultipart(bootstrap, host, port, uriFile, file, factory, headers, bodylist);
@ -155,7 +155,7 @@ public class HttpClient {
* @return the list of headers that will be used in every example after * @return the list of headers that will be used in every example after
**/ **/
private static List<Entry<String,String>> formget(ClientBootstrap bootstrap, String host, int port, String get, private static List<Entry<String,String>> formget(ClientBootstrap bootstrap, String host, int port, String get,
URI uriSimple) { URI uriSimple) {
// XXX /formget // XXX /formget
// No use of HttpPostRequestEncoder since not a POST // No use of HttpPostRequestEncoder since not a POST
// Start the connection attempt. // Start the connection attempt.
@ -193,14 +193,14 @@ public class HttpClient {
request.setHeader(HttpHeaders.Names.HOST, host); request.setHeader(HttpHeaders.Names.HOST, host);
request.setHeader(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.CLOSE); request.setHeader(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.CLOSE);
request.setHeader(HttpHeaders.Names.ACCEPT_ENCODING, HttpHeaders.Values.GZIP+","+ request.setHeader(HttpHeaders.Names.ACCEPT_ENCODING, HttpHeaders.Values.GZIP+","+
HttpHeaders.Values.DEFLATE); HttpHeaders.Values.DEFLATE);
request.setHeader(HttpHeaders.Names.ACCEPT_CHARSET, "ISO-8859-1,utf-8;q=0.7,*;q=0.7"); request.setHeader(HttpHeaders.Names.ACCEPT_CHARSET, "ISO-8859-1,utf-8;q=0.7,*;q=0.7");
request.setHeader(HttpHeaders.Names.ACCEPT_LANGUAGE, "fr"); request.setHeader(HttpHeaders.Names.ACCEPT_LANGUAGE, "fr");
request.setHeader(HttpHeaders.Names.REFERER, uriSimple.toString()); request.setHeader(HttpHeaders.Names.REFERER, uriSimple.toString());
request.setHeader(HttpHeaders.Names.USER_AGENT, "Netty Simple Http Client side"); request.setHeader(HttpHeaders.Names.USER_AGENT, "Netty Simple Http Client side");
request.setHeader(HttpHeaders.Names.ACCEPT, request.setHeader(HttpHeaders.Names.ACCEPT,
"text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
//connection will not close but needed //connection will not close but needed
// request.setHeader("Connection","keep-alive"); // request.setHeader("Connection","keep-alive");
// request.setHeader("Keep-Alive","300"); // request.setHeader("Keep-Alive","300");
@ -232,12 +232,12 @@ public class HttpClient {
* @return the list of HttpData object (attribute and file) to be reused on next post * @return the list of HttpData object (attribute and file) to be reused on next post
*/ */
private static List<InterfaceHttpData> formpost(ClientBootstrap bootstrap, private static List<InterfaceHttpData> formpost(ClientBootstrap bootstrap,
String host, int port, String host, int port,
URI uriSimple, File file, HttpDataFactory factory, URI uriSimple, File file, HttpDataFactory factory,
List<Entry<String,String>> headers) { List<Entry<String,String>> headers) {
// XXX /formpost // XXX /formpost
// Start the connection attempt. // Start the connection attempt.
ChannelFuture future = bootstrap.connect(new InetSocketAddress(host, port)); ChannelFuture future = bootstrap.connect(new InetSocketAddress(host, port));
// Wait until the connection attempt succeeds or fails. // Wait until the connection attempt succeeds or fails.
Channel channel = future.awaitUninterruptibly().getChannel(); Channel channel = future.awaitUninterruptibly().getChannel();
if (!future.isSuccess()) { if (!future.isSuccess()) {
@ -266,7 +266,7 @@ public class HttpClient {
// it is legal to add directly header or cookie into the request until finalize // it is legal to add directly header or cookie into the request until finalize
for (Entry<String, String> entry : headers) { for (Entry<String, String> entry : headers) {
request.setHeader(entry.getKey(), entry.getValue()); request.setHeader(entry.getKey(), entry.getValue());
} }
// add Form attribute // add Form attribute
try { try {
@ -327,13 +327,13 @@ public class HttpClient {
* @param bodylist * @param bodylist
*/ */
private static void formpostmultipart(ClientBootstrap bootstrap, String host, int port, private static void formpostmultipart(ClientBootstrap bootstrap, String host, int port,
URI uriFile, File file, HttpDataFactory factory, URI uriFile, File file, HttpDataFactory factory,
List<Entry<String,String>> headers, List<InterfaceHttpData> bodylist) { List<Entry<String,String>> headers, List<InterfaceHttpData> bodylist) {
// XXX /formpostmultipart // XXX /formpostmultipart
// Start the connection attempt. // Start the connection attempt.
ChannelFuture future = bootstrap.connect(new InetSocketAddress(host, port)); ChannelFuture future = bootstrap.connect(new InetSocketAddress(host, port));
// Wait until the connection attempt succeeds or fails. // Wait until the connection attempt succeeds or fails.
Channel channel = future.awaitUninterruptibly().getChannel(); Channel channel = future.awaitUninterruptibly().getChannel();
if (!future.isSuccess()) { if (!future.isSuccess()) {
future.getCause().printStackTrace(); future.getCause().printStackTrace();
bootstrap.releaseExternalResources(); bootstrap.releaseExternalResources();

2
src/main/java/org/jboss/netty/example/http/upload/HttpClientPipelineFactory.java
View File

@ -36,7 +36,7 @@ import org.jboss.netty.handler.stream.ChunkedWriteHandler;
* @version $Rev$, $Date$ * @version $Rev$, $Date$
*/ */
public class HttpClientPipelineFactory implements ChannelPipelineFactory { public class HttpClientPipelineFactory implements ChannelPipelineFactory {
private final boolean ssl; private final boolean ssl;
public HttpClientPipelineFactory(boolean ssl) { public HttpClientPipelineFactory(boolean ssl) {
this.ssl = ssl; this.ssl = ssl;

2
src/main/java/org/jboss/netty/example/http/upload/HttpResponseHandler.java
View File

@ -36,7 +36,7 @@ public class HttpResponseHandler extends SimpleChannelUpstreamHandler {
private volatile boolean readingChunks; private volatile boolean readingChunks;
@Override @Override
public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception { public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
if (!readingChunks) { if (!readingChunks) {
HttpResponse response = (HttpResponse) e.getMessage(); HttpResponse response = (HttpResponse) e.getMessage();

4
src/main/java/org/jboss/netty/example/http/upload/HttpServer.java
View File

@ -34,8 +34,8 @@ public class HttpServer {
// Configure the server. // Configure the server.
ServerBootstrap bootstrap = new ServerBootstrap( ServerBootstrap bootstrap = new ServerBootstrap(
new NioServerSocketChannelFactory( new NioServerSocketChannelFactory(
Executors.newCachedThreadPool(), Executors.newCachedThreadPool(),
Executors.newCachedThreadPool())); Executors.newCachedThreadPool()));
// Set up the event pipeline factory. // Set up the event pipeline factory.
bootstrap.setPipelineFactory(new HttpServerPipelineFactory()); bootstrap.setPipelineFactory(new HttpServerPipelineFactory());

44
src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpDataFactory.java
View File

@ -51,7 +51,7 @@ public class DefaultHttpDataFactory implements HttpDataFactory {
* Keep all HttpDatas until cleanAllHttpDatas() is called. * Keep all HttpDatas until cleanAllHttpDatas() is called.
*/ */
private ConcurrentHashMap<HttpRequest, List<HttpData>> requestFileDeleteMap = private ConcurrentHashMap<HttpRequest, List<HttpData>> requestFileDeleteMap =
new ConcurrentHashMap<HttpRequest, List<HttpData>>(); new ConcurrentHashMap<HttpRequest, List<HttpData>>();
/** /**
* HttpData will be in memory if less than default size (16KB). * HttpData will be in memory if less than default size (16KB).
* The type will be Mixed. * The type will be Mixed.
@ -88,10 +88,10 @@ public class DefaultHttpDataFactory implements HttpDataFactory {
* @return the associated list of Files for the request * @return the associated list of Files for the request
*/ */
private List<HttpData> getList(HttpRequest request) { private List<HttpData> getList(HttpRequest request) {
List<HttpData> list = requestFileDeleteMap.get(request); List<HttpData> list = requestFileDeleteMap.get(request);
if (list == null) { if (list == null) {
list = new ArrayList<HttpData>(); list = new ArrayList<HttpData>();
requestFileDeleteMap.put(request, list); requestFileDeleteMap.put(request, list);
} }
return list; return list;
} }
@ -170,33 +170,33 @@ public class DefaultHttpDataFactory implements HttpDataFactory {
@Override @Override
public void removeHttpDataFromClean(HttpRequest request, InterfaceHttpData data) { public void removeHttpDataFromClean(HttpRequest request, InterfaceHttpData data) {
if (data instanceof HttpData) { if (data instanceof HttpData) {
List<HttpData> fileToDelete = getList(request); List<HttpData> fileToDelete = getList(request);
fileToDelete.remove(data); fileToDelete.remove(data);
} }
} }
@Override @Override
public void cleanRequestHttpDatas(HttpRequest request) { public void cleanRequestHttpDatas(HttpRequest request) {
List<HttpData> fileToDelete = requestFileDeleteMap.remove(request); List<HttpData> fileToDelete = requestFileDeleteMap.remove(request);
if (fileToDelete != null) { if (fileToDelete != null) {
for (HttpData data: fileToDelete) { for (HttpData data: fileToDelete) {
data.delete(); data.delete();
} }
fileToDelete.clear(); fileToDelete.clear();
} }
} }
@Override @Override
public void cleanAllHttpDatas() { public void cleanAllHttpDatas() {
for (HttpRequest request : requestFileDeleteMap.keySet()) { for (HttpRequest request : requestFileDeleteMap.keySet()) {
List<HttpData> fileToDelete = requestFileDeleteMap.get(request); List<HttpData> fileToDelete = requestFileDeleteMap.get(request);
if (fileToDelete != null) { if (fileToDelete != null) {
for (HttpData data: fileToDelete) { for (HttpData data: fileToDelete) {
data.delete(); data.delete();
} }
fileToDelete.clear(); fileToDelete.clear();
} }
requestFileDeleteMap.remove(request); requestFileDeleteMap.remove(request);
} }
} }
} }

4
src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestDecoder.java
View File

@ -634,7 +634,7 @@ public class HttpPostRequestDecoder {
} }
case FIELD: { case FIELD: {
// Now get value according to Content-Type and Charset // Now get value according to Content-Type and Charset
Charset localCharset = null; Charset localCharset = null;
Attribute charsetAttribute = currentFieldAttributes Attribute charsetAttribute = currentFieldAttributes
.get(HttpHeaders.Values.CHARSET); .get(HttpHeaders.Values.CHARSET);
if (charsetAttribute != null) { if (charsetAttribute != null) {
@ -854,7 +854,7 @@ public class HttpPostRequestDecoder {
Attribute attribute; Attribute attribute;
try { try {
attribute = factory.createAttribute(request, attribute = factory.createAttribute(request,
contents[0].trim(), contents[0].trim(),
decodeAttribute(cleanString(contents[i]), charset)); decodeAttribute(cleanString(contents[i]), charset));
} catch (NullPointerException e) { } catch (NullPointerException e) {
throw new ErrorDataDecoderException(e); throw new ErrorDataDecoderException(e);

430
src/test/java/org/jboss/netty/handler/ipfilter/IpFilterRuleTest.java
View File

@ -19,260 +19,260 @@ import org.junit.Test;
public class IpFilterRuleTest extends TestCase public class IpFilterRuleTest extends TestCase
{ {
public static boolean accept(IpFilterRuleHandler h, InetSocketAddress addr) throws Exception public static boolean accept(IpFilterRuleHandler h, InetSocketAddress addr) throws Exception
{ {
return h.accept(new ChannelHandlerContext() return h.accept(new ChannelHandlerContext()
{ {
@Override @Override
public boolean canHandleDownstream() public boolean canHandleDownstream()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public boolean canHandleUpstream() public boolean canHandleUpstream()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public Object getAttachment() public Object getAttachment()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public Channel getChannel() public Channel getChannel()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public ChannelHandler getHandler() public ChannelHandler getHandler()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public String getName() public String getName()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public ChannelPipeline getPipeline() public ChannelPipeline getPipeline()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public void sendDownstream(ChannelEvent e) public void sendDownstream(ChannelEvent e)
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override @Override
public void sendUpstream(ChannelEvent e) public void sendUpstream(ChannelEvent e)
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override @Override
public void setAttachment(Object attachment) public void setAttachment(Object attachment)
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
}, },
new UpstreamMessageEvent(new Channel() new UpstreamMessageEvent(new Channel()
{ {
@Override @Override
public ChannelFuture bind(SocketAddress localAddress) public ChannelFuture bind(SocketAddress localAddress)
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public ChannelFuture close() public ChannelFuture close()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public ChannelFuture connect(SocketAddress remoteAddress) public ChannelFuture connect(SocketAddress remoteAddress)
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public ChannelFuture disconnect() public ChannelFuture disconnect()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public ChannelFuture getCloseFuture() public ChannelFuture getCloseFuture()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public ChannelConfig getConfig() public ChannelConfig getConfig()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public ChannelFactory getFactory() public ChannelFactory getFactory()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public Integer getId() public Integer getId()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public int getInterestOps() public int getInterestOps()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return 0; return 0;
} }
@Override @Override
public SocketAddress getLocalAddress() public SocketAddress getLocalAddress()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public Channel getParent() public Channel getParent()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public ChannelPipeline getPipeline() public ChannelPipeline getPipeline()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public SocketAddress getRemoteAddress() public SocketAddress getRemoteAddress()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public boolean isBound() public boolean isBound()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public boolean isConnected() public boolean isConnected()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public boolean isOpen() public boolean isOpen()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public boolean isReadable() public boolean isReadable()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public boolean isWritable() public boolean isWritable()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return false; return false;
} }
@Override @Override
public ChannelFuture setInterestOps(int interestOps) public ChannelFuture setInterestOps(int interestOps)
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public ChannelFuture setReadable(boolean readable) public ChannelFuture setReadable(boolean readable)
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public ChannelFuture unbind() public ChannelFuture unbind()
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public ChannelFuture write(Object message) public ChannelFuture write(Object message)
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public ChannelFuture write(Object message, SocketAddress remoteAddress) public ChannelFuture write(Object message, SocketAddress remoteAddress)
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override @Override
public int compareTo(Channel o) public int compareTo(Channel o)
{ {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return 0; return 0;
} }
}, h, addr), }, h, addr),
addr); addr);
} }
@Test @Test
public void testIpFilterRule() throws Exception public void testIpFilterRule() throws Exception
{ {
IpFilterRuleHandler h = new IpFilterRuleHandler(); IpFilterRuleHandler h = new IpFilterRuleHandler();
h.addAll(new IpFilterRuleList("+n:localhost, -n:*")); h.addAll(new IpFilterRuleList("+n:localhost, -n:*"));
InetSocketAddress addr = new InetSocketAddress(InetAddress.getLocalHost(), 8080); InetSocketAddress addr = new InetSocketAddress(InetAddress.getLocalHost(), 8080);
@ -317,6 +317,6 @@ public class IpFilterRuleTest extends TestCase
addr = new InetSocketAddress(InetAddress.getByName(InetAddress.getLocalHost().getHostName()), 8080); addr = new InetSocketAddress(InetAddress.getByName(InetAddress.getLocalHost().getHostName()), 8080);
assertTrue(accept(h, addr)); assertTrue(accept(h, addr));
} }
} }