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
/
SetVlanId.java
diff --git
a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanId.java
b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanId.java
index b1e4748bc3b4f9dd1426cd4958af319eabda5e23..fcc71f32d89da12ce27ad333c2d1f7fa8e1e0897 100644
(file)
--- a/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanId.java
+++ b/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/action/SetVlanId.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.
*
@@
-20,15
+19,16
@@
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-
public class SetVlanId extends Action {
public class SetVlanId extends Action {
- @XmlElement
+ private static final long serialVersionUID = 1L;
+ @XmlElement
private int vlanId;
private int vlanId;
- private SetVlanId() {
-
- }
-
+ @SuppressWarnings("unused")
+ private SetVlanId() {
+
+ }
+
public SetVlanId(int vlanId) {
type = ActionType.SET_VLAN_ID;
this.vlanId = vlanId;
public SetVlanId(int vlanId) {
type = ActionType.SET_VLAN_ID;
this.vlanId = vlanId;
@@
-46,15
+46,19
@@
public class SetVlanId 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;
+ }
SetVlanId other = (SetVlanId) obj;
SetVlanId other = (SetVlanId) obj;
- if (vlanId != other.vlanId)
+ if (vlanId != other.vlanId)
{
return false;
return false;
+ }
return true;
}
return true;
}