X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Freactor%2FCrossSourceStatementReactor.java;h=3856d7265840033bd0ab8920ba77f81dc06e6e17;hb=5ed67b08210c4c092cc6502748a2615d5e0a6970;hp=06ae43adce10e9ef5cb88bf33dcecdcd16a1889d;hpb=481a692d463636bbcf75f023da71703913e1b605;p=yangtools.git

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java
index 06ae43adce..3856d72658 100644
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java
@@ -7,23 +7,44 @@
  */
 package org.opendaylight.yangtools.yang.parser.stmt.reactor;
 
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext;
-
 import com.google.common.collect.ImmutableMap;
+import com.google.common.io.ByteSource;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupportBundle;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
+import org.opendaylight.yangtools.yang.parser.spi.validation.ValidationBundlesNamespace.ValidationBundleType;
+import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl;
+import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext;
+import org.opendaylight.yangtools.yang.parser.util.NamedFileInputStream;
 
 public class CrossSourceStatementReactor {
 
     private final Map<ModelProcessingPhase,StatementSupportBundle> supportedTerminology;
+    private final Map<ValidationBundleType,Collection<?>> supportedValidation;
+
+    CrossSourceStatementReactor(final Map<ModelProcessingPhase, StatementSupportBundle> supportedTerminology) {
+        this.supportedTerminology = ImmutableMap.copyOf(supportedTerminology);
+        this.supportedValidation = ImmutableMap.of();
+    }
 
-    CrossSourceStatementReactor(Map<ModelProcessingPhase, StatementSupportBundle> supportedTerminology) {
+    CrossSourceStatementReactor(final Map<ModelProcessingPhase, StatementSupportBundle> supportedTerminology, final Map<ValidationBundleType,Collection<?>> supportedValidation) {
         this.supportedTerminology = ImmutableMap.copyOf(supportedTerminology);
+        this.supportedValidation = ImmutableMap.copyOf(supportedValidation);
     }
 
     public static final Builder builder() {
@@ -37,31 +58,42 @@ public class CrossSourceStatementReactor {
     public static class Builder implements org.opendaylight.yangtools.concepts.Builder<CrossSourceStatementReactor>{
 
         final Map<ModelProcessingPhase,StatementSupportBundle> bundles = new EnumMap<>(ModelProcessingPhase.class);
+        final Map<ValidationBundleType,Collection<?>> validationBundles = new EnumMap<>(ValidationBundleType.class);
 
-        public Builder setBundle(ModelProcessingPhase phase,StatementSupportBundle bundle) {
+        public Builder setBundle(final ModelProcessingPhase phase,final StatementSupportBundle bundle) {
             bundles.put(phase, bundle);
             return this;
         }
 
+
+        public Builder setValidationBundle(final ValidationBundleType type, final Collection<?> validationBundle) {
+            validationBundles.put(type,validationBundle);
+            return this;
+        }
+
         @Override
         public CrossSourceStatementReactor build() {
-            return new CrossSourceStatementReactor(bundles);
+            return new CrossSourceStatementReactor(bundles, validationBundles);
         }
-
     }
 
     public class BuildAction {
-
         private final BuildGlobalContext context;
 
         public BuildAction() {
-            this.context = new BuildGlobalContext(supportedTerminology);
+            this.context = new BuildGlobalContext(supportedTerminology, supportedValidation);
         }
 
-        public void addSource(StatementStreamSource source) {
+        public void addSource(final StatementStreamSource source) {
             context.addSource(source);
         }
 
+        public void addSources(final StatementStreamSource... sources) {
+            for (StatementStreamSource source : sources) {
+                context.addSource(source);
+            }
+        }
+
         public EffectiveModelContext build() throws SourceException, ReactorException {
             return context.build();
         }
@@ -70,7 +102,49 @@ public class CrossSourceStatementReactor {
             return context.buildEffective();
         }
 
-    }
+        public SchemaContext buildEffective(final Collection<ByteSource> yangByteSources) throws SourceException,
+                ReactorException, IOException {
+            for (ByteSource yangByteSource : yangByteSources) {
+                addSource(new YangStatementSourceImpl(yangByteSource.openStream()));
+            }
+
+            return buildEffective();
+        }
+
+        public SchemaContext buildEffective(final List<InputStream> yangInputStreams) throws SourceException,
+                ReactorException {
+            for (InputStream yangInputStream : yangInputStreams) {
+                addSource(new YangStatementSourceImpl(yangInputStream));
+            }
 
+            return buildEffective();
+        }
 
+        /**
+         * @deprecated This method was never used and relies on deprecated module methods.
+         */
+        @Deprecated
+        public Map<File, Module> buildEffectiveMappedToSource(final List<File> yangFiles) throws SourceException,
+                ReactorException, FileNotFoundException {
+            if (yangFiles == null || yangFiles.isEmpty()) {
+                return Collections.emptyMap();
+            }
+
+            Map<String, File> pathToFile = new HashMap<>();
+            Map<File, Module> sourceFileToModule = new HashMap<>();
+
+            for (File yangFile : yangFiles) {
+                addSource(new YangStatementSourceImpl(new NamedFileInputStream(yangFile, yangFile.getPath())));
+                pathToFile.put(yangFile.getPath(), yangFile);
+            }
+
+            EffectiveSchemaContext schema = buildEffective();
+            Set<Module> modules = schema.getModules();
+            for (Module module : modules) {
+                sourceFileToModule.put(pathToFile.get(module.getModuleSourcePath()), module);
+            }
+
+            return sourceFileToModule;
+        }
+    }
 }