This removes the static import, which hid the fact we are using two
different ClassLoaderUtils (both deprecated).
Change-Id: If37786d591a4c9975d2d10539c70f888dd7d6c5c
Signed-off-by: Robert Varga <rovarga@cisco.com>
import org.opendaylight.controller.sal.binding.codegen.RuntimeCodeHelper
import org.opendaylight.controller.sal.binding.spi.NotificationInvokerFactory
import org.opendaylight.controller.sal.binding.spi.NotificationInvokerFactory.NotificationInvoker
import org.opendaylight.controller.sal.binding.codegen.RuntimeCodeHelper
import org.opendaylight.controller.sal.binding.spi.NotificationInvokerFactory
import org.opendaylight.controller.sal.binding.spi.NotificationInvokerFactory.NotificationInvoker
-import org.opendaylight.yangtools.sal.binding.generator.util.ClassLoaderUtils
+import org.opendaylight.yangtools.yang.binding.util.ClassLoaderUtils
import org.opendaylight.yangtools.sal.binding.generator.util.JavassistUtils
import org.opendaylight.yangtools.yang.binding.BaseIdentity
import org.opendaylight.yangtools.yang.binding.DataContainer
import org.opendaylight.yangtools.sal.binding.generator.util.JavassistUtils
import org.opendaylight.yangtools.yang.binding.BaseIdentity
import org.opendaylight.yangtools.yang.binding.DataContainer
import org.opendaylight.yangtools.yang.binding.annotations.QName
import org.opendaylight.yangtools.yang.binding.annotations.RoutingContext
import org.opendaylight.yangtools.yang.binding.annotations.QName
import org.opendaylight.yangtools.yang.binding.annotations.RoutingContext
-import static org.opendaylight.yangtools.concepts.util.ClassLoaderUtils.*
-
import static extension org.opendaylight.controller.sal.binding.codegen.RuntimeCodeSpecification.*
import static extension org.opendaylight.controller.sal.binding.codegen.YangtoolsMappingHelper.*
import static extension org.opendaylight.controller.sal.binding.codegen.RuntimeCodeSpecification.*
import static extension org.opendaylight.controller.sal.binding.codegen.YangtoolsMappingHelper.*
}
override <T extends RpcService> getDirectProxyFor(Class<T> iface) {
}
override <T extends RpcService> getDirectProxyFor(Class<T> iface) {
- val T instance = withClassLoaderAndLock(iface.classLoader,lock) [|
+ val T instance = ClassLoaderUtils.withClassLoaderAndLock(iface.classLoader,lock) [|
val proxyName = iface.directProxyName;
val potentialClass = ClassLoaderUtils.tryToLoadClassWithTCCL(proxyName)
if(potentialClass != null) {
val proxyName = iface.directProxyName;
val potentialClass = ClassLoaderUtils.tryToLoadClassWithTCCL(proxyName)
if(potentialClass != null) {
}
override <T extends RpcService> getRouterFor(Class<T> iface,String routerInstanceName) {
}
override <T extends RpcService> getRouterFor(Class<T> iface,String routerInstanceName) {
- val metadata = withClassLoader(iface.classLoader) [|
+ val metadata = ClassLoaderUtils.withClassLoader(iface.classLoader) [|
val supertype = iface.asCtClass
return supertype.rpcMetadata;
]
val supertype = iface.asCtClass
return supertype.rpcMetadata;
]
- val instance = <T>withClassLoaderAndLock(iface.classLoader,lock) [ |
+ val instance = ClassLoaderUtils.<T>withClassLoaderAndLock(iface.classLoader,lock) [ |
val supertype = iface.asCtClass
val routerName = iface.routerName;
val potentialClass = ClassLoaderUtils.tryToLoadClassWithTCCL(routerName)
val supertype = iface.asCtClass
val routerName = iface.routerName;
val potentialClass = ClassLoaderUtils.tryToLoadClassWithTCCL(routerName)
protected def resolveInvokerClass(Class<? extends NotificationListener> class1) {
protected def resolveInvokerClass(Class<? extends NotificationListener> class1) {
- return <RuntimeGeneratedInvokerPrototype>withClassLoaderAndLock(class1.classLoader,lock) [|
+ return ClassLoaderUtils.<RuntimeGeneratedInvokerPrototype>withClassLoaderAndLock(class1.classLoader,lock) [|
val invoker = invokerClasses.get(class1);
if (invoker !== null) {
return invoker;
val invoker = invokerClasses.get(class1);
if (invoker !== null) {
return invoker;