Merge "Fix bug when creating SRG termination points"

[transportpce.git] / pce / src / main / java / org / opendaylight / transportpce / pce / gnpy / consumer / ResultDeserializer.java

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/consumer/ResultDeserializer.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/consumer/ResultDeserializer.java
index 222be701df7d5f0138bd152806b1c178f52cac5d..8ddbb417ea933d48fa6867be1eb6c204ffcb0d44 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/consumer/ResultDeserializer.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/consumer/ResultDeserializer.java
@@ -12,33 +12,36 @@ import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import java.io.IOException;
 import org.opendaylight.transportpce.common.converter.JsonStringConverter;
-import org.opendaylight.yang.gen.v1.gnpy.path.rev200909.Result;
+import org.opendaylight.yang.gen.v1.gnpy.path.rev220221.Result;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactorySupplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 //This class is a temporary workaround while waiting jackson
 //support in yang tools https://git.opendaylight.org/gerrit/c/yangtools/+/94852
 @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "temporary class")
 public class ResultDeserializer extends StdDeserializer<Result> {
 
+    private static final Logger LOG = LoggerFactory.getLogger(ResultDeserializer.class);
     private static final long serialVersionUID = 1L;
-    private  JsonStringConverter<Result> converter;
-    private  YangInstanceIdentifier yangId;
+    private JsonStringConverter<Result> converter;
+    private YangInstanceIdentifier yangId;
 
     public ResultDeserializer(JsonStringConverter<Result> converter) {
         super(Result.class);
         this.converter = converter;
-        QName pathQname = QName.create("gnpy:path", "2020-09-09", "result");
+        QName pathQname = Result.QNAME;
+        LOG.info("QName of the first result class {}", pathQname);
         yangId = YangInstanceIdentifier.of(pathQname);
     }
 
     @Override
     public Result deserialize(JsonParser parser, DeserializationContext ctxt) throws IOException {
-        return converter
-                .createDataObjectFromJsonString(yangId,
-                        parser.readValueAsTree().toString(),
-                        JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02);
+        return converter.createDataObjectFromJsonString(yangId,parser.readValueAsTree().toString(),
+            JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02);
     }
 
 }