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 <mciglan@cisco.com>
(cherry picked from commit 061b7374a7b9d70104a675d033c6762cb3c5b5a3)

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 e2f6b6c56148b797fabec40db9581efe71e54fd2..8ca069fc1670b0a6fa528abf8f860d5e7d65de12 100644 (file)
--- 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<ClassLoader> 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<ClassLoader>(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<? extends YangModuleInfo> moduleInfos) {