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

ClearTextHttp2ServerUpgradeHandler can be merged with inner PriorKnowledgeHandler (#10008)

Browse Source 
Motivation:

ClearTextHttp2ServerUpgradeHandler is currently more complex then needed. We can simplify it by directly implement the prior-knowledge logic as part of the handler.

Modifications:

Merge inner PriorKnowledgeHandler logic into ClearTextHttp2ServerUpgradeHandler by extending ByteToMessageDecoder directly

Result:

Cleaner code and less pipeline operations
This commit is contained in:
Norman Maurer 2020-02-08 08:49:55 +01:00 committed by GitHub
parent 2a5118f824
commit e7f291629b
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
codec-http2/src/main/java/io/netty/handler/codec/http2/CleartextHttp2ServerUpgradeHandler.java
View File

@ -18,7 +18,6 @@ package io.netty.handler.codec.http2;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil; import io.netty.buffer.ByteBufUtil;
import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerAdapter;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.ByteToMessageDecoder;
import io.netty.handler.codec.http.HttpServerCodec; import io.netty.handler.codec.http.HttpServerCodec;
@ -39,7 +38,7 @@ import static io.netty.util.internal.ObjectUtil.checkNotNull;
* prior knowledge or not. * prior knowledge or not.
*/ */
@UnstableApi @UnstableApi
public final class CleartextHttp2ServerUpgradeHandler extends ChannelHandlerAdapter { public final class CleartextHttp2ServerUpgradeHandler extends ByteToMessageDecoder {
private static final ByteBuf CONNECTION_PREFACE = unreleasableBuffer(connectionPrefaceBuf()); private static final ByteBuf CONNECTION_PREFACE = unreleasableBuffer(connectionPrefaceBuf());
private final HttpServerCodec httpServerCodec; private final HttpServerCodec httpServerCodec;
@ -66,16 +65,14 @@ public final class CleartextHttp2ServerUpgradeHandler extends ChannelHandlerAdap
@Override @Override
public void handlerAdded(ChannelHandlerContext ctx) throws Exception { public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
ctx.pipeline() ctx.pipeline()
.addBefore(ctx.name(), null, new PriorKnowledgeHandler()) .addAfter(ctx.name(), null, httpServerUpgradeHandler)
.addBefore(ctx.name(), null, httpServerCodec) .addAfter(ctx.name(), null, httpServerCodec);
.replace(this, null, httpServerUpgradeHandler);
} }
/** /**
* Peek inbound message to determine current connection wants to start HTTP/2 * Peek inbound message to determine current connection wants to start HTTP/2
* by HTTP upgrade or prior knowledge * by HTTP upgrade or prior knowledge
*/ */
private final class PriorKnowledgeHandler extends ByteToMessageDecoder {
@Override @Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception { protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
int prefaceLength = CONNECTION_PREFACE.readableBytes(); int prefaceLength = CONNECTION_PREFACE.readableBytes();
@ -97,7 +94,6 @@ public final class CleartextHttp2ServerUpgradeHandler extends ChannelHandlerAdap
ctx.fireUserEventTriggered(PriorKnowledgeUpgradeEvent.INSTANCE); ctx.fireUserEventTriggered(PriorKnowledgeUpgradeEvent.INSTANCE);
} }
} }
}
/** /**
* User event that is fired to notify about HTTP/2 protocol is started. * User event that is fired to notify about HTTP/2 protocol is started.