From b681508d95a7897da263a92f7e3f0aff0adecb33 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 1 Jul 2019 14:12:48 +0200 Subject: [PATCH] Make private methods static Eclipse is flagging a number of methods as potentially-static, make sure we mark them as such. Change-Id: I4254dd29716f4365d71f81c3f3a0e7a9590d9801 Signed-off-by: Robert Varga --- .../test/BackwardsCompatibleNotificationBrokerTest.java | 2 +- .../binding/impl/test/Bug1333DataChangeListenerTest.java | 2 +- .../sal/binding/impl/test/DataTreeChangeListenerTest.java | 2 +- .../impl/test/ListInsertionDataChangeListenerTest.java | 2 +- .../mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java | 2 +- .../DatastoreContextContextPropertiesUpdaterTest.java | 2 +- ...rdedDOMDataBrokerDelegatingReadWriteTransactionTest.java | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/BackwardsCompatibleNotificationBrokerTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/BackwardsCompatibleNotificationBrokerTest.java index 5b49bd7873..d2d39be030 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/BackwardsCompatibleNotificationBrokerTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/BackwardsCompatibleNotificationBrokerTest.java @@ -42,7 +42,7 @@ public class BackwardsCompatibleNotificationBrokerTest extends AbstractNotificat notificationService); } - private TwoLevelListChanged createTestData() { + private static TwoLevelListChanged createTestData() { final TwoLevelListChangedBuilder tb = new TwoLevelListChangedBuilder(); tb.setTopLevelList(ImmutableList.of(new TopLevelListBuilder().withKey(new TopLevelListKey("test")).build())); return tb.build(); diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/Bug1333DataChangeListenerTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/Bug1333DataChangeListenerTest.java index 1665bef48b..da18ae2a61 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/Bug1333DataChangeListenerTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/Bug1333DataChangeListenerTest.java @@ -50,7 +50,7 @@ public class Bug1333DataChangeListenerTest extends AbstractDataTreeChangeListene BindingReflections.getModuleInfo(TreeComplexUsesAugment.class)); } - private Top topWithListItem() { + private static Top topWithListItem() { return top(topLevelList(TOP_FOO_KEY, complexUsesAugment(USES_ONE_KEY, USES_TWO_KEY))); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/DataTreeChangeListenerTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/DataTreeChangeListenerTest.java index 91d86c1d59..8887be0a64 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/DataTreeChangeListenerTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/DataTreeChangeListenerTest.java @@ -183,7 +183,7 @@ public class DataTreeChangeListenerTest extends AbstractConcurrentDataBrokerTest assertEquals(TOP_INITIAL_DATA, initialNode.getDataAfter()); } - private void verifyModification(final DataObjectModification barWrite, + private static void verifyModification(final DataObjectModification barWrite, final PathArgument pathArg, final ModificationType eventType) { assertEquals(pathArg.getType(), barWrite.getDataType()); assertEquals(eventType,barWrite.getModificationType()); diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/ListInsertionDataChangeListenerTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/ListInsertionDataChangeListenerTest.java index 143cb8e1cb..5f34e9a1ac 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/ListInsertionDataChangeListenerTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/ListInsertionDataChangeListenerTest.java @@ -160,7 +160,7 @@ public class ListInsertionDataChangeListenerTest extends AbstractDataTreeChangeL barListener.verify(); } - private Function, Boolean> topSubtreeModified(final TopLevelList topFoo, + private static Function, Boolean> topSubtreeModified(final TopLevelList topFoo, final TopLevelList topBar) { return match(ModificationType.SUBTREE_MODIFIED, TOP, (Function) dataBefore -> Objects.equals(top(topFoo), dataBefore), diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java index 3108ee681c..282330d7a3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java @@ -58,7 +58,7 @@ public class ShardDataTreeListenerInfoMXBeanImpl extends AbstractMXBean implemen } @SuppressWarnings("checkstyle:IllegalCatch") - private List getListenerActorsInfo(Collection actors) { + private static List getListenerActorsInfo(Collection actors) { final Timeout timeout = new Timeout(20, TimeUnit.SECONDS); final List> futureList = new ArrayList<>(actors.size()); for (ActorSelection actor: actors) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextContextPropertiesUpdaterTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextContextPropertiesUpdaterTest.java index 38a89d0c75..a113856627 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextContextPropertiesUpdaterTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextContextPropertiesUpdaterTest.java @@ -82,7 +82,7 @@ public class DatastoreContextContextPropertiesUpdaterTest { updater.close(); } - private Object resolveField(final String name, final Object obj) throws Exception { + private static Object resolveField(final String name, final Object obj) throws Exception { final Field currProps = obj.getClass().getDeclaredField(name); currProps.setAccessible(true); return currProps.get(obj); diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransactionTest.java b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransactionTest.java index 8475b284b2..e86e93a12c 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransactionTest.java +++ b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransactionTest.java @@ -87,7 +87,7 @@ public class ShardedDOMDataBrokerDelegatingReadWriteTransactionTest { assertEquals(Optional.absent(), rwTx.read(LogicalDatastoreType.OPERATIONAL, TestModel.TEST_PATH).checkedGet()); } - private DataContainerChild outerNode(int... ids) { + private static DataContainerChild outerNode(int... ids) { CollectionNodeBuilder outer = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME); for (int id : ids) { outer.addChild(ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, id)); @@ -96,11 +96,11 @@ public class ShardedDOMDataBrokerDelegatingReadWriteTransactionTest { return outer.build(); } - private NormalizedNode testNodeWithOuter(int... ids) { + private static NormalizedNode testNodeWithOuter(int... ids) { return testNodeWithOuter(outerNode(ids)); } - private NormalizedNode testNodeWithOuter(DataContainerChild outer) { + private static NormalizedNode testNodeWithOuter(DataContainerChild outer) { return ImmutableContainerNodeBuilder.create() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)).withChild(outer) .build(); -- 2.36.6