BUG-865: remove TypeDefinitionAwareCodec nested classes

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodec.java
index 24981326d7ab49c18cf34e1442c03197224b9510..1c154dd587999cb1d283a112465dff1629845e0a 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodec.java
@@ -7,10 +7,8 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.codec;
 
-import com.google.common.base.Joiner;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition;
@@ -25,8 +23,6 @@ import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinit
 import org.opendaylight.yangtools.yang.model.util.DerivedType;
 
 public abstract class TypeDefinitionAwareCodec<J, T extends TypeDefinition<T>> implements DataStringCodec<J> {
-
-    private static final TypeDefinitionAwareCodec<?,?> EMPTY_DEFAULT_CODEC = new EmptyStringCodec(Optional.<EmptyTypeDefinition>absent());
     private final Optional<T> typeDefinition;
     private final Class<J> inputClass;
 
@@ -54,7 +50,7 @@ public abstract class TypeDefinitionAwareCodec<J, T extends TypeDefinition<T>> i
     public static final <T extends TypeDefinition<T>> TypeDefinitionAwareCodec<?, T> fromType(final T typeDefinition) {
         final T normalizedType = (T) DerivedType.from(typeDefinition);
         @SuppressWarnings("rawtypes")
-        TypeDefinitionAwareCodec codec = null;
+        final TypeDefinitionAwareCodec codec;
 
         if (normalizedType instanceof BinaryTypeDefinition) {
             codec = BinaryStringCodec.from((BinaryTypeDefinition)normalizedType);
@@ -65,7 +61,7 @@ public abstract class TypeDefinitionAwareCodec<J, T extends TypeDefinition<T>> i
         } else if (normalizedType instanceof DecimalTypeDefinition) {
             codec = DecimalStringCodec.from((DecimalTypeDefinition)normalizedType);
         } else if (normalizedType instanceof EmptyTypeDefinition) {
-            codec = EMPTY_DEFAULT_CODEC;
+            codec = EmptyStringCodec.INSTANCE;
         } else if (normalizedType instanceof EnumTypeDefinition) {
             codec = EnumStringCodec.from((EnumTypeDefinition)normalizedType);
         } else if (normalizedType instanceof IntegerTypeDefinition) {
@@ -76,131 +72,9 @@ public abstract class TypeDefinitionAwareCodec<J, T extends TypeDefinition<T>> i
             codec = UnionStringCodec.from((UnionTypeDefinition)normalizedType);
         } else if (normalizedType instanceof UnsignedIntegerTypeDefinition) {
             codec = AbstractIntegerStringCodec.from((UnsignedIntegerTypeDefinition) normalizedType);
+        } else {
+            codec = null;
         }
         return codec;
     }
-
-    @Deprecated
-    public static class BooleanCodecStringImpl extends BooleanStringCodec{
-        protected BooleanCodecStringImpl(final Optional<BooleanTypeDefinition> typeDef) {
-            super(typeDef);
-        }
-    }
-
-    @Deprecated
-    public static class Uint8CodecStringImpl extends Uint8StringCodec {
-
-        protected Uint8CodecStringImpl(final Optional<UnsignedIntegerTypeDefinition> typeDef) {
-            super(typeDef);
-        }
-    }
-
-    @Deprecated
-    public static class Uint16CodecStringImpl extends Uint16StringCodec {
-        protected Uint16CodecStringImpl(final Optional<UnsignedIntegerTypeDefinition> typeDef) {
-            super(typeDef);
-        }
-    }
-
-    @Deprecated
-    public static class Uint32CodecStringImpl extends Uint32StringCodec {
-        protected Uint32CodecStringImpl(final Optional<UnsignedIntegerTypeDefinition> typeDef) {
-            super(typeDef);
-        }
-    }
-
-    @Deprecated
-    public static class Uint64CodecStringImpl extends Uint64StringCodec {
-        protected Uint64CodecStringImpl(final Optional<UnsignedIntegerTypeDefinition> typeDef) {
-            super(typeDef);
-        }
-    }
-
-    @Deprecated
-    public static class StringCodecStringImpl extends StringStringCodec {
-        protected StringCodecStringImpl(final Optional<StringTypeDefinition> typeDef) {
-            super(typeDef.get());
-        }
-    }
-
-    @Deprecated
-    public static class Int16CodecStringImpl extends Int16StringCodec {
-        protected Int16CodecStringImpl(final Optional<IntegerTypeDefinition> typeDef) {
-            super(typeDef);
-        }
-    }
-
-    @Deprecated
-    public static class Int32CodecStringImpl extends Int32StringCodec {
-        protected Int32CodecStringImpl(final Optional<IntegerTypeDefinition> typeDef) {
-            super(typeDef);
-        }
-
-    }
-
-    @Deprecated
-    public static class Int64CodecStringImpl extends Int64StringCodec {
-        protected Int64CodecStringImpl(final Optional<IntegerTypeDefinition> typeDef) {
-            super(typeDef);
-        }
-
-    }
-
-    @Deprecated
-    public static class Int8CodecStringImpl extends Int8StringCodec {
-
-        protected Int8CodecStringImpl(final Optional<IntegerTypeDefinition> typeDef) {
-            super(typeDef);
-        }
-
-    }
-
-    @Deprecated
-    public static class EmptyCodecStringImpl extends EmptyStringCodec {
-        protected EmptyCodecStringImpl(final Optional<EmptyTypeDefinition> typeDef) {
-            super(typeDef);
-        }
-    }
-
-    @Deprecated
-    public static final class BinaryCodecStringImpl extends BinaryStringCodec {
-        protected BinaryCodecStringImpl(final Optional<BinaryTypeDefinition> typeDef) {
-            super(typeDef);
-        }
-
-    }
-
-    @Deprecated
-    public static final class BitsCodecStringImpl extends BitsStringCodec {
-
-        public static final Joiner JOINER = Joiner.on(" ").skipNulls();
-        public static final Splitter SPLITTER = Splitter.on(' ').omitEmptyStrings().trimResults();
-
-        protected BitsCodecStringImpl(final Optional<BitsTypeDefinition> typeDef) {
-            super(typeDef);
-        }
-    }
-
-    @Deprecated
-    public static class EnumCodecStringImpl extends EnumStringCodec {
-
-        protected EnumCodecStringImpl(final Optional<EnumTypeDefinition> typeDef) {
-            super(typeDef);
-        }
-
-    }
-
-    @Deprecated
-    public static class DecimalCodecStringImpl extends DecimalStringCodec {
-        protected DecimalCodecStringImpl(final Optional<DecimalTypeDefinition> typeDef) {
-            super(typeDef);
-        }
-    }
-
-    @Deprecated
-    public static class UnionCodecStringImpl extends UnionStringCodec {
-        protected UnionCodecStringImpl(final Optional<UnionTypeDefinition> typeDef) {
-            super(typeDef);
-        }
-    }
 }