Fix mdsal-binding-dom-adapter blueprint

We have a wrong reference here to DefaultQueryFactory as well as
mismatching constructor. Fix that up.

Change-Id: Idfccae3ec2ef4fd1d7c0dad975cc99238126c7ff
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultQueryFactory.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultQueryFactory.java
index 7927d0a9a74b8e7623b27c4705c6253ab243ffac..c30315690398a7c32de709eff040aaaf4c0bba3a 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultQueryFactory.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/DefaultQueryFactory.java
@@ -14,6 +14,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.mdsal.binding.api.query.DescendantQueryBuilder;
 import org.opendaylight.mdsal.binding.api.query.QueryFactory;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec;
 import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -23,11 +24,15 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 public final class DefaultQueryFactory implements QueryFactory {
     private final BindingNormalizedNodeCodecRegistry registry;
 
-    @Inject
     public DefaultQueryFactory(final BindingNormalizedNodeCodecRegistry registry) {
         this.registry = requireNonNull(registry);
     }
 
+    @Inject
+    public DefaultQueryFactory(final BindingToNormalizedNodeCodec codec) {
+        this(codec.getCodecRegistry());
+    }
+
     @Override
     public <T extends DataObject> DescendantQueryBuilder<T> querySubtree(final InstanceIdentifier<T> rootPath) {
         return new DefaultDescendantQueryBuilder<>(registry.getCodecContext(), rootPath);

diff --git a/binding/mdsal-binding-dom-adapter/src/main/resources/org/opendaylight/blueprint/binding-adapter.xml b/binding/mdsal-binding-dom-adapter/src/main/resources/org/opendaylight/blueprint/binding-adapter.xml
index 7ca10af30c86608b32fc1bbc40221742fa7481fb..d0e7906308125e9d1a7c2683f610ebde9c2641f4 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/resources/org/opendaylight/blueprint/binding-adapter.xml
+++ b/binding/mdsal-binding-dom-adapter/src/main/resources/org/opendaylight/blueprint/binding-adapter.xml
@@ -20,7 +20,7 @@
   </service>
 
   <!-- QueryFactory based on the codec -->
-  <bean id="queryFactory" class="org.opendaylight.mdsal.query.binding.adapter.DefaultQueryFactory">
+  <bean id="queryFactory" class="org.opendaylight.mdsal.binding.dom.adapter.query.DefaultQueryFactory">
       <argument ref="mappingCodec"/>
   </bean>