X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fsal%2Fapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcore%2FNode.java;h=5c21294f46da0438da325b263039a895e3f08371;hb=a3a28e8138fa25170b01e6b51a44490f002f6e91;hp=f54a515576816fe8d5f27cdc6d2a80454264693f;hpb=0462ef3bfb5ee79460e73e103e347ad8ec4a2e34;p=controller.git

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 f54a515576..5c21294f46 100644
--- 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
@@ -27,6 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
 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;
@@ -39,6 +40,7 @@ import org.opendaylight.controller.sal.utils.HexEncode;
  *
  */
 @XmlAccessorType(XmlAccessType.NONE)
+@XmlRootElement
 public class Node implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -51,8 +53,8 @@ public class Node implements Serializable {
      * 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
          */
@@ -111,7 +113,7 @@ public class Node implements Serializable {
          * @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 {