Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-731: fix warnings from missing generic arguments"
[controller.git]
/
opendaylight
/
md-sal
/
sal-remoterpc-connector
/
implementation
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
connector
/
remoterpc
/
dto
/
Message.java
diff --git
a/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/dto/Message.java
b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/dto/Message.java
index 95fe99c81c7da67e52b8274ffd37eddea8753aa2..cbcfe3e2a9e4833a2c88ffc08fd2bb05b0ed3d79 100644
(file)
--- a/
opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/dto/Message.java
+++ b/
opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/dto/Message.java
@@
-8,15
+8,21
@@
package org.opendaylight.controller.sal.connector.remoterpc.dto;
package org.opendaylight.controller.sal.connector.remoterpc.dto;
-import org.opendaylight.controller.sal.connector.api.RpcRouter;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
-import
java.io.*
;
+import
org.opendaylight.controller.sal.connector.api.RpcRouter
;
public class Message implements Serializable {
public class Message implements Serializable {
+ private static final long serialVersionUID = 1L;
public static enum MessageType {
public static enum MessageType {
- ANNOUNCE((byte) 0), //TODO: Remove announce, add rpc registration and deregistration
-
HEARTBEAT
((byte) 1),
+ PING((byte) 0),
+
PONG
((byte) 1),
REQUEST((byte) 2),
RESPONSE((byte) 3),
ERROR((byte)4);
REQUEST((byte) 2),
RESPONSE((byte) 3),
ERROR((byte)4);
@@
-35,7
+41,7
@@
public class Message implements Serializable {
private MessageType type;
private String sender;
private String recipient;
private MessageType type;
private String sender;
private String recipient;
- private RpcRouter.RouteIdentifier route;
+ private RpcRouter.RouteIdentifier
<?, ?, ?>
route;
private Object payload;
public MessageType getType() {
private Object payload;
public MessageType getType() {
@@
-54,11
+60,11
@@
public class Message implements Serializable {
this.sender = sender;
}
this.sender = sender;
}
- public RpcRouter.RouteIdentifier getRoute() {
+ public RpcRouter.RouteIdentifier
<?, ?, ?>
getRoute() {
return route;
}
return route;
}
- public void setRoute(RpcRouter.RouteIdentifier route) {
+ public void setRoute(RpcRouter.RouteIdentifier
<?, ?, ?>
route) {
this.route = route;
}
this.route = route;
}
@@
-77,6
+83,7
@@
public class Message implements Serializable {
public void setRecipient(String recipient) {
this.recipient = recipient;
}
public void setRecipient(String recipient) {
this.recipient = recipient;
}
+
@Override
public String toString() {
return "Message{" +
@Override
public String toString() {
return "Message{" +
@@
-116,13
+123,14
@@
public class Message implements Serializable {
return o.readObject();
}
return o.readObject();
}
- public static class Response extends Message implements RpcRouter.RpcReply {
+ public static class Response extends Message implements RpcRouter.RpcReply<Object> {
+ private static final long serialVersionUID = 1L;
private ResponseCode code; // response code
public static enum ResponseCode {
SUCCESS(200), BADREQUEST(400), TIMEOUT(408), GONE(410), SERVERERROR(500), SERVICEUNAVAILABLE(503);
private ResponseCode code; // response code
public static enum ResponseCode {
SUCCESS(200), BADREQUEST(400), TIMEOUT(408), GONE(410), SERVERERROR(500), SERVICEUNAVAILABLE(503);
- private int code;
+ private
final
int code;
ResponseCode(int code) {
this.code = code;
ResponseCode(int code) {
this.code = code;
@@
-143,7
+151,7
@@
public class Message implements Serializable {
*/
public static class MessageBuilder{
*/
public static class MessageBuilder{
- private Message message;
+ private
final
Message message;
public MessageBuilder(){
message = new Message();
public MessageBuilder(){
message = new Message();
@@
-165,7
+173,7
@@
public class Message implements Serializable {
return this;
}
return this;
}
- public MessageBuilder route(RpcRouter.RouteIdentifier route){
+ public MessageBuilder route(RpcRouter.RouteIdentifier
<?, ?, ?>
route){
message.setRoute(route);
return this;
}
message.setRoute(route);
return this;
}