Adjust to yangtools-2.0.0/odlparent-3.0.0 changes

[netconf.git] / restconf / restconf-nb-rfc8040 / src / main / java / org / opendaylight / restconf / nb / rfc8040 / references / SchemaContextRef.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/references/SchemaContextRef.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/references/SchemaContextRef.java
index 64623c6e7bc5c0e9a1fcef54a4cf091d0a81890d..40fdd71e9c272b7bb5d6a9489f90ac21d829bec8 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/references/SchemaContextRef.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/references/SchemaContextRef.java
@@ -10,10 +10,12 @@ package org.opendaylight.restconf.nb.rfc8040.references;
 import java.lang.ref.SoftReference;
 import java.net.URI;
 import java.util.Date;
+import java.util.Optional;
 import java.util.Set;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
 import org.opendaylight.restconf.nb.rfc8040.Rfc8040;
 import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.Revision;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
@@ -35,7 +37,7 @@ public final class SchemaContextRef {
      *             actual {@link SchemaContext}
      */
     public SchemaContextRef(final SchemaContext schemaContext) {
-        this.schemaContextRef = new SoftReference<SchemaContext>(schemaContext);
+        this.schemaContextRef = new SoftReference<>(schemaContext);
     }
 
     /**
@@ -92,11 +94,10 @@ public final class SchemaContextRef {
      *             revision of module
      * @return {@link Module}
      */
-    public Module findModuleByNamespaceAndRevision(final URI namespace, final Date revision) {
-        return this.get().findModuleByNamespaceAndRevision(namespace, revision);
+    public Module findModuleByNamespaceAndRevision(final URI namespace, final Optional<Revision> revision) {
+        return this.get().findModule(namespace, revision).orElse(null);
     }
 
-
     /**
      * Find {@link Module} in {@link SchemaContext} of {@link DOMMountPoint} by
      * {@link QName} of {@link Module}.
@@ -110,7 +111,7 @@ public final class SchemaContextRef {
     public Module findModuleInMountPointByQName(final DOMMountPoint mountPoint, final QName moduleQname) {
         final SchemaContext schemaContext = mountPoint == null ? null : mountPoint.getSchemaContext();
         return schemaContext == null ? null
-                : schemaContext.findModuleByName(moduleQname.getLocalName(), moduleQname.getRevision());
+                : schemaContext.findModule(moduleQname.getLocalName(), moduleQname.getRevision()).orElse(null);
     }
 
     /**
@@ -134,7 +135,7 @@ public final class SchemaContextRef {
      *             revision of module
      * @return {@link Module}
      */
-    public Module findModuleByNameAndRevision(final String localName, final Date revision) {
-        return this.get().findModuleByName(localName, revision);
+    public Module findModuleByNameAndRevision(final String localName, final Optional<Revision> revision) {
+        return this.get().findModule(localName, revision).orElse(null);
     }
 }