BUG-865: remove JSONCodec.needQuotes()

This method is not anywhere and is part of internal contract,
remove it.

Change-Id: I9196b1257422598c97c12cabac97f87773d0993f
Signed-off-by: Robert Varga <rovarga@cisco.com>

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 9b3f3d2ac4e12f942b43eb4943b048c677f08bc8..cb20ffc947fe4bf1a4f0670138870c12e6bf3caf 100644 (file)
--- 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
@@ -41,15 +41,16 @@ abstract class AbstractJSONCodec<T> implements JSONCodec<T> {
     public static JSONCodec<?> create(final Codec<String, ?> codec) {
         if (codec instanceof BooleanCodec) {
             return new BooleanJSONCodec((BooleanCodec<String>) codec);
-        } else if (codec instanceof DecimalCodec || codec instanceof Int8Codec
+        }
+        if (codec instanceof DecimalCodec || codec instanceof Int8Codec
                 || codec instanceof Int16Codec || codec instanceof Int32Codec
                 || codec instanceof Int64Codec || codec instanceof Uint8Codec
                 || codec instanceof Uint16Codec || codec instanceof Uint32Codec
                 || codec instanceof Uint64Codec) {
             return new NumberJSONCodec(codec);
-        } else {
-            return new QuotedJSONCodec<>(codec);
         }
+
+        return new QuotedJSONCodec<>(codec);
     }
 
     @Override

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/BooleanJSONCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/BooleanJSONCodec.java
index 63b415c350d09c946fc286c0ed12f56913d4abf1..ac4e6f98fb6de517b0c4f41277689d83b6f475f9 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/BooleanJSONCodec.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/BooleanJSONCodec.java
@@ -21,11 +21,6 @@ final class BooleanJSONCodec extends AbstractJSONCodec<Boolean> {
         super(codec);
     }
 
-    @Override
-    public boolean needQuotes() {
-        return false;
-    }
-
     /**
      * Serialize specified value with specified JsonWriter.
      *

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodec.java
index 9d754b9fe6ed0d8f091e3a56c1904ee5191d229d..e1deebe2f2908f9dda9707eda0a78004cf222a24 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodec.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodec.java
@@ -12,12 +12,6 @@ import java.io.IOException;
 import org.opendaylight.yangtools.concepts.Codec;
 
 interface JSONCodec<T> extends Codec<String, T> {
-    /**
-     * @deprecated Unused, remove once we are sure we do not need this anymore.
-     */
-    @Deprecated
-    boolean needQuotes();
-
     /**
      * Serialize specified value with specified JsonWriter.
      *

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java
index 521161acfab5b4eecef30705b8aac26d256c3ec8..c585241545d8abf645461dff1340737891bd285a 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java
@@ -49,11 +49,6 @@ public final class JSONCodecFactory {
             return null;
         }
 
-        @Override
-        public boolean needQuotes() {
-            return false;
-        }
-
         @Override
         public void serializeToWriter(final JsonWriter writer, final Object value) throws IOException {
             // NOOP since codec is unkwown.
@@ -95,7 +90,6 @@ public final class JSONCodecFactory {
         return new JSONCodecFactory(context);
     }
 
-    @SuppressWarnings("unchecked")
     private JSONCodec<?> createCodec(final DataSchemaNode key, final TypeDefinition<?> type) {
         if (type instanceof LeafrefTypeDefinition) {
             return createReferencedTypeCodec(key, (LeafrefTypeDefinition) type);
@@ -127,10 +121,9 @@ public final class JSONCodecFactory {
         return jsonStringUnionCodec;
     }
 
-    @SuppressWarnings("unchecked")
     private JSONCodec<?> createFromSimpleType(final DataSchemaNode schema, final TypeDefinition<?> type) {
         if (type instanceof InstanceIdentifierTypeDefinition) {
-            return (JSONCodec<Object>) iidCodec;
+            return iidCodec;
         }
         if (type instanceof EmptyTypeDefinition) {
             return JSONEmptyCodec.INSTANCE;

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONEmptyCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONEmptyCodec.java
index 8df0b69d53a8dd0e5babf6d92cc8df200f7e9e2d..cde22349c148979d067c5ca85994b529e2cd6c4b 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONEmptyCodec.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONEmptyCodec.java
@@ -29,16 +29,10 @@ final class JSONEmptyCodec implements JSONCodec<Object> {
         return null;
     }
 
-    @Override
-    public boolean needQuotes() {
-        return false;
-    }
-
     @Override
     public void serializeToWriter(final JsonWriter writer, final Object value) throws IOException {
         writer.beginArray();
         writer.value((String) null);
         writer.endArray();
     }
-
 }

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStringIdentityrefCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStringIdentityrefCodec.java
index b6f6a58d9599962cc740e69c40fb3ff928811786..32b77b50c559c3bb049df96c688d43bc931b16c7 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStringIdentityrefCodec.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStringIdentityrefCodec.java
@@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.data.codec.gson;
 
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.data.util.ModuleStringIdentityrefCodec;
@@ -31,11 +30,6 @@ final class JSONStringIdentityrefCodec extends ModuleStringIdentityrefCodec impl
         }
     }
 
-    @Override
-    public boolean needQuotes() {
-        return true;
-    }
-
     /**
      * Serialize QName with specified JsonWriter.
      *

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStringInstanceIdentifierCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStringInstanceIdentifierCodec.java
index 4c7fd20312b58721a7e84d5e46d71a35e58a1798..d7176970560af588038f61ade9d9effb086460ca 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStringInstanceIdentifierCodec.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStringInstanceIdentifierCodec.java
@@ -19,8 +19,7 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
-final class JSONStringInstanceIdentifierCodec
-        extends AbstractModuleStringInstanceIdentifierCodec
+final class JSONStringInstanceIdentifierCodec extends AbstractModuleStringInstanceIdentifierCodec
         implements JSONCodec<YangInstanceIdentifier> {
     private final DataSchemaContextTree dataContextTree;
     private final JSONCodecFactory codecFactory;
@@ -48,11 +47,6 @@ final class JSONStringInstanceIdentifierCodec
         return dataContextTree;
     }
 
-    @Override
-    public boolean needQuotes() {
-        return true;
-    }
-
     @Override
     protected Object deserializeKeyValue(final DataSchemaNode schemaNode, final String value) {
         Preconditions.checkNotNull(schemaNode, "schemaNode cannot be null");

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStringUnionCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStringUnionCodec.java
index 067227b7d89b6b4a2419696e28d238fc3c51e7e8..8b874324a01e61c6e6b5e971a2709b62100402b3 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStringUnionCodec.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONStringUnionCodec.java
@@ -10,18 +10,13 @@ package org.opendaylight.yangtools.yang.data.codec.gson;
 import com.google.common.base.Preconditions;
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
-
 import org.opendaylight.yangtools.concepts.Codec;
 import org.opendaylight.yangtools.yang.data.util.AbstractStringUnionCodec;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 final class JSONStringUnionCodec extends AbstractStringUnionCodec implements JSONCodec<Object> {
-    private static final Logger LOG = LoggerFactory.getLogger(JSONStringUnionCodec.class);
-
     private final JSONCodecFactory codecFactory;
 
     JSONStringUnionCodec(final DataSchemaNode schema, final UnionTypeDefinition typeDefinition,
@@ -30,16 +25,12 @@ final class JSONStringUnionCodec extends AbstractStringUnionCodec implements JSO
         this.codecFactory = Preconditions.checkNotNull(codecFactory);
     }
 
-    @Override
-    public boolean needQuotes() {
-        return true;
-    }
-
     @Override
     public void serializeToWriter(JsonWriter writer, Object value) throws IOException {
         writer.value(serialize(value));
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     protected Codec<String, Object> codecFor(final TypeDefinition<?> type) {
         return (Codec<String, Object>) codecFactory.codecFor(schema, type);

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/NumberJSONCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/NumberJSONCodec.java
index d262a440ce86681bc2d9508f601b8ee74b502abc..27222e857a2d9bdf6fd51b1f27c8f071a1c49b75 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/NumberJSONCodec.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/NumberJSONCodec.java
@@ -21,11 +21,6 @@ final class NumberJSONCodec<T extends Number> extends AbstractJSONCodec<T > {
         super(codec);
     }
 
-    @Override
-    public boolean needQuotes() {
-        return false;
-    }
-
     /**
      * Serialize specified value with specified JsonWriter.
      *

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/QuotedJSONCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/QuotedJSONCodec.java
index 45782896cf2b3bbe3d9040da4904713519e69365..30ab141736b12a5219e72ed08ba9520c84cb40a5 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/QuotedJSONCodec.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/QuotedJSONCodec.java
@@ -21,11 +21,6 @@ final class QuotedJSONCodec<T> extends AbstractJSONCodec<T> {
         super(codec);
     }
 
-    @Override
-    public boolean needQuotes() {
-        return true;
-    }
-
     /**
      * Serialize specified value with specified JsonWriter.
      *