From a3d67093f609c01cf4ed64eb674bbaf1fb5ad7f8 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 27 Oct 2021 23:12:14 +0200
Subject: [PATCH] Allow rebinding the prefix of an UnresolvedQName

There are callers who are dealing with prefix being optional, possibly
added (or changed) in a later context. Add the ability to do that
without re-validating the local name.

JIRA: YANGTOOLS-1359
Change-Id: I099589d8a579f854dcc0ae1740027e7af24470bf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 840bcc965c8eeb566d8cebd870f35e1be85cc617)
---
 .../yangtools/yang/common/QualifiedQName.java          |  2 +-
 .../yangtools/yang/common/UnqualifiedQName.java        | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QualifiedQName.java b/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QualifiedQName.java
index 1c12ecb4cf..a003ce92b5 100644
--- a/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QualifiedQName.java
+++ b/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QualifiedQName.java
@@ -34,7 +34,7 @@ public final class QualifiedQName extends AbstractQName implements Comparable<Qu
 
     private final String prefix;
 
-    private QualifiedQName(final String prefix, final String localName) {
+    QualifiedQName(final String prefix, final String localName) {
         super(localName);
         this.prefix = requireNonNull(prefix);
     }
diff --git a/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/UnqualifiedQName.java b/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/UnqualifiedQName.java
index 821bc910a1..54a14c1dd7 100644
--- a/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/UnqualifiedQName.java
+++ b/common/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/UnqualifiedQName.java
@@ -55,6 +55,16 @@ public final class UnqualifiedQName extends AbstractQName implements Comparable<
         return isValidLocalName(localName) ? new UnqualifiedQName(localName) : null;
     }
 
+    /**
+     * Return a {@link QualifiedQName} object bound to specified {@code prefix}.
+     *
+     * @return a {@link QualifiedQName} object bound to specified {@code prefix}
+     * @throws NullPointerException if {@code newPrefix} is null
+     */
+    public QualifiedQName withPrefix(final String newPrefix) {
+        return new QualifiedQName(newPrefix, getLocalName());
+    }
+
     /**
      * Read an UnqualifiedQName from a DataInput. The format is expected to match the output format of
      * {@link #writeTo(DataOutput)}.
-- 
2.36.6