* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.yangtools.yang.validator;
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.File;
import java.io.FileFilter;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
+import java.util.ServiceLoader;
import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.YangConstants;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
+import org.opendaylight.yangtools.yang.model.parser.api.YangParser;
+import org.opendaylight.yangtools.yang.model.parser.api.YangParserException;
+import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory;
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;
-class SystemTestUtils {
+final class SystemTestUtils {
+
+ private static final Pattern MODULE_PATTERN = Pattern.compile("module(.*?)\\{");
+ private static final Pattern WHITESPACES = Pattern.compile("\\s+");
+ private static final @NonNull YangParserFactory PARSER_FACTORY;
+
+ static {
+ final Iterator<@NonNull YangParserFactory> it = ServiceLoader.load(YangParserFactory.class).iterator();
+ if (!it.hasNext()) {
+ throw new IllegalStateException("No YangParserFactory found");
+ }
+ PARSER_FACTORY = it.next();
+ }
+
+ private SystemTestUtils() {
+ // Hidden on purpose
+ }
static final FileFilter YANG_FILE_FILTER = file -> {
- final String name = file.getName().toLowerCase();
- return name.endsWith(".yang") && file.isFile();
+ final String name = file.getName().toLowerCase(Locale.ENGLISH);
+ return name.endsWith(YangConstants.RFC6020_YANG_FILE_EXTENSION) && file.isFile();
};
static SchemaContext parseYangSources(final List<String> yangLibDirs, final List<String> yangTestFiles,
- final Set<QName> supportedFeatures, final boolean recursiveSearch) throws ReactorException, IOException,
- YangSyntaxErrorException {
+ final Set<QName> supportedFeatures, final boolean recursiveSearch) throws IOException, YangParserException {
/*
* Current dir "." should be always present implicitly in the list of
* directories where dependencies are searched for
final List<File> testFiles = new ArrayList<>();
for (final String yangTestFile : yangTestFiles) {
- testFiles.add(new File(yangTestFile));
+ if (!yangTestFile.endsWith(YangConstants.RFC6020_YANG_FILE_EXTENSION)) {
+ testFiles.add(findInFiles(libFiles, yangTestFile));
+ } else {
+ testFiles.add(new File(yangTestFile));
+ }
}
return parseYangSources(supportedFeatures, testFiles, libFiles);
}
static SchemaContext parseYangSources(final Set<QName> supportedFeatures, final List<File> testFiles,
- 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 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();
- reactor.addSources(testSources);
- reactor.addLibSources(libSources);
+ final List<File> libFiles) throws IOException, YangParserException {
+ checkArgument(!testFiles.isEmpty(), "No yang sources");
+ final YangParser parser = PARSER_FACTORY.createParser();
if (supportedFeatures != null) {
- reactor.setSupportedFeatures(supportedFeatures);
+ parser.setSupportedFeatures(supportedFeatures);
+ }
+
+ for (File file : testFiles) {
+ parser.addSource(YangTextSchemaSource.forFile(file));
+ }
+ for (File file : libFiles) {
+ parser.addLibSource(YangTextSchemaSource.forFile(file));
}
- return reactor.buildEffective();
+ return parser.buildSchemaContext();
}
- 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)));
+ private static File findInFiles(final List<File> libFiles, final String yangTestFile) throws IOException {
+ for (final File file : libFiles) {
+ if (WHITESPACES.matcher(getModelNameFromFile(file)).replaceAll("").equals(yangTestFile)) {
+ return file;
+ }
}
- return yangSources;
+ throw new FileNotFoundException("Model with specific module-name does not exist : " + yangTestFile);
+ }
+
+ private static String getModelNameFromFile(final File file) throws IOException {
+ final String fileAsString = readFile(file.getAbsolutePath());
+ final Matcher matcher = MODULE_PATTERN.matcher(fileAsString);
+ return matcher.find() ? matcher.group(1) : "";
+ }
+
+ private static String readFile(final String path) throws IOException {
+ return new String(Files.readAllBytes(Paths.get(path)), StandardCharsets.UTF_8);
}
+ @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
private static Collection<File> getYangFiles(final String yangSourcesDirectoryPath, final boolean recursiveSearch)
throws FileNotFoundException {
final File testSourcesDir = new File(yangSourcesDirectoryPath);
: Arrays.asList(testSourcesDir.listFiles(YANG_FILE_FILTER));
}
+ @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
private static List<File> searchYangFiles(final File dir) {
- Preconditions.checkNotNull(dir);
- Preconditions.checkArgument(dir.isDirectory(), "File %s is not a directory", dir.getPath());
+ requireNonNull(dir);
+ 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")) {
+ } else if (file.isFile()
+ && file.getName().toLowerCase(Locale.ENGLISH).endsWith(YangConstants.RFC6020_YANG_FILE_EXTENSION)) {
yangFiles.add(file);
}
}
Code Review / yangtools.git / blobdiff