Remove JSONCodecFactory.create(SchemaContext)

[yangtools.git] / yang / yang-data-codec-gson / src / main / java / org / opendaylight / yangtools / yang / data / codec / gson / JSONStringInstanceIdentifierCodec.java

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 528162a359e2151e2b971ec573cbe85abb2f63b0..1fed9a3201449128965a7273df6e62f48b573bc1 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
@@ -7,54 +7,72 @@
  */
 package org.opendaylight.yangtools.yang.data.codec.gson;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
 import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.net.URI;
+import java.util.Iterator;
+import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.util.AbstractModuleStringInstanceIdentifierCodec;
 import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+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 implements JSONCodec<YangInstanceIdentifier> {
-    private final SchemaContext context;
+final class JSONStringInstanceIdentifierCodec extends AbstractModuleStringInstanceIdentifierCodec
+        implements JSONCodec<YangInstanceIdentifier> {
     private final DataSchemaContextTree dataContextTree;
+    private final JSONCodecFactory codecFactory;
+    private final SchemaContext context;
 
-    JSONStringInstanceIdentifierCodec(final SchemaContext context) {
-        this.context = Preconditions.checkNotNull(context);
+    JSONStringInstanceIdentifierCodec(final SchemaContext context, final JSONCodecFactory jsonCodecFactory) {
+        this.context = requireNonNull(context);
         this.dataContextTree = DataSchemaContextTree.from(context);
+        this.codecFactory = requireNonNull(jsonCodecFactory);
     }
 
     @Override
-    protected Module moduleForPrefix(final String prefix) {
-        return context.findModuleByName(prefix, null);
+    protected Module moduleForPrefix(@Nonnull final String prefix) {
+        final Iterator<Module> modules = context.findModules(prefix).iterator();
+        return modules.hasNext() ? modules.next() : null;
     }
 
     @Override
-    protected String prefixForNamespace(final URI namespace) {
-        final Module module = context.findModuleByNamespaceAndRevision(namespace, null);
-        return module == null ? null : module.getName();
+    protected String prefixForNamespace(@Nonnull final URI namespace) {
+        final Iterator<Module> modules = context.findModules(namespace).iterator();
+        return modules.hasNext() ? modules.next().getName() : null;
     }
 
+    @Nonnull
     @Override
     protected DataSchemaContextTree getDataContextTree() {
         return dataContextTree;
     }
 
     @Override
-    public boolean needQuotes() {
-        return true;
+    protected Object deserializeKeyValue(final DataSchemaNode schemaNode, final String value) {
+        requireNonNull(schemaNode, "schemaNode cannot be null");
+        checkArgument(schemaNode instanceof LeafSchemaNode, "schemaNode must be of type LeafSchemaNode");
+        final JSONCodec<?> objectJSONCodec = codecFactory.codecFor((LeafSchemaNode) schemaNode);
+        return objectJSONCodec.parseValue(null, value);
+    }
+
+    @Override
+    public Class<YangInstanceIdentifier> getDataType() {
+        return YangInstanceIdentifier.class;
+    }
+
+    @Override
+    public YangInstanceIdentifier parseValue(final Object ctx, final String str) {
+        return deserialize(str);
     }
 
-    /**
-     * Serialize YangInstanceIdentifier with specified JsonWriter.
-     *
-     * @param writer JsonWriter
-     * @param value YangInstanceIdentifier
-     */
     @Override
-    public void serializeToWriter(JsonWriter writer, YangInstanceIdentifier value) throws IOException {
-        writer.value(serialize(value));
+    public void writeValue(final JsonWriter ctx, final YangInstanceIdentifier value) throws IOException {
+        ctx.value(serialize(value));
     }
 }