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 "Refactor LeaderElectionScenarioTests"
[controller.git]
/
opendaylight
/
md-sal
/
sal-remoterpc-connector
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
remote
/
rpc
/
RouteIdentifierImpl.java
diff --git
a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RouteIdentifierImpl.java
b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RouteIdentifierImpl.java
index ea72238fbcb3aa6cc29621c76821d08a0eb4e158..99e812193c727f403404852976177483e064d902 100644
(file)
--- a/
opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RouteIdentifierImpl.java
+++ b/
opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RouteIdentifierImpl.java
@@
-7,20
+7,21
@@
*/
package org.opendaylight.controller.remote.rpc;
*/
package org.opendaylight.controller.remote.rpc;
+import com.google.common.base.Preconditions;
+import java.io.Serializable;
import org.opendaylight.controller.sal.connector.api.RpcRouter;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.controller.sal.connector.api.RpcRouter;
import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
-
-import java.io.Serializable;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-public class RouteIdentifierImpl implements RpcRouter.RouteIdentifier<QName, QName, InstanceIdentifier>,Serializable {
+public class RouteIdentifierImpl implements RpcRouter.RouteIdentifier<QName, QName,
Yang
InstanceIdentifier>,Serializable {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
- private QName context;
- private QName type;
- private InstanceIdentifier route;
+ private
final
QName context;
+ private
final
QName type;
+ private
final Yang
InstanceIdentifier route;
- public RouteIdentifierImpl(QName context, QName type, InstanceIdentifier route) {
+ public RouteIdentifierImpl(final QName context, final QName type, final YangInstanceIdentifier route) {
+ Preconditions.checkNotNull(type, "Rpc type should not be null");
this.context = context;
this.type = type;
this.route = route;
this.context = context;
this.type = type;
this.route = route;
@@
-28,26
+29,26
@@
public class RouteIdentifierImpl implements RpcRouter.RouteIdentifier<QName, QNa
@Override
public QName getContext() {
@Override
public QName getContext() {
- return
this.
context;
+ return context;
}
@Override
public QName getType() {
}
@Override
public QName getType() {
- return t
his.t
ype;
+ return type;
}
@Override
}
@Override
- public InstanceIdentifier getRoute() {
- return
this.
route;
+ public
Yang
InstanceIdentifier getRoute() {
+ return route;
}
@Override
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(
final
Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- RouteIdentifierImpl that = (RouteIdentifierImpl) o;
+
final
RouteIdentifierImpl that = (RouteIdentifierImpl) o;
if (context == null){
if (that.getContext() != null) return false;
if (context == null){
if (that.getContext() != null) return false;
@@
-69,7
+70,7
@@
public class RouteIdentifierImpl implements RpcRouter.RouteIdentifier<QName, QNa
@Override
public int hashCode() {
@Override
public int hashCode() {
- int prime = 31;
+
final
int prime = 31;
int result = 0;
result = prime * result + (context == null ? 0:context.hashCode());
result = prime * result + (type == null ? 0:type.hashCode());
int result = 0;
result = prime * result + (context == null ? 0:context.hashCode());
result = prime * result + (type == null ? 0:type.hashCode());