BUG-865: remove use of QName.cachedReference()

[controller.git] / opendaylight / config / yang-jmx-generator / src / main / java / org / opendaylight / controller / config / yangjmxgenerator / ConfigConstants.java

diff --git a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/ConfigConstants.java b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/ConfigConstants.java
index 8cc0ffa165a8d63f387dcb1dd9812b0ec0764124..f3ef5f1e0bb70bfe8f385b3d6345d233da2f0707 100644 (file)
--- a/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/ConfigConstants.java
+++ b/opendaylight/config/yang-jmx-generator/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/ConfigConstants.java
@@ -8,37 +8,42 @@
 package org.opendaylight.controller.config.yangjmxgenerator;
 
 import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QNameModule;
 
-public class ConfigConstants {
+public final class ConfigConstants {
 
     private ConfigConstants() {
     }
 
-    public static final String CONFIG_NAMESPACE = "urn:opendaylight:params:xml:ns:yang:controller:config";
+    private static final QName DUMMY_CONFIG_QNAME = QName.create(
+        "urn:opendaylight:params:xml:ns:yang:controller:config", "2013-04-05", "dummy").intern();
+    private static final QName DUMM_RPC_QNAME = QName.create(
+        "urn:ietf:params:xml:ns:yang:rpc-context", "2013-06-17", "dummy").intern();
+    private static final QNameModule CONFIG_MOD = DUMMY_CONFIG_QNAME.getModule();
+    private static final QNameModule RPC_MOD = DUMM_RPC_QNAME.getModule();
 
+    public static final String CONFIG_NAMESPACE = CONFIG_MOD.getNamespace().toString();
     public static final String CONFIG_MODULE = "config";
     public static final String CONFIG_THREADS_MODULE = "config-threads";
     public static final String IETF_INET_TYPES = "ietf-inet-types";
 
-    public static final QName SERVICE_TYPE_Q_NAME = createConfigQName("service-type");
-    public static final QName MODULE_TYPE_Q_NAME = createConfigQName("module-type");
-    public static final QName JAVA_CLASS_EXTENSION_QNAME = createConfigQName("java-class");
-    public static final QName REQUIRED_IDENTITY_EXTENSION_QNAME = createConfigQName("required-identity");
-    public static final QName INNER_STATE_BEAN_EXTENSION_QNAME = createConfigQName("inner-state-bean");
-    public static final QName PROVIDED_SERVICE_EXTENSION_QNAME = createConfigQName("provided-service");
-    public static final QName JAVA_NAME_PREFIX_EXTENSION_QNAME = createConfigQName("java-name-prefix");
-    public static final QName RPC_CONTEXT_REF_GROUPING_QNAME = createRpcXQName("rpc-context-ref");
-    public static final QName RPC_CONTEXT_REF_GROUPING_LEAF = createRpcXQName("context-instance");
-    public static final QName RPC_CONTEXT_INSTANCE_EXTENSION_QNAME = createRpcXQName("rpc-context-instance");
+    public static final QName SERVICE_TYPE_Q_NAME = createConfigQName("service-type").intern();
+    public static final QName MODULE_TYPE_Q_NAME = createConfigQName("module-type").intern();
+    public static final QName JAVA_CLASS_EXTENSION_QNAME = createConfigQName("java-class").intern();
+    public static final QName DISABLE_OSGI_SERVICE_REG_QNAME = createConfigQName("disable-osgi-service-registration").intern();
+    public static final QName REQUIRED_IDENTITY_EXTENSION_QNAME = createConfigQName("required-identity").intern();
+    public static final QName INNER_STATE_BEAN_EXTENSION_QNAME = createConfigQName("inner-state-bean").intern();
+    public static final QName PROVIDED_SERVICE_EXTENSION_QNAME = createConfigQName("provided-service").intern();
+    public static final QName JAVA_NAME_PREFIX_EXTENSION_QNAME = createConfigQName("java-name-prefix").intern();
+    public static final QName RPC_CONTEXT_REF_GROUPING_QNAME = createRpcXQName("rpc-context-ref").intern();
+    public static final QName RPC_CONTEXT_REF_GROUPING_LEAF = createRpcXQName("context-instance").intern();
+    public static final QName RPC_CONTEXT_INSTANCE_EXTENSION_QNAME = createRpcXQName("rpc-context-instance").intern();
 
     public static QName createConfigQName(final String localName) {
-        // FIXME: pre-construct QNameModule
-        return QName.create(CONFIG_NAMESPACE, "2013-04-05", localName);
+        return QName.create(CONFIG_MOD, localName);
     }
 
     public static QName createRpcXQName(final String localName) {
-        // FIXME: pre-construct QNameModule
-        return QName.create("urn:ietf:params:xml:ns:yang:rpc-context",
-                "2013-06-17", localName);
+        return QName.create(RPC_MOD, localName);
     }
 }