Added support for parsing submodules & added dependency utility parser

[yangtools.git] / yang / yang-model-util / src / main / java / org / opendaylight / yangtools / yang / model / util / repo / AbstractCachingSchemaSourceProvider.java

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/AbstractCachingSchemaSourceProvider.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/AbstractCachingSchemaSourceProvider.java
index 021531e21f5ca254f441a8e8c340c8423cbd6ef7..ae03a49e0008c8cc7d396e287cc3cfcb894c12db 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/AbstractCachingSchemaSourceProvider.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/repo/AbstractCachingSchemaSourceProvider.java
@@ -18,25 +18,31 @@ public abstract class AbstractCachingSchemaSourceProvider<I, O> implements Schem
 
     @Override
     public Optional<O> getSchemaSource(String moduleName, Optional<String> revision) {
-        return getSchemaSourceImpl(moduleName, revision, defaultDelegate);
+        checkNotNull(moduleName, "Module name should not be null.");
+        checkNotNull(revision, "Revision should not be null");
+        return getSchemaSource(SourceIdentifier.create(moduleName, revision));
+    }
+    
+    @Override
+    public Optional<O> getSchemaSource(SourceIdentifier sourceIdentifier) {
+        return getSchemaSourceImpl(sourceIdentifier, defaultDelegate);
     }
 
-    private Optional<O> getSchemaSourceImpl(String moduleName, Optional<String> revision,
+    protected final Optional<O> getSchemaSourceImpl(SourceIdentifier identifier,
             SchemaSourceProvider<I> delegate) {
-        checkNotNull(moduleName, "Module name should not be null.");
-        checkNotNull(revision, "Revision should not be null");
+        checkNotNull(identifier, "Source identifier name should not be null.");
 
-        Optional<O> cached = getCachedSchemaSource(moduleName, revision);
+        Optional<O> cached = getCachedSchemaSource(identifier);
         if (cached.isPresent()) {
             return cached;
         }
-        Optional<I> live = delegate.getSchemaSource(moduleName, revision);
-        return cacheSchemaSource(moduleName, revision, live);
+        Optional<I> live = delegate.getSchemaSource(identifier);
+        return cacheSchemaSource(identifier, live);
     }
 
-    abstract protected Optional<O> cacheSchemaSource(String moduleName, Optional<String> revision, Optional<I> stream);
+    abstract protected Optional<O> cacheSchemaSource(SourceIdentifier identifier, Optional<I> stream);
 
-    abstract protected Optional<O> getCachedSchemaSource(String moduleName, Optional<String> revision);
+    abstract protected Optional<O> getCachedSchemaSource(SourceIdentifier identifier);
 
     public SchemaSourceProvider<I> getDelegate() {
         return defaultDelegate;
@@ -47,7 +53,9 @@ public abstract class AbstractCachingSchemaSourceProvider<I, O> implements Schem
         return new SchemaSourceProviderInstance(delegate);
     }
 
-    private class SchemaSourceProviderInstance implements SchemaSourceProvider<O>, Delegator<SchemaSourceProvider<I>> {
+    private class SchemaSourceProviderInstance implements //
+    SchemaSourceProvider<O>, 
+    Delegator<SchemaSourceProvider<I>> {
 
         private final SchemaSourceProvider<I> delegate;
 
@@ -58,12 +66,17 @@ public abstract class AbstractCachingSchemaSourceProvider<I, O> implements Schem
 
         @Override
         public Optional<O> getSchemaSource(String moduleName, Optional<String> revision) {
-            return getSchemaSourceImpl(moduleName, revision, getDelegate());
+            return getSchemaSource(SourceIdentifier.create(moduleName, revision));
         }
 
         @Override
         public SchemaSourceProvider<I> getDelegate() {
             return delegate;
         }
+
+        @Override
+        public Optional<O> getSchemaSource(SourceIdentifier sourceIdentifier) {
+            return getSchemaSourceImpl(sourceIdentifier, getDelegate());
+        }
     }
 }