Migrate UnresolvedQName.unqualified() callers

This method has a better replacement, migrate to using it.

Change-Id: Ie8b59777665af8312a4453cf1aa6c8e932e143c6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit f58b21d05c3ab30415ac26a086ba49932cae9dca)

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/AbstractOperationsModule.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/AbstractOperationsModule.java
index b0349162a1428b528423054ccbac1e954343c412..158133143a484e39f5dbf0423ff33edf6ccfec70 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/AbstractOperationsModule.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/AbstractOperationsModule.java
@@ -14,7 +14,6 @@ import java.util.Optional;
 import java.util.Set;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.UnresolvedQName;
 import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified;
 import org.opendaylight.yangtools.yang.common.YangVersion;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
@@ -67,7 +66,7 @@ abstract class AbstractOperationsModule implements Module, ModuleEffectiveStatem
 
     @Override
     public final Unqualified argument() {
-        return UnresolvedQName.unqualified(getName());
+        return Unqualified.of(getName());
     }
 
     @Override

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/ApiPathTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/ApiPathTest.java
index 464a6dd538ff2f9a41eaa8b6e2a8e3d2d006d9f2..7584f5e1e1a61b480bc7b1680ea1aad4c75b677a 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/ApiPathTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/ApiPathTest.java
@@ -19,7 +19,7 @@ import org.junit.Test;
 import org.opendaylight.restconf.nb.rfc8040.ApiPath.ApiIdentifier;
 import org.opendaylight.restconf.nb.rfc8040.ApiPath.ListInstance;
 import org.opendaylight.restconf.nb.rfc8040.ApiPath.Step;
-import org.opendaylight.yangtools.yang.common.UnresolvedQName;
+import org.opendaylight.yangtools.yang.common.UnresolvedQName.Unqualified;
 
 public class ApiPathTest {
     @Test
@@ -103,14 +103,14 @@ public class ApiPathTest {
     private static void assertApiIdentifier(final Step step, final String module, final String identifier) {
         assertThat(step, instanceOf(ApiIdentifier.class));
         assertEquals(module, step.module());
-        assertEquals(UnresolvedQName.unqualified(identifier), step.identifier());
+        assertEquals(Unqualified.of(identifier), step.identifier());
     }
 
     private static void assertListInstance(final Step step, final String module, final String identifier,
             final String... keyValues) {
         assertThat(step, instanceOf(ListInstance.class));
         assertEquals(module, step.module());
-        assertEquals(UnresolvedQName.unqualified(identifier), step.identifier());
+        assertEquals(Unqualified.of(identifier), step.identifier());
         assertEquals(Arrays.asList(keyValues), ((ListInstance) step).keyValues());
     }