Add mdsal-binding-dom-codec-osgi dependency

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / main / java / org / opendaylight / mdsal / binding / dom / adapter / BindingToNormalizedNodeCodec.java

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java
index 49cee98b28e94f0bf9cc20eff3020a0ec531bddc..d296fa2fc329b036cbf4a7d78226b64cea226ac7 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java
@@ -62,7 +62,6 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.impl.codec.DeserializationException;
-import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.model.api.ActionDefinition;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextListener;
@@ -202,7 +201,8 @@ public class BindingToNormalizedNodeCodec implements BindingNormalizedNodeSerial
     }
 
     @Override
-    public final InstanceIdentifier<?> fromYangInstanceIdentifier(final YangInstanceIdentifier dom) {
+    public final <T extends DataObject> InstanceIdentifier<T> fromYangInstanceIdentifier(
+            final YangInstanceIdentifier dom) {
         return codecRegistry.fromYangInstanceIdentifier(dom);
     }
 
@@ -277,10 +277,6 @@ public class BindingToNormalizedNodeCodec implements BindingNormalizedNodeSerial
         }
     }
 
-    public final BindingNormalizedNodeCodecRegistry getCodecFactory() {
-        return codecRegistry;
-    }
-
     // FIXME: This should be probably part of Binding Runtime context
     public final ImmutableBiMap<Method, SchemaPath> getRpcMethodToSchemaPath(final Class<? extends RpcService> key) {
         final Module module = getModuleBlocking(key);
@@ -359,13 +355,13 @@ public class BindingToNormalizedNodeCodec implements BindingNormalizedNodeSerial
         return new SimpleEntry<>(bindingPath, codecContext);
     }
 
-    SchemaPath getActionPath(final Class<? extends Action<?, ?, ?>> type) {
+    final SchemaPath getActionPath(final Class<? extends Action<?, ?, ?>> type) {
         final ActionDefinition schema = runtimeContext().getActionDefinition(type);
         checkArgument(schema != null, "Failed to find schema for %s", type);
         return schema.getPath();
     }
 
-    private BindingRuntimeContext runtimeContext() {
+    final BindingRuntimeContext runtimeContext() {
         return futureSchema.runtimeContext();
     }
 
@@ -373,10 +369,6 @@ public class BindingToNormalizedNodeCodec implements BindingNormalizedNodeSerial
         return ImmutableSet.copyOf(Iterators.transform(path.getPathArguments().iterator(), PathArgument::getType));
     }
 
-    protected NormalizedNode<?, ?> instanceIdentifierToNode(final YangInstanceIdentifier parentPath) {
-        return ImmutableNodes.fromInstanceId(runtimeContext().getSchemaContext(), parentPath);
-    }
-
     protected Collection<DOMDataTreeIdentifier> toDOMDataTreeIdentifiers(
             final Collection<DataTreeIdentifier<?>> subtrees) {
         return subtrees.stream().map(this::toDOMDataTreeIdentifier).collect(Collectors.toSet());