Update ProtoBuf 3 & gRPC
- Protocol Buffers: 3.0.0
- gRPC: 1.0.0-pre2
Change-Id: Ic80d3f660d4a0aa37a99d4e6d4dc45e0b70b073b
diff --git a/apps/kafka-integration/api/pom.xml b/apps/kafka-integration/api/pom.xml
index 438c5b1..bacccc6 100644
--- a/apps/kafka-integration/api/pom.xml
+++ b/apps/kafka-integration/api/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>3.0.0-beta-2</version>
+ <version>3.0.0</version>
</dependency>
<dependency>
diff --git a/apps/kafka-integration/api/src/main/java/org/onosproject/kafkaintegration/api/KafkaPublisherService.java b/apps/kafka-integration/api/src/main/java/org/onosproject/kafkaintegration/api/KafkaPublisherService.java
index b92b890..052c1e6 100644
--- a/apps/kafka-integration/api/src/main/java/org/onosproject/kafkaintegration/api/KafkaPublisherService.java
+++ b/apps/kafka-integration/api/src/main/java/org/onosproject/kafkaintegration/api/KafkaPublisherService.java
@@ -16,7 +16,8 @@
package org.onosproject.kafkaintegration.api;
-import com.google.protobuf.GeneratedMessage;
+import com.google.protobuf.GeneratedMessageV3;
+
import org.onosproject.kafkaintegration.api.dto.OnosEvent.Type;
/**
@@ -30,5 +31,6 @@
* @param eventType the ONOS eventtype
* @param message generated Protocol buffer message from ONOS event data
*/
- void publish(Type eventType, GeneratedMessage message);
+ // FIXME reconsider message type, something similar to "OnosEvent"?
+ void publish(Type eventType, GeneratedMessageV3 message);
}
diff --git a/apps/kafka-integration/api/src/main/java/org/onosproject/kafkaintegration/api/dto/OnosEvent.java b/apps/kafka-integration/api/src/main/java/org/onosproject/kafkaintegration/api/dto/OnosEvent.java
index 2d51c7c..26f16f5 100644
--- a/apps/kafka-integration/api/src/main/java/org/onosproject/kafkaintegration/api/dto/OnosEvent.java
+++ b/apps/kafka-integration/api/src/main/java/org/onosproject/kafkaintegration/api/dto/OnosEvent.java
@@ -16,13 +16,14 @@
import org.onosproject.event.AbstractEvent;
-import com.google.protobuf.GeneratedMessage;
+import com.google.protobuf.GeneratedMessageV3;
/**
* Represents the converted Onos Event data into protobuf format.
*
*/
-public class OnosEvent extends AbstractEvent<OnosEvent.Type, GeneratedMessage> {
+// FIXME lack of abstraction in subject type is biting us
+public class OnosEvent extends AbstractEvent<OnosEvent.Type, GeneratedMessageV3> {
/**
* Creates a new Onos Event.
@@ -30,7 +31,7 @@
* @param type The Type of Onos Event
* @param subject Protobuf message corresponding to the Onos Event
*/
- public OnosEvent(Type type, GeneratedMessage subject) {
+ public OnosEvent(Type type, GeneratedMessageV3 subject) {
super(type, subject);
}