Use more modern QNameModule methods in restconf-nb

We can use better methods to express what we really need. Migrate over.

Change-Id: Ic3eea4484800468e331d30127671675a68834013
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfStrategy.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfStrategy.java
index 0d591ec1b6f0d1252aed33e87d0f3280577b4b27..5af9064f9fed1163b88ec0cdf98ea7b47b1b252b 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfStrategy.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/RestconfStrategy.java
@@ -1250,8 +1250,8 @@ public abstract class RestconfStrategy {
                 .collect(ImmutableSet.toImmutableSet());
             if (!rpcNames.isEmpty()) {
                 final var namespace = entry.getKey();
-                table.computeIfAbsent(namespace.getNamespace(), ignored -> new HashMap<>())
-                    .put(namespace.getRevision().orElse(null), rpcNames);
+                table.computeIfAbsent(namespace.namespace(), ignored -> new HashMap<>())
+                    .put(namespace.revision(), rpcNames);
             }
         }
 
@@ -1261,7 +1261,7 @@ public abstract class RestconfStrategy {
             entry.getValue().entrySet().stream()
             .sorted(Comparator.comparing(Entry::getKey, (first, second) -> Revision.compare(second, first)))
             .findFirst()
-            .ifPresent(row -> rpcs.putAll(QNameModule.create(entry.getKey(), row.getKey()), row.getValue()));
+            .ifPresent(row -> rpcs.putAll(QNameModule.of(entry.getKey(), row.getKey()), row.getValue()));
         }
         return RestconfFuture.of(new OperationsGetResult.Container(modelContext, rpcs.build()));
     }

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java
index c2acb5e60f5a18f64d735fd45ecbcb9c9f009084..43ed84c7afbc02920881b9af35cb92ece0dbdafb 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/mdsal/MdsalRestconfServer.java
@@ -360,8 +360,7 @@ public final class MdsalRestconfServer implements RestconfServer, AutoCloseable
             return RestconfFuture.failed(new RestconfDocumentedException("RESTCONF is not available"));
         }
         return RestconfFuture.of(new NormalizedNodePayload(stack.toInference(),
-            ImmutableNodes.leafNode(YANG_LIBRARY_VERSION, stack.modelContext()
-                .findModuleStatements("ietf-yang-library").iterator().next().localQNameModule().getRevision()
-                .map(Revision::toString).orElse(""))));
+            ImmutableNodes.leafNode(YANG_LIBRARY_VERSION, stack.modelContext().findModuleStatements("ietf-yang-library")
+                .iterator().next().localQNameModule().revisionUnion().unionString())));
     }
 }

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/AbstractInstanceIdentifierTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/AbstractInstanceIdentifierTest.java
index 367d4314a972294875d258ac6ccf3a291858d1ab..2b4753bc886fef63ad5f2fd3d9f9d16ab10a4bd1 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/AbstractInstanceIdentifierTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/AbstractInstanceIdentifierTest.java
@@ -13,14 +13,12 @@ import java.nio.charset.StandardCharsets;
 import org.opendaylight.restconf.server.api.DatabindContext;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.Revision;
-import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public abstract class AbstractInstanceIdentifierTest {
-    protected static final QNameModule INSTANCE_IDENTIFIER_MODULE_QNAME = QNameModule.create(
-        XMLNamespace.of("instance:identifier:module"), Revision.of("2014-01-17"));
+    protected static final QNameModule INSTANCE_IDENTIFIER_MODULE_QNAME =
+        QNameModule.ofRevision("instance:identifier:module", "2014-01-17");
 
     protected static final QName CONT_QNAME = QName.create(INSTANCE_IDENTIFIER_MODULE_QNAME, "cont");
     protected static final QName CONT1_QNAME = QName.create(CONT_QNAME, "cont1");

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapperTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapperTest.java
index a93f116b5c1d9f92c8741eb3219dad0804aec75e..87c171dc5475384c548b5d2b5add43712f998030 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapperTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapperTest.java
@@ -35,16 +35,14 @@ import org.opendaylight.yangtools.yang.common.ErrorTag;
 import org.opendaylight.yangtools.yang.common.ErrorType;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.Revision;
-import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 import org.skyscreamer.jsonassert.JSONAssert;
 
 @RunWith(Parameterized.class)
 public class RestconfDocumentedExceptionMapperTest {
-    private static final QNameModule MONITORING_MODULE_INFO = QNameModule.create(
-        XMLNamespace.of("instance:identifier:patch:module"), Revision.of("2015-11-21"));
+    private static final QNameModule MONITORING_MODULE_INFO =
+        QNameModule.ofRevision("instance:identifier:patch:module", "2015-11-21");
 
     private static RestconfDocumentedExceptionMapper exceptionMapper;
 

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/AbstractNotificationListenerTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/AbstractNotificationListenerTest.java
index 03e6eceb63a40b6fda33772db56793f9eb91d311..803d5cff24bfd86b87933cc24488e0a6a0faaaa4 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/AbstractNotificationListenerTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/AbstractNotificationListenerTest.java
@@ -8,14 +8,11 @@
 package org.opendaylight.restconf.nb.rfc8040.streams;
 
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.Revision;
-import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public abstract class AbstractNotificationListenerTest {
-    protected static final QNameModule MODULE =
-        QNameModule.create(XMLNamespace.of("notifi:mod"), Revision.of("2016-11-23"));
+    protected static final QNameModule MODULE = QNameModule.ofRevision("notifi:mod", "2016-11-23");
     protected static final EffectiveModelContext MODEL_CONTEXT =
         YangParserTestUtils.parseYangResourceDirectory("/notifications");
 }

diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java
index 09038c50562907497bc10548bd1f47146fe577dc..763e3e37b4a4a08c1969bb0f36c10004ee1ddb04 100644 (file)
--- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java
+++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java
@@ -23,20 +23,17 @@ import org.opendaylight.yangtools.yang.common.ErrorTag;
 import org.opendaylight.yangtools.yang.common.ErrorType;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.Revision;
-import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.data.util.DataSchemaContext;
 import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 public abstract class AbstractFieldsTranslatorTest<T> extends AbstractJukeboxTest {
-    private static final QNameModule Q_NAME_MODULE_TEST_SERVICES = QNameModule.create(
-        XMLNamespace.of("tests:test-services"), Revision.of("2019-03-25"));
-    private static final QNameModule Q_NAME_MODULE_AUGMENTED_JUKEBOX = QNameModule.create(
-        XMLNamespace.of("http://example.com/ns/augmented-jukebox"), Revision.of("2016-05-05"));
-    private static final QNameModule Q_NAME_MODULE_FOO = QNameModule.create(
-        XMLNamespace.of("urn:foo"), Revision.of("2023-03-27"));
+    private static final QNameModule Q_NAME_MODULE_TEST_SERVICES =
+        QNameModule.ofRevision("tests:test-services", "2019-03-25");
+    private static final QNameModule Q_NAME_MODULE_AUGMENTED_JUKEBOX =
+        QNameModule.ofRevision("http://example.com/ns/augmented-jukebox", "2016-05-05");
+    private static final QNameModule Q_NAME_MODULE_FOO = QNameModule.ofRevision("urn:foo", "2023-03-27");
 
     private static final EffectiveModelContext TEST_SERVICES_SCHEMA =
         YangParserTestUtils.parseYangResourceDirectory("/test-services");