Allow DOMMountPoint to not have a model context

We need to allow mount points without a context, as that is what
NETCONF requires for now.

JIRA: MDSAL-435
Change-Id: Ia74bc3416162663e67003486cf67f3cfac46e340
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java
index 5a4fabb18a611f43b7401c5a729e8c8c7c4da6b5..0074a828b1d38d4e579e724c751177752a8fa7ec 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/SimpleDOMMountPoint.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.mdsal.dom.spi;
 
+import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ClassToInstanceMap;
@@ -27,7 +28,7 @@ public final class SimpleDOMMountPoint implements DOMMountPoint {
             final ClassToInstanceMap<DOMService> services, final EffectiveModelContext ctx) {
         this.identifier =  requireNonNull(identifier);
         this.services = ImmutableClassToInstanceMap.copyOf(services);
-        this.schemaContext = requireNonNull(ctx);
+        this.schemaContext = ctx;
     }
 
     public static SimpleDOMMountPoint create(final YangInstanceIdentifier identifier,
@@ -42,6 +43,7 @@ public final class SimpleDOMMountPoint implements DOMMountPoint {
 
     @Override
     public EffectiveModelContext getEffectiveModelContext() {
+        checkState(schemaContext != null, "Mount point %s does not have a model context", identifier);
         return schemaContext;
     }