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

Renamed beginDecode() to newDecoder()

Browse Source
This commit is contained in:
Trustin Lee 2009-11-02 09:35:33 +00:00
parent cdf1474059
commit d450f0a228
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
View File

@ -28,15 +28,15 @@ import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
* Decodes the content of the received {@link HttpMessage} and {@link HttpChunk}. * Decodes the content of the received {@link HttpMessage} and {@link HttpChunk}.
* The original content ({@link HttpMessage#getContent()} or {@link HttpChunk#getContent()}) * The original content ({@link HttpMessage#getContent()} or {@link HttpChunk#getContent()})
* is replaced with the new content decoded by the {@link DecoderEmbedder}, * is replaced with the new content decoded by the {@link DecoderEmbedder},
* which is created by {@link #beginDecode(String)}. Once decoding is finished, * which is created by {@link #newDecoder(String)}. Once decoding is finished,
* the value of the <tt>'Content-Encoding'</tt> header is set to <tt>'identity'</tt> * the value of the <tt>'Content-Encoding'</tt> header is set to <tt>'identity'</tt>
* and the <tt>'Content-Length'</tt> header is updated to the length of the * and the <tt>'Content-Length'</tt> header is updated to the length of the
* decoded content. If the content encoding of the original is not supported * decoded content. If the content encoding of the original is not supported
* by the decoder, {@link #beginDecode(String)} returns {@code null} and no * by the decoder, {@link #newDecoder(String)} returns {@code null} and no
* decoding occurs (i.e. pass-through). * decoding occurs (i.e. pass-through).
* <p> * <p>
* Please note that this is an abstract class. You have to extend this class * Please note that this is an abstract class. You have to extend this class
* and implement {@link #beginDecode(String)} properly to make this class * and implement {@link #newDecoder(String)} properly to make this class
* functional. For example, refer to the source code of {@link HttpContentDecompressor}. * functional. For example, refer to the source code of {@link HttpContentDecompressor}.
* *
* @author The Netty Project (netty-dev@lists.jboss.org) * @author The Netty Project (netty-dev@lists.jboss.org)
@ -75,7 +75,7 @@ public abstract class HttpContentDecoder extends SimpleChannelUpstreamHandler {
contentEncoding = contentEncoding.trim(); contentEncoding = contentEncoding.trim();
} }
if (contentEncoding != null && (decoder = beginDecode(contentEncoding)) != null) { if (contentEncoding != null && (decoder = newDecoder(contentEncoding)) != null) {
// Decode the content and remove or replace the existing headers // Decode the content and remove or replace the existing headers
// so that the message looks like a decoded message. // so that the message looks like a decoded message.
m.setHeader(HttpHeaders.Names.CONTENT_ENCODING, HttpHeaders.Values.IDENTITY); m.setHeader(HttpHeaders.Names.CONTENT_ENCODING, HttpHeaders.Values.IDENTITY);
@ -163,7 +163,7 @@ public abstract class HttpContentDecoder extends SimpleChannelUpstreamHandler {
* {@code null} otherwise (alternatively, you can throw an exception * {@code null} otherwise (alternatively, you can throw an exception
* to block unknown encoding). * to block unknown encoding).
*/ */
protected abstract DecoderEmbedder<ChannelBuffer> beginDecode(String contentEncoding) throws Exception; protected abstract DecoderEmbedder<ChannelBuffer> newDecoder(String contentEncoding) throws Exception;
private ChannelBuffer decode(ChannelBuffer buf) { private ChannelBuffer decode(ChannelBuffer buf) {
decoder.offer(buf); decoder.offer(buf);

2
src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
View File

@ -43,7 +43,7 @@ import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
@ChannelPipelineCoverage("one") @ChannelPipelineCoverage("one")
public class HttpContentDecompressor extends HttpContentDecoder { public class HttpContentDecompressor extends HttpContentDecoder {
@Override @Override
protected DecoderEmbedder<ChannelBuffer> beginDecode(String contentEncoding) throws Exception { protected DecoderEmbedder<ChannelBuffer> newDecoder(String contentEncoding) throws Exception {
if ("gzip".equalsIgnoreCase(contentEncoding) || "x-gzip".equalsIgnoreCase(contentEncoding)) { if ("gzip".equalsIgnoreCase(contentEncoding) || "x-gzip".equalsIgnoreCase(contentEncoding)) {
return new DecoderEmbedder<ChannelBuffer>(new ZlibDecoder(ZlibWrapper.GZIP)); return new DecoderEmbedder<ChannelBuffer>(new ZlibDecoder(ZlibWrapper.GZIP));
} else if ("deflate".equalsIgnoreCase(contentEncoding) || "x-deflate".equalsIgnoreCase(contentEncoding)) { } else if ("deflate".equalsIgnoreCase(contentEncoding) || "x-deflate".equalsIgnoreCase(contentEncoding)) {