From 96d661e192255c52c590110268ea464527b71b45 Mon Sep 17 00:00:00 2001 From: Martin Ciglan Date: Fri, 27 Jan 2017 16:18:38 +0100 Subject: [PATCH] Don't use deprecated SourceIdentifier.create() method anymore - replace call with right method - bit of a code cleanup Change-Id: Ie9dacf66cbb6494b25e1747952463326152c423a Signed-off-by: Martin Ciglan (cherry picked from commit 061b7374a7b9d70104a675d033c6762cb3c5b5a3) --- .../binding/generator/impl/ModuleInfoBackedContext.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleInfoBackedContext.java b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleInfoBackedContext.java index e2f6b6c561..8ca069fc16 100644 --- a/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleInfoBackedContext.java +++ b/binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleInfoBackedContext.java @@ -26,6 +26,7 @@ import org.opendaylight.yangtools.yang.binding.YangModuleInfo; 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; @@ -63,7 +64,7 @@ public class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy String modulePackageName = BindingReflections.getModelRootPackageName(fullyQualifiedName); WeakReference classLoaderRef = packageNameToClassLoader.get(modulePackageName); - ClassLoader classloader = null; + ClassLoader classloader; if (classLoaderRef != null && (classloader = classLoaderRef.get()) != null) { return ClassLoaderUtils.loadClass(classloader, fullyQualifiedName); } @@ -103,7 +104,7 @@ public class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy if (previous == null) { String modulePackageName = moduleInfo.getClass().getPackage().getName(); packageNameToClassLoader.putIfAbsent(modulePackageName, - new WeakReference(moduleClassLoader)); + new WeakReference<>(moduleClassLoader)); ctxResolver.registerSource(toYangTextSource(identifier, moduleInfo)); for (YangModuleInfo importedInfo : moduleInfo.getImportedModules()) { resolveModuleInfo(importedInfo); @@ -133,7 +134,7 @@ public class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy } 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 moduleInfos) { -- 2.36.6