Do not use deprecated mountpoint registration

Use proper builder pattern to talk to the mount point.

Change-Id: I7b4463e7fa5d04ef309b09e0f6ce5ecd8146271a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/services/simple/impl/RestconfSchemaServiceTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/services/simple/impl/RestconfSchemaServiceTest.java
index d9b280212ec512e6565d4b4588e93c94a3db28ec..c74cd7a376e563a1c0e10fd296bf38605f49fbfa 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/services/simple/impl/RestconfSchemaServiceTest.java
+++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/services/simple/impl/RestconfSchemaServiceTest.java
@@ -14,18 +14,14 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.when;
 
-import com.google.common.collect.ImmutableClassToInstanceMap;
-import java.util.HashMap;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
 import org.opendaylight.controller.md.sal.dom.broker.impl.mount.DOMMountPointServiceImpl;
-import org.opendaylight.controller.md.sal.dom.broker.spi.mount.SimpleDOMMountPoint;
 import org.opendaylight.mdsal.dom.api.DOMYangTextSourceProvider;
 import org.opendaylight.restconf.common.errors.RestconfDocumentedException;
 import org.opendaylight.restconf.common.errors.RestconfError;
@@ -72,10 +68,6 @@ public class RestconfSchemaServiceTest {
     // schema context with mount points
     private SchemaContext schemaContextWithMountPoints;
 
-    // mount point with schema context with modules behind mount point
-    private DOMMountPoint mountPoint;
-    // mount point with null schema context
-    private DOMMountPoint mountPointWithNullSchemaContext;
     // mount point service
     private DOMMountPointService mountPointService;
 
@@ -89,22 +81,13 @@ public class RestconfSchemaServiceTest {
         this.schemaContextWithMountPoints =
                 YangParserTestUtils.parseYangFiles(TestRestconfUtils.loadFiles("/modules/mount-points"));
 
-        // create and register mount points
-        this.mountPoint = SimpleDOMMountPoint.create(
-                YangInstanceIdentifier.of(QName.create("mount:point:1", "2016-01-01", "cont")),
-                ImmutableClassToInstanceMap.copyOf(new HashMap<>()),
-                this.schemaContextBehindMountPoint
-        );
-
-        this.mountPointWithNullSchemaContext = SimpleDOMMountPoint.create(
-                YangInstanceIdentifier.of(QName.create("mount:point:2", "2016-01-01", "cont")),
-                ImmutableClassToInstanceMap.copyOf(new HashMap<>()),
-                null
-        );
-
         this.mountPointService = new DOMMountPointServiceImpl();
-        ((DOMMountPointServiceImpl) this.mountPointService).registerMountPoint(this.mountPoint);
-        ((DOMMountPointServiceImpl) this.mountPointService).registerMountPoint(this.mountPointWithNullSchemaContext);
+        // create and register mount points
+        mountPointService.createMountPoint(
+            YangInstanceIdentifier.of(QName.create("mount:point:1", "2016-01-01", "cont")))
+        .addInitialSchemaContext(schemaContextBehindMountPoint).register();
+        mountPointService.createMountPoint(
+            YangInstanceIdentifier.of(QName.create("mount:point:2", "2016-01-01", "cont"))).register();
 
         this.schemaService = new RestconfSchemaServiceImpl(this.mockContextHandler,
                 DOMMountPointServiceHandler.newInstance(mountPointService), sourceProvider);

diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java
index bf0b513375279f8046780a74c158d6af1f1921b4..2ca00cf7a55326e1d8c9a91f9eb9840f4dd3e5bf 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java
+++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java
@@ -15,8 +15,6 @@ import static org.junit.Assert.fail;
 import static org.mockito.Mockito.when;
 
 import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableClassToInstanceMap;
-import com.google.common.collect.Maps;
 import java.util.Map.Entry;
 import org.junit.Before;
 import org.junit.Rule;
@@ -27,7 +25,6 @@ import org.mockito.MockitoAnnotations;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
 import org.opendaylight.controller.md.sal.dom.broker.impl.mount.DOMMountPointServiceImpl;
-import org.opendaylight.controller.md.sal.dom.broker.spi.mount.SimpleDOMMountPoint;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.api.DOMYangTextSourceProvider;
 import org.opendaylight.restconf.common.context.InstanceIdentifierContext;
@@ -115,18 +112,14 @@ public class ParserIdentifierTest {
         this.schemaContextOnMountPoint =
                 YangParserTestUtils.parseYangFiles(TestRestconfUtils.loadFiles("/parser-identifier"));
 
-        // create and register mount point
-        this.mountPoint = SimpleDOMMountPoint.create(
-                YangInstanceIdentifier.builder()
-                        .node(QName.create("mount:point", "2016-06-02", "mount-container"))
-                        .node(QName.create("mount:point", "2016-06-02", "point-number"))
-                        .build(),
-                ImmutableClassToInstanceMap.copyOf(Maps.newHashMap()),
-                this.schemaContextOnMountPoint
-        );
-
         this.mountPointService = new DOMMountPointServiceImpl();
-        ((DOMMountPointServiceImpl) this.mountPointService).registerMountPoint(this.mountPoint);
+
+        // create and register mount point
+        mountPoint = mountPointService.createMountPoint(YangInstanceIdentifier.builder()
+            .node(QName.create("mount:point", "2016-06-02", "mount-container"))
+            .node(QName.create("mount:point", "2016-06-02", "point-number"))
+            .build())
+        .addInitialSchemaContext(this.schemaContextOnMountPoint).register().getInstance();
 
         // register mount point with null schema context
         when(this.mockMountPoint.getSchemaContext()).thenReturn(null);