BUG-865: deprecate XmlUtils.resolveBaseTypeFrom()

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / codec / AbstractIntegerStringCodec.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/AbstractIntegerStringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/AbstractIntegerStringCodec.java
index 2bf9a35a34e6024062f71e142fe9ac247ae21009..b7dfa00bd02ab37a29f2e2ab88a3dddb12e886e4 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/AbstractIntegerStringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/AbstractIntegerStringCodec.java
@@ -31,9 +31,9 @@ import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinit
 
 abstract class AbstractIntegerStringCodec<N extends Number & Comparable<N>, T extends TypeDefinition<T>> extends TypeDefinitionAwareCodec<N, T>{
 
-    private static final Pattern intPattern = Pattern.compile("[+-]?[1-9][0-9]*$");
-    private static final Pattern hexPattern = Pattern.compile("[+-]?0[xX][0-9a-fA-F]+");
-    private static final Pattern octalPattern = Pattern.compile("[+-]?0[1-7][0-7]*$");
+    private static final Pattern INT_PATTERN = Pattern.compile("[+-]?[1-9][0-9]*$");
+    private static final Pattern HEX_PATTERN = Pattern.compile("[+-]?0[xX][0-9a-fA-F]+");
+    private static final Pattern OCT_PATTERN = Pattern.compile("[+-]?0[1-7][0-7]*$");
 
     // For up to two characters, this is very fast
     private static final CharMatcher X_MATCHER = CharMatcher.anyOf("xX");
@@ -117,7 +117,7 @@ abstract class AbstractIntegerStringCodec<N extends Number & Comparable<N>, T ex
     }
 
 
-    private final void validate(final N value) {
+    private void validate(final N value) {
         if (rangeConstraints.isEmpty()) {
             return;
         }
@@ -159,7 +159,7 @@ abstract class AbstractIntegerStringCodec<N extends Number & Comparable<N>, T ex
         return type.getRangeConstraints();
     }
 
-    private static final int provideBase(final String integer) {
+    private static int provideBase(final String integer) {
         if (integer == null) {
             throw new IllegalArgumentException("String representing integer number cannot be NULL");
         }
@@ -168,15 +168,15 @@ abstract class AbstractIntegerStringCodec<N extends Number & Comparable<N>, T ex
             return 10;
         }
 
-        final Matcher intMatcher = intPattern.matcher(integer);
+        final Matcher intMatcher = INT_PATTERN.matcher(integer);
         if (intMatcher.matches()) {
             return 10;
         }
-        final Matcher hexMatcher = hexPattern.matcher(integer);
+        final Matcher hexMatcher = HEX_PATTERN.matcher(integer);
         if (hexMatcher.matches()) {
             return 16;
         }
-        final Matcher octMatcher = octalPattern.matcher(integer);
+        final Matcher octMatcher = OCT_PATTERN.matcher(integer);
         if (octMatcher.matches()) {
             return 8;
         }