Bug 865: ModuleInfoBackedContext is no more SchemaSourceProvider.
authorTony Tkacik <ttkacik@cisco.com>
Fri, 23 Jan 2015 11:29:09 +0000 (12:29 +0100)
committerTony Tkacik <ttkacik@cisco.com>
Mon, 26 Jan 2015 10:43:03 +0000 (11:43 +0100)
ModuleInfoBackedContext is only used as only class-loader registry
for generated classes and and utility class to create Schema Context
from Binding v1 jar artefacts.

Thus it is safely remove implementation of unused and now deprecated
interface SchemaSourceProvider.

Change-Id: Iee9abf7d35a1a0c64878005c17a6ab82a1857eb3
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/ModuleInfoBackedContext.java

index 487933684d5e54fa7333f6a994d2ea8ce2a8ef6e..2ce4b1b5dda31cef014ff66d47cca18b9ceb6fa4 100644 (file)
@@ -26,15 +26,14 @@ import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider;
-import org.opendaylight.yangtools.yang.model.util.repo.AdvancedSchemaSourceProvider;
-import org.opendaylight.yangtools.yang.model.util.repo.SourceIdentifier;
+import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
 import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy //
         implements //
-        AdvancedSchemaSourceProvider<InputStream>, ModuleInfoRegistry, SchemaContextProvider {
+        ModuleInfoRegistry, SchemaContextProvider {
 
     private ModuleInfoBackedContext(final ClassLoadingStrategy loadingStrategy) {
         this.backingLoadingStrategy = loadingStrategy;
@@ -154,24 +153,6 @@ public class ModuleInfoBackedContext extends GeneratedClassLoadingStrategy //
         return registration;
     }
 
-    @Override
-    public Optional<InputStream> getSchemaSource(final SourceIdentifier sourceIdentifier) {
-        YangModuleInfo info = sourceIdentifierToModuleInfo.get(sourceIdentifier);
-        if (info == null) {
-            return Optional.absent();
-        }
-        try {
-            return Optional.of(info.getModuleSourceStream());
-        } catch (IOException e) {
-            return Optional.absent();
-        }
-    }
-
-    @Override
-    public Optional<InputStream> getSchemaSource(final String moduleName, final Optional<String> revision) {
-        return getSchemaSource(SourceIdentifier.create(moduleName, revision));
-    }
-
     private static class YangModuleInfoRegistration extends AbstractObjectRegistration<YangModuleInfo> {
 
         private final ModuleInfoBackedContext context;