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-2329 Add test for anyxmls inside rpc resonse for netcfon-connector"
[controller.git]
/
opendaylight
/
sal
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
action
/
Output.java
diff --git
a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Output.java
b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Output.java
index e09968836ff1877cfb195974808aaceda1ef4680..5bd9efb30b691ad2775c2687f15538ff2783f332 100644
(file)
--- a/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Output.java
+++ b/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/Output.java
@@
-1,4
+1,3
@@
-
/*
* Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
*
/*
* Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
*
@@
-18,25
+17,23
@@
import org.opendaylight.controller.sal.core.NodeConnector;
/**
* Represents the action of sending the packet out of a physical port
/**
* Represents the action of sending the packet out of a physical port
- *
- *
- *
*/
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
*/
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-
public class Output extends Action {
public class Output extends Action {
- @XmlElement
+ private static final long serialVersionUID = 1L;
+ @XmlElement
private NodeConnector port;
/* Dummy constructor for JAXB */
private NodeConnector port;
/* Dummy constructor for JAXB */
- private Output () {
+ @SuppressWarnings("unused")
+ private Output() {
}
public Output(NodeConnector port) {
type = ActionType.OUTPUT;
this.port = port;
}
public Output(NodeConnector port) {
type = ActionType.OUTPUT;
this.port = port;
- //checkValue(port);
+ //
checkValue(port);
}
public NodeConnector getPort() {
}
public NodeConnector getPort() {
@@
-45,18
+42,23
@@
public class Output extends Action {
@Override
public boolean equals(Object obj) {
@Override
public boolean equals(Object obj) {
- if (this == obj)
+ if (this == obj)
{
return true;
return true;
- if (!super.equals(obj))
+ }
+ if (!super.equals(obj)) {
return false;
return false;
- if (getClass() != obj.getClass())
+ }
+ if (getClass() != obj.getClass()) {
return false;
return false;
+ }
Output other = (Output) obj;
if (port == null) {
Output other = (Output) obj;
if (port == null) {
- if (other.port != null)
+ if (other.port != null)
{
return false;
return false;
- } else if (!port.equals(other.port))
+ }
+ } else if (!port.equals(other.port)) {
return false;
return false;
+ }
return true;
}
return true;
}