BUG 2245 Fixed Local Variable Names

Change-Id: Iae8a14c08d5a2d902a0be56bb0a1752132e0e3ab
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/FlowRemovedMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowRemovedMessageFactory.java
index 86a2d0858614d0e6d915198b94d9aa5d4d15f158..97a4390f2b3d3b4a1201045e49f14b48e14e1f84 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowRemovedMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowRemovedMessageFactory.java
@@ -48,12 +48,12 @@ public class FlowRemovedMessageFactory implements OFDeserializer<FlowRemovedMess
         builder.setDurationNsec(rawMessage.readUnsignedInt());
         builder.setIdleTimeout(rawMessage.readUnsignedShort());
         builder.setHardTimeout(rawMessage.readUnsignedShort());
-        byte[] packet_count = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
-        rawMessage.readBytes(packet_count);
-        builder.setPacketCount(new BigInteger(1, packet_count));
-        byte[] byte_count = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
-        rawMessage.readBytes(byte_count);
-        builder.setByteCount(new BigInteger(1, byte_count));
+        byte[] packetCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
+        rawMessage.readBytes(packetCount);
+        builder.setPacketCount(new BigInteger(1, packetCount));
+        byte[] byteCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
+        rawMessage.readBytes(byteCount);
+        builder.setByteCount(new BigInteger(1, byteCount));
         OFDeserializer<Match> matchDeserializer = registry.getDeserializer(new MessageCodeKey(
                 EncodeConstants.OF13_VERSION_ID, EncodeConstants.EMPTY_VALUE, Match.class));
         builder.setMatch(matchDeserializer.deserialize(rawMessage));

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowRemovedMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowRemovedMessageFactory.java
index e048092dce326919a12457fa1db05e5bccd51639..18573f1ba389095e2a7206cd4f600638ea58d0d8 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowRemovedMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FlowRemovedMessageFactory.java
@@ -51,12 +51,12 @@ public class OF10FlowRemovedMessageFactory implements OFDeserializer<FlowRemoved
         builder.setDurationNsec(rawMessage.readUnsignedInt());
         builder.setIdleTimeout(rawMessage.readUnsignedShort());
         rawMessage.skipBytes(PADDING_IN_FLOW_REMOVED_MESSAGE_2);
-        byte[] packet_count = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
-        rawMessage.readBytes(packet_count);
-        builder.setPacketCount(new BigInteger(1, packet_count));
-        byte[] byte_count = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
-        rawMessage.readBytes(byte_count);
-        builder.setByteCount(new BigInteger(1, byte_count));
+        byte[] packetCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
+        rawMessage.readBytes(packetCount);
+        builder.setPacketCount(new BigInteger(1, packetCount));
+        byte[] byteCount = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
+        rawMessage.readBytes(byteCount);
+        builder.setByteCount(new BigInteger(1, byteCount));
         return builder.build();
     }
 

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/instruction/WriteMetadataInstructionDeserializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/instruction/WriteMetadataInstructionDeserializer.java
index e92260e3ae159fd373acb728b9c5a8181be44f76..419dc974d2ca256c90dcceefe9a3fdd44bc9ada7 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/instruction/WriteMetadataInstructionDeserializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/instruction/WriteMetadataInstructionDeserializer.java
@@ -35,9 +35,9 @@ public class WriteMetadataInstructionDeserializer extends AbstractInstructionDes
         byte[] metadata = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];\r
         input.readBytes(metadata);\r
         metadataBuilder.setMetadata(metadata);\r
-        byte[] metadata_mask = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];\r
-        input.readBytes(metadata_mask);\r
-        metadataBuilder.setMetadataMask(metadata_mask);\r
+        byte[] metadataMask = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];\r
+        input.readBytes(metadataMask);\r
+        metadataBuilder.setMetadataMask(metadataMask);\r
         builder.addAugmentation(MetadataInstruction.class, metadataBuilder.build());\r
         return builder.build();\r
     }\r

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializer.java
index 93ff402db21a0dd99967892b75a90c1700e8a918..645df95c3a5a51222b54bc6d67a6246fb5f2f486 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializer.java
@@ -69,18 +69,18 @@ public class OF10MatchDeserializer implements OFDeserializer<MatchV10> {
      * @return decoded FlowWildcardsV10
      */
     public static FlowWildcardsV10 createWildcards(final long input) {
-        boolean _iNPORT = (input & (1 << 0)) != 0;
-        boolean _dLVLAN = (input & (1 << 1)) != 0;
-        boolean _dLSRC = (input & (1 << 2)) != 0;
-        boolean _dLDST = (input & (1 << 3)) != 0;
-        boolean _dLTYPE = (input & (1 << 4)) != 0;
-        boolean _nWPROTO = (input & (1 << 5)) != 0;
-        boolean _tPSRC = (input & (1 << 6)) != 0;
-        boolean _tPDST = (input & (1 << 7)) != 0;
-        boolean _dLVLANPCP = (input & (1 << 20)) != 0;
-        boolean _nWTOS = (input & (1 << 21)) != 0;
-        return new FlowWildcardsV10(_dLDST, _dLSRC, _dLTYPE, _dLVLAN,
-                _dLVLANPCP, _iNPORT, _nWPROTO, _nWTOS, _tPDST, _tPSRC);
+        boolean inPort = (input & (1 << 0)) != 0;
+        boolean dlVLAN = (input & (1 << 1)) != 0;
+        boolean dlSrc = (input & (1 << 2)) != 0;
+        boolean dlDst = (input & (1 << 3)) != 0;
+        boolean dLType = (input & (1 << 4)) != 0;
+        boolean nwProto = (input & (1 << 5)) != 0;
+        boolean tpSrc = (input & (1 << 6)) != 0;
+        boolean tpDst = (input & (1 << 7)) != 0;
+        boolean dlVLANpcp = (input & (1 << 20)) != 0;
+        boolean nwTos = (input & (1 << 21)) != 0;
+        return new FlowWildcardsV10(dlDst, dlSrc, dLType, dlVLAN,
+                dlVLANpcp, inPort, nwProto, nwTos, tpDst, tpSrc);
     }
 
     /**