Rename JSONInstanceIdentifierCodec

This class is oddly named, it should be called
InstanceIdentifierJSONCodec.

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

diff --git a/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONInstanceIdentifierCodec.java b/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/InstanceIdentifierJSONCodec.java
similarity index 94%
rename from codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONInstanceIdentifierCodec.java
rename to codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/InstanceIdentifierJSONCodec.java
index 2c45a60f6523d009bf3b14be3bd2d631c1a3a055..f949849bd26e2aa24694cc1019b2809fab841aa0 100644 (file)
--- a/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONInstanceIdentifierCodec.java
+++ b/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/InstanceIdentifierJSONCodec.java
@@ -25,15 +25,15 @@ import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.util.LeafrefResolver;
 
-abstract sealed class JSONInstanceIdentifierCodec extends AbstractStringInstanceIdentifierCodec
+abstract sealed class InstanceIdentifierJSONCodec extends AbstractStringInstanceIdentifierCodec
         implements JSONCodec<YangInstanceIdentifier> {
-    static final class Lhotka02 extends JSONInstanceIdentifierCodec {
+    static final class Lhotka02 extends InstanceIdentifierJSONCodec {
         Lhotka02(final EffectiveModelContext context, final JSONCodecFactory jsonCodecFactory) {
             super(context, jsonCodecFactory);
         }
     }
 
-    static final class RFC7951 extends JSONInstanceIdentifierCodec {
+    static final class RFC7951 extends InstanceIdentifierJSONCodec {
         RFC7951(final EffectiveModelContext context, final JSONCodecFactory jsonCodecFactory) {
             super(context, jsonCodecFactory);
         }
@@ -55,7 +55,7 @@ abstract sealed class JSONInstanceIdentifierCodec extends AbstractStringInstance
     private final JSONCodecFactory codecFactory;
     private final EffectiveModelContext context;
 
-    JSONInstanceIdentifierCodec(final EffectiveModelContext context, final JSONCodecFactory jsonCodecFactory) {
+    InstanceIdentifierJSONCodec(final EffectiveModelContext context, final JSONCodecFactory jsonCodecFactory) {
         this.context = requireNonNull(context);
         dataContextTree = DataSchemaContextTree.from(context);
         codecFactory = requireNonNull(jsonCodecFactory);

diff --git a/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodec.java b/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodec.java
index d872cced6eb21ffb7166f279b6f19dd0566123d5..ed0796b161f6380acddd24d33cec14f7d44031a7 100644 (file)
--- a/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodec.java
+++ b/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodec.java
@@ -18,9 +18,8 @@ import org.opendaylight.yangtools.yang.data.util.codec.TypeAwareCodec;
  * @param <T> Normalized value type
  */
 public sealed interface JSONCodec<T> extends TypeAwareCodec<T, Object, JsonWriter>
-        permits AbstractJSONCodec, EmptyJSONCodec, IdentityrefJSONCodec, NullJSONCodec, UnionJSONCodec,
-                // FIXME: rename this guy
-                JSONInstanceIdentifierCodec {
+        permits AbstractJSONCodec, EmptyJSONCodec, IdentityrefJSONCodec, InstanceIdentifierJSONCodec, UnionJSONCodec,
+                NullJSONCodec {
     /**
      * {@inheritDoc}.
      *

diff --git a/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java b/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java
index da267f8da3af91520a11113c51aaba18c0564172..da84508a66b2765d98c23ffd4c925f4a8d7f6dc0 100644 (file)
--- a/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java
+++ b/codec/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java
@@ -72,7 +72,7 @@ public abstract sealed class JSONCodecFactory extends AbstractInputStreamNormali
     @Deprecated(since = "12.0.0", forRemoval = true)
     static final class Lhotka02 extends JSONCodecFactory {
         Lhotka02(final @NonNull EffectiveModelContext context, final @NonNull CodecCache<JSONCodec<?>> cache) {
-            super(context, cache, JSONInstanceIdentifierCodec.Lhotka02::new);
+            super(context, cache, InstanceIdentifierJSONCodec.Lhotka02::new);
         }
 
         @Override
@@ -93,7 +93,7 @@ public abstract sealed class JSONCodecFactory extends AbstractInputStreamNormali
 
     static final class RFC7951 extends JSONCodecFactory {
         RFC7951(final @NonNull  EffectiveModelContext context, final @NonNull CodecCache<JSONCodec<?>> cache) {
-            super(context, cache, JSONInstanceIdentifierCodec.RFC7951::new);
+            super(context, cache, InstanceIdentifierJSONCodec.RFC7951::new);
         }
 
         @Override
@@ -112,13 +112,13 @@ public abstract sealed class JSONCodecFactory extends AbstractInputStreamNormali
         }
     }
 
-    private final @NonNull JSONInstanceIdentifierCodec iidCodec;
+    private final @NonNull InstanceIdentifierJSONCodec iidCodec;
 
     @SuppressFBWarnings(value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR",
         justification = "https://github.com/spotbugs/spotbugs/issues/1867")
     private JSONCodecFactory(final @NonNull EffectiveModelContext context,
             final @NonNull CodecCache<JSONCodec<?>> cache,
-            final BiFunction<EffectiveModelContext, JSONCodecFactory, @NonNull JSONInstanceIdentifierCodec> iidCodec) {
+            final BiFunction<EffectiveModelContext, JSONCodecFactory, @NonNull InstanceIdentifierJSONCodec> iidCodec) {
         super(context, cache);
         this.iidCodec = verifyNotNull(iidCodec.apply(context, this));
     }