Merge "fixing warnings"

[controller.git] / opendaylight / sal / api / src / main / java / org / opendaylight / controller / sal / core / NodeConnector.java

diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeConnector.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeConnector.java
index 96e6cc7f10c6e9714152bec8309bc81bce47ad99..59a184e5737db9f0aab5512e40f2e44395a3be39 100644 (file)
--- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeConnector.java
+++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeConnector.java
@@ -50,8 +50,8 @@ public class NodeConnector implements Serializable {
      */
     public static class NodeConnectorIDType {
         private static final
-        ConcurrentHashMap<String, ImmutablePair<Class, String>> compatibleType =
-            new ConcurrentHashMap<String, ImmutablePair<Class, String>>();
+        ConcurrentHashMap<String, ImmutablePair<Class<? extends Object>, String>> compatibleType =
+            new ConcurrentHashMap<String, ImmutablePair<Class<? extends Object>, String>>();
         /**
          * Represent a special port pointing toward the controller,
          * this is to send data packets toward the controller from
@@ -61,7 +61,7 @@ public class NodeConnector implements Serializable {
         /**
          * Special port describing ALL the ports in the system,
          * should be used for flooding like mechanism but better
-         * to be carefull with it
+         * to be careful with it
          */
         public static String ALL = "ALL";
         /**
@@ -175,7 +175,7 @@ public class NodeConnector implements Serializable {
          * @return true if registered, false otherwise
          */
         public static boolean registerIDType(String type,
-                                             Class compatibleID,
+                                             Class<? extends Object> compatibleID,
                                              String compatibleNode) {
             if (compatibleType.get(type) != null) {
                 return false;
@@ -460,13 +460,13 @@ public class NodeConnector implements Serializable {
     }
 
     /**
-     * return a NodeConnector from a string not containing explicitely
+     * return a NodeConnector from a string not containing explicitly
      * the Node portion which has to be supplied as parameter
      *
      * @param str String to be parsed in a NodeConnector
      * @param n Node to which the NodeConnector is attached
      *
-     * @return the NodeConnector if parse is succesfull, null otherwise
+     * @return the NodeConnector if parse is successful, null otherwise
      */
     public static NodeConnector fromStringNoNode(String str, Node n) {
         if (str == null) {