From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 31 Jul 2019 09:09:16 +0000 (+0200)
Subject: Add checkValidIdentifierStart()
X-Git-Tag: release/sodium~10
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=dec98428c4dabd3d6767076b3d6e453b3c0b438a;p=netconf.git

Add checkValidIdentifierStart()

We have slight code duplicate, fix this by adding a utility method.

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

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java
index 8ad3642440..758398b78d 100644
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java
@@ -199,8 +199,7 @@ public final class YangInstanceIdentifierDeserializer {
     }
 
     private QName prepareQName() {
-        checkValid(IDENTIFIER_FIRST_CHAR.matches(currentChar()),
-            "Identifier must start with character from set 'a-zA-Z_'");
+        checkValidIdentifierStart();
         final String preparedPrefix = nextIdentifierFromNextSequence(IDENTIFIER);
         final String prefix;
         final String localName;
@@ -217,8 +216,7 @@ public final class YangInstanceIdentifierDeserializer {
             case COLON:
                 prefix = preparedPrefix;
                 skipCurrentChar();
-                checkValid(IDENTIFIER_FIRST_CHAR.matches(currentChar()),
-                        "Identifier must start with character from set 'a-zA-Z_'");
+                checkValidIdentifierStart();
                 localName = nextIdentifierFromNextSequence(IDENTIFIER);
 
                 if (!allCharsConsumed() && currentChar() == EQUAL) {
@@ -299,6 +297,11 @@ public final class YangInstanceIdentifierDeserializer {
             errorMsg);
     }
 
+    private void checkValidIdentifierStart() {
+        checkValid(IDENTIFIER_FIRST_CHAR.matches(currentChar()),
+            "Identifier must start with character from set 'a-zA-Z_'");
+    }
+
     private char currentChar() {
         return data.charAt(offset);
     }