Minor JavaDoc fixes in CountingRejectedExecutionHandler

[yangtools.git] / yang / yang-system-test / src / main / java / org / opendaylight / yangtools / yang / parser / system / test / SystemTestUtils.java

diff --git a/yang/yang-system-test/src/main/java/org/opendaylight/yangtools/yang/parser/system/test/SystemTestUtils.java b/yang/yang-system-test/src/main/java/org/opendaylight/yangtools/yang/parser/system/test/SystemTestUtils.java
index d8be9fd8be636815d73f61976b99563b333fd51f..7792c34658f402a1f5760b47d8f5be83551cba78 100644 (file)
--- a/yang/yang-system-test/src/main/java/org/opendaylight/yangtools/yang/parser/system/test/SystemTestUtils.java
+++ b/yang/yang-system-test/src/main/java/org/opendaylight/yangtools/yang/parser/system/test/SystemTestUtils.java
@@ -8,9 +8,11 @@
 
 package org.opendaylight.yangtools.yang.parser.system.test;
 
+import com.google.common.base.Preconditions;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -18,25 +20,24 @@ import java.util.List;
 import java.util.Set;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
+import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
+import org.opendaylight.yangtools.yang.parser.rfc6020.repo.YangStatementStreamSource;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl;
-import org.opendaylight.yangtools.yang.parser.util.NamedFileInputStream;
 
 class SystemTestUtils {
 
-    static final FileFilter YANG_FILE_FILTER = new FileFilter() {
-        @Override
-        public boolean accept(final File file) {
-            final String name = file.getName().toLowerCase();
-            return name.endsWith(".yang") && file.isFile();
-        }
+    static final FileFilter YANG_FILE_FILTER = file -> {
+        final String name = file.getName().toLowerCase();
+        return name.endsWith(".yang") && file.isFile();
     };
 
     static SchemaContext parseYangSources(final List<String> yangLibDirs, final List<String> yangTestFiles,
-            final Set<QName> supportedFeatures) throws FileNotFoundException, ReactorException {
+            final Set<QName> supportedFeatures, final boolean recursiveSearch) throws ReactorException, IOException,
+            YangSyntaxErrorException {
         /*
          * Current dir "." should be always present implicitly in the list of
          * directories where dependencies are searched for
@@ -47,7 +48,7 @@ class SystemTestUtils {
 
         final List<File> libFiles = new ArrayList<>();
         for (final String yangLibDir : yangLibDirs) {
-            libFiles.addAll(getYangFiles(yangLibDir));
+            libFiles.addAll(getYangFiles(yangLibDir, recursiveSearch));
         }
 
         final List<File> testFiles = new ArrayList<>();
@@ -59,38 +60,60 @@ class SystemTestUtils {
     }
 
     static SchemaContext parseYangSources(final Set<QName> supportedFeatures, final List<File> testFiles,
-            final List<File> libFiles) throws FileNotFoundException, ReactorException {
-        final StatementStreamSource[] testSources = getYangStatementSources(testFiles);
-        final StatementStreamSource[] libSources = getYangStatementSources(libFiles);
+            final List<File> libFiles) throws ReactorException, IOException, YangSyntaxErrorException {
+        final List<StatementStreamSource> testSources = getYangStatementSources(testFiles);
+        final List<StatementStreamSource> libSources = getYangStatementSources(libFiles);
         return parseYangSources(testSources, libSources, supportedFeatures);
     }
 
-    static SchemaContext parseYangSources(final StatementStreamSource[] testSources,
-            final StatementStreamSource[] libSources, final Set<QName> supportedFeatures) throws ReactorException {
+    static SchemaContext parseYangSources(final List<StatementStreamSource> testSources,
+            final List<StatementStreamSource> libSources, final Set<QName> supportedFeatures) throws ReactorException {
+        Preconditions.checkArgument(testSources != null && !testSources.isEmpty(), "No yang sources");
 
-        final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR
-                .newBuild(supportedFeatures);
+        final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild();
         reactor.addSources(testSources);
         reactor.addLibSources(libSources);
 
+        if (supportedFeatures != null) {
+            reactor.setSupportedFeatures(supportedFeatures);
+        }
+
         return reactor.buildEffective();
     }
 
-    private static StatementStreamSource[] getYangStatementSources(final List<File> yangFiles)
-            throws FileNotFoundException {
-        final StatementStreamSource[] yangSources = new StatementStreamSource[yangFiles.size()];
-        for (int i = 0; i < yangFiles.size(); i++) {
-            yangSources[i] = new YangStatementSourceImpl(new NamedFileInputStream(yangFiles.get(i), yangFiles.get(i)
-                    .getPath()));
+    private static List<StatementStreamSource> getYangStatementSources(final List<File> yangFiles)
+            throws IOException, YangSyntaxErrorException {
+        final List<StatementStreamSource> yangSources = new ArrayList<>(yangFiles.size());
+        for (File file : yangFiles) {
+            yangSources.add(YangStatementStreamSource.create(YangTextSchemaSource.forFile(file)));
         }
         return yangSources;
     }
 
-    private static Collection<File> getYangFiles(final String yangSourcesDirectoryPath) throws FileNotFoundException {
+    private static Collection<File> getYangFiles(final String yangSourcesDirectoryPath, final boolean recursiveSearch)
+            throws FileNotFoundException {
         final File testSourcesDir = new File(yangSourcesDirectoryPath);
-        if (testSourcesDir == null || !testSourcesDir.isDirectory()) {
+        if (!testSourcesDir.isDirectory()) {
             throw new FileNotFoundException(String.format("%s no such directory", yangSourcesDirectoryPath));
         }
-        return Arrays.asList(testSourcesDir.listFiles(YANG_FILE_FILTER));
+
+        return recursiveSearch ? searchYangFiles(testSourcesDir)
+            : Arrays.asList(testSourcesDir.listFiles(YANG_FILE_FILTER));
+    }
+
+    private static List<File> searchYangFiles(final File dir) {
+        Preconditions.checkNotNull(dir);
+        Preconditions.checkArgument(dir.isDirectory(), "File %s is not a directory", dir.getPath());
+
+        final List<File> yangFiles = new ArrayList<>();
+        for (final File file : dir.listFiles()) {
+            if (file.isDirectory()) {
+                yangFiles.addAll(searchYangFiles(file));
+            } else if (file.isFile() && file.getName().toLowerCase().endsWith(".yang")) {
+                yangFiles.add(file);
+            }
+        }
+
+        return yangFiles;
     }
 }