Adapt TransportPCE code to Sulfur

[transportpce.git] / test-common / src / main / java / org / opendaylight / transportpce / test / converter / DataObjectConverter.java

diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/DataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/DataObjectConverter.java
index f724e5d47dbdf255da439bdb76bdf08f17cbf3f4..d6cbcae988f97c48b5ce58db0e84a27ac671d57f 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/DataObjectConverter.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/DataObjectConverter.java
@@ -16,28 +16,25 @@ import org.opendaylight.yangtools.yang.binding.DataContainer;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.Notification;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 public interface DataObjectConverter {
 
     <T extends DataObject> Optional<T> getDataObject(
-            @Nonnull NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?> normalizedNode,
+            @Nonnull NormalizedNode normalizedNode,
             @Nonnull QName rootNode);
 
     <T extends DataObject> Optional<T> getDataObjectFromRpc(
-            @Nonnull NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?> normalizedNode,
-            @Nonnull SchemaPath rpcSchemaPath);
+            @Nonnull NormalizedNode normalizedNode);
 
-    Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> transformIntoNormalizedNode(
+    Optional<NormalizedNode> transformIntoNormalizedNode(
             @Nonnull InputStream inputStream);
 
-    Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> transformIntoNormalizedNode(
+    Optional<NormalizedNode> transformIntoNormalizedNode(
             @Nonnull Reader inputReader, SchemaNode parentSchema);
 
-    Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> transformIntoNormalizedNode(
+    Optional<NormalizedNode> transformIntoNormalizedNode(
             @Nonnull Reader inputReader);
 
     <T extends DataObject> Writer writerFromDataObject(@Nonnull DataObject object, Class<T> dataObjectClass,
@@ -46,11 +43,11 @@ public interface DataObjectConverter {
     <T extends DataObject> Writer writerFromRpcDataObject(@Nonnull DataObject object, Class<T> dataObjectClass,
             ConvertType<T> convertType, QName rpcOutputQName, String rpcName);
 
-    <T extends DataObject> Optional<NormalizedNode<?, ?>> toNormalizedNodes(@Nonnull T object,
-            Class<T> dataObjectClass);
+    <T extends DataObject> Optional<NormalizedNode> toNormalizedNodes(@Nonnull T object,
+            Class dataObjectClass);
 
-    public interface ConvertType<T> {
-        Optional<NormalizedNode<?, ?>> toNormalizedNodes(T object, Class<T> clazz);
+    interface ConvertType<T> {
+        Optional<NormalizedNode> toNormalizedNodes(T object, Class<T> clazz);
     }
 
     /**