Fix lead transaction cancellation

[mdsal.git] / dom / mdsal-dom-spi / src / main / java / org / opendaylight / mdsal / dom / spi / SimpleDOMMountPoint.java

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 75eaed9226adfa66bf8b3e479589f6ac0b31917f..fc07c70fb3f91f4095b11270ac0a0edb86fcb7ff 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
@@ -5,33 +5,31 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.mdsal.dom.spi;
 
-import com.google.common.base.Optional;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap;
+import java.util.Optional;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
 import org.opendaylight.mdsal.dom.api.DOMService;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
-public class SimpleDOMMountPoint implements DOMMountPoint {
+public final class SimpleDOMMountPoint implements DOMMountPoint {
 
     private final YangInstanceIdentifier identifier;
     private final ClassToInstanceMap<DOMService> services;
-    private final SchemaContext schemaContext;
 
     private SimpleDOMMountPoint(final YangInstanceIdentifier identifier,
-            final ClassToInstanceMap<DOMService> services, final SchemaContext ctx) {
-        this.identifier = identifier;
+            final ClassToInstanceMap<DOMService> services) {
+        this.identifier =  requireNonNull(identifier);
         this.services = ImmutableClassToInstanceMap.copyOf(services);
-        this.schemaContext = ctx;
     }
 
-    public static final SimpleDOMMountPoint create(final YangInstanceIdentifier identifier,
-            final ClassToInstanceMap<DOMService> services, final SchemaContext ctx) {
-        return new SimpleDOMMountPoint(identifier, services, ctx);
+    public static SimpleDOMMountPoint create(final YangInstanceIdentifier identifier,
+            final ClassToInstanceMap<DOMService> services) {
+        return new SimpleDOMMountPoint(identifier, services);
     }
 
     @Override
@@ -39,13 +37,8 @@ public class SimpleDOMMountPoint implements DOMMountPoint {
         return identifier;
     }
 
-    @Override
-    public SchemaContext getSchemaContext() {
-        return schemaContext;
-    }
-
     @Override
     public <T extends DOMService> Optional<T> getService(final Class<T> cls) {
-        return Optional.fromNullable(services.getInstance(cls));
+        return Optional.ofNullable(services.getInstance(cls));
     }
 }