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 "fixing warnings"
[controller.git]
/
opendaylight
/
sal
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
core
/
Node.java
diff --git
a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java
b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java
index b199e5ce72f4bfaeab1e7a02426c8449ce8b357b..5c21294f46da0438da325b263039a895e3f08371 100644
(file)
--- a/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java
+++ b/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java
@@
-18,23
+18,20
@@
*/
package org.opendaylight.controller.sal.core;
*/
package org.opendaylight.controller.sal.core;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.Set;
-import java.math.BigInteger;
-
import java.io.Serializable;
import java.io.Serializable;
-import java.lang.String;
+import java.math.BigInteger;
+import java.util.Set;
import java.util.UUID;
import java.util.UUID;
-import java.lang.Long;
-import java.lang.Class;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.opendaylight.controller.sal.utils.HexEncode;
+import java.util.concurrent.ConcurrentHashMap;
-import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.opendaylight.controller.sal.utils.HexEncode;
/**
* Describe a generic network element in multiple SDNs technologies. A
/**
* Describe a generic network element in multiple SDNs technologies. A
@@
-43,6
+40,7
@@
import javax.xml.bind.annotation.XmlAttribute;
*
*/
@XmlAccessorType(XmlAccessType.NONE)
*
*/
@XmlAccessorType(XmlAccessType.NONE)
+@XmlRootElement
public class Node implements Serializable {
private static final long serialVersionUID = 1L;
public class Node implements Serializable {
private static final long serialVersionUID = 1L;
@@
-55,8
+53,8
@@
public class Node implements Serializable {
* surround.
*/
public static final class NodeIDType {
* surround.
*/
public static final class NodeIDType {
- private static final ConcurrentHashMap<String, Class> compatibleType =
- new ConcurrentHashMap<String, Class>();
+ private static final ConcurrentHashMap<String, Class
<? extends Object>
> compatibleType =
+ new ConcurrentHashMap<String, Class
<? extends Object>
>();
/**
* Identifier for an OpenFlow node
*/
/**
* Identifier for an OpenFlow node
*/
@@
-115,7
+113,7
@@
public class Node implements Serializable {
* @return true if registered, false otherwise
*/
public static boolean registerIDType(String type,
* @return true if registered, false otherwise
*/
public static boolean registerIDType(String type,
- Class compatibleID) {
+ Class
<? extends Object>
compatibleID) {
if (compatibleType.get(type) != null) {
return false;
} else {
if (compatibleType.get(type) != null) {
return false;
} else {