From b06545c4a763a42a9a6862cc3d412bd45abd9873 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 24 Jul 2018 13:10:07 +0200 Subject: [PATCH] Use moved BindingReflections BindingReflections are being evacuated from yang-binding, use them from their new location. Change-Id: Icb0a53635dee002f14ed9ddfe779fde198db8fc8 Signed-off-by: Robert Varga --- .../topology/singleton/impl/MountPointEndToEndTest.java | 2 +- .../topology/singleton/impl/NetconfTopologyManagerTest.java | 3 +-- .../sal/restconf/broker/client/SalRemoteClientImpl.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java index 45cfd3090e..a7ad10784f 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java @@ -86,6 +86,7 @@ import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext; +import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.mdsal.dom.api.DOMMountPointListener; import org.opendaylight.mdsal.eos.dom.simple.SimpleDOMEntityOwnershipService; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider; @@ -123,7 +124,6 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.YangModuleInfo; -import org.opendaylight.yangtools.yang.binding.util.BindingReflections; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java index 01a7749a12..d2c3638f69 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java @@ -5,7 +5,6 @@ * 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.netconf.topology.singleton.impl; import static org.awaitility.Awaitility.await; @@ -53,6 +52,7 @@ import org.opendaylight.controller.md.sal.binding.test.ConstantSchemaAbstractDat import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; +import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration; import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; @@ -76,7 +76,6 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.YangModuleInfo; -import org.opendaylight.yangtools.yang.binding.util.BindingReflections; public class NetconfTopologyManagerTest { private static final int ACTOR_RESPONSE_WAIT_TIME = 10; diff --git a/restconf/sal-restconf-broker/src/main/java/org/opendaylight/netconf/sal/restconf/broker/client/SalRemoteClientImpl.java b/restconf/sal-restconf-broker/src/main/java/org/opendaylight/netconf/sal/restconf/broker/client/SalRemoteClientImpl.java index d5795e36f1..b55df02c74 100644 --- a/restconf/sal-restconf-broker/src/main/java/org/opendaylight/netconf/sal/restconf/broker/client/SalRemoteClientImpl.java +++ b/restconf/sal-restconf-broker/src/main/java/org/opendaylight/netconf/sal/restconf/broker/client/SalRemoteClientImpl.java @@ -11,12 +11,12 @@ import com.google.common.base.Preconditions; import java.net.URL; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext; import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer; +import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.netconf.sal.restconf.broker.SalRemoteServiceBroker; import org.opendaylight.yangtools.restconf.client.RestconfClientFactory; import org.opendaylight.yangtools.restconf.client.api.RestconfClientContext; import org.opendaylight.yangtools.restconf.client.api.UnsupportedProtocolException; import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext; -import org.opendaylight.yangtools.yang.binding.util.BindingReflections; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaContextHolder; import org.slf4j.Logger; -- 2.36.6