X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fimpl%2Ftest%2FBackwardsCompatibleNotificationBrokerTest.java;h=394a465af5deb5807766410bcdb4d106e0e85d8c;hb=aaea3e9a92ae9d6fac04c4a065db4b35cbca9ed0;hp=f43352d1018e3345dbbd7188d5fb4947b7bb630a;hpb=608760751ce7fcf4e84e86a8b33d43bc1d9984d6;p=controller.git 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 f43352d101..394a465af5 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 @@ -10,17 +10,16 @@ package org.opendaylight.controller.md.sal.binding.impl.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.util.concurrent.TimeUnit; -import org.opendaylight.controller.md.sal.binding.compat.HeliumNotificationProviderServiceAdapter; - import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; import org.opendaylight.controller.md.sal.binding.api.NotificationService; +import org.opendaylight.controller.md.sal.binding.compat.HeliumNotificationProviderServiceAdapter; import org.opendaylight.controller.md.sal.binding.test.AbstractNotificationBrokerTest; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.OpendaylightMdsalListTestListener; @@ -31,6 +30,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.NotificationListener; +@Deprecated public class BackwardsCompatibleNotificationBrokerTest extends AbstractNotificationBrokerTest { private NotificationProviderService notificationProviderService; @@ -39,12 +39,13 @@ public class BackwardsCompatibleNotificationBrokerTest extends AbstractNotificat public void initTest() { final NotificationService notificationService = getNotificationService(); final NotificationPublishService notificationPublishService = getNotificationPublishService(); - notificationProviderService = new HeliumNotificationProviderServiceAdapter(notificationPublishService, notificationService); + notificationProviderService = new HeliumNotificationProviderServiceAdapter(notificationPublishService, + notificationService); } - private TwoLevelListChanged createTestData() { + private static TwoLevelListChanged createTestData() { final TwoLevelListChangedBuilder tb = new TwoLevelListChangedBuilder(); - tb.setTopLevelList(ImmutableList.of(new TopLevelListBuilder().setKey(new TopLevelListKey("test")).build())); + tb.setTopLevelList(ImmutableList.of(new TopLevelListBuilder().withKey(new TopLevelListKey("test")).build())); return tb.build(); } @@ -66,20 +67,21 @@ public class BackwardsCompatibleNotificationBrokerTest extends AbstractNotificat private static class NotifTestListenerChild extends NotifTestListener { - public NotifTestListenerChild(final CountDownLatch latch) { + NotifTestListenerChild(final CountDownLatch latch) { super(latch); } } + private static class NotifTestListener implements OpendaylightMdsalListTestListener { - private List receivedNotifications = new ArrayList<>(); - private CountDownLatch latch; + private final List receivedNotifications = new ArrayList<>(); + private final CountDownLatch latch; - public NotifTestListener(CountDownLatch latch) { + NotifTestListener(final CountDownLatch latch) { this.latch = latch; } @Override - public void onTwoLevelListChanged(TwoLevelListChanged notification) { + public void onTwoLevelListChanged(final TwoLevelListChanged notification) { receivedNotifications.add(notification); latch.countDown(); } @@ -88,5 +90,4 @@ public class BackwardsCompatibleNotificationBrokerTest extends AbstractNotificat return receivedNotifications; } } - }