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

Add support for ExtensionRegistryLite in ProtobufDecoder

Browse Source 
Motivation:

ExtensionRegistry is a subclass of ExtensionRegistryLite.  The ProtobufDecoder
doesn't use the registry directly, it simply passes it through to the Protobuf
API.  The Protobuf calls in question are themselves written in terms
ExtensionRegistryLite not ExtensionRegistry.

Modifications:

Require ExtensionRegistryLite instead of ExtensionRegistry in ProtobufDecoder.

Result:

Consumers can use ExtensionRegistryLite with ProtobufDecoder.
This commit is contained in:
Barber, Francis 2014-08-28 21:24:38 -07:00 committed by Norman Maurer
parent f7616d22eb
commit 08cec3c56b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java
View File

@ -16,6 +16,7 @@
package io.netty.handler.codec.protobuf; package io.netty.handler.codec.protobuf;
import com.google.protobuf.ExtensionRegistry; import com.google.protobuf.ExtensionRegistry;
import com.google.protobuf.ExtensionRegistryLite;
import com.google.protobuf.Message; import com.google.protobuf.Message;
import com.google.protobuf.MessageLite; import com.google.protobuf.MessageLite;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
@ -78,7 +79,7 @@ public class ProtobufDecoder extends MessageToMessageDecoder<ByteBuf> {
} }
private final MessageLite prototype; private final MessageLite prototype;
private final ExtensionRegistry extensionRegistry; private final ExtensionRegistryLite extensionRegistry;
/** /**
* Creates a new instance. * Creates a new instance.
@ -88,6 +89,10 @@ public class ProtobufDecoder extends MessageToMessageDecoder<ByteBuf> {
} }
public ProtobufDecoder(MessageLite prototype, ExtensionRegistry extensionRegistry) { public ProtobufDecoder(MessageLite prototype, ExtensionRegistry extensionRegistry) {
this(prototype, (ExtensionRegistryLite) extensionRegistry);
}
public ProtobufDecoder(MessageLite prototype, ExtensionRegistryLite extensionRegistry) {
if (prototype == null) { if (prototype == null) {
throw new NullPointerException("prototype"); throw new NullPointerException("prototype");
} }