Merge dev/fluorine work across to master

[unimgr.git] / impl / src / test / java / org / opendaylight / unimgr / utils / ActivationDriverMocks.java

diff --git a/impl/src/test/java/org/opendaylight/unimgr/utils/ActivationDriverMocks.java b/impl/src/test/java/org/opendaylight/unimgr/utils/ActivationDriverMocks.java
index 4eb3faed55fef327aea3edac0ac341a32c932e62..31e56d02133b0df2b558548b44344fe1e68a2269 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/utils/ActivationDriverMocks.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/utils/ActivationDriverMocks.java
@@ -22,12 +22,13 @@ import org.opendaylight.unimgr.mef.nrp.api.ActivationDriver;
 import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverBuilder;
 import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverRepoService;
 import org.opendaylight.unimgr.mef.nrp.impl.ActivationDriverRepoServiceImpl;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.common.rev171113.Uuid;
 
-/**
- * @author bartosz.michalik@amartus.com
- */
-public class ActivationDriverMocks {
+
+public final class ActivationDriverMocks {
+
+    private ActivationDriverMocks() {
+    }
+
     /**
      * Prepare mock {@link ActivationDriverBuilder}. The driver is produced via provided producer function. This covers
      * single port requests.
@@ -36,7 +37,8 @@ public class ActivationDriverMocks {
      */
     public static ActivationDriverBuilder prepareDriver(Supplier<ActivationDriver> supplier) {
         final ActivationDriverBuilder mock = mock(ActivationDriverBuilder.class);
-        doAnswer(inv -> Optional.ofNullable(supplier.get())).when(mock).driverFor(any(ActivationDriverBuilder.BuilderContext.class));
+        doAnswer(inv -> Optional.ofNullable(
+                supplier.get())).when(mock).driverFor(any(ActivationDriverBuilder.BuilderContext.class));
         return mock;
     }
 
@@ -45,23 +47,24 @@ public class ActivationDriverMocks {
         return new Builder();
     }
 
-    public static class Builder {
-        HashMap<Uuid, ActivationDriver> drivers = new HashMap<>();
+    public static final class Builder {
+        HashMap<String , ActivationDriver> drivers = new HashMap<>();
 
         private Builder() {}
 
-        public Builder add(Uuid uuid, ActivationDriver driver) {
-            drivers.put(uuid, driver);
+        public Builder add(String id, ActivationDriver driver) {
+            drivers.put(id, driver);
             return this;
         }
 
         public ActivationDriverRepoService build() {
             List<ActivationDriverBuilder> builders = drivers.entrySet().stream().map(e -> {
-                ActivationDriverBuilder b = mock(ActivationDriverBuilder.class);
-                when(b.getNodeUuid()).thenReturn(e.getKey());
-                when(b.driverFor(any(ActivationDriverBuilder.BuilderContext.class))).thenReturn(Optional.of(e.getValue()));
+                ActivationDriverBuilder mock = mock(ActivationDriverBuilder.class);
+                when(mock.getActivationDriverId()).thenReturn(e.getKey());
+                when(mock.driverFor(any(ActivationDriverBuilder.BuilderContext.class)))
+                    .thenReturn(Optional.of(e.getValue()));
 
-                return b;
+                return mock;
             }).collect(Collectors.toList());
             return new ActivationDriverRepoServiceImpl(builders);
         }