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%2FBindingDOMMountPointServiceAdapterTest.java;h=7c022b065b566ed0689e6b173835306f9c8b3e46;hb=4ad8e1880cfee424eac9e4f12e461d98445a6e44;hp=0697833d2de05c06f58f40d0a74553c39e82a906;hpb=3ec97cd0a86ad1b79f6854dc6924eb7b06e359a3;p=controller.git

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 0697833d2d..7c022b065b 100644
--- 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
@@ -8,13 +8,16 @@
 package org.opendaylight.controller.md.sal.binding.impl;
 
 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;
@@ -38,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));
     }