From ff6a13fa0e28d9ad81d7881525c624c394f68a56 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 4 Aug 2020 13:14:40 +0200 Subject: [PATCH] Mark potentially-static methods as static Eclipse is pointing out a large number of warnings around methods not being static. Fix these up. Change-Id: Id8ff43ef4556b8e21aa01296e95af36747425489 Signed-off-by: Robert Varga --- .../genius/mdsalutil/ericmatches/EricMatchInfoHelper.java | 2 +- .../genius/mdsalutil/nxmatches/NxMatchInfoHelper.java | 2 +- .../java/org/opendaylight/genius/mdsalutil/packet/IPv4.java | 2 +- .../genius/utils/clustering/EntityOwnershipUtils.java | 2 +- .../genius/mdsalutil/actions/ActionLearnTest.java | 4 ++-- .../genius/mdsalutil/actions/ActionLoadIpToSpaTest.java | 4 ++-- .../genius/mdsalutil/actions/ActionLoadMacToShaTest.java | 6 +++--- .../actions/ActionMoveSourceDestinationEthTest.java | 4 ++-- .../actions/ActionMoveSourceDestinationIpTest.java | 4 ++-- .../actions/ActionMoveSourceDestinationIpv6Test.java | 4 ++-- .../genius/mdsalutil/actions/ActionNxLoadInPortTest.java | 2 +- .../genius/mdsalutil/actions/ActionNxLoadMetadataTest.java | 2 +- .../mdsalutil/actions/ActionSetDestinationIpTest.java | 6 +++--- .../actions/ActionSetFieldEthernetDestinationTest.java | 6 +++--- .../mdsalutil/actions/ActionSetFieldEthernetSourceTest.java | 6 +++--- .../genius/mdsalutil/actions/ActionSetIcmpTypeTest.java | 4 ++-- .../genius/mdsalutil/actions/ActionSetIcmpv6TypeTest.java | 4 ++-- .../genius/mdsalutil/actions/ActionSetSourceIpTest.java | 6 +++--- .../genius/mdsalutil/actions/ActionSetSourceIpv6Test.java | 6 +++--- .../mdsalutil/actions/ActionSetTcpDestinationPortTest.java | 4 ++-- .../mdsalutil/actions/ActionSetTcpSourcePortTest.java | 4 ++-- .../mdsalutil/actions/ActionSetUdpDestinationPortTest.java | 4 ++-- .../mdsalutil/actions/ActionSetUdpSourcePortTest.java | 4 ++-- .../mdsalutil/instructions/InstructionApplyActionsTest.java | 2 +- .../mdsalutil/instructions/InstructionClearActionsTest.java | 2 +- .../mdsalutil/instructions/InstructionGotoTableTest.java | 2 +- .../mdsalutil/instructions/InstructionWriteActionsTest.java | 2 +- .../mdsalutil/interfaces/testutils/FlowAssertTestUtils.java | 2 +- .../interfaces/testutils/TestIMdsalApiManager.java | 2 +- .../genius/mdsalutil/matches/MatchInPortTest.java | 5 ++--- 30 files changed, 54 insertions(+), 55 deletions(-) diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/ericmatches/EricMatchInfoHelper.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/ericmatches/EricMatchInfoHelper.java index 3032cc638..66bba53e7 100644 --- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/ericmatches/EricMatchInfoHelper.java +++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/ericmatches/EricMatchInfoHelper.java @@ -63,7 +63,7 @@ public abstract class EricMatchInfoHelper extentionKey) { Map extensions = null; diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchInfoHelper.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchInfoHelper.java index 6ab62448c..09b87ee54 100644 --- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchInfoHelper.java +++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/nxmatches/NxMatchInfoHelper.java @@ -65,7 +65,7 @@ public abstract class NxMatchInfoHelper extentionKey) { diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/packet/IPv4.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/packet/IPv4.java index 02feff103..60575afa4 100644 --- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/packet/IPv4.java +++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/packet/IPv4.java @@ -435,7 +435,7 @@ public class IPv4 extends Packet { * in IPv4 Header. * @return short */ - private short generateId() { + private static short generateId() { Random randomgen = new Random(); return (short) randomgen.nextInt(Short.MAX_VALUE + 1); } diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/clustering/EntityOwnershipUtils.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/clustering/EntityOwnershipUtils.java index 64133a856..ba2b2af28 100644 --- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/clustering/EntityOwnershipUtils.java +++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/clustering/EntityOwnershipUtils.java @@ -147,7 +147,7 @@ public class EntityOwnershipUtils { } // see GENIUS-237 why we do this optimization instead of using Entity.toString() - private String getEntityIdentifierString(String entityType, String entityName) { + private static String getEntityIdentifierString(String entityType, String entityName) { return new StringBuilder(entityType.length() + entityName.length()).append(entityType).append(entityName) .toString(); } diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLearnTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLearnTest.java index 3fa030ae0..da87578f7 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLearnTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLearnTest.java @@ -41,7 +41,7 @@ public class ActionLearnTest { private static final int FIN_IDLE_TIMEOUT = 8; private static final int FIN_HARD_TIMEOUT = 9; - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof NxActionLearnNodesNodeTableFlowApplyActionsCase); NxActionLearnNodesNodeTableFlowApplyActionsCase nxAction = (NxActionLearnNodesNodeTableFlowApplyActionsCase) action.getAction(); @@ -118,7 +118,7 @@ public class ActionLearnTest { verifyAction(buildActionLearn().buildAction()); } - private ActionLearn buildActionLearn() { + private static ActionLearn buildActionLearn() { return new ActionLearn(IDLE_TIMEOUT, HARD_TIMEOUT, PRIORITY, COOKIE, FLAGS, TABLE_ID, FIN_IDLE_TIMEOUT, FIN_HARD_TIMEOUT, Arrays.asList( diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadIpToSpaTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadIpToSpaTest.java index d08b62684..47a71e43a 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadIpToSpaTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadIpToSpaTest.java @@ -28,14 +28,14 @@ import org.opendaylight.yangtools.yang.common.Uint64; public class ActionLoadIpToSpaTest { private static final String IP_ADDRESS = "1.2.3.4"; - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { verifyAction(new ActionLoadIpToSpa(IP_ADDRESS).buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof NxActionRegLoadNodesNodeTableFlowApplyActionsCase); NxActionRegLoadNodesNodeTableFlowApplyActionsCase actionCase = (NxActionRegLoadNodesNodeTableFlowApplyActionsCase) action.getAction(); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadMacToShaTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadMacToShaTest.java index 26fdd8632..8249af3c5 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadMacToShaTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadMacToShaTest.java @@ -29,14 +29,14 @@ import org.opendaylight.yangtools.yang.common.Uint64; public class ActionLoadMacToShaTest { private static final String MAC_ADDRESS = "11:22:33:44:55:66"; - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { verifyAction(new ActionLoadMacToSha(new MacAddress(MAC_ADDRESS)).buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof NxActionRegLoadNodesNodeTableFlowApplyActionsCase); NxActionRegLoadNodesNodeTableFlowApplyActionsCase actionCase = (NxActionRegLoadNodesNodeTableFlowApplyActionsCase) action.getAction(); @@ -54,7 +54,7 @@ public class ActionLoadMacToShaTest { @Test public void generateAction() { ActionInfo actionInfo = new ActionLoadMacToSha(new MacAddress(MAC_ADDRESS)); - assertEquals(("MacAddress{_value=" + MAC_ADDRESS + "}"), + assertEquals("MacAddress{_value=" + MAC_ADDRESS + "}", ((ActionLoadMacToSha) actionInfo).getAddress().toString()); } diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationEthTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationEthTest.java index f8fced838..13c7310a4 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationEthTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationEthTest.java @@ -24,14 +24,14 @@ import org.opendaylight.yangtools.yang.common.Empty; * Test class for {@link ActionMoveSourceDestinationEth}. */ public class ActionMoveSourceDestinationEthTest { - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { verifyAction(new ActionMoveSourceDestinationEth().buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof NxActionRegMoveNodesNodeTableFlowApplyActionsCase); NxActionRegMoveNodesNodeTableFlowApplyActionsCase actionCase = (NxActionRegMoveNodesNodeTableFlowApplyActionsCase) action.getAction(); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpTest.java index f74404b12..1093cf543 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpTest.java @@ -24,14 +24,14 @@ import org.opendaylight.yangtools.yang.common.Empty; * Test class for {@link ActionMoveSourceDestinationIp}. */ public class ActionMoveSourceDestinationIpTest { - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { verifyAction(new ActionMoveSourceDestinationIp().buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof NxActionRegMoveNodesNodeTableFlowApplyActionsCase); NxActionRegMoveNodesNodeTableFlowApplyActionsCase actionCase = (NxActionRegMoveNodesNodeTableFlowApplyActionsCase) action.getAction(); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpv6Test.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpv6Test.java index cd7b31dc7..ad76801f0 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpv6Test.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpv6Test.java @@ -24,14 +24,14 @@ import org.opendaylight.yangtools.yang.common.Empty; * Test class for {@link ActionMoveSourceDestinationIpv6}. */ public class ActionMoveSourceDestinationIpv6Test { - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { verifyAction(new ActionMoveSourceDestinationIpv6().buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof NxActionRegMoveNodesNodeTableFlowApplyActionsCase); NxActionRegMoveNodesNodeTableFlowApplyActionsCase actionCase = (NxActionRegMoveNodesNodeTableFlowApplyActionsCase) action.getAction(); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadInPortTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadInPortTest.java index b4b1049c5..2f1631194 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadInPortTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadInPortTest.java @@ -35,7 +35,7 @@ public class ActionNxLoadInPortTest { verifyAction(new ActionNxLoadInPort(VALUE).buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof NxActionRegLoadNodesNodeTableFlowApplyActionsCase); NxActionRegLoadNodesNodeTableFlowApplyActionsCase actionCase = (NxActionRegLoadNodesNodeTableFlowApplyActionsCase) action.getAction(); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadMetadataTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadMetadataTest.java index 7a62dd096..79516f694 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadMetadataTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadMetadataTest.java @@ -38,7 +38,7 @@ public class ActionNxLoadMetadataTest { verifyAction(new ActionNxLoadMetadata(VALUE, START, END).buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof NxActionRegLoadNodesNodeTableFlowApplyActionsCase); NxActionRegLoadNodesNodeTableFlowApplyActionsCase actionCase = (NxActionRegLoadNodesNodeTableFlowApplyActionsCase) action.getAction(); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetDestinationIpTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetDestinationIpTest.java index cf4daee31..1f05cbf6d 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetDestinationIpTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetDestinationIpTest.java @@ -26,7 +26,7 @@ public class ActionSetDestinationIpTest { private static final String IP_ADDRESS = "1.2.3.4"; private static final String IP_MASK = "32"; - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { @@ -35,7 +35,7 @@ public class ActionSetDestinationIpTest { verifyAction(new ActionSetDestinationIp(new Ipv4Prefix(IP_ADDRESS + "/" + IP_MASK)).buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof SetFieldCase); SetFieldCase actionCase = (SetFieldCase) action.getAction(); assertNotNull(actionCase.getSetField().getLayer3Match()); @@ -47,7 +47,7 @@ public class ActionSetDestinationIpTest { @Test public void generateAction() { ActionInfo actionInfo = new ActionSetDestinationIp(IP_ADDRESS); - assertEquals(("Ipv4Prefix{_value=" + IP_ADDRESS + "/" + IP_MASK + "}"), + assertEquals("Ipv4Prefix{_value=" + IP_ADDRESS + "/" + IP_MASK + "}", ((ActionSetDestinationIp) actionInfo).getDestination().toString()); } } diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetFieldEthernetDestinationTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetFieldEthernetDestinationTest.java index 1c062466e..ac800d629 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetFieldEthernetDestinationTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetFieldEthernetDestinationTest.java @@ -24,14 +24,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti public class ActionSetFieldEthernetDestinationTest { private static final String MAC_ADDRESS = "11:22:33:44:55:66"; - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { verifyAction(new ActionSetFieldEthernetDestination(new MacAddress(MAC_ADDRESS)).buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof SetFieldCase); SetFieldCase actionCase = (SetFieldCase) action.getAction(); assertNotNull(actionCase.getSetField().getEthernetMatch()); @@ -44,7 +44,7 @@ public class ActionSetFieldEthernetDestinationTest { public void generateAction() { ActionInfo actionInfo = new ActionSetFieldEthernetDestination(new MacAddress(MAC_ADDRESS)); actionInfo.buildAction(); - assertEquals(("MacAddress{_value=" + MAC_ADDRESS + "}"), + assertEquals("MacAddress{_value=" + MAC_ADDRESS + "}", ((ActionSetFieldEthernetDestination) actionInfo).getDestination().toString()); } } diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetFieldEthernetSourceTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetFieldEthernetSourceTest.java index 454eb5cf6..9077e05fc 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetFieldEthernetSourceTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetFieldEthernetSourceTest.java @@ -24,14 +24,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti public class ActionSetFieldEthernetSourceTest { private static final String MAC_ADDRESS = "11:22:33:44:55:66"; - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { verifyAction(new ActionSetFieldEthernetSource(new MacAddress(MAC_ADDRESS)).buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof SetFieldCase); SetFieldCase actionCase = (SetFieldCase) action.getAction(); assertNotNull(actionCase.getSetField().getEthernetMatch()); @@ -44,7 +44,7 @@ public class ActionSetFieldEthernetSourceTest { public void generateAction() { ActionInfo actionInfo = new ActionSetFieldEthernetSource(new MacAddress(MAC_ADDRESS)); actionInfo.buildAction(); - assertEquals(("MacAddress{_value=" + MAC_ADDRESS + "}"), + assertEquals("MacAddress{_value=" + MAC_ADDRESS + "}", ((ActionSetFieldEthernetSource) actionInfo).getSource().toString()); } } diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetIcmpTypeTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetIcmpTypeTest.java index acbc2475b..da92b35e6 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetIcmpTypeTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetIcmpTypeTest.java @@ -24,14 +24,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026 public class ActionSetIcmpTypeTest { private static final short TYPE = (short) 2; - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { verifyAction(new ActionSetIcmpType(TYPE).buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof SetFieldCase); SetFieldCase actionCase = (SetFieldCase) action.getAction(); assertNotNull(actionCase.getSetField().getIcmpv4Match()); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetIcmpv6TypeTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetIcmpv6TypeTest.java index 70fb4a016..6e3a5c033 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetIcmpv6TypeTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetIcmpv6TypeTest.java @@ -24,14 +24,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026 public class ActionSetIcmpv6TypeTest { private static final short TYPE = (short) 129; - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { verifyAction(new ActionSetIcmpv6Type(TYPE).buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof SetFieldCase); SetFieldCase actionCase = (SetFieldCase) action.getAction(); assertNotNull(actionCase.getSetField().getIcmpv6Match()); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetSourceIpTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetSourceIpTest.java index f98736170..d83332b32 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetSourceIpTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetSourceIpTest.java @@ -26,7 +26,7 @@ public class ActionSetSourceIpTest { private static final String IP_ADDRESS = "1.2.3.4"; private static final String IP_MASK = "32"; - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { @@ -35,7 +35,7 @@ public class ActionSetSourceIpTest { verifyAction(new ActionSetSourceIp(new Ipv4Prefix(IP_ADDRESS + "/" + IP_MASK)).buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof SetFieldCase); SetFieldCase actionCase = (SetFieldCase) action.getAction(); assertNotNull(actionCase.getSetField().getLayer3Match()); @@ -47,7 +47,7 @@ public class ActionSetSourceIpTest { @Test public void generateAction() { ActionInfo actionInfo = new ActionSetSourceIp(IP_ADDRESS); - assertEquals(("Ipv4Prefix{_value=" + IP_ADDRESS + "/" + IP_MASK + "}"), + assertEquals("Ipv4Prefix{_value=" + IP_ADDRESS + "/" + IP_MASK + "}", ((ActionSetSourceIp) actionInfo).getSource().toString()); } } diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetSourceIpv6Test.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetSourceIpv6Test.java index ec3cca6ca..11edb1d32 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetSourceIpv6Test.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetSourceIpv6Test.java @@ -26,7 +26,7 @@ public class ActionSetSourceIpv6Test { private static final String IP_ADDRESS = "2001:db8::1"; private static final String IP_MASK = "128"; - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { @@ -35,7 +35,7 @@ public class ActionSetSourceIpv6Test { verifyAction(new ActionSetSourceIpv6(new Ipv6Prefix(IP_ADDRESS + "/" + IP_MASK)).buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof SetFieldCase); SetFieldCase actionCase = (SetFieldCase) action.getAction(); assertNotNull(actionCase.getSetField().getLayer3Match()); @@ -47,7 +47,7 @@ public class ActionSetSourceIpv6Test { @Test public void generateAction() { ActionInfo actionInfo = new ActionSetSourceIpv6(IP_ADDRESS); - assertEquals(("Ipv6Prefix{_value=" + IP_ADDRESS + "/" + IP_MASK + "}"), + assertEquals("Ipv6Prefix{_value=" + IP_ADDRESS + "/" + IP_MASK + "}", ((ActionSetSourceIpv6) actionInfo).getSource().toString()); } } diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTcpDestinationPortTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTcpDestinationPortTest.java index 44f643a86..c796aa93b 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTcpDestinationPortTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTcpDestinationPortTest.java @@ -24,14 +24,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026 public class ActionSetTcpDestinationPortTest { private static final int PORT = 22; - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { verifyAction(new ActionSetTcpDestinationPort(PORT).buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof SetFieldCase); SetFieldCase actionCase = (SetFieldCase) action.getAction(); assertNotNull(actionCase.getSetField().getLayer4Match()); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTcpSourcePortTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTcpSourcePortTest.java index 2087d3ecd..9d4b1706e 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTcpSourcePortTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTcpSourcePortTest.java @@ -24,14 +24,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026 public class ActionSetTcpSourcePortTest { private static final int PORT = 22; - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { verifyAction(new ActionSetTcpSourcePort(PORT).buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof SetFieldCase); SetFieldCase actionCase = (SetFieldCase) action.getAction(); assertNotNull(actionCase.getSetField().getLayer4Match()); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetUdpDestinationPortTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetUdpDestinationPortTest.java index f1c90f3cd..158dd65fd 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetUdpDestinationPortTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetUdpDestinationPortTest.java @@ -24,14 +24,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026 public class ActionSetUdpDestinationPortTest { private static final int PORT = 22; - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { verifyAction(new ActionSetUdpDestinationPort(PORT).buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof SetFieldCase); SetFieldCase actionCase = (SetFieldCase) action.getAction(); assertNotNull(actionCase.getSetField().getLayer4Match()); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetUdpSourcePortTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetUdpSourcePortTest.java index 64de9fd04..e301acd74 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetUdpSourcePortTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionSetUdpSourcePortTest.java @@ -24,14 +24,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026 public class ActionSetUdpSourcePortTest { private static final int PORT = 22; - private XtendBeanGenerator generator = new XtendBeanGenerator(); + private final XtendBeanGenerator generator = new XtendBeanGenerator(); @Test public void actionInfoTest() { verifyAction(new ActionSetUdpSourcePort(PORT).buildAction()); } - private void verifyAction(Action action) { + private static void verifyAction(Action action) { assertTrue(action.getAction() instanceof SetFieldCase); SetFieldCase actionCase = (SetFieldCase) action.getAction(); assertNotNull(actionCase.getSetField().getLayer4Match()); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionApplyActionsTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionApplyActionsTest.java index 8cb530756..cb77caea5 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionApplyActionsTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionApplyActionsTest.java @@ -35,7 +35,7 @@ public class InstructionApplyActionsTest { verifyInstructionInfo(INSTRUCTION_INFO); } - private void verifyInstructionInfo(InstructionInfo instructionInfo) { + private static void verifyInstructionInfo(InstructionInfo instructionInfo) { Instruction instruction = instructionInfo.buildInstruction(2); assertEquals(2, instruction.key().getOrder().intValue()); assertTrue(instruction.getInstruction() instanceof ApplyActionsCase); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionClearActionsTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionClearActionsTest.java index 717640055..c0ecb2469 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionClearActionsTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionClearActionsTest.java @@ -28,7 +28,7 @@ public class InstructionClearActionsTest { verifyInstructionInfo(INSTRUCTION_INFO); } - private void verifyInstructionInfo(InstructionInfo instructionInfo) { + private static void verifyInstructionInfo(InstructionInfo instructionInfo) { Instruction instruction = instructionInfo.buildInstruction(2); assertEquals(2, instruction.key().getOrder().intValue()); assertTrue(instruction.getInstruction() instanceof ClearActionsCase); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionGotoTableTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionGotoTableTest.java index 6fa8b4ac7..7f4f7c373 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionGotoTableTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionGotoTableTest.java @@ -28,7 +28,7 @@ public class InstructionGotoTableTest { verifyInstructionInfo(INSTRUCTION_INFO); } - private void verifyInstructionInfo(InstructionInfo instructionInfo) { + private static void verifyInstructionInfo(InstructionInfo instructionInfo) { Instruction instruction = instructionInfo.buildInstruction(2); assertEquals(2, instruction.key().getOrder().intValue()); assertTrue(instruction.getInstruction() instanceof GoToTableCase); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionWriteActionsTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionWriteActionsTest.java index d2b0e3560..aadde8908 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionWriteActionsTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/instructions/InstructionWriteActionsTest.java @@ -35,7 +35,7 @@ public class InstructionWriteActionsTest { verifyInstructionInfo(INSTRUCTION_INFO); } - private void verifyInstructionInfo(InstructionInfo instructionInfo) { + private static void verifyInstructionInfo(InstructionInfo instructionInfo) { Instruction instruction = instructionInfo.buildInstruction(2); assertEquals(2, instruction.key().getOrder().intValue()); assertTrue(instruction.getInstruction() instanceof WriteActionsCase); diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/interfaces/testutils/FlowAssertTestUtils.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/interfaces/testutils/FlowAssertTestUtils.java index 6688aa35e..b05666836 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/interfaces/testutils/FlowAssertTestUtils.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/interfaces/testutils/FlowAssertTestUtils.java @@ -36,7 +36,7 @@ public class FlowAssertTestUtils { assertEqualBeans(rebuildFlow(expected), rebuildFlow(actual)); } - private Flow rebuildFlow(Flow flow) { + private static Flow rebuildFlow(Flow flow) { FlowBuilder flowBuilder = new FlowBuilder(flow); InstructionsBuilder instructionsBuilder = new InstructionsBuilder(); if (flow.getInstructions() != null) { diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/interfaces/testutils/TestIMdsalApiManager.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/interfaces/testutils/TestIMdsalApiManager.java index d85564c0f..5533ccb85 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/interfaces/testutils/TestIMdsalApiManager.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/interfaces/testutils/TestIMdsalApiManager.java @@ -170,7 +170,7 @@ public abstract class TestIMdsalApiManager implements IMdsalApiManager { } } - private List sortFlows(Iterable flowsToSort) { + private static List sortFlows(Iterable flowsToSort) { List sortedFlows = Lists.newArrayList(flowsToSort); sortedFlows.sort((flow1, flow2) -> ComparisonChain.start() .compare(flow1.getTableId(), flow2.getTableId()) diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/matches/MatchInPortTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/matches/MatchInPortTest.java index e59b9ae38..4551188f6 100644 --- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/matches/MatchInPortTest.java +++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/matches/MatchInPortTest.java @@ -21,12 +21,11 @@ public class MatchInPortTest { .testEquals(); } - private MatchInPort newMatchInPort1() { + private static MatchInPort newMatchInPort1() { return new MatchInPort(Uint64.ONE, 123); } - private MatchInPort newMatchInPort2() { + private static MatchInPort newMatchInPort2() { return new MatchInPort(Uint64.valueOf(10), 456); } - } -- 2.36.6