Bump upstream dependencies to Potassium GA
[transportpce.git] / test-common / src / main / java / org / opendaylight / transportpce / test / converter / AbstractDataObjectConverter.java
index 3bd1fb38d01a70d85a313f0c00d773440fde180c..59be4bb4b434c7ada421f771616aa4a741e73e25 100644 (file)
@@ -8,7 +8,6 @@
 package org.opendaylight.transportpce.test.converter;
 
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
@@ -113,9 +112,8 @@ public abstract class AbstractDataObjectConverter implements DataObjectConverter
     @SuppressWarnings({"rawtypes","unchecked"})
     public <T extends DataObject> Optional<NormalizedNode> toNormalizedNodes(@NonNull T object,
             Class dataObjectClass) {
-        Entry<YangInstanceIdentifier, NormalizedNode> normalizedNode =
-                codecRegistry.toNormalizedNode(InstanceIdentifier.create(dataObjectClass), object);
-        return Optional.ofNullable(normalizedNode.getValue());
+        return Optional.of(codecRegistry.toNormalizedDataObject(InstanceIdentifier.create(dataObjectClass), object)
+            .node());
     }
 
     @Override