From 9b949596f3bf56a8bbea2cd3ec536743bbc43aa4 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 4 Aug 2020 14:03:11 +0200 Subject: [PATCH] Make potentially-static methods as such Eclipse is pointing a number of methods as candidates for being static, mark them as such. Change-Id: I69068433b48b49bb3e5b3ee21b6e26f2d6c6ce77 Signed-off-by: Robert Varga --- .../rpcservice/CloudscalerRpcServiceImpl.java | 4 ++-- .../rpcservice/ComputeNodeManager.java | 7 ++++--- .../tests/CloudScalerServiceTest.java | 16 ++++++++-------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/CloudscalerRpcServiceImpl.java b/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/CloudscalerRpcServiceImpl.java index b4a55573e..6ae0192f4 100644 --- a/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/CloudscalerRpcServiceImpl.java +++ b/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/CloudscalerRpcServiceImpl.java @@ -233,7 +233,7 @@ public class CloudscalerRpcServiceImpl implements CloudscalerRpcService { return Futures.immediateFuture(DONE_RPC_RESPONSE); } - private InstanceIdentifier buildOvsdbNodeId(ComputeNode computeNode) { return InstanceIdentifier .create(NetworkTopology.class) @@ -244,7 +244,7 @@ public class CloudscalerRpcServiceImpl implements CloudscalerRpcService { .network.topology.topology.NodeKey(new NodeId(computeNode.getNodeid()))); } - private InstanceIdentifier buildOpenflowNodeIid(ComputeNode computeNode) { + private static InstanceIdentifier buildOpenflowNodeIid(ComputeNode computeNode) { return InstanceIdentifier.builder(Nodes.class) .child(Node.class, new NodeKey( new org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId( diff --git a/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/ComputeNodeManager.java b/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/ComputeNodeManager.java index 8d28b65af..3082f0674 100644 --- a/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/ComputeNodeManager.java +++ b/cloudscaler/impl/src/main/java/org/opendaylight/genius/cloudscaler/rpcservice/ComputeNodeManager.java @@ -146,7 +146,7 @@ public class ComputeNodeManager { .build(); } - private Uint64 getDpnIdFromBridge(OvsdbBridgeAugmentation bridgeAugmentation) { + private static Uint64 getDpnIdFromBridge(OvsdbBridgeAugmentation bridgeAugmentation) { if (bridgeAugmentation.getDatapathId() == null) { return Uint64.ZERO; } @@ -166,7 +166,8 @@ public class ComputeNodeManager { } - private void logErrorIfComputeNodeIsAlreadyTaken(Uint64 datapathid, String nodeId, Optional optional) { + private static void logErrorIfComputeNodeIsAlreadyTaken(Uint64 datapathid, String nodeId, + Optional optional) { ComputeNode existingNode = optional.get(); if (!Objects.equals(existingNode.getNodeid(), nodeId)) { LOG.error("ComputeNodeManager Compute is already connected by compute {}", existingNode); @@ -177,7 +178,7 @@ public class ComputeNodeManager { } } - private InstanceIdentifier getWildcardPath() { + private static InstanceIdentifier getWildcardPath() { return InstanceIdentifier .create(NetworkTopology.class) .child(Topology.class, new TopologyKey(new TopologyId("ovsdb:1"))) diff --git a/cloudscaler/impl/src/test/java/org/opendaylight/genius/cloudscaler/tests/CloudScalerServiceTest.java b/cloudscaler/impl/src/test/java/org/opendaylight/genius/cloudscaler/tests/CloudScalerServiceTest.java index d16ad3618..66b68cd87 100644 --- a/cloudscaler/impl/src/test/java/org/opendaylight/genius/cloudscaler/tests/CloudScalerServiceTest.java +++ b/cloudscaler/impl/src/test/java/org/opendaylight/genius/cloudscaler/tests/CloudScalerServiceTest.java @@ -117,20 +117,20 @@ public class CloudScalerServiceTest { public CloudScalerServiceTest() { } - private InstanceIdentifier buildComputeNodeIid(String computeName) { + private static InstanceIdentifier buildComputeNodeIid(String computeName) { return InstanceIdentifier.builder(ComputeNodes.class) .child(ComputeNode.class, new ComputeNodeKey(computeName)) .build(); } - private InstanceIdentifier buildNodeId(String nodeId) { + private static InstanceIdentifier buildNodeId(String nodeId) { return InstanceIdentifier .create(NetworkTopology.class) .child(Topology.class, new TopologyKey(new TopologyId("ovsdb:1"))) .child(Node.class, new NodeKey(new NodeId(nodeId))); } - private Node buildNode(String nodeId, String computeName, String datapathid) { + private static Node buildNode(String nodeId, String computeName, String datapathid) { NodeBuilder nodeBuilder = new NodeBuilder(); nodeBuilder.setNodeId(new NodeId(nodeId)); OvsdbBridgeAugmentationBuilder bridge = new OvsdbBridgeAugmentationBuilder(); @@ -139,11 +139,11 @@ public class CloudScalerServiceTest { otherConfigsBuilder.setBridgeOtherConfigValue(computeName); bridge.setDatapathId(new DatapathId(datapathid)); bridge.setBridgeOtherConfigs(Lists.newArrayList(otherConfigsBuilder.build())); - nodeBuilder.addAugmentation(OvsdbBridgeAugmentation.class, bridge.build()); + nodeBuilder.addAugmentation(OvsdbBridgeAugmentation.class,bridge.build()); return nodeBuilder.build(); } - private InstanceIdentifier + private static InstanceIdentifier buildOpenflowNodeIid(Uint64 dpnid) { return InstanceIdentifier.builder(Nodes.class) .child(org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node.class, @@ -152,7 +152,7 @@ public class CloudScalerServiceTest { "openflow:" + dpnid.toString()))).build(); } - private org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node buildOpenflowNode( + private static org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node buildOpenflowNode( Uint64 dpnId) { org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder nodeBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder(); @@ -199,7 +199,7 @@ public class CloudScalerServiceTest { CONFIGURATION, buildComputeNodeIid(COMPUTE2)).get().isTombstoned()); } - private ComputeNode buildComputeNode(String nodeid1, BigInteger dpn1, String compute1) { + private static ComputeNode buildComputeNode(String nodeid1, BigInteger dpn1, String compute1) { return new ComputeNodeBuilder() .setComputeName(compute1) .setDpnid(dpn1) @@ -251,7 +251,7 @@ public class CloudScalerServiceTest { AWAITER.until(() -> nodesRecoverd.contains(DPN1)); } - private BridgeRefEntry buildBridgeRefEntry(Uint64 dpnId, String nodeId) { + private static BridgeRefEntry buildBridgeRefEntry(Uint64 dpnId, String nodeId) { return new BridgeRefEntryBuilder() .setDpid(dpnId) .setBridgeReference(new OvsdbBridgeRef(buildNodeIid(nodeId))) -- 2.36.6