From a52d25ffbfe41e0b2f507efdef1ebee6bbc771c1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 3 May 2016 13:54:17 +0200 Subject: [PATCH] Make potentially-static methods static Change-Id: Ifcb3541dced996f106a3ca4fdf5bfa52130eb6ab Signed-off-by: Robert Varga --- .../org/opendaylight/controller/cluster/example/TestDriver.java | 2 +- .../controller/cluster/raft/messages/InstallSnapshotTest.java | 2 +- .../datastore/node/utils/transformer/NormalizedNodePruner.java | 2 +- .../controller/cluster/databroker/ConcurrentDOMDataBroker.java | 2 +- .../LeastLoadedCandidateSelectionStrategyTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/TestDriver.java b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/TestDriver.java index 9aa6f751bc..74ded5f606 100644 --- a/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/TestDriver.java +++ b/opendaylight/md-sal/sal-akka-raft-example/src/main/java/org/opendaylight/controller/cluster/example/TestDriver.java @@ -134,7 +134,7 @@ public class TestDriver { } // create the listener using a separate actor system for each example actor - private void createClusterRoleChangeListener(List memberIds) { + private static void createClusterRoleChangeListener(List memberIds) { System.out.println("memberIds="+memberIds); for (String memberId : memberIds) { ActorRef listenerActor = listenerActorSystem.actorOf( diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotTest.java index b2d518e1ed..1d60158dce 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotTest.java @@ -68,7 +68,7 @@ public class InstallSnapshotTest { assertEquals("isSerializedType", false, InstallSnapshot.isSerializedType(new Object())); } - private void verifyInstallSnapshot(InstallSnapshot expected, InstallSnapshot actual) { + private static void verifyInstallSnapshot(InstallSnapshot expected, InstallSnapshot actual) { assertEquals("getTerm", expected.getTerm(), actual.getTerm()); assertEquals("getChunkIndex", expected.getChunkIndex(), actual.getChunkIndex()); assertEquals("getTotalChunks", expected.getTotalChunks(), actual.getTotalChunks()); diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePruner.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePruner.java index 03fb6412b3..91d323ea73 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePruner.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePruner.java @@ -243,7 +243,7 @@ public class NormalizedNodePruner implements NormalizedNodeStreamWriter { Preconditions.checkState(!sealed, "Pruner can be used only once"); } - private boolean hasValidSchema(QName name, NormalizedNodeBuilderWrapper parent) { + private static boolean hasValidSchema(QName name, NormalizedNodeBuilderWrapper parent) { boolean valid = parent.getSchema().isPresent() && parent.getSchema().get().getChild(name) != null; if(!valid) { LOG.debug("Schema not found for {}", name); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java index 02362b9371..4794e2ad6a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java @@ -340,7 +340,7 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat throw new UnsupportedOperationException("Commit cohort is not supported for " + path); } - private LogicalDatastoreType toLegacy(org.opendaylight.mdsal.common.api.LogicalDatastoreType datastoreType) { + private static LogicalDatastoreType toLegacy(org.opendaylight.mdsal.common.api.LogicalDatastoreType datastoreType) { switch (datastoreType) { case CONFIGURATION: return LogicalDatastoreType.CONFIGURATION; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/LeastLoadedCandidateSelectionStrategyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/LeastLoadedCandidateSelectionStrategyTest.java index d0cd32f1b0..d8c3b4bb06 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/LeastLoadedCandidateSelectionStrategyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/selectionstrategy/LeastLoadedCandidateSelectionStrategyTest.java @@ -79,7 +79,7 @@ public class LeastLoadedCandidateSelectionStrategyTest { return viableCandidates; } - private void assertStatistics(Map statistics, long... count){ + private static void assertStatistics(Map statistics, long... count){ for(int i=0;i