Bump upstreams for Silicon

[netconf.git] / netconf / netconf-api / src / main / java / org / opendaylight / netconf / api / capability / YangModuleCapability.java

diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/YangModuleCapability.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/YangModuleCapability.java
index 6546f660b3b6f7630a7de073570cad72c6788877..592ee9f08fbef39b4b6164f6d1a999814caafe22 100644 (file)
--- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/YangModuleCapability.java
+++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/capability/YangModuleCapability.java
@@ -5,12 +5,11 @@
  * 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.netconf.api.capability;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
 import org.opendaylight.yangtools.yang.common.Revision;
-import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.ModuleLike;
 
 /**
  * Yang model representing capability.
@@ -22,7 +21,7 @@ public final class YangModuleCapability extends BasicCapability {
     private final String moduleName;
     private final String moduleNamespace;
 
-    public YangModuleCapability(final Module module, final String moduleContent) {
+    public YangModuleCapability(final ModuleLike module, final String moduleContent) {
         super(toCapabilityURI(module));
         this.content = moduleContent;
         this.moduleName = module.getName();
@@ -35,7 +34,7 @@ public final class YangModuleCapability extends BasicCapability {
         return Optional.of(content);
     }
 
-    private static String toCapabilityURI(final Module module) {
+    private static String toCapabilityURI(final ModuleLike module) {
         final StringBuilder sb = new StringBuilder();
         sb.append(module.getNamespace()).append("?module=").append(module.getName());
 
@@ -58,6 +57,6 @@ public final class YangModuleCapability extends BasicCapability {
 
     @Override
     public Optional<String> getRevision() {
-        return Optional.of(revision);
+        return Optional.ofNullable(revision);
     }
 }