Migrate OSGI compendium reference

[controller.git] / opendaylight / md-sal / sal-binding-broker / src / test / java / org / opendaylight / controller / md / sal / binding / impl / BindingDOMMountPointServiceAdapterTest.java

diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapterTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapterTest.java
index a2ece0bd042bcdd87d1eb9c939eb2fe8e8cc3235..7c022b065b566ed0689e6b173835306f9c8b3e46 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapterTest.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMMountPointServiceAdapterTest.java
@@ -7,14 +7,17 @@
  */
 package org.opendaylight.controller.md.sal.binding.impl;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 
 import com.google.common.base.Optional;
 import com.google.common.cache.LoadingCache;
+import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
@@ -25,6 +28,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
+@Deprecated
 public class BindingDOMMountPointServiceAdapterTest {
 
     @Mock
@@ -37,14 +41,15 @@ public class BindingDOMMountPointServiceAdapterTest {
     private ClassLoadingStrategy classLoadingStrategy;
 
     @Before
+    @SuppressModernizer
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        codec = Mockito.spy(new BindingToNormalizedNodeCodec(classLoadingStrategy, codecRegistry));
-        Mockito.doAnswer(invocationOnMock -> Optional.of(Mockito.mock(DOMMountPoint.class)))
+        codec = spy(new BindingToNormalizedNodeCodec(classLoadingStrategy, codecRegistry));
+        doReturn(Optional.of(mock(DOMMountPoint.class)))
                 .when(mountService).getMountPoint(any(YangInstanceIdentifier.class));
-        Mockito.doReturn(YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(QName.create("(a)b"))))
+        doReturn(YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(QName.create("(a)b"))))
                 .when(codec).toYangInstanceIdentifierBlocking(any(InstanceIdentifier.class));
-        Mockito.doReturn(InstanceIdentifier.create(DataObject.class))
+        doReturn(InstanceIdentifier.create(DataObject.class))
                 .when(codecRegistry).fromYangInstanceIdentifier(any(YangInstanceIdentifier.class));
     }