Migrate users of deprecated yang.common methods

QNameModule and QName have deprecated a few methods, migrate to their
replacements.

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

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/FutureSchemaTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/FutureSchemaTest.java
index 5041864899f18cb6a696d406f5708ec1d0f8f3e0..73ffb42ab1dc8b983144a48e5da524f375548107 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/FutureSchemaTest.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/FutureSchemaTest.java
@@ -15,14 +15,13 @@ import com.google.common.collect.ImmutableSet;
 import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.XMLNamespace;
 
 public class FutureSchemaTest {
     @Test
     public void basicTest() {
         final FutureSchema futureSchema = FutureSchema.create(0, TimeUnit.MICROSECONDS, true);
         assertNotNull(futureSchema);
-        assertFalse(futureSchema.waitForSchema(QNameModule.create(XMLNamespace.of("test"))));
+        assertFalse(futureSchema.waitForSchema(QNameModule.of("test")));
         assertFalse(futureSchema.waitForSchema(ImmutableSet.of()));
         assertEquals(0, futureSchema.getDuration());
         assertEquals(TimeUnit.MICROSECONDS, futureSchema.getUnit());

diff --git a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java
index fd30bb6ac01eaadf2e4c03b69bb8f330d1d35162..6d180fff19bf79ce811e29220a9387e30f6c1143 100644 (file)
--- a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java
+++ b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java
@@ -179,7 +179,7 @@ public final class ModuleInfoSnapshotResolver implements Mutable {
         // Alright, now let's find out which sources got captured
         final var sources = new HashSet<SourceIdentifier>();
         for (var entry : modelContext.getModuleStatements().entrySet()) {
-            final var revision = entry.getKey().getRevision().orElse(null);
+            final var revision = entry.getKey().revision();
             final var module = entry.getValue();
 
             sources.add(new SourceIdentifier(module.argument(), revision));

diff --git a/binding/mdsal-binding-runtime-spi/src/test/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotBuilderTest.java b/binding/mdsal-binding-runtime-spi/src/test/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotBuilderTest.java
index 618007f635bb54e25469dfda069e7d01b6129fd1..78454ab60b7758243a9b0b0a0a405ec5ce059e7d 100644 (file)
--- a/binding/mdsal-binding-runtime-spi/src/test/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotBuilderTest.java
+++ b/binding/mdsal-binding-runtime-spi/src/test/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotBuilderTest.java
@@ -16,7 +16,6 @@ import org.opendaylight.yang.gen.v1.mdsal767.norev.One$F;
 import org.opendaylight.yang.svc.v1.mdsal767.norev.YangModuleInfoImpl;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory;
 
 class ModuleInfoSnapshotBuilderTest {
@@ -29,7 +28,7 @@ class ModuleInfoSnapshotBuilderTest {
         final var snapshot = snapshotBuilder.build();
         final var modelContext = snapshot.modelContext();
         final var modules = modelContext.getModuleStatements();
-        final var module = modules.get(QNameModule.create(XMLNamespace.of("mdsal767")));
+        final var module = modules.get(QNameModule.of("mdsal767"));
         assertEquals(1, module.features().size());
         final var feature = module.features().stream().findAny().orElseThrow();
         assertEquals(QName.create("mdsal767", "one"), feature.argument());

diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/contract/Naming.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/contract/Naming.java
index 536e69db7d6eae0ea45badc3daa855bf5af4b7a7..77261584747fe126dfc56fd49f6da2fd09fedb00 100644 (file)
--- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/contract/Naming.java
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/contract/Naming.java
@@ -20,7 +20,6 @@ import com.google.common.collect.Interner;
 import com.google.common.collect.Interners;
 import java.util.Collection;
 import java.util.Locale;
-import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.checkerframework.checker.regex.qual.Regex;
@@ -35,7 +34,6 @@ import org.opendaylight.yangtools.yang.binding.RpcInput;
 import org.opendaylight.yangtools.yang.binding.ScalarTypeObject;
 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.YangDataName;
 
 @Beta
@@ -186,7 +184,7 @@ public final class Naming {
     }
 
     private static @NonNull String getRootPackageName(final StringBuilder builder, final QNameModule module) {
-        String namespace = module.getNamespace().toString();
+        String namespace = module.namespace().toString();
         namespace = COLON_SLASH_SLASH.matcher(namespace).replaceAll(QUOTED_DOT);
 
         final char[] chars = namespace.toCharArray();
@@ -204,11 +202,11 @@ public final class Naming {
             builder.append('.');
         }
 
-        final Optional<Revision> optRev = module.getRevision();
-        if (optRev.isPresent()) {
+        final var revision = module.revision();
+        if (revision != null) {
             // Revision is in format 2017-10-26, we want the output to be 171026, which is a matter of picking the
             // right characters.
-            final String rev = optRev.orElseThrow().toString();
+            final String rev = revision.toString();
             checkArgument(rev.length() == 10, "Unsupported revision %s", rev);
             builder.append("rev").append(rev, 2, 4).append(rev, 5, 7).append(rev.substring(8));
         } else {

diff --git a/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/contract/NamingTest.java b/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/contract/NamingTest.java
index 3d241537bd114493820e472cd25a36dfe591da48..9c71536d9d6dc4260973117b795e4297dbf7451f 100644 (file)
--- a/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/contract/NamingTest.java
+++ b/binding/yang-binding/src/test/java/org/opendaylight/yangtools/yang/binding/contract/NamingTest.java
@@ -14,8 +14,6 @@ import java.util.List;
 import org.junit.Test;
 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.common.YangDataName;
 
 public class NamingTest {
@@ -57,8 +55,8 @@ public class NamingTest {
         assertEquals("org.opendaylight.yang.gen.v1.test.uri.rev171026",
             Naming.getRootPackageName(QName.create("test:URI", "2017-10-26", "test")));
         assertEquals("org.opendaylight.yang.gen.v1.urn.m.o.d.u.l.e.n.a.m.e.t.e.s.t._case._1digit.rev130910",
-            Naming.getRootPackageName(QNameModule.create(
-                XMLNamespace.of("urn:m*o+d,u;l=e.n/a-m@e.t$e#s't.case.1digit"), Revision.of("2013-09-10"))));
+            Naming.getRootPackageName(QNameModule.ofRevision(
+                "urn:m*o+d,u;l=e.n/a-m@e.t$e#s't.case.1digit", "2013-09-10")));
         assertEquals("_1testpublic", Naming.normalizePackageName("1testpublic"));
         assertEquals("Test", Naming.getGetterSuffix(QName.create("test", "test")));
         assertEquals("XmlClass", Naming.getGetterSuffix(QName.create("test", "class")));
@@ -117,7 +115,7 @@ public class NamingTest {
 
     @Test
     public void yangDataMapping() {
-        final var ns = QNameModule.create(XMLNamespace.of("unused"));
+        final var ns = QNameModule.of("unused");
 
         // single ascii compliant non-conflicting word - remain as is
         assertEquals("single", Naming.mapYangDataName(new YangDataName(ns, "single")));

diff --git a/dom/mdsal-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/DOMDataTreeIdentifierTest.java b/dom/mdsal-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/DOMDataTreeIdentifierTest.java
index e1e7450a081efac6df5ec7f3dbd51aa691cf032a..7cc5765499ca7a79e6ba1515718a3dc94880230e 100644 (file)
--- a/dom/mdsal-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/DOMDataTreeIdentifierTest.java
+++ b/dom/mdsal-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/DOMDataTreeIdentifierTest.java
@@ -20,7 +20,6 @@ import org.junit.jupiter.api.Test;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 class DOMDataTreeIdentifierTest {
@@ -29,7 +28,7 @@ class DOMDataTreeIdentifierTest {
     private static final String COMPARE_FIRST_LISTS = "A-test-lists";
     private static final String COMPARE_SECOND_LISTS = "B-test-lists";
     private static final QNameModule TEST_MODULE =
-        QNameModule.create(XMLNamespace.of("urn:opendaylight:params:xml:ns:yang:controller:md:sal:test:store"));
+        QNameModule.of("urn:opendaylight:params:xml:ns:yang:controller:md:sal:test:store");
     private static final YangInstanceIdentifier REF_YII_IID =
         YangInstanceIdentifier.of(QName.create(TEST_MODULE, REF_LISTS));
     private static final YangInstanceIdentifier TEST_YII_IID =

diff --git a/dom/mdsal-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/DOMRpcIdentifierTest.java b/dom/mdsal-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/DOMRpcIdentifierTest.java
index 8adc1802d6a9da9b36a672fbad060520cab05405..8378d007b028d1a95766a09820b414177c993e8a 100644 (file)
--- a/dom/mdsal-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/DOMRpcIdentifierTest.java
+++ b/dom/mdsal-dom-api/src/test/java/org/opendaylight/mdsal/dom/api/DOMRpcIdentifierTest.java
@@ -14,16 +14,15 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import org.junit.jupiter.api.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
-import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 class DOMRpcIdentifierTest {
-    private static final QNameModule TEST_MODULE = QNameModule.create(XMLNamespace.of(
-            "urn:opendaylight:params:xml:ns:yang:controller:md:sal:test:store"));
+    private static final QNameModule TEST_MODULE =
+        QNameModule.of("urn:opendaylight:params:xml:ns:yang:controller:md:sal:test:store");
     private static final QName LOCAL_QNAME = QName.create(TEST_MODULE, "local");
     private static final DOMRpcIdentifier GLOBAL = DOMRpcIdentifier.create(LOCAL_QNAME, null);
     private static final DOMRpcIdentifier LOCAL = DOMRpcIdentifier.create(LOCAL_QNAME,
-            YangInstanceIdentifier.of(LOCAL_QNAME));
+        YangInstanceIdentifier.of(LOCAL_QNAME));
 
     @Test
     void createTest() {

diff --git a/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibraryContentBuilderImpl.java b/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibraryContentBuilderImpl.java
index 2f21db2fa182f03b92c1985f65c0f8f794bffc8c..29d0172009f89a4d0e0893456e87f68c4b6dec86 100644 (file)
--- a/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibraryContentBuilderImpl.java
+++ b/yanglib/mdsal-yanglib-rfc8525/src/main/java/org/opendaylight/mdsal/yanglib/rfc8525/YangLibraryContentBuilderImpl.java
@@ -97,7 +97,7 @@ final class YangLibraryContentBuilderImpl implements YangLibraryContentBuilder {
     private static Module buildModule(final org.opendaylight.yangtools.yang.model.api.Module module) {
         return new ModuleBuilder()
             .setName(new YangIdentifier(module.getName()))
-            .setNamespace(new Uri(module.getQNameModule().getNamespace().toString()))
+            .setNamespace(new Uri(module.getQNameModule().namespace().toString()))
             .setRevision(convertRevision(module.getRevision()))
             .setSubmodule(module.getSubmodules().stream()
                 .map(submodule -> new SubmoduleBuilder()