Further rework of base schemas

[netconf.git] / netconf / sal-netconf-connector / src / main / java / org / opendaylight / netconf / sal / connect / netconf / schema / mapping / BaseSchema.java

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseSchema.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseSchema.java
index 9a4c8e6a699170e4e8d1a6e7d5b39fa64e0c3984..5466e069e3e72e554e87f4f8c8e0aed269bfc75a 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseSchema.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/BaseSchema.java
@@ -9,40 +9,21 @@ package org.opendaylight.netconf.sal.connect.netconf.schema.mapping;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
-import java.util.Arrays;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.binding.runtime.spi.BindingRuntimeHelpers;
+import org.opendaylight.yangtools.concepts.Immutable;
 import org.opendaylight.yangtools.rcf8528.data.util.EmptyMountPointContext;
-import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider;
 import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 
-public enum BaseSchema implements EffectiveModelContextProvider {
-    BASE_NETCONF_CTX(
-        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601
-            .$YangModuleInfoImpl.getInstance(),
-        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.extension.rev131210
-            .$YangModuleInfoImpl.getInstance()
-    ),
-    BASE_NETCONF_CTX_WITH_NOTIFICATIONS(
-        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.extension.rev131210
-            .$YangModuleInfoImpl.getInstance(),
-        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714
-            .$YangModuleInfoImpl.getInstance(),
-        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601
-            .$YangModuleInfoImpl.getInstance(),
-        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206
-            .$YangModuleInfoImpl.getInstance()
-    );
-
+public final class BaseSchema implements EffectiveModelContextProvider, Immutable {
     private final @NonNull ImmutableMap<QName, ? extends RpcDefinition> mappedRpcs;
     private final @NonNull EmptyMountPointContext mountContext;
 
-    BaseSchema(final YangModuleInfo... modules) {
-        mountContext = new EmptyMountPointContext(BindingRuntimeHelpers.createEffectiveModel(Arrays.asList(modules)));
-        mappedRpcs = Maps.uniqueIndex(getSchemaContext().getOperations(), RpcDefinition::getQName);
+    BaseSchema(final EffectiveModelContext context) {
+        mountContext = new EmptyMountPointContext(context);
+        mappedRpcs = Maps.uniqueIndex(context.getOperations(), RpcDefinition::getQName);
     }
 
     @NonNull ImmutableMap<QName, ? extends RpcDefinition> getMappedRpcs() {