Do not depend on ietf-netconf-monitoring-extension

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

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/DefaultBaseNetconfSchemas.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/DefaultBaseNetconfSchemas.java
index 0409e68b0c9d1f262c24da53fcb44a14067ddab2..ea9100b81d8ce6b9879ca7264f4df4929e64125b 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/DefaultBaseNetconfSchemas.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/DefaultBaseNetconfSchemas.java
@@ -8,7 +8,7 @@
 package org.opendaylight.netconf.sal.connect.netconf.schema.mapping;
 
 import com.google.common.annotations.Beta;
-import java.util.Arrays;
+import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.eclipse.jdt.annotation.NonNull;
@@ -41,22 +41,22 @@ public final class DefaultBaseNetconfSchemas implements BaseNetconfSchemas {
 
     private static EffectiveModelContext withoutNotifications(final YangParserFactory parserFactory)
             throws YangParserException {
-        return BindingRuntimeHelpers.createEffectiveModel(parserFactory, Arrays.asList(
+        return BindingRuntimeHelpers.createEffectiveModel(parserFactory, List.of(
             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
+            org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004
                 .$YangModuleInfoImpl.getInstance()));
     }
 
     private static EffectiveModelContext withNotifications(final YangParserFactory parserFactory)
             throws YangParserException {
-        return BindingRuntimeHelpers.createEffectiveModel(parserFactory, Arrays.asList(
-            org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.extension.rev131210
-                .$YangModuleInfoImpl.getInstance(),
+        return BindingRuntimeHelpers.createEffectiveModel(parserFactory, List.of(
             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.monitoring.rev101004
+                .$YangModuleInfoImpl.getInstance(),
             org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206
                 .$YangModuleInfoImpl.getInstance()));
     }