Skip to content

Commit

Permalink
upgrade protobuf version to support proto3
Browse files Browse the repository at this point in the history
  • Loading branch information
Abid Mohammed committed Aug 5, 2018
1 parent 57e38d0 commit 3890258
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.AbstractMessage;
import com.google.protobuf.GeneratedMessage;

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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions src/test/resources/SampleProtoA.proto
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
syntax = "proto3";
package ProtocolBuffers; // the namespace for the compiled classes

option java_package = "de.javakaffee.kryoserializers.protobuf";
option java_outer_classname = "SampleProtoAOuterClass";

message SampleProtoA {
optional string name = 1;
optional uint32 message_id = 2;
string name = 1;
uint32 message_id = 2;
}
7 changes: 4 additions & 3 deletions src/test/resources/SampleProtoB.proto
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
syntax = "proto3";
package ProtocolBuffers; // the namespace for the compiled classes

option java_package = "de.javakaffee.kryoserializers.protobuf";
option java_outer_classname = "SampleProtoBOuterClass";

message SampleProtoB {
required uint32 identifier = 1;
required string state = 2;
required string city = 3;
uint32 identifier = 1;
string state = 2;
string city = 3;
}

0 comments on commit 3890258

Please sign in to comment.