Change local names of local variables in FeaturesReplyMessageFactory and OxmIpv6ExtHd...

Change-Id: Id55fae5958725e9526f9a5633f8ea7fde8ac9c5b
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactory.java
index d7991eb9fc49496b6eec5f095f961dc3ab393ab7..b599c208dfb0c21db5d471d059dfd504ebac6abd 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactory.java
@@ -45,15 +45,15 @@ public class FeaturesReplyMessageFactory implements OFDeserializer<GetFeaturesOu
     }
 
     private static Capabilities createCapabilities(long input) {
-        final Boolean FLOW_STATS = (input & (1 << 0)) != 0;
-        final Boolean TABLE_STATS = (input & (1 << 1)) != 0;
-        final Boolean PORT_STATS = (input & (1 << 2)) != 0;
-        final Boolean GROUP_STATS = (input & (1 << 3)) != 0;
-        final Boolean IP_REASM = (input & (1 << 5)) != 0;
-        final Boolean QUEUE_STATS = (input & (1 << 6)) != 0;
-        final Boolean PORT_BLOCKED = (input & (1 << 8)) != 0;
-        return new Capabilities(FLOW_STATS, GROUP_STATS, IP_REASM,
-                PORT_BLOCKED, PORT_STATS, QUEUE_STATS, TABLE_STATS);
+        final Boolean flowStats = (input & (1 << 0)) != 0;
+        final Boolean tableStats = (input & (1 << 1)) != 0;
+        final Boolean portStats = (input & (1 << 2)) != 0;
+        final Boolean groupStats = (input & (1 << 3)) != 0;
+        final Boolean ipReasm = (input & (1 << 5)) != 0;
+        final Boolean queueStats = (input & (1 << 6)) != 0;
+        final Boolean portBlocked = (input & (1 << 8)) != 0;
+        return new Capabilities(flowStats, groupStats, ipReasm,
+                portBlocked, portStats, queueStats, tableStats);
     }
 
 }

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializer.java
index e4925d47b913b2dfc510f57b93e2c39c8cd2e21d..26f7f8399be71f5f4cfc4fc73ca75d7f14630f0d 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializer.java
@@ -42,16 +42,16 @@ public class OxmIpv6ExtHdrDeserializer extends AbstractOxmMatchEntryDeserializer
             MatchEntriesBuilder builder) {\r
         PseudoFieldMatchEntryBuilder pseudoBuilder = new PseudoFieldMatchEntryBuilder();\r
         int bitmap = input.readUnsignedShort();\r
-        final Boolean NONEXT = ((bitmap) & (1<<0)) != 0;\r
-        final Boolean ESP = ((bitmap) & (1<<1)) != 0;\r
-        final Boolean AUTH = ((bitmap) & (1<<2)) != 0;\r
-        final Boolean DEST = ((bitmap) & (1<<3)) != 0;\r
-        final Boolean FRAG = ((bitmap) & (1<<4)) != 0;\r
-        final Boolean ROUTER = ((bitmap) & (1<<5)) != 0;\r
-        final Boolean HOP = ((bitmap) & (1<<6)) != 0;\r
-        final Boolean UNREP = ((bitmap) & (1<<7)) != 0;\r
-        final Boolean UNSEQ = ((bitmap) & (1<<8)) != 0;\r
-        pseudoBuilder.setPseudoField(new Ipv6ExthdrFlags(AUTH, DEST, ESP, FRAG, HOP, NONEXT, ROUTER, UNREP, UNSEQ));\r
+        final Boolean nonext = ((bitmap) & (1<<0)) != 0;\r
+        final Boolean esp = ((bitmap) & (1<<1)) != 0;\r
+        final Boolean auth = ((bitmap) & (1<<2)) != 0;\r
+        final Boolean dest = ((bitmap) & (1<<3)) != 0;\r
+        final Boolean frag = ((bitmap) & (1<<4)) != 0;\r
+        final Boolean router = ((bitmap) & (1<<5)) != 0;\r
+        final Boolean hop = ((bitmap) & (1<<6)) != 0;\r
+        final Boolean unrep = ((bitmap) & (1<<7)) != 0;\r
+        final Boolean unseq = ((bitmap) & (1<<8)) != 0;\r
+        pseudoBuilder.setPseudoField(new Ipv6ExthdrFlags(auth, dest, esp, frag, hop, nonext, router, unrep, unseq));\r
         builder.addAugmentation(PseudoFieldMatchEntry.class, pseudoBuilder.build());\r
     }\r
 \r