Fixing warnings in the sal sub-project.

[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 46c5a9dae933baee49c47e98476a37dd9222dae5..d58be6771bb034d5cf7738b1eaa5c47caa4ec4ce 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
@@ -97,42 +97,42 @@ public class NodeConnector implements Serializable {
         // for Unit Testing coverage
         static {
             compatibleType.put(CONTROLLER,
         // for Unit Testing coverage
         static {
             compatibleType.put(CONTROLLER,

-                               new ImmutablePair(Short.class, null));
+                               new ImmutablePair<Class<? extends Object>, String>(Short.class, null));

             compatibleType.put(ALL,
             compatibleType.put(ALL,

-                               new ImmutablePair(Short.class, null));
+                               new ImmutablePair<Class<? extends Object>, String>(Short.class, null));

             compatibleType.put(SWSTACK,
             compatibleType.put(SWSTACK,

-                               new ImmutablePair(Short.class, null));
+                               new ImmutablePair<Class<? extends Object>, String>(Short.class, null));

             compatibleType.put(HWPATH,
             compatibleType.put(HWPATH,

-                               new ImmutablePair(Short.class, null));
+                               new ImmutablePair<Class<? extends Object>, String>(Short.class, null));

             compatibleType.put(OPENFLOW,
             compatibleType.put(OPENFLOW,

-                               new ImmutablePair(Short.class,
+                               new ImmutablePair<Class<? extends Object>, String>(Short.class,

                                                  Node.NodeIDType.OPENFLOW));
             compatibleType.put(PCEP,
                                                  Node.NodeIDType.OPENFLOW));
             compatibleType.put(PCEP,

-                               new ImmutablePair(Integer.class,
+                               new ImmutablePair<Class<? extends Object>, String>(Integer.class,

                                                  Node.NodeIDType.PCEP));
             compatibleType.put(ONEPK,
                                                  Node.NodeIDType.PCEP));
             compatibleType.put(ONEPK,

-                               new ImmutablePair(String.class,
+                               new ImmutablePair<Class<? extends Object>, String>(String.class,

                                                  Node.NodeIDType.ONEPK));
             compatibleType.put(OPENFLOW2PCEP,
                                                  Node.NodeIDType.ONEPK));
             compatibleType.put(OPENFLOW2PCEP,

-                               new ImmutablePair(Short.class,
+                               new ImmutablePair<Class<? extends Object>, String>(Short.class,

                                                  Node.NodeIDType.OPENFLOW));
             compatibleType.put(OPENFLOW2ONEPK,
                                                  Node.NodeIDType.OPENFLOW));
             compatibleType.put(OPENFLOW2ONEPK,

-                               new ImmutablePair(Short.class,
+                               new ImmutablePair<Class<? extends Object>, String>(Short.class,

                                                  Node.NodeIDType.OPENFLOW));
             compatibleType.put(PCEP2OPENFLOW,
                                                  Node.NodeIDType.OPENFLOW));
             compatibleType.put(PCEP2OPENFLOW,

-                               new ImmutablePair(Integer.class,
+                               new ImmutablePair<Class<? extends Object>, String>(Integer.class,

                                                  Node.NodeIDType.PCEP));
             compatibleType.put(PCEP2ONEPK,
                                                  Node.NodeIDType.PCEP));
             compatibleType.put(PCEP2ONEPK,

-                               new ImmutablePair(Integer.class,
+                               new ImmutablePair<Class<? extends Object>, String>(Integer.class,

                                                  Node.NodeIDType.PCEP));
             compatibleType.put(ONEPK2OPENFLOW,
                                                  Node.NodeIDType.PCEP));
             compatibleType.put(ONEPK2OPENFLOW,

-                               new ImmutablePair(String.class,
+                               new ImmutablePair<Class<? extends Object>, String>(String.class,

                                                  Node.NodeIDType.ONEPK));
             compatibleType.put(ONEPK2PCEP,
                                                  Node.NodeIDType.ONEPK));
             compatibleType.put(ONEPK2PCEP,

-                               new ImmutablePair(String.class,
+                               new ImmutablePair<Class<? extends Object>, String>(String.class,

                                                  Node.NodeIDType.ONEPK));
             compatibleType.put(PRODUCTION,
                                                  Node.NodeIDType.ONEPK));
             compatibleType.put(PRODUCTION,

-                               new ImmutablePair(String.class,
+                               new ImmutablePair<Class<? extends Object>, String>(String.class,

                                                  Node.NodeIDType.PRODUCTION));
         }
 
                                                  Node.NodeIDType.PRODUCTION));
         }
 


@@ -186,7 +186,7 @@ public class NodeConnector implements Serializable {
             if (compatibleType.get(type) != null) {
                 return false;
             }  else {
             if (compatibleType.get(type) != null) {
                 return false;
             }  else {

-                compatibleType.put(type, new ImmutablePair(compatibleID,
+                compatibleType.put(type, new ImmutablePair<Class<? extends Object>, String>(compatibleID,

                                                            compatibleNode));
                 return true;
             }
                                                            compatibleNode));
                 return true;
             }


@@ -340,6 +340,7 @@ public class NodeConnector implements Serializable {
      *
      * @param type of node to be set
      */
      *
      * @param type of node to be set
      */

+    @SuppressWarnings("unused")

     private void setType(String type) {
         this.nodeConnectorType = type;
         if (this.nodeConnectorIDString != null) {
     private void setType(String type) {
         this.nodeConnectorType = type;
         if (this.nodeConnectorIDString != null) {


@@ -373,6 +374,7 @@ public class NodeConnector implements Serializable {
      *
      * @param nodeConnectorIDString String representation for NodeConnectorID
      */
      *
      * @param nodeConnectorIDString String representation for NodeConnectorID
      */

+    @SuppressWarnings("unused")

     private void setNodeConnectorIDString(String IDStr) {
         this.nodeConnectorIDString = IDStr;
         if (this.nodeConnectorType != null) {
     private void setNodeConnectorIDString(String IDStr) {
         this.nodeConnectorIDString = IDStr;
         if (this.nodeConnectorType != null) {