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);
}
diff --git a/apps/kafka-integration/core/pom.xml b/apps/kafka-integration/core/pom.xml
index d29662d..b9f1290 100644
--- a/apps/kafka-integration/core/pom.xml
+++ b/apps/kafka-integration/core/pom.xml
@@ -50,7 +50,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.3.1</version>
</dependency>
<dependency>
@@ -74,7 +73,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>
<groupId>org.onosproject</groupId>
diff --git a/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/converter/DeviceEventConverter.java b/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/converter/DeviceEventConverter.java
index 6b2ee24..6a2d1f3 100644
--- a/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/converter/DeviceEventConverter.java
+++ b/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/converter/DeviceEventConverter.java
@@ -14,7 +14,8 @@
*/
package org.onosproject.kafkaintegration.converter;
-import com.google.protobuf.GeneratedMessage;
+import com.google.protobuf.GeneratedMessageV3;
+
import org.onosproject.event.Event;
import org.onosproject.grpc.net.Device.DeviceCore;
import org.onosproject.grpc.net.Device.DeviceType;
@@ -34,7 +35,7 @@
private final Logger log = LoggerFactory.getLogger(getClass());
@Override
- public GeneratedMessage convertToProtoMessage(Event<?, ?> event) {
+ public GeneratedMessageV3 convertToProtoMessage(Event<?, ?> event) {
DeviceEvent deviceEvent = (DeviceEvent) event;
diff --git a/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/converter/EventConverter.java b/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/converter/EventConverter.java
index c1e7739..3cbabc2 100644
--- a/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/converter/EventConverter.java
+++ b/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/converter/EventConverter.java
@@ -16,7 +16,7 @@
import org.onosproject.event.Event;
-import com.google.protobuf.GeneratedMessage;
+import com.google.protobuf.GeneratedMessageV3;
/**
*
@@ -32,5 +32,6 @@
* @param event ONOS Event object
* @return converted data in protobuf format.
*/
- GeneratedMessage convertToProtoMessage(Event<?, ?> event);
+ // FIXME reconsider return type, something similar to "OnosEvent"?
+ GeneratedMessageV3 convertToProtoMessage(Event<?, ?> event);
}
diff --git a/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/converter/LinkEventConverter.java b/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/converter/LinkEventConverter.java
index febe020..913d0e5 100644
--- a/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/converter/LinkEventConverter.java
+++ b/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/converter/LinkEventConverter.java
@@ -25,7 +25,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.protobuf.GeneratedMessage;
+import com.google.protobuf.GeneratedMessageV3;
/**
* Converts for ONOS Link event message to protobuf format.
@@ -35,7 +35,7 @@
private final Logger log = LoggerFactory.getLogger(getClass());
@Override
- public GeneratedMessage convertToProtoMessage(Event<?, ?> event) {
+ public GeneratedMessageV3 convertToProtoMessage(Event<?, ?> event) {
LinkEvent linkEvent = (LinkEvent) event;
diff --git a/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/impl/KafkaPublisherManager.java b/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/impl/KafkaPublisherManager.java
index 104619a..39c23f3 100644
--- a/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/impl/KafkaPublisherManager.java
+++ b/apps/kafka-integration/core/src/main/java/org/onosproject/kafkaintegration/impl/KafkaPublisherManager.java
@@ -22,7 +22,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.protobuf.GeneratedMessage;
+import com.google.protobuf.GeneratedMessageV3;
/**
* Dispatch ONOS Events to all interested Listeners.
@@ -53,7 +53,7 @@
}
@Override
- public void publish(Type eventType, GeneratedMessage message) {
+ public void publish(Type eventType, GeneratedMessageV3 message) {
log.debug("Dispatching ONOS Event {}", eventType);
post(new OnosEvent(eventType, message));
}
diff --git a/apps/kafka-integration/web/pom.xml b/apps/kafka-integration/web/pom.xml
index e38332f..3dcd937 100644
--- a/apps/kafka-integration/web/pom.xml
+++ b/apps/kafka-integration/web/pom.xml
@@ -87,7 +87,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>