- replace call with right method
- bit of a code cleanup
Change-Id: Ie9dacf66cbb6494b25e1747952463326152c423a
Signed-off-by: Martin Ciglan <mciglan@cisco.com>
(cherry picked from commit
061b7374a7b9d70104a675d033c6762cb3c5b5a3)
import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider;
import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider;
+import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException;
import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException;
import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
String modulePackageName = BindingReflections.getModelRootPackageName(fullyQualifiedName);
WeakReference<ClassLoader> classLoaderRef = packageNameToClassLoader.get(modulePackageName);
String modulePackageName = BindingReflections.getModelRootPackageName(fullyQualifiedName);
WeakReference<ClassLoader> classLoaderRef = packageNameToClassLoader.get(modulePackageName);
- ClassLoader classloader = null;
+ ClassLoader classloader;
if (classLoaderRef != null && (classloader = classLoaderRef.get()) != null) {
return ClassLoaderUtils.loadClass(classloader, fullyQualifiedName);
}
if (classLoaderRef != null && (classloader = classLoaderRef.get()) != null) {
return ClassLoaderUtils.loadClass(classloader, fullyQualifiedName);
}
if (previous == null) {
String modulePackageName = moduleInfo.getClass().getPackage().getName();
packageNameToClassLoader.putIfAbsent(modulePackageName,
if (previous == null) {
String modulePackageName = moduleInfo.getClass().getPackage().getName();
packageNameToClassLoader.putIfAbsent(modulePackageName,
- new WeakReference<ClassLoader>(moduleClassLoader));
+ new WeakReference<>(moduleClassLoader));
ctxResolver.registerSource(toYangTextSource(identifier, moduleInfo));
for (YangModuleInfo importedInfo : moduleInfo.getImportedModules()) {
resolveModuleInfo(importedInfo);
ctxResolver.registerSource(toYangTextSource(identifier, moduleInfo));
for (YangModuleInfo importedInfo : moduleInfo.getImportedModules()) {
resolveModuleInfo(importedInfo);
}
private static SourceIdentifier sourceIdentifierFrom(final YangModuleInfo moduleInfo) {
}
private static SourceIdentifier sourceIdentifierFrom(final YangModuleInfo moduleInfo) {
- return SourceIdentifier.create(moduleInfo.getName(), Optional.of(moduleInfo.getRevision()));
+ return RevisionSourceIdentifier.create(moduleInfo.getName(), Optional.of(moduleInfo.getRevision()));
}
public void addModuleInfos(final Iterable<? extends YangModuleInfo> moduleInfos) {
}
public void addModuleInfos(final Iterable<? extends YangModuleInfo> moduleInfos) {