From fd6ee99fd61d0c9eea0f6f4f809d967f0ee0fcd3 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 26 Dec 2015 17:07:30 +0100 Subject: [PATCH] Use QNameModule#intern() QNameModule#cachedReference() is deprecated, use #intern() instead. Change-Id: Ic60eb4f3968f3e3251e2b798c385043a717c5089 Signed-off-by: Robert Varga --- .../opendaylight/yangtools/yang/common/YangConstants.java | 4 ++-- .../transform/QNameModuleReplacementFunction.java | 2 +- .../yangtools/yang/model/api/Rfc6020Mapping.java | 2 +- .../opendaylight/yangtools/yang/model/util/BaseTypes.java | 2 +- .../yangtools/yang/parser/builder/impl/ModuleBuilder.java | 6 +++--- .../yangtools/yang/parser/builder/impl/ModuleImpl.java | 4 ++-- .../yangtools/yang/parser/impl/YangParserListenerImpl.java | 2 +- .../yang/parser/stmt/rfc6020/ModuleStatementSupport.java | 4 ++-- .../yangtools/yang/parser/stmt/rfc6020/Utils.java | 7 +++---- .../rfc6020/effective/ModuleEffectiveStatementImpl.java | 3 +-- .../rfc6020/effective/SubmoduleEffectiveStatementImpl.java | 4 ++-- 11 files changed, 19 insertions(+), 21 deletions(-) diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/YangConstants.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/YangConstants.java index dbc25eb5b9..5adc588e0f 100644 --- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/YangConstants.java +++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/YangConstants.java @@ -26,12 +26,12 @@ public final class YangConstants { /** * Base QNameModule for all YANG statements. */ - public static final QNameModule RFC6020_YANG_MODULE = QNameModule.cachedReference(QNameModule.create(RFC6020_YANG_NAMESPACE, null)); + public static final QNameModule RFC6020_YANG_MODULE = QNameModule.create(RFC6020_YANG_NAMESPACE, null).intern(); /** * Base QNameModule for all YIN statements. */ - public static final QNameModule RFC6020_YIN_MODULE = QNameModule.cachedReference(QNameModule.create(RFC6020_YIN_NAMESPACE, null)); + public static final QNameModule RFC6020_YIN_MODULE = QNameModule.create(RFC6020_YIN_NAMESPACE, null).intern(); private YangConstants() { throw new UnsupportedOperationException("Utility class"); diff --git a/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/QNameModuleReplacementFunction.java b/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/QNameModuleReplacementFunction.java index 6790fc004d..42fbccb553 100644 --- a/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/QNameModuleReplacementFunction.java +++ b/yang/yang-data-transform/src/main/java/org/opendaylight/yangtools/transform/QNameModuleReplacementFunction.java @@ -25,7 +25,7 @@ class QNameModuleReplacementFunction implements Function { public QName apply(QName input) { QNameModule potential = mapping.get(input.getModule()); if (potential != null) { - return QName.cachedReference(QName.create(potential, input.getLocalName())); + return QName.create(potential, input.getLocalName()).intern(); } return input; } diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Rfc6020Mapping.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Rfc6020Mapping.java index feb35e3573..d791ab960e 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Rfc6020Mapping.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/Rfc6020Mapping.java @@ -187,7 +187,7 @@ public enum Rfc6020Mapping implements StatementDefinition { } @Nonnull private static QName yinQName(String nameStr) { - return QName.cachedReference(QName.create(YangConstants.RFC6020_YIN_MODULE, nameStr)); + return QName.create(YangConstants.RFC6020_YIN_MODULE, nameStr).intern(); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java index dfc5dfb5c4..facfe3080c 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java @@ -89,7 +89,7 @@ public final class BaseTypes { * @return built-in base yang type QName. */ public static QName constructQName(final String typeName) { - return QName.cachedReference(QName.create(YangConstants.RFC6020_YANG_MODULE, typeName)); + return QName.create(YangConstants.RFC6020_YANG_MODULE, typeName).intern(); } /** diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java index 07e1c9b605..14ee3961e0 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleBuilder.java @@ -63,7 +63,7 @@ import org.opendaylight.yangtools.yang.parser.util.YangParseException; * otherwise result may not be valid. */ public class ModuleBuilder extends AbstractDocumentedDataNodeContainerBuilder implements DocumentedNodeBuilder { - private static final QNameModule EMPTY_QNAME_MODULE = QNameModule.cachedReference(QNameModule.create(null, null)); + private static final QNameModule EMPTY_QNAME_MODULE = QNameModule.create(null, null).intern(); private static final String GROUPING_STR = "Grouping"; private static final String TYPEDEF_STR = "typedef"; private ModuleImpl instance; @@ -349,7 +349,7 @@ public class ModuleBuilder extends AbstractDocumentedDataNodeContainerBuilder im } public void setNamespace(final URI namespace) { - this.qnameModule = QNameModule.cachedReference(QNameModule.create(namespace, qnameModule.getRevision())); + this.qnameModule = QNameModule.create(namespace, qnameModule.getRevision()).intern(); } public String getPrefix() { @@ -411,7 +411,7 @@ public class ModuleBuilder extends AbstractDocumentedDataNodeContainerBuilder im } public void setRevision(final Date revision) { - this.qnameModule = QNameModule.cachedReference(QNameModule.create(qnameModule.getNamespace(), revision)); + this.qnameModule = QNameModule.create(qnameModule.getNamespace(), revision).intern(); } public void setPrefix(final String prefix) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java index bfd515b766..9b04c6875c 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/ModuleImpl.java @@ -75,8 +75,8 @@ public final class ModuleImpl extends AbstractDocumentedDataNodeContainer implem this.submodules = ImmutableSet. copyOf(builder.submodules); this.prefix = builder.getPrefix(); - this.qnameModule = QNameModule.cachedReference(QNameModule.create(builder.getNamespace(), - builder.getRevision() == null ? null : new Date(builder.getRevision().getTime()))); + this.qnameModule = QNameModule.create(builder.getNamespace(), + builder.getRevision() == null ? null : new Date(builder.getRevision().getTime())).intern(); this.yangVersion = builder.getYangVersion(); this.organization = builder.getOrganization(); this.contact = builder.getContact(); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java index 0a3c7fe6ef..1254e2d5f7 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/YangParserListenerImpl.java @@ -600,7 +600,7 @@ public final class YangParserListenerImpl extends YangParserBaseListener { namespace = namespaces.get(revision); } - final QNameModule mod = QNameModule.cachedReference(QNameModule.create(namespace, revision)); + final QNameModule mod = QNameModule.create(namespace, revision).intern(); qname = QName.create(mod, name); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java index 1f68421d2c..a6e5f0c0bd 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModuleStatementSupport.java @@ -106,7 +106,7 @@ public class ModuleStatementSupport extends revisionDate = Optional.of(SimpleDateFormatUtil.DEFAULT_DATE_REV); } - QNameModule qNameModule = QNameModule.cachedReference(QNameModule.create(moduleNs.get(), revisionDate.orNull())); + QNameModule qNameModule = QNameModule.create(moduleNs.get(), revisionDate.orNull()).intern(); ModuleIdentifier moduleIdentifier = new ModuleIdentifierImpl(stmt.getStatementArgument(), Optional. absent(), revisionDate); @@ -134,4 +134,4 @@ public class ModuleStatementSupport extends super.onFullDefinitionDeclared(stmt); SUBSTATEMENT_VALIDATOR.validate(stmt); } -} \ No newline at end of file +} diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Utils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Utils.java index 62a5944f1c..1d976c5aa0 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Utils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Utils.java @@ -246,8 +246,8 @@ public final class Utils { ctx.getRoot().rawStatementArgument(), value); final QNameModule resultQNameModule; if (qNameModule.getRevision() == null) { - resultQNameModule = QNameModule.cachedReference( - QNameModule.create(qNameModule.getNamespace(), SimpleDateFormatUtil.DEFAULT_DATE_REV)); + resultQNameModule = QNameModule.create(qNameModule.getNamespace(), SimpleDateFormatUtil.DEFAULT_DATE_REV) + .intern(); } else { resultQNameModule = qNameModule; } @@ -288,8 +288,7 @@ public final class Utils { return qNameModule; } - return QNameModule.cachedReference( - QNameModule.create(qNameModule.getNamespace(), SimpleDateFormatUtil.DEFAULT_DATE_REV)); + return QNameModule.create(qNameModule.getNamespace(), SimpleDateFormatUtil.DEFAULT_DATE_REV).intern(); } @Nullable diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ModuleEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ModuleEffectiveStatementImpl.java index 20103be894..3ba7ff4f98 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ModuleEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/ModuleEffectiveStatementImpl.java @@ -24,8 +24,7 @@ public final class ModuleEffectiveStatementImpl extends AbstractEffectiveModule< final QNameModule module = ctx.getFromNamespace(ModuleCtxToModuleQName.class, ctx); if (module.getRevision() == null) { - qNameModule = QNameModule.cachedReference( - QNameModule.create(module.getNamespace(), SimpleDateFormatUtil.DEFAULT_DATE_REV)); + qNameModule = QNameModule.create(module.getNamespace(), SimpleDateFormatUtil.DEFAULT_DATE_REV).intern(); } else { qNameModule = module; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/SubmoduleEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/SubmoduleEffectiveStatementImpl.java index 7c185e7ac6..dc3af809c7 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/SubmoduleEffectiveStatementImpl.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/SubmoduleEffectiveStatementImpl.java @@ -30,9 +30,9 @@ public final class SubmoduleEffectiveStatementImpl extends AbstractEffectiveModu belongsToModuleName); RevisionEffectiveStatementImpl submoduleRevision = firstEffective(RevisionEffectiveStatementImpl.class); - this.qNameModule = QNameModule.cachedReference(submoduleRevision == null ? + this.qNameModule = (submoduleRevision == null ? QNameModule.create(belongsToModuleQName.getNamespace(), SimpleDateFormatUtil.DEFAULT_DATE_REV) : - QNameModule.create(belongsToModuleQName.getNamespace(), submoduleRevision.argument())); + QNameModule.create(belongsToModuleQName.getNamespace(), submoduleRevision.argument())).intern(); } @Override -- 2.36.6