Refactor protocol buffer to split models into different packages
Change-Id: I26152ba227ebe9afd871c6e501ccca17c49e1e4e
diff --git a/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/LinkProviderServiceClientProxy.java b/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/LinkProviderServiceClientProxy.java
index 78f9f37..5c40c90 100644
--- a/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/LinkProviderServiceClientProxy.java
+++ b/incubator/rpc-grpc/src/main/java/org/onosproject/incubator/rpc/grpc/LinkProviderServiceClientProxy.java
@@ -15,18 +15,16 @@
*/
package org.onosproject.incubator.rpc.grpc;
-import static org.onosproject.incubator.protobuf.models.ProtobufUtils.asMap;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.onosproject.grpc.net.Link.LinkType;
+import com.google.common.annotations.Beta;
+import com.google.common.util.concurrent.ListenableFuture;
+import io.grpc.Channel;
import org.onosproject.grpc.net.link.LinkProviderServiceRpcGrpc;
import org.onosproject.grpc.net.link.LinkProviderServiceRpcGrpc.LinkProviderServiceRpcFutureStub;
import org.onosproject.grpc.net.link.LinkService.LinkDetectedMsg;
import org.onosproject.grpc.net.link.LinkService.LinkVanishedMsg;
import org.onosproject.grpc.net.link.LinkService.Void;
+import org.onosproject.grpc.net.link.models.LinkEnumsProto.LinkTypeProto;
+import org.onosproject.grpc.net.models.ConnectPointProtoOuterClass.ConnectPointProto;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Link.Type;
@@ -38,10 +36,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.Beta;
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
-import io.grpc.Channel;
+import static org.onosproject.incubator.protobuf.models.ProtobufUtils.asMap;
/**
* Proxy object to handle LinkProviderService calls.
@@ -226,25 +225,25 @@
* Translates ONOS object to gRPC message.
*
* @param type {@link org.onosproject.net.Link.Type Link.Type}
- * @return gRPC LinkType
+ * @return gRPC LinkTypeProto
*/
- private LinkType translate(Type type) {
+ private LinkTypeProto translate(Type type) {
switch (type) {
case DIRECT:
- return LinkType.DIRECT;
+ return LinkTypeProto.DIRECT;
case EDGE:
- return LinkType.EDGE;
+ return LinkTypeProto.EDGE;
case INDIRECT:
- return LinkType.INDIRECT;
+ return LinkTypeProto.INDIRECT;
case OPTICAL:
- return LinkType.OPTICAL;
+ return LinkTypeProto.OPTICAL;
case TUNNEL:
- return LinkType.TUNNEL;
+ return LinkTypeProto.TUNNEL;
case VIRTUAL:
- return LinkType.VIRTUAL;
+ return LinkTypeProto.VIRTUAL;
default:
- return LinkType.DIRECT;
+ return LinkTypeProto.DIRECT;
}
}
@@ -253,10 +252,10 @@
* Translates ONOS object to gRPC message.
*
* @param cp {@link ConnectPoint}
- * @return gRPC ConnectPoint
+ * @return gRPC ConnectPointProto
*/
- private org.onosproject.grpc.net.Link.ConnectPoint translate(ConnectPoint cp) {
- return org.onosproject.grpc.net.Link.ConnectPoint.newBuilder()
+ private ConnectPointProto translate(ConnectPoint cp) {
+ return ConnectPointProto.newBuilder()
.setDeviceId(cp.deviceId().toString())
.setPortNumber(cp.port().toString())
.build();