Merge pull request #93 from mohamabid/master

Upgrade to google-protobuf 3.6.1 to support proto3 messages
magro · Nov 25, 2018 · e8cea98 · e8cea98
2 parents 2baa088 + 0dcc975
commit e8cea98
Show file tree

Hide file tree

Showing 7 changed files with 415 additions and 275 deletions.
diff --git a/pom.xml b/pom.xml
@@ -188,7 +188,7 @@
 		<dependency>
 			<groupId>com.google.protobuf</groupId>
 			<artifactId>protobuf-java</artifactId>
-			<version>2.6.1</version>
+			<version>3.6.1</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>

diff --git a/src/main/java/de/javakaffee/kryoserializers/protobuf/ProtobufSerializer.java b/src/main/java/de/javakaffee/kryoserializers/protobuf/ProtobufSerializer.java
@@ -4,13 +4,14 @@
 import com.esotericsoftware.kryo.Serializer;
 import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
-import com.google.protobuf.GeneratedMessage;
+import com.google.protobuf.AbstractMessage;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+
 import static com.esotericsoftware.kryo.Kryo.NULL;
 
-public class ProtobufSerializer<T extends GeneratedMessage> extends Serializer<T> {
+public class ProtobufSerializer<T extends AbstractMessage> extends Serializer<T> {
 
     private Method parseFromMethod = null;
 

diff --git a/src/test/java/de/javakaffee/kryoserializers/protobuf/ProtobufSerializerTest.java b/src/test/java/de/javakaffee/kryoserializers/protobuf/ProtobufSerializerTest.java
@@ -20,8 +20,8 @@ public class ProtobufSerializerTest {
     @BeforeTest
     public void setUp() throws Exception {
         _kryo = new Kryo();
-        _kryo.register(SampleProtoA.class, new ProtobufSerializer());
-        _kryo.register(SampleProtoB.class, new ProtobufSerializer());
+        _kryo.register(SampleProtoA.class, new ProtobufSerializer<SampleProtoA>());
+        _kryo.register(SampleProtoB.class, new ProtobufSerializer<SampleProtoB>());
     }
 
     @Test