From 515f08a3e800a31814282b326c6abd4948723a8b Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Tue, 14 Mar 2017 19:38:44 +0100
Subject: [PATCH] Reduce visibility of codec methods

These are needlessly protected/public, lower them to package-private.

Change-Id: I06ef86402051be3a010d88470ed2c0569853dbb0
Signed-off-by: Robert Varga <rovarga@cisco.com>
---
 .../yangtools/yang/data/codec/gson/AbstractJSONCodec.java    | 2 +-
 .../yang/data/impl/codec/AbstractIntegerStringCodec.java     | 5 +++--
 .../yangtools/yang/data/impl/codec/Int16StringCodec.java     | 4 ++--
 .../yangtools/yang/data/impl/codec/Int32StringCodec.java     | 4 ++--
 .../yangtools/yang/data/impl/codec/Int64StringCodec.java     | 4 ++--
 .../yangtools/yang/data/impl/codec/Int8StringCodec.java      | 4 ++--
 .../yangtools/yang/data/impl/codec/Uint16StringCodec.java    | 4 ++--
 .../yangtools/yang/data/impl/codec/Uint32StringCodec.java    | 4 ++--
 .../yangtools/yang/data/impl/codec/Uint64StringCodec.java    | 4 ++--
 .../yangtools/yang/data/impl/codec/Uint8StringCodec.java     | 4 ++--
 10 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/AbstractJSONCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/AbstractJSONCodec.java
index cb20ffc947..7c00715f32 100644
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/AbstractJSONCodec.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/AbstractJSONCodec.java
@@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwareCodec;
 /**
  * Abstract base implementation of {@link JSONCodec}, which wraps a {@link TypeDefinitionAwareCodec}.
  *
- * @param <T> Deserialized objec type
+ * @param <T> Deserialized object type
  */
 abstract class AbstractJSONCodec<T> implements JSONCodec<T> {
     private final Codec<String, T> codec;
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 5ff364828d..022d347116 100644
--- 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
@@ -15,6 +15,7 @@ import static org.opendaylight.yangtools.yang.model.util.BaseTypes.UINT16_QNAME;
 import static org.opendaylight.yangtools.yang.model.util.BaseTypes.UINT32_QNAME;
 import static org.opendaylight.yangtools.yang.model.util.BaseTypes.UINT64_QNAME;
 import static org.opendaylight.yangtools.yang.model.util.BaseTypes.UINT8_QNAME;
+
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
@@ -148,9 +149,9 @@ abstract class AbstractIntegerStringCodec<N extends Number & Comparable<N>, T ex
      * @param radix numeric base.
      * @return Deserialized value.
      */
-    protected abstract N deserialize(String stringRepresentation, int radix);
+    abstract N deserialize(String stringRepresentation, int radix);
 
-    protected abstract N convertValue(Number value);
+    abstract N convertValue(Number value);
 
 
     protected static List<RangeConstraint> extractRange(final IntegerTypeDefinition type) {
diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16StringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16StringCodec.java
index 1f52f0b4cd..0493f8b8bd 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16StringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16StringCodec.java
@@ -19,7 +19,7 @@ final class Int16StringCodec extends AbstractIntegerStringCodec<Short, IntegerTy
     }
 
     @Override
-    public Short deserialize(final String stringRepresentation, final int base) {
+    Short deserialize(final String stringRepresentation, final int base) {
         return Short.valueOf(stringRepresentation, base);
     }
 
@@ -29,7 +29,7 @@ final class Int16StringCodec extends AbstractIntegerStringCodec<Short, IntegerTy
     }
 
     @Override
-    protected Short convertValue(final Number value) {
+    Short convertValue(final Number value) {
         return value.shortValue();
     }
 }
diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int32StringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int32StringCodec.java
index e9505fb515..24654757bc 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int32StringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int32StringCodec.java
@@ -19,7 +19,7 @@ final class Int32StringCodec extends AbstractIntegerStringCodec<Integer, Integer
     }
 
     @Override
-    public Integer deserialize(final String stringRepresentation, final int base) {
+    Integer deserialize(final String stringRepresentation, final int base) {
         return Integer.valueOf(stringRepresentation, base);
     }
 
@@ -29,7 +29,7 @@ final class Int32StringCodec extends AbstractIntegerStringCodec<Integer, Integer
     }
 
     @Override
-    protected Integer convertValue(final Number value) {
+    Integer convertValue(final Number value) {
         return value.intValue();
     }
 }
diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int64StringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int64StringCodec.java
index f3f22b21ab..89feceb9fd 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int64StringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int64StringCodec.java
@@ -20,7 +20,7 @@ final class Int64StringCodec extends AbstractIntegerStringCodec<Long, IntegerTyp
     }
 
     @Override
-    public Long deserialize(final String stringRepresentation, final int base) {
+    Long deserialize(final String stringRepresentation, final int base) {
         return Long.valueOf(stringRepresentation, base);
     }
 
@@ -30,7 +30,7 @@ final class Int64StringCodec extends AbstractIntegerStringCodec<Long, IntegerTyp
     }
 
     @Override
-    protected Long convertValue(final Number value) {
+    Long convertValue(final Number value) {
         return value.longValue();
     }
 }
diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int8StringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int8StringCodec.java
index 5c477929e3..fd938ed99a 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int8StringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int8StringCodec.java
@@ -20,7 +20,7 @@ final class Int8StringCodec extends AbstractIntegerStringCodec<Byte, IntegerType
     }
 
     @Override
-    public Byte deserialize(final String stringRepresentation, final int base) {
+    Byte deserialize(final String stringRepresentation, final int base) {
         return Byte.valueOf(stringRepresentation, base);
     }
 
@@ -30,7 +30,7 @@ final class Int8StringCodec extends AbstractIntegerStringCodec<Byte, IntegerType
     }
 
     @Override
-    protected Byte convertValue(final Number value) {
+    Byte convertValue(final Number value) {
         return value.byteValue();
     }
 }
diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint16StringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint16StringCodec.java
index 887fe14a65..ddd021ab70 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint16StringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint16StringCodec.java
@@ -20,7 +20,7 @@ final class Uint16StringCodec extends AbstractIntegerStringCodec<Integer, Unsign
     }
 
     @Override
-    public Integer deserialize(final String stringRepresentation, final int base) {
+    Integer deserialize(final String stringRepresentation, final int base) {
         return Integer.valueOf(stringRepresentation, base);
     }
 
@@ -30,7 +30,7 @@ final class Uint16StringCodec extends AbstractIntegerStringCodec<Integer, Unsign
     }
 
     @Override
-    protected Integer convertValue(final Number value) {
+    Integer convertValue(final Number value) {
         return value.intValue();
     }
 }
diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint32StringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint32StringCodec.java
index 2909deb6b9..feba81f337 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint32StringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint32StringCodec.java
@@ -21,7 +21,7 @@ final class Uint32StringCodec extends AbstractIntegerStringCodec<Long, UnsignedI
     }
 
     @Override
-    public Long deserialize(final String stringRepresentation, final int base) {
+    Long deserialize(final String stringRepresentation, final int base) {
         return Long.valueOf(stringRepresentation, base);
     }
 
@@ -31,7 +31,7 @@ final class Uint32StringCodec extends AbstractIntegerStringCodec<Long, UnsignedI
     }
 
     @Override
-    protected Long convertValue(final Number value) {
+    Long convertValue(final Number value) {
         return value.longValue();
     }
 }
diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64StringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64StringCodec.java
index 098b1d5741..dbd0e63958 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64StringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64StringCodec.java
@@ -22,7 +22,7 @@ final class Uint64StringCodec extends AbstractIntegerStringCodec<BigInteger, Uns
     }
 
     @Override
-    public BigInteger deserialize(final String stringRepresentation, final int base) {
+    BigInteger deserialize(final String stringRepresentation, final int base) {
         return new BigInteger(stringRepresentation, base);
     }
 
@@ -32,7 +32,7 @@ final class Uint64StringCodec extends AbstractIntegerStringCodec<BigInteger, Uns
     }
 
     @Override
-    protected BigInteger convertValue(final Number value) {
+    BigInteger convertValue(final Number value) {
         if (value instanceof BigInteger) {
             return (BigInteger) value;
         }
diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint8StringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint8StringCodec.java
index bd60cb3233..9b30015dc5 100644
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint8StringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint8StringCodec.java
@@ -26,12 +26,12 @@ final class Uint8StringCodec extends AbstractIntegerStringCodec<Short, UnsignedI
     }
 
     @Override
-    public Short deserialize(final String stringRepresentation, final int base) {
+    Short deserialize(final String stringRepresentation, final int base) {
         return Short.valueOf(stringRepresentation, base);
     }
 
     @Override
-    protected Short convertValue(final Number value) {
+    Short convertValue(final Number value) {
         return value.shortValue();
     }
 }
-- 
2.36.6