BUG-2245 Sonar technical debt

   - correct Local Final Variable Name

Change-Id: I4fde8e15edc8893fd9871a268465eb39da5b92b9
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/MultipartReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
index 20d7eda2c2ef26fa22884034d02245342c5b064a..19f7a38e16cf79a173e1527302b551644f89c5da 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
@@ -295,12 +295,12 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
     }
     
     private static FlowModFlags createFlowModFlagsFromBitmap(int input){
-        final Boolean _oFPFFSENDFLOWREM = (input & (1 << 0)) != 0;
-        final Boolean _oFPFFCHECKOVERLAP = (input & (1 << 1)) != 0;
-        final Boolean _oFPFFRESETCOUNTS = (input & (1 << 2)) != 0; 
-        final Boolean _oFPFFNOPKTCOUNTS = (input & (1 << 3)) != 0;
-        final Boolean _oFPFFNOBYTCOUNTS = (input & (1 << 4)) != 0;
-        return new FlowModFlags(_oFPFFCHECKOVERLAP, _oFPFFNOBYTCOUNTS, _oFPFFNOPKTCOUNTS, _oFPFFRESETCOUNTS, _oFPFFSENDFLOWREM);
+        final Boolean fmfSENDFLOWREM = (input & (1 << 0)) != 0;
+        final Boolean fmfCHECKOVERLAP = (input & (1 << 1)) != 0;
+        final Boolean fmfRESETCOUNTS = (input & (1 << 2)) != 0; 
+        final Boolean fmfNOPKTCOUNTS = (input & (1 << 3)) != 0;
+        final Boolean fmfNOBYTCOUNTS = (input & (1 << 4)) != 0;
+        return new FlowModFlags(fmfCHECKOVERLAP, fmfNOBYTCOUNTS, fmfNOPKTCOUNTS, fmfRESETCOUNTS, fmfSENDFLOWREM);
     }
     
     private static MultipartReplyAggregateCase setAggregate(ByteBuf input) {
@@ -580,17 +580,17 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
     }
     
     private static MeterFlags createMeterFlags(long input){
-        final Boolean _oFPMFKBPS = (input & (1 << 0)) != 0;
-        final Boolean _oFPMFPKTPS = (input & (1 << 1)) != 0;
-        final Boolean _oFPMFBURST = (input & (1 << 2)) != 0;
-        final Boolean _oFPMFSTATS = (input & (1 << 3)) != 0;
-        return new MeterFlags(_oFPMFBURST, _oFPMFKBPS, _oFPMFPKTPS, _oFPMFSTATS);
+        final Boolean mfKBPS = (input & (1 << 0)) != 0;
+        final Boolean mfPKTPS = (input & (1 << 1)) != 0;
+        final Boolean mfBURST = (input & (1 << 2)) != 0;
+        final Boolean mfSTATS = (input & (1 << 3)) != 0;
+        return new MeterFlags(mfBURST, mfKBPS, mfPKTPS, mfSTATS);
     }
     
     private static MeterBandTypeBitmap createMeterBandsBitmap(long input) {
-        final Boolean _oFPMBTDROP = (input & (1 << 1)) != 0;
-        final Boolean _oFPMBTDSCPREMARK = (input & (1 << 2)) != 0;
-        return new MeterBandTypeBitmap(_oFPMBTDROP, _oFPMBTDSCPREMARK);
+        final Boolean mbtDROP = (input & (1 << 1)) != 0;
+        final Boolean mbtDSCPREMARK = (input & (1 << 2)) != 0;
+        return new MeterBandTypeBitmap(mbtDROP, mbtDSCPREMARK);
     }
     
     private static MultipartReplyMeterCase setMeter(ByteBuf input) {
@@ -727,39 +727,39 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
     }
     
     private static PortConfig createPortConfig(long input){
-        final Boolean _portDown   = ((input) & (1<<0)) != 0;
-        final Boolean _noRecv    = ((input) & (1<<2)) != 0;
-        final Boolean _noFwd       = ((input) & (1<<5)) != 0;
-        final Boolean _noPacketIn = ((input) & (1<<6)) != 0;
-        return new PortConfig(_noFwd, _noPacketIn, _noRecv, _portDown);
+        final Boolean pcPortDown   = ((input) & (1<<0)) != 0;
+        final Boolean pcNRecv    = ((input) & (1<<2)) != 0;
+        final Boolean pcNFwd       = ((input) & (1<<5)) != 0;
+        final Boolean pcNPacketIn = ((input) & (1<<6)) != 0;
+        return new PortConfig(pcNFwd, pcNPacketIn, pcNRecv, pcPortDown);
     }
     
     private static PortState createPortState(long input){
-        final Boolean _linkDown = ((input) & (1<<0)) != 0;
-        final Boolean _blocked  = ((input) & (1<<1)) != 0;
-        final Boolean _live     = ((input) & (1<<2)) != 0;
-        return new PortState(_blocked, _linkDown, _live);
+        final Boolean psLinkDown = ((input) & (1<<0)) != 0;
+        final Boolean psBlocked  = ((input) & (1<<1)) != 0;
+        final Boolean psLive     = ((input) & (1<<2)) != 0;
+        return new PortState(psBlocked, psLinkDown, psLive);
     }
     
     private static PortFeatures createPortFeatures(long input){
-        final Boolean _10mbHd = ((input) & (1<<0)) != 0;
-        final Boolean _10mbFd = ((input) & (1<<1)) != 0;
-        final Boolean _100mbHd = ((input) & (1<<2)) != 0;
-        final Boolean _100mbFd = ((input) & (1<<3)) != 0;
-        final Boolean _1gbHd = ((input) & (1<<4)) != 0;
-        final Boolean _1gbFd = ((input) & (1<<5)) != 0;
-        final Boolean _10gbFd = ((input) & (1<<6)) != 0;
-        final Boolean _40gbFd = ((input) & (1<<7)) != 0;
-        final Boolean _100gbFd = ((input) & (1<<8)) != 0;
-        final Boolean _1tbFd = ((input) & (1<<9)) != 0;
-        final Boolean _other = ((input) & (1<<10)) != 0;
-        final Boolean _copper = ((input) & (1<<11)) != 0;
-        final Boolean _fiber = ((input) & (1<<12)) != 0;
-        final Boolean _autoneg = ((input) & (1<<13)) != 0;
-        final Boolean _pause = ((input) & (1<<14)) != 0;
-        final Boolean _pauseAsym = ((input) & (1<<15)) != 0;
-        return new PortFeatures(_100gbFd, _100mbFd, _100mbHd, _10gbFd, _10mbFd, _10mbHd, _1gbFd,
-                _1gbHd, _1tbFd, _40gbFd, _autoneg, _copper, _fiber, _other, _pause, _pauseAsym);
+        final Boolean pf10mbHd = ((input) & (1<<0)) != 0;
+        final Boolean pf10mbFd = ((input) & (1<<1)) != 0;
+        final Boolean pf100mbHd = ((input) & (1<<2)) != 0;
+        final Boolean pf100mbFd = ((input) & (1<<3)) != 0;
+        final Boolean pf1gbHd = ((input) & (1<<4)) != 0;
+        final Boolean pf1gbFd = ((input) & (1<<5)) != 0;
+        final Boolean pf10gbFd = ((input) & (1<<6)) != 0;
+        final Boolean pf40gbFd = ((input) & (1<<7)) != 0;
+        final Boolean pf100gbFd = ((input) & (1<<8)) != 0;
+        final Boolean pf1tbFd = ((input) & (1<<9)) != 0;
+        final Boolean pfOther = ((input) & (1<<10)) != 0;
+        final Boolean pfCopper = ((input) & (1<<11)) != 0;
+        final Boolean pfFiber = ((input) & (1<<12)) != 0;
+        final Boolean pfAutoneg = ((input) & (1<<13)) != 0;
+        final Boolean pfPause = ((input) & (1<<14)) != 0;
+        final Boolean pfPauseAsym = ((input) & (1<<15)) != 0;
+        return new PortFeatures(pf100gbFd, pf100mbFd, pf100mbHd, pf10gbFd, pf10mbFd, pf10mbHd, pf1gbFd,
+                pf1gbHd, pf1tbFd, pf40gbFd, pfAutoneg, pfCopper, pfFiber, pfOther, pfPause, pfPauseAsym);
     }
     
     private static MultipartReplyGroupFeaturesCase setGroupFeatures(ByteBuf rawMessage) {
@@ -782,43 +782,43 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
     }
     
     private static ActionType createActionBitmap(long input) {
-        final Boolean OFPAT_OUTPUT = ((input) & (1<<0)) != 0;
-        final Boolean OFPAT_COPY_TTL_OUT = ((input) & (1<<11)) != 0;
-        final Boolean OFPAT_COPY_TTL_IN = ((input) & (1<<12)) != 0;
-        final Boolean OFPAT_SET_MPLS_TTL = ((input) & (1<<15)) != 0;
-        final Boolean OFPAT_DEC_MPLS_TTL = ((input) & (1<<16)) != 0;
-        final Boolean OFPAT_PUSH_VLAN = ((input) & (1<<17)) != 0;
-        final Boolean OFPAT_POP_VLAN = ((input) & (1<<18)) != 0;
-        final Boolean OFPAT_PUSH_MPLS = ((input) & (1<<19)) != 0;
-        final Boolean OFPAT_POP_MPLS = ((input) & (1<<20)) != 0;
-        final Boolean OFPAT_SET_QUEUE = ((input) & (1<<21)) != 0;
-        final Boolean OFPAT_GROUP = ((input) & (1<<22)) != 0;
-        final Boolean OFPAT_SET_NW_TTL = ((input) & (1<<23)) != 0;
-        final Boolean OFPAT_DEC_NW_TTL = ((input) & (1<<24)) != 0;
-        final Boolean OFPAT_SET_FIELD = ((input) & (1<<25)) != 0;
-        final Boolean OFPAT_PUSH_PBB = ((input) & (1<<26)) != 0;
-        final Boolean OFPAT_POP_PBB = ((input) & (1<<27)) != 0;
-        final Boolean OFPAT_EXPERIMENTER = false;
-        return new ActionType(OFPAT_COPY_TTL_IN, OFPAT_COPY_TTL_OUT, OFPAT_DEC_MPLS_TTL,
-                OFPAT_DEC_NW_TTL, OFPAT_EXPERIMENTER, OFPAT_GROUP, OFPAT_OUTPUT, OFPAT_POP_MPLS,
-                OFPAT_POP_PBB, OFPAT_POP_VLAN, OFPAT_PUSH_MPLS, OFPAT_PUSH_PBB, OFPAT_PUSH_VLAN,
-                OFPAT_SET_FIELD, OFPAT_SET_MPLS_TTL, OFPAT_SET_NW_TTL, OFPAT_SET_QUEUE);
+        final Boolean atOutput = ((input) & (1<<0)) != 0;
+        final Boolean atCopyTTLout = ((input) & (1<<11)) != 0;
+        final Boolean atCopyTTLin = ((input) & (1<<12)) != 0;
+        final Boolean atSetMplsTTL = ((input) & (1<<15)) != 0;
+        final Boolean atDecMplsTTL = ((input) & (1<<16)) != 0;
+        final Boolean atPushVLAN = ((input) & (1<<17)) != 0;
+        final Boolean atPopVLAN = ((input) & (1<<18)) != 0;
+        final Boolean atPushMPLS = ((input) & (1<<19)) != 0;
+        final Boolean atPopMPLS = ((input) & (1<<20)) != 0;
+        final Boolean atSetQueue = ((input) & (1<<21)) != 0;
+        final Boolean atGroup = ((input) & (1<<22)) != 0;
+        final Boolean atSetNWTTL = ((input) & (1<<23)) != 0;
+        final Boolean atDecNWTTL = ((input) & (1<<24)) != 0;
+        final Boolean atSetField = ((input) & (1<<25)) != 0;
+        final Boolean atPushPBB = ((input) & (1<<26)) != 0;
+        final Boolean atPopPBB = ((input) & (1<<27)) != 0;
+        final Boolean atExperimenter = false;
+        return new ActionType(atCopyTTLin, atCopyTTLout, atDecMplsTTL,
+                atDecNWTTL, atExperimenter, atGroup, atOutput, atPopMPLS,
+                atPopPBB, atPopVLAN, atPushMPLS, atPushPBB, atPushVLAN,
+                atSetField, atSetMplsTTL, atSetNWTTL, atSetQueue);
     }
 
     private static GroupCapabilities createCapabilities(long input) {
-        final Boolean OFOFPGFC_SELECT_WEIGHT = ((input) & (1<<0)) != 0;
-        final Boolean OFPGFC_SELECT_LIVENESS = ((input) & (1<<1)) != 0;
-        final Boolean OFPGFC_CHAINING = ((input) & (1<<2)) != 0;
-        final Boolean OFPGFC_CHAINING_CHECKS = ((input) & (1<<3)) != 0;
-        return new GroupCapabilities(OFPGFC_CHAINING, OFPGFC_CHAINING_CHECKS, OFPGFC_SELECT_LIVENESS, OFOFPGFC_SELECT_WEIGHT);
+        final Boolean gcSelectWeight = ((input) & (1<<0)) != 0;
+        final Boolean gcSelectLiveness = ((input) & (1<<1)) != 0;
+        final Boolean gcChaining = ((input) & (1<<2)) != 0;
+        final Boolean gcChainingChecks = ((input) & (1<<3)) != 0;
+        return new GroupCapabilities(gcChaining, gcChainingChecks, gcSelectLiveness, gcSelectWeight);
     }
 
     private static GroupTypes createGroupType(long input) {
-        final Boolean OFPGT_ALL = ((input) & (1<<0)) != 0;
-        final Boolean OFPGT_SELECT = ((input) & (1<<1)) != 0;
-        final Boolean OFPGT_INDIRECT = ((input) & (1<<2)) != 0;
-        final Boolean OFPGT_FF = ((input) & (1<<3)) != 0;
-        return new GroupTypes(OFPGT_ALL, OFPGT_FF, OFPGT_INDIRECT, OFPGT_SELECT);
+        final Boolean gtAll = ((input) & (1<<0)) != 0;
+        final Boolean gtSelect = ((input) & (1<<1)) != 0;
+        final Boolean gtIndirect = ((input) & (1<<2)) != 0;
+        final Boolean gtFF = ((input) & (1<<3)) != 0;
+        return new GroupTypes(gtAll, gtFF, gtIndirect, gtSelect);
     }
     
     private MultipartReplyGroupDescCase setGroupDesc(ByteBuf input) {

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java
index 13da41f0ca8a42fc6ab9ae0efabe6393adb24a15..f8f967e4637edddcf1d848f9247b031eaa64507b 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java
@@ -56,35 +56,35 @@ public class OF10FeaturesReplyMessageFactory implements OFDeserializer<GetFeatur
     }
 
     private static CapabilitiesV10 createCapabilitiesV10(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 STP = (input & (1 << 3)) != 0;
-        final Boolean RESERVED = (input & (1 << 4)) != 0;
-        final Boolean IP_REASM = (input & (1 << 5)) != 0;
-        final Boolean QUEUE_STATS = (input & (1 << 6)) != 0;
-        final Boolean ARP_MATCH_IP = (input & (1 << 7)) != 0;
-        return new CapabilitiesV10(ARP_MATCH_IP, FLOW_STATS, IP_REASM,
-                PORT_STATS, QUEUE_STATS, RESERVED, STP, 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 stp = (input & (1 << 3)) != 0;
+        final Boolean reserved = (input & (1 << 4)) != 0;
+        final Boolean ipReasm = (input & (1 << 5)) != 0;
+        final Boolean queueStats = (input & (1 << 6)) != 0;
+        final Boolean arpMatchIp = (input & (1 << 7)) != 0;
+        return new CapabilitiesV10(arpMatchIp, flowStats, ipReasm,
+                portStats, queueStats, reserved, stp, tableStats);
     }
     
     private static ActionTypeV10 createActionsV10(long input) {
-        final Boolean OUTPUT = (input & (1 << 0)) != 0;
-        final Boolean SET_VLAN_VID = (input & (1 << 1)) != 0;
-        final Boolean SET_VLAN_PCP = (input & (1 << 2)) != 0;
-        final Boolean STRIP_VLAN = (input & (1 << 3)) != 0;
-        final Boolean SET_DL_SRC = (input & (1 << 4)) != 0;
-        final Boolean SET_DL_DST = (input & (1 << 5)) != 0;
-        final Boolean SET_NW_SRC = (input & (1 << 6)) != 0;
-        final Boolean SET_NW_DST = (input & (1 << 7)) != 0;
-        final Boolean SET_NW_TOS = (input & (1 << 8)) != 0;
-        final Boolean SET_TP_SRC = (input & (1 << 9)) != 0;
-        final Boolean SET_TP_DST = (input & (1 << 10)) != 0;
-        final Boolean ENQUEUE = (input & (1 << 11)) != 0;
-        final Boolean VENDOR = (input & (1 << 12)) != 0;
-        return new ActionTypeV10(ENQUEUE, OUTPUT, SET_DL_DST, SET_DL_SRC,
-                SET_NW_DST, SET_NW_SRC, SET_NW_TOS, SET_TP_DST, SET_TP_SRC,
-                SET_VLAN_PCP, SET_VLAN_VID, STRIP_VLAN, VENDOR);
+        final Boolean output = (input & (1 << 0)) != 0;
+        final Boolean setVLANvid = (input & (1 << 1)) != 0;
+        final Boolean setVLANpcp = (input & (1 << 2)) != 0;
+        final Boolean stripVLAN = (input & (1 << 3)) != 0;
+        final Boolean setDLsrc = (input & (1 << 4)) != 0;
+        final Boolean setDLdst = (input & (1 << 5)) != 0;
+        final Boolean setNWsrc = (input & (1 << 6)) != 0;
+        final Boolean setNWdst = (input & (1 << 7)) != 0;
+        final Boolean setNWtos = (input & (1 << 8)) != 0;
+        final Boolean setTPsrc = (input & (1 << 9)) != 0;
+        final Boolean setTPdst = (input & (1 << 10)) != 0;
+        final Boolean enqueue = (input & (1 << 11)) != 0;
+        final Boolean vendor = (input & (1 << 12)) != 0;
+        return new ActionTypeV10(enqueue, output, setDLdst, setDLsrc,
+                setNWdst, setNWsrc, setNWtos, setTPdst, setTPsrc,
+                setVLANpcp, setVLANvid, stripVLAN, vendor);
     }
 
     private static PhyPort deserializePort(ByteBuf rawMessage) {

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactory.java
index e204d762153868e6b523a1035f7e95c1fcbdb806..5bd9cb32b4670809468e087a2150edc344e5d248 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactory.java
@@ -58,38 +58,38 @@ public class PortStatusMessageFactory implements OFDeserializer<PortStatusMessag
     }
 
     private static PortFeatures createPortFeatures(long input){
-        final Boolean _10mbHd = ((input) & (1<<0)) != 0;
-        final Boolean _10mbFd = ((input) & (1<<1)) != 0;
-        final Boolean _100mbHd = ((input) & (1<<2)) != 0;
-        final Boolean _100mbFd = ((input) & (1<<3)) != 0;
-        final Boolean _1gbHd = ((input) & (1<<4)) != 0;
-        final Boolean _1gbFd = ((input) & (1<<5)) != 0;
-        final Boolean _10gbFd = ((input) & (1<<6)) != 0;
-        final Boolean _40gbFd = ((input) & (1<<7)) != 0;
-        final Boolean _100gbFd = ((input) & (1<<8)) != 0;
-        final Boolean _1tbFd = ((input) & (1<<9)) != 0;
-        final Boolean _other = ((input) & (1<<10)) != 0;
-        final Boolean _copper = ((input) & (1<<11)) != 0;
-        final Boolean _fiber = ((input) & (1<<12)) != 0;
-        final Boolean _autoneg = ((input) & (1<<13)) != 0;
-        final Boolean _pause = ((input) & (1<<14)) != 0;
-        final Boolean _pauseAsym = ((input) & (1<<15)) != 0;
-        return new PortFeatures(_100gbFd, _100mbFd, _100mbHd, _10gbFd, _10mbFd, _10mbHd, _1gbFd,
-                _1gbHd, _1tbFd, _40gbFd, _autoneg, _copper, _fiber, _other, _pause, _pauseAsym);
+        final Boolean pf10mbHd = ((input) & (1<<0)) != 0;
+        final Boolean pf10mbFd = ((input) & (1<<1)) != 0;
+        final Boolean pf100mbHd = ((input) & (1<<2)) != 0;
+        final Boolean pf100mbFd = ((input) & (1<<3)) != 0;
+        final Boolean pf1gbHd = ((input) & (1<<4)) != 0;
+        final Boolean pf1gbFd = ((input) & (1<<5)) != 0;
+        final Boolean pf10gbFd = ((input) & (1<<6)) != 0;
+        final Boolean pf40gbFd = ((input) & (1<<7)) != 0;
+        final Boolean pf100gbFd = ((input) & (1<<8)) != 0;
+        final Boolean pf1tbFd = ((input) & (1<<9)) != 0;
+        final Boolean pfOther = ((input) & (1<<10)) != 0;
+        final Boolean pfCopper = ((input) & (1<<11)) != 0;
+        final Boolean pfFiber = ((input) & (1<<12)) != 0;
+        final Boolean pfAutoneg = ((input) & (1<<13)) != 0;
+        final Boolean pfPause = ((input) & (1<<14)) != 0;
+        final Boolean pfPauseAsym = ((input) & (1<<15)) != 0;
+        return new PortFeatures(pf100gbFd, pf100mbFd, pf100mbHd, pf10gbFd, pf10mbFd, pf10mbHd, pf1gbFd,
+                pf1gbHd, pf1tbFd, pf40gbFd, pfAutoneg, pfCopper, pfFiber, pfOther, pfPause, pfPauseAsym);
     }
     
     private static PortState createPortState(long input){
-        final Boolean _linkDown = ((input) & (1<<0)) != 0;
-        final Boolean _blocked  = ((input) & (1<<1)) != 0;
-        final Boolean _live     = ((input) & (1<<2)) != 0;
-        return new PortState(_blocked, _linkDown, _live);
+        final Boolean psLinkDown = ((input) & (1<<0)) != 0;
+        final Boolean psBblocked  = ((input) & (1<<1)) != 0;
+        final Boolean psLive     = ((input) & (1<<2)) != 0;
+        return new PortState(psBblocked, psLinkDown, psLive);
     }
     
     private static PortConfig createPortConfig(long input){
-        final Boolean _portDown   = ((input) & (1<<0)) != 0;
-        final Boolean _noRecv    = ((input) & (1<<2)) != 0;
-        final Boolean _noFwd       = ((input) & (1<<5)) != 0;
-        final Boolean _noPacketIn = ((input) & (1<<6)) != 0;
-        return new PortConfig(_noFwd, _noPacketIn, _noRecv, _portDown);
+        final Boolean pcPortDown   = ((input) & (1<<0)) != 0;
+        final Boolean pcNoRecv    = ((input) & (1<<2)) != 0;
+        final Boolean pcNoFwd       = ((input) & (1<<5)) != 0;
+        final Boolean pcNoPacketIn = ((input) & (1<<6)) != 0;
+        return new PortConfig(pcNoFwd, pcNoPacketIn, pcNoRecv, pcPortDown);
     }
 }

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OpenflowUtils.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OpenflowUtils.java
index 8ba8e74c5badbf1a76095253e9e283822bba2d05..78f27eac865b1a2f7afbdf02836ed651dc5f5c80 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OpenflowUtils.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OpenflowUtils.java
@@ -25,15 +25,15 @@ public abstract class OpenflowUtils {
      * @return port state\r
      */\r
     public static PortStateV10 createPortState(long input){\r
-        final Boolean _linkDown = ((input) & (1<<0)) != 0;\r
-        final Boolean _blocked = ((input) & (1<<1)) != 0;\r
-        final Boolean _live = ((input) & (1<<2)) != 0;\r
-        final Boolean _stpListen = ((input) & (1<<8)) == 0;\r
-        final Boolean _stpLearn = ((input) & (1<<8)) != 0;\r
-        final Boolean _stpForward = ((input) & (1<<9)) != 0; // equals 2 << 8\r
-        final Boolean _stpBlock = (((input) & (1<<9)) != 0) && (((input) & (1<<8)) != 0); // equals 3 << 8\r
-        final Boolean _stpMask = ((input) & (1<<10)) != 0; // equals 4 << 8\r
-        return new PortStateV10(_blocked, _linkDown, _live, _stpBlock, _stpForward, _stpLearn, _stpListen, _stpMask);\r
+        final Boolean psLinkDown = ((input) & (1<<0)) != 0;\r
+        final Boolean psBlocked = ((input) & (1<<1)) != 0;\r
+        final Boolean psLive = ((input) & (1<<2)) != 0;\r
+        final Boolean psStpListen = ((input) & (1<<8)) == 0;\r
+        final Boolean psStpLearn = ((input) & (1<<8)) != 0;\r
+        final Boolean psStpForward = ((input) & (1<<9)) != 0; // equals 2 << 8\r
+        final Boolean psStpBlock = (((input) & (1<<9)) != 0) && (((input) & (1<<8)) != 0); // equals 3 << 8\r
+        final Boolean psStpMask = ((input) & (1<<10)) != 0; // equals 4 << 8\r
+        return new PortStateV10(psBlocked, psLinkDown, psLive, psStpBlock, psStpForward, psStpLearn, psStpListen, psStpMask);\r
     }\r
 \r
     /**\r
@@ -42,14 +42,14 @@ public abstract class OpenflowUtils {
      * @return port state\r
      */\r
     public static PortConfigV10 createPortConfig(long input){\r
-        final Boolean _portDown = ((input) & (1<<0)) != 0;\r
-        final Boolean _noStp = ((input) & (1<<1)) != 0;\r
-        final Boolean _noRecv = ((input) & (1<<2)) != 0;\r
-        final Boolean _noRecvStp = ((input) & (1<<3)) != 0;\r
-        final Boolean _noFlood = ((input) & (1<<4)) != 0;\r
-        final Boolean _noFwd  = ((input) & (1<<5)) != 0;\r
-        final Boolean _noPacketIn = ((input) & (1<<6)) != 0;\r
-        return new PortConfigV10(_noFlood, _noFwd, _noPacketIn, _noRecv, _noRecvStp, _noStp, _portDown);\r
+        final Boolean pcPortDown = ((input) & (1<<0)) != 0;\r
+        final Boolean pcNoStp = ((input) & (1<<1)) != 0;\r
+        final Boolean pcNoRecv = ((input) & (1<<2)) != 0;\r
+        final Boolean pcNoRecvStp = ((input) & (1<<3)) != 0;\r
+        final Boolean pcNoFlood = ((input) & (1<<4)) != 0;\r
+        final Boolean pcNoFwd  = ((input) & (1<<5)) != 0;\r
+        final Boolean pcNoPacketIn = ((input) & (1<<6)) != 0;\r
+        return new PortConfigV10(pcNoFlood, pcNoFwd, pcNoPacketIn, pcNoRecv, pcNoRecvStp, pcNoStp, pcPortDown);\r
     }\r
 \r
     /**\r
@@ -58,19 +58,19 @@ public abstract class OpenflowUtils {
      * @return port state\r
      */\r
     public static PortFeaturesV10 createPortFeatures(long input){\r
-        final Boolean _10mbHd = ((input) & (1<<0)) != 0;\r
-        final Boolean _10mbFd = ((input) & (1<<1)) != 0;\r
-        final Boolean _100mbHd = ((input) & (1<<2)) != 0;\r
-        final Boolean _100mbFd = ((input) & (1<<3)) != 0;\r
-        final Boolean _1gbHd = ((input) & (1<<4)) != 0;\r
-        final Boolean _1gbFd = ((input) & (1<<5)) != 0;\r
-        final Boolean _10gbFd = ((input) & (1<<6)) != 0;\r
-        final Boolean _copper = ((input) & (1<<7)) != 0;\r
-        final Boolean _fiber = ((input) & (1<<8)) != 0;\r
-        final Boolean _autoneg = ((input) & (1<<9)) != 0;\r
-        final Boolean _pause = ((input) & (1<<10)) != 0;\r
-        final Boolean _pauseAsym = ((input) & (1<<11)) != 0;\r
-        return new PortFeaturesV10(_100mbFd, _100mbHd, _10gbFd, _10mbFd, _10mbHd,\r
-                _1gbFd, _1gbHd, _autoneg, _copper, _fiber, _pause, _pauseAsym);\r
+        final Boolean pf10mbHd = ((input) & (1<<0)) != 0;\r
+        final Boolean pf10mbFd = ((input) & (1<<1)) != 0;\r
+        final Boolean pf100mbHd = ((input) & (1<<2)) != 0;\r
+        final Boolean pf100mbFd = ((input) & (1<<3)) != 0;\r
+        final Boolean pf1gbHd = ((input) & (1<<4)) != 0;\r
+        final Boolean pf1gbFd = ((input) & (1<<5)) != 0;\r
+        final Boolean pf10gbFd = ((input) & (1<<6)) != 0;\r
+        final Boolean pfCopper = ((input) & (1<<7)) != 0;\r
+        final Boolean pfFiber = ((input) & (1<<8)) != 0;\r
+        final Boolean pfAutoneg = ((input) & (1<<9)) != 0;\r
+        final Boolean pfPause = ((input) & (1<<10)) != 0;\r
+        final Boolean pfPauseAsym = ((input) & (1<<11)) != 0;\r
+        return new PortFeaturesV10(pf100mbFd, pf100mbHd, pf10gbFd, pf10mbFd, pf10mbHd,\r
+                pf1gbFd, pf1gbHd, pfAutoneg, pfCopper, pfFiber, pfPause, pfPauseAsym);\r
     }\r
 }
\ No newline at end of file