X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Futil%2FModuleQNameUtil.java;h=e1c73df41369c7647543474a7cefbbf76ad4b436;hb=2d60632f7cf63712e8357a3cf3fc40d83366e5e6;hp=e84337756e4ad6a74200ce1cd60293848b59d3ab;hpb=213aae87ecaccb43f3d909e0455db43511ace381;p=controller.git

diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/util/ModuleQNameUtil.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/util/ModuleQNameUtil.java
index e84337756e..e1c73df413 100644
--- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/util/ModuleQNameUtil.java
+++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/util/ModuleQNameUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2013, 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -7,36 +7,36 @@
  */
 package org.opendaylight.controller.config.manager.impl.util;
 
-import org.opendaylight.controller.config.spi.ModuleFactory;
-import org.opendaylight.yangtools.yang.binding.annotations.ModuleQName;
-import org.osgi.framework.BundleContext;
-
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import org.opendaylight.controller.config.spi.ModuleFactory;
+import org.opendaylight.yangtools.yang.binding.annotations.ModuleQName;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.osgi.framework.BundleContext;
 
-public class ModuleQNameUtil {
+public final class ModuleQNameUtil {
 
-    public static Set<String> getQNames(Map<String, Entry<ModuleFactory, BundleContext>> resolved) {
-        Set<String> result = new HashSet<>();
-        for (Entry<ModuleFactory, BundleContext> entry : resolved.values()) {
+    private ModuleQNameUtil() {
+    }
+
+    public static Set<String> getQNames(final Map<String, Entry<ModuleFactory, BundleContext>> resolved) {
+        final Set<String> result = new HashSet<>();
+        for (final Entry<ModuleFactory, BundleContext> entry : resolved.values()) {
             Class<?> inspected = entry.getKey().getClass();
             if (inspected.isInterface()) {
                 throw new IllegalArgumentException("Unexpected interface " + inspected);
             }
             ModuleQName annotation = null;
-            while(annotation == null && inspected != null) {
+            while (annotation == null && inspected != null) {
                 annotation = inspected.getAnnotation(ModuleQName.class);
                 inspected = inspected.getSuperclass();
             }
             if (annotation != null) {
-                // FIXME
-                String qName = "(" + annotation.namespace() + "?revision=" + annotation.revision() + ")" + annotation.name();
-                result.add(qName);
+                result.add(QName.create(annotation.namespace(), annotation.revision(), annotation.name()).toString());
             }
         }
         return result;
     }
-
 }