Remove OSGiQueryFactory

We have constructor injection, so let's do that. Also activate lazily
and therefore lower debug levels.

Change-Id: I0b37a2bab8109d47d13276b135b7f510272ee024
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 c085b1cda22b676edd10b44a91085fca55e4f76d..c4560db58e6db1aee5fdebfefb4678bd0ed5ce8b 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
@@ -30,10 +30,15 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Beta
+@Component
 @MetaInfServices
 @Singleton
 public final class DefaultQueryFactory implements QueryFactory {
@@ -68,8 +73,16 @@ public final class DefaultQueryFactory implements QueryFactory {
     }
 
     @Inject
-    public DefaultQueryFactory(final BindingCodecTree codec) {
+    @Activate
+    public DefaultQueryFactory(@Reference final BindingCodecTree codec) {
         this.codec = requireNonNull(codec);
+        LOG.debug("Binding Query activated");
+    }
+
+    @Deactivate
+    @SuppressWarnings("static-method")
+    void deactivate() {
+        LOG.debug("Binding Query deactivated");
     }
 
     @Override

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/OSGiQueryFactory.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/OSGiQueryFactory.java
deleted file mode 100644 (file)
index 0595b6f..0000000
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/query/OSGiQueryFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2020 PANTHEON.tech, s.r.o. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.mdsal.binding.dom.adapter.query;
-
-import com.google.common.annotations.Beta;
-import org.opendaylight.mdsal.binding.api.query.DescendantQueryBuilder;
-import org.opendaylight.mdsal.binding.api.query.QueryFactory;
-import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Deactivate;
-import org.osgi.service.component.annotations.Reference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Beta
-@Component(immediate = true)
-public final class OSGiQueryFactory implements QueryFactory {
-    private static final Logger LOG = LoggerFactory.getLogger(OSGiQueryFactory.class);
-
-    @Reference
-    BindingCodecTree codec;
-
-    private DefaultQueryFactory delegate;
-
-    @Override
-    public <T extends DataObject> DescendantQueryBuilder<T> querySubtree(final InstanceIdentifier<T> rootPath) {
-        return delegate.querySubtree(rootPath);
-    }
-
-    @Activate
-    void activate() {
-        delegate = new DefaultQueryFactory(codec);
-        LOG.info("Binding Query activated");
-    }
-
-    @Deactivate
-    void deactivate() {
-        delegate = null;
-        LOG.info("Binding Query deactivated");
-    }
-}