X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Futil%2Fcapability%2FYangModuleCapability.java;fp=opendaylight%2Fconfig%2Fconfig-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Futil%2Fcapability%2FYangModuleCapability.java;h=521a09f92181ac298056f1a00507976e44c7db9e;hb=20a32e6459fd1e27e7669bf1ebc7742b96787b94;hp=dcf16b34edf0cade4f3a867dffb65d5ac5a04803;hpb=b95285098ab2090d36095c69fc838d4df4d61300;p=controller.git diff --git a/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/capability/YangModuleCapability.java b/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/capability/YangModuleCapability.java index dcf16b34ed..521a09f921 100644 --- a/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/capability/YangModuleCapability.java +++ b/opendaylight/config/config-util/src/main/java/org/opendaylight/controller/config/util/capability/YangModuleCapability.java @@ -9,7 +9,7 @@ package org.opendaylight.controller.config.util.capability; import com.google.common.base.Optional; -import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil; +import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.Module; /** @@ -27,7 +27,7 @@ public final class YangModuleCapability extends BasicCapability { this.content = moduleContent; this.moduleName = module.getName(); this.moduleNamespace = module.getNamespace().toString(); - this.revision = SimpleDateFormatUtil.getRevisionFormat().format(module.getRevision()); + this.revision = module.getRevision().map(Revision::toString).orElse(null); } @Override @@ -36,8 +36,14 @@ public final class YangModuleCapability extends BasicCapability { } private static String toCapabilityURI(final Module module) { - return String.valueOf(module.getNamespace()) + "?module=" - + module.getName() + "&revision=" + SimpleDateFormatUtil.getRevisionFormat().format(module.getRevision()); + final StringBuilder sb = new StringBuilder(); + sb.append(module.getNamespace()).append("?module=").append(module.getName()); + + final java.util.Optional rev = module.getRevision(); + if (rev.isPresent()) { + sb.append("&revision=").append(rev.get()); + } + return sb.toString(); } @Override