Bug 2245 - Fixed 'If Stmts Must Use Braces'

Change-Id: Ibef534ef02ef6058ec34dbca7ec172a03612d8d1
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKey.java
index 8db03d938f730b949f184b99323a4ea653371e2c..08db5a013400515673f82f4df3f9119422a66c83 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKey.java
@@ -37,15 +37,19 @@ public class EnhancedMessageCodeKey extends MessageCodeKey {
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (this == obj)\r
+        if (this == obj) {\r
             return true;\r
-        if (!super.equals(obj))\r
+        }\r
+        if (!super.equals(obj)) {\r
             return false;\r
-        if (getClass() != obj.getClass())\r
+        }\r
+        if (getClass() != obj.getClass()) {\r
             return false;\r
+        }\r
         EnhancedMessageCodeKey other = (EnhancedMessageCodeKey) obj;\r
-        if (msgType2 != other.msgType2)\r
+        if (msgType2 != other.msgType2) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
 \r

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKey.java
index 15919e4f38805681cf18a9106e853b99f6c0b4c8..a21572104c08343d6ee1d19cbe370662fbd8b11b 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKey.java
@@ -30,19 +30,24 @@ public class EnhancedMessageTypeKey<E, F> extends MessageTypeKey<E> {
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (this == obj)\r
+        if (this == obj) {\r
             return true;\r
-        if (!super.equals(obj))\r
+        }\r
+        if (!super.equals(obj)) {\r
             return false;\r
-        if (getClass() != obj.getClass())\r
+        }\r
+        if (getClass() != obj.getClass()) {\r
             return false;\r
+        }\r
         @SuppressWarnings("rawtypes")\r
         EnhancedMessageTypeKey other = (EnhancedMessageTypeKey) obj;\r
         if (msgType2 == null) {\r
-            if (other.msgType2 != null)\r
+            if (other.msgType2 != null) {\r
                 return false;\r
-        } else if (!msgType2.getName().equals(other.msgType2.getName()))\r
+            }\r
+        } else if (!msgType2.getName().equals(other.msgType2.getName())) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
 \r
@@ -50,4 +55,4 @@ public class EnhancedMessageTypeKey<E, F> extends MessageTypeKey<E> {
     public String toString() {\r
         return super.toString() + " msgType2: " + msgType2.getName();\r
     }\r
-}\r
+}
\ No newline at end of file

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageCodeKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageCodeKey.java
index 86d5a4d158133504413c65cfe9657224ba211dce..56b6bb1a8a123457cd96dede185bef13b658565e 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageCodeKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageCodeKey.java
@@ -40,22 +40,29 @@ public class MessageCodeKey {
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (this == obj)\r
+        if (this == obj) {\r
             return true;\r
-        if (obj == null)\r
+        }\r
+        if (obj == null) {\r
             return false;\r
-        if (!(obj instanceof MessageCodeKey))\r
+        }\r
+        if (!(obj instanceof MessageCodeKey)) {\r
             return false;\r
+        }\r
         MessageCodeKey other = (MessageCodeKey) obj;\r
         if (clazz == null) {\r
-            if (other.clazz != null)\r
+            if (other.clazz != null) {\r
                 return false;\r
-        } else if (!clazz.equals(other.clazz))\r
+            }\r
+        } else if (!clazz.equals(other.clazz)) {\r
             return false;\r
-        if (msgType != other.msgType)\r
+        }\r
+        if (msgType != other.msgType) {\r
             return false;\r
-        if (msgVersion != other.msgVersion)\r
+        }\r
+        if (msgVersion != other.msgVersion) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
 \r
@@ -63,5 +70,4 @@ public class MessageCodeKey {
     public String toString() {\r
         return "msgVersion: " + msgVersion + " objectClass: " + clazz.getName() + " msgType: " + msgType;\r
     }\r
-\r
 }
\ No newline at end of file

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKey.java
index d5d303e48960e47ad605d391badf15f0f6383b67..2e1d01890e084d1253bd1a637aa957f9dccb0655 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKey.java
@@ -45,21 +45,26 @@ public class MessageTypeKey<E> {
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (!(obj instanceof MessageTypeKey))
+        }
+        if (!(obj instanceof MessageTypeKey)) {
             return false;
+        }
         MessageTypeKey<?> other = (MessageTypeKey<?>) obj;
         if (msgType == null) {
-            if (other.msgType != null)
+            if (other.msgType != null) {
                 return false;
-        } else if (!msgType.equals(other.msgType))
+            }
+        } else if (!msgType.equals(other.msgType)) {
             return false;
-        if (msgVersion != other.msgVersion)
+        }
+        if (msgVersion != other.msgVersion) {
             return false;
+        }
         return true;
     }
- 
-}
+}
\ No newline at end of file

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKey.java
index db17b3b5b647f057ca5ec8af2408dbc94d88cd96..d7363fbb1cf43a9d383d6dcb5e3f230610718bd6 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKey.java
@@ -39,18 +39,23 @@ public class ActionDeserializerKey extends MessageCodeKey {
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (this == obj)\r
+        if (this == obj) {\r
             return true;\r
-        if (!super.equals(obj))\r
+        }\r
+        if (!super.equals(obj)) {\r
             return false;\r
-        if (!(obj instanceof ActionDeserializerKey))\r
+        }\r
+        if (!(obj instanceof ActionDeserializerKey)) {\r
             return false;\r
+        }\r
         ActionDeserializerKey other = (ActionDeserializerKey) obj;\r
         if (experimenterId == null) {\r
-            if (other.experimenterId != null)\r
+            if (other.experimenterId != null) {\r
                 return false;\r
-        } else if (!experimenterId.equals(other.experimenterId))\r
+            }\r
+        } else if (!experimenterId.equals(other.experimenterId)) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
 \r

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKey.java
index bf1fe7dcb92d307d034ea0ed9fdb3a48fb7d168c..4e33c56ca293055ca8e8f82d0512944362cc9503 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKey.java
@@ -44,23 +44,30 @@ public class ActionSerializerKey<TYPE extends ActionBase> extends MessageTypeKey
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (this == obj)\r
+        if (this == obj) {\r
             return true;\r
-        if (!super.equals(obj))\r
+        }\r
+        if (!super.equals(obj)) {\r
             return false;\r
-        if (getClass() != obj.getClass())\r
+        }\r
+        if (getClass() != obj.getClass()) {\r
             return false;\r
+        }\r
         ActionSerializerKey<?> other = (ActionSerializerKey<?>) obj;\r
         if (actionType == null) {\r
-            if (other.actionType != null)\r
+            if (other.actionType != null) {\r
                 return false;\r
-        } else if (!actionType.equals(other.actionType))\r
+            }\r
+        } else if (!actionType.equals(other.actionType)) {\r
             return false;\r
+        }\r
         if (experimenterId == null) {\r
-            if (other.experimenterId != null)\r
+            if (other.experimenterId != null) {\r
                 return false;\r
-        } else if (!experimenterId.equals(other.experimenterId))\r
+            }\r
+        } else if (!experimenterId.equals(other.experimenterId)) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
 \r

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKey.java
index 91f8977a6b63ee0c3d0d19f508c9c78b20d90b03..c21608780b272208a59f09190dd10423c8aae0d4 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKey.java
@@ -39,18 +39,23 @@ public class InstructionDeserializerKey extends MessageCodeKey {
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (this == obj)\r
+        if (this == obj) {\r
             return true;\r
-        if (!super.equals(obj))\r
+        }\r
+        if (!super.equals(obj)) {\r
             return false;\r
-        if (!(obj instanceof InstructionDeserializerKey))\r
+        }\r
+        if (!(obj instanceof InstructionDeserializerKey)) {\r
             return false;\r
+        }\r
         InstructionDeserializerKey other = (InstructionDeserializerKey) obj;\r
         if (experimenterId == null) {\r
-            if (other.experimenterId != null)\r
+            if (other.experimenterId != null) {\r
                 return false;\r
-        } else if (!experimenterId.equals(other.experimenterId))\r
+            }\r
+        } else if (!experimenterId.equals(other.experimenterId)) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
 \r

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKey.java
index 899568dc24ae3ac9457bc33f571f92a553eb8f26..7759c0bf0b64e1431b0ffbefabc44d1928b9809f 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKey.java
@@ -46,23 +46,30 @@ public class InstructionSerializerKey<TYPE extends InstructionBase>
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (this == obj)\r
+        if (this == obj) {\r
             return true;\r
-        if (!super.equals(obj))\r
+        }\r
+        if (!super.equals(obj)) {\r
             return false;\r
-        if (!(obj instanceof InstructionSerializerKey))\r
+        }\r
+        if (!(obj instanceof InstructionSerializerKey)) {\r
             return false;\r
+        }\r
         InstructionSerializerKey<?> other = (InstructionSerializerKey<?>) obj;\r
         if (experimenterId == null) {\r
-            if (other.experimenterId != null)\r
+            if (other.experimenterId != null) {\r
                 return false;\r
-        } else if (!experimenterId.equals(other.experimenterId))\r
+            }\r
+        } else if (!experimenterId.equals(other.experimenterId)) {\r
             return false;\r
+        }\r
         if (instructionType == null) {\r
-            if (other.instructionType != null)\r
+            if (other.instructionType != null) {\r
                 return false;\r
-        } else if (!instructionType.equals(other.instructionType))\r
+            }\r
+        } else if (!instructionType.equals(other.instructionType)) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
 \r

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKey.java
index 593ca8d65358eebe8017356a64d0f7777d4e3faa..d50d9fb1450ab6b9fcddb1fd5e3a56acef526e81 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKey.java
@@ -51,20 +51,26 @@ public final class MatchEntryDeserializerKey extends MessageCodeKey
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (this == obj)\r
+        if (this == obj) {\r
             return true;\r
-        if (!super.equals(obj))\r
+        }\r
+        if (!super.equals(obj)) {\r
             return false;\r
-        if (getClass() != obj.getClass())\r
+        }\r
+        if (getClass() != obj.getClass()) {\r
             return false;\r
+        }\r
         MatchEntryDeserializerKey other = (MatchEntryDeserializerKey) obj;\r
         if (experimenterId == null) {\r
-            if (other.experimenterId != null)\r
+            if (other.experimenterId != null) {\r
                 return false;\r
-        } else if (!experimenterId.equals(other.experimenterId))\r
+            }\r
+        } else if (!experimenterId.equals(other.experimenterId)) {\r
             return false;\r
-        if (oxmField != other.oxmField)\r
+        }\r
+        if (oxmField != other.oxmField) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
 \r

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKey.java
index c7f07f6212fd516c23423526bfd01c5b19a784f8..55d67e56fd29bf37d9d328a362ddfabb97fad3c4 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKey.java
@@ -58,28 +58,37 @@ public final class MatchEntrySerializerKey<OXM_CLASS extends OxmClassBase, OXM_F
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (this == obj)\r
+        if (this == obj) {\r
             return true;\r
-        if (!super.equals(obj))\r
+        }\r
+        if (!super.equals(obj)) {\r
             return false;\r
-        if (getClass() != obj.getClass())\r
+        }\r
+        if (getClass() != obj.getClass()) {\r
             return false;\r
+        }\r
         MatchEntrySerializerKey<?, ?> other = (MatchEntrySerializerKey<?, ?>) obj;\r
         if (experimenterId == null) {\r
-            if (other.experimenterId != null)\r
+            if (other.experimenterId != null) {\r
                 return false;\r
-        } else if (!experimenterId.equals(other.experimenterId))\r
+            }\r
+        } else if (!experimenterId.equals(other.experimenterId)) {\r
             return false;\r
+        }\r
         if (oxmClass == null) {\r
-            if (other.oxmClass != null)\r
+            if (other.oxmClass != null) {\r
                 return false;\r
-        } else if (!oxmClass.equals(other.oxmClass))\r
+            }\r
+        } else if (!oxmClass.equals(other.oxmClass)) {\r
             return false;\r
+        }\r
         if (oxmField == null) {\r
-            if (other.oxmField != null)\r
+            if (other.oxmField != null) {\r
                 return false;\r
-        } else if (!oxmField.equals(other.oxmField))\r
+            }\r
+        } else if (!oxmField.equals(other.oxmField)) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
 \r

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKey.java
index f9f3cb113e9897db5d47a9cd9c2dead11924098c..45b2d02aae405dfe5803872c45095ada2840a981 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKey.java
@@ -40,19 +40,23 @@ public final class ExperimenterActionSerializerKey extends ActionSerializerKey<E
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (this == obj)\r
+        if (this == obj) {\r
             return true;\r
-        if (!super.equals(obj))\r
+        }\r
+        if (!super.equals(obj)) {\r
             return false;\r
-        if (getClass() != obj.getClass())\r
+        }\r
+        if (getClass() != obj.getClass()) {\r
             return false;\r
+        }\r
         ExperimenterActionSerializerKey other = (ExperimenterActionSerializerKey) obj;\r
         if (actionSubType == null) {\r
-            if (other.actionSubType != null)\r
+            if (other.actionSubType != null) {\r
                 return false;\r
-        } else if (!actionSubType.equals(other.actionSubType))\r
+            }\r
+        } else if (!actionSubType.equals(other.actionSubType)) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
-\r
 }
\ No newline at end of file

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKey.java
index d4841f20521f0f91d0d09915316952594efb58dd..1682d6d3405a85599b112e217352d2f22c8911a1 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKey.java
@@ -43,18 +43,23 @@ public final class ExperimenterIdDeserializerKey extends MessageCodeKey
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (this == obj)\r
+        if (this == obj) {\r
             return true;\r
-        if (!super.equals(obj))\r
+        }\r
+        if (!super.equals(obj)) {\r
             return false;\r
-        if (!(obj instanceof ExperimenterIdDeserializerKey))\r
+        }\r
+        if (!(obj instanceof ExperimenterIdDeserializerKey)) {\r
             return false;\r
+        }\r
         ExperimenterIdDeserializerKey other = (ExperimenterIdDeserializerKey) obj;\r
         if (experimenterId == null) {\r
-            if (other.experimenterId != null)\r
+            if (other.experimenterId != null) {\r
                 return false;\r
-        } else if (!experimenterId.equals(other.experimenterId))\r
+            }\r
+        } else if (!experimenterId.equals(other.experimenterId)) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
 \r

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKey.java
index 47d3608a3439579f8d99ff99341accb5d92ec2c4..2336e9a8390ee98ba033883a5eb33eedc3813242 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKey.java
@@ -41,18 +41,23 @@ public class ExperimenterIdSerializerKey<TYPE extends DataObject> extends Messag
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (this == obj)\r
+        if (this == obj) {\r
             return true;\r
-        if (!super.equals(obj))\r
+        }\r
+        if (!super.equals(obj)) {\r
             return false;\r
-        if (!(obj instanceof ExperimenterIdSerializerKey))\r
+        }\r
+        if (!(obj instanceof ExperimenterIdSerializerKey)) {\r
             return false;\r
+        }\r
         ExperimenterIdSerializerKey<?> other = (ExperimenterIdSerializerKey<?>) obj;\r
         if (experimenterId == null) {\r
-            if (other.experimenterId != null)\r
+            if (other.experimenterId != null) {\r
                 return false;\r
-        } else if (!experimenterId.equals(other.experimenterId))\r
+            }\r
+        } else if (!experimenterId.equals(other.experimenterId)) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
 \r

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/RpcResponseKey.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/RpcResponseKey.java
index a01098d4ccbcdb80b95871e442c9b2d05984702a..5ec0c0b164bc83bea40eaaad5471ee0b48fb0b68 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/RpcResponseKey.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/RpcResponseKey.java
@@ -52,20 +52,25 @@ public class RpcResponseKey {
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
+        }
         RpcResponseKey other = (RpcResponseKey) obj;
         if (outputClazz == null) {
-            if (other.outputClazz != null)
+            if (other.outputClazz != null) {
                 return false;
-        } else if (!outputClazz.equals(other.outputClazz))
+            }
+        } else if (!outputClazz.equals(other.outputClazz)) {
             return false;
 //        if (xid != other.xid)
 //            return false;
+        }
         return true;
     }
 
@@ -74,5 +79,4 @@ public class RpcResponseKey {
         return "RpcResultKey [xid=" + xid + ", outputClazz=" + outputClazz
                 + "]";
     }
-
-}
+}
\ No newline at end of file

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageTypeCodeKey.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageTypeCodeKey.java
index bb4368abc2ae25dd4ba7c751e0cdfb230d043dcf..d623297e732c5d93930d53c2bf575a2a28881032 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageTypeCodeKey.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageTypeCodeKey.java
@@ -53,18 +53,22 @@ public class MessageTypeCodeKey {
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
+        }
         MessageTypeCodeKey other = (MessageTypeCodeKey) obj;
-        if (msgType != other.msgType)
+        if (msgType != other.msgType) {
             return false;
-        if (msgVersion != other.msgVersion)
+        }
+        if (msgVersion != other.msgVersion) {
             return false;
+        }
         return true;
     }
-    
-}
+}
\ No newline at end of file

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassKey.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassKey.java
index 8be2df3e07337b9ac7a8173677b294e58af2585a..7774937bb432a508026bff1488bd7e804821037d 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassKey.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassKey.java
@@ -36,17 +36,22 @@ public class TypeToClassKey {
 \r
     @Override\r
     public boolean equals(Object obj) {\r
-        if (this == obj)\r
+        if (this == obj) {\r
             return true;\r
-        if (obj == null)\r
+        }\r
+        if (obj == null) {\r
             return false;\r
-        if (getClass() != obj.getClass())\r
+        }\r
+        if (getClass() != obj.getClass()) {\r
             return false;\r
+        }\r
         TypeToClassKey other = (TypeToClassKey) obj;\r
-        if (type != other.type)\r
+        if (type != other.type) {\r
             return false;\r
-        if (version != other.version)\r
+        }\r
+        if (version != other.version) {\r
             return false;\r
+        }\r
         return true;\r
     }\r
-}\r
+}
\ No newline at end of file