From: Robert Varga Date: Wed, 25 Oct 2017 13:42:34 +0000 (+0200) Subject: BUG-4688: eliminate QName(Module).getFormattedRevision() X-Git-Tag: v2.0.0~147 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=7cc9ba13a25827d3b3ea6fb47c9ba38b3dc9bbc9;p=yangtools.git BUG-4688: eliminate QName(Module).getFormattedRevision() Since we are capturing revisions in their objects, these methods do not really serve a purpose, remove them. Change-Id: Iac1601fd5e049472d3cda77db9ff306b0443d4ab Signed-off-by: Robert Varga --- diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java index ce3c1f305c..5ff45e0ad7 100644 --- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java +++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java @@ -340,8 +340,9 @@ public final class QName implements Immutable, Serializable, Comparable { if (getNamespace() != null) { sb.append(QNAME_LEFT_PARENTHESIS).append(getNamespace()); - if (getFormattedRevision() != null) { - sb.append(QNAME_REVISION_DELIMITER).append(getFormattedRevision()); + final Optional rev = getRevision(); + if (rev.isPresent()) { + sb.append(QNAME_REVISION_DELIMITER).append(rev.get()); } sb.append(QNAME_RIGHT_PARENTHESIS); } @@ -349,21 +350,6 @@ public final class QName implements Immutable, Serializable, Comparable { return sb.toString(); } - /** - * Return string representation of revision in format YYYY-mm-dd - * - *

- * YANG Specification defines format for revision as - * YYYY-mm-dd. This format for revision is reused accross multiple places - * such as capabilities URI, YANG modules, etc. - * - * @return String representation of revision or null, if revision is not - * set. - */ - public String getFormattedRevision() { - return module.getFormattedRevision(); - } - /** * Creates copy of this with revision and prefix unset. * diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java index 31a4b85212..886d8eedd8 100644 --- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java +++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QNameModule.java @@ -77,10 +77,6 @@ public final class QNameModule implements Immutable, Serializable { return new QNameModule(namespace, revision); } - public String getFormattedRevision() { - return revision == null ? null : revision.toString(); - } - /** * Returns the namespace of the module which is specified as argument of * YANG Module namespace keyword.