From 289e98e460028db9b6f30f3e330423c959a660a6 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 12 Mar 2024 18:07:04 +0100 Subject: [PATCH] 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 --- .../runtime/spi/ModuleInfoSnapshotResolver.java | 2 +- .../runtime/spi/ModuleInfoSnapshotBuilderTest.java | 3 +-- .../yangtools/yang/binding/contract/Naming.java | 10 ++++------ .../yangtools/yang/binding/contract/NamingTest.java | 8 +++----- 4 files changed, 9 insertions(+), 14 deletions(-) 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 fd30bb6ac0..6d180fff19 100644 --- 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(); 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 618007f635..78454ab60b 100644 --- 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 536e69db7d..7726158474 100644 --- 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 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 3d241537bd..9c71536d9d 100644 --- 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"))); -- 2.36.6