package org.opendaylight.yangtools.yang.test.util;
import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.File;
import java.io.FileFilter;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
+import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
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.stream.Collectors;
+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.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.parser.api.YangSyntaxErrorException;
+import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceRepresentation;
import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode;
-import org.opendaylight.yangtools.yang.parser.rfc6020.repo.YinStatementStreamSource;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
-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;
+import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
/**
* Utility class which provides convenience methods for producing effective schema context based on the supplied
- * yang/yin sources or paths to these sources
+ * yang/yin sources or paths to these sources.
*/
@Beta
public final class YangParserTestUtils {
private static final FileFilter YANG_FILE_FILTER = file -> {
- final String name = file.getName().toLowerCase();
+ // Locale keeps SpotBugs happy. It should not matter that much anyway.
+ final String name = file.getName().toLowerCase(Locale.ENGLISH);
return name.endsWith(YangConstants.RFC6020_YANG_FILE_EXTENSION) && file.isFile();
};
+ 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 YangParserTestUtils() {
throw new UnsupportedOperationException("Utility class should not be instantiated.");
}
/**
- * Creates a new effective schema context containing the specified YANG sources. Statement parser mode is set to
+ * Creates a new effective schema context containing the specified YANG source. Statement parser mode is set to
* default mode and all YANG features are supported.
*
- * @param sources YANG sources to be parsed
+ * @param resource relative path to the YANG file to be parsed
*
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- *
- * @deprecated Migration method only, do not use.
*/
- @Deprecated
- public static SchemaContext parseYangSources(final YangStatementSourceImpl... sources) throws ReactorException {
- return parseYangSources(StatementParserMode.DEFAULT_MODE, sources);
+ public static SchemaContext parseYangResource(final String resource) {
+ return parseYangResource(resource, StatementParserMode.DEFAULT_MODE);
}
/**
- * Creates a new effective schema context containing the specified YANG sources. Statement parser mode is set to
- * default mode.
- *
- * @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
- * models are resolved
- * @param sources YANG sources to be parsed
+ * Creates a new effective schema context containing the specified YANG source. All YANG features are supported.
*
+ * @param resource relative path to the YANG file to be parsed
+ * @param parserMode mode of statement parser
* @return effective schema context
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- *
- * @deprecated Migration method only, do not use.
*/
- @Deprecated
- public static SchemaContext parseYangSources(final Set<QName> supportedFeatures,
- final YangStatementSourceImpl... sources) throws ReactorException {
- return parseYangSources(supportedFeatures, StatementParserMode.DEFAULT_MODE, sources);
+ public static SchemaContext parseYangResource(final String resource, final StatementParserMode parserMode) {
+ return parseYangResource(resource, parserMode, null);
}
/**
- * Creates a new effective schema context containing the specified YANG sources. All YANG features are supported.
- *
- * @param statementParserMode mode of statement parser
- * @param sources YANG sources to be parsed
+ * Creates a new effective schema context containing the specified YANG source. Statement parser mode is set to
+ * default mode.
*
+ * @param resource relative path to the YANG file to be parsed
+ * @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
+ * model are resolved
* @return effective schema context
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- *
- * @deprecated Migration method only, do not use.
*/
- @Deprecated
- public static SchemaContext parseYangSources(final StatementParserMode statementParserMode,
- final YangStatementSourceImpl... sources) throws ReactorException {
- return parseYangSources(null, statementParserMode, sources);
+ public static SchemaContext parseYangResource(final String resource, final Set<QName> supportedFeatures) {
+ return parseYangResource(resource, StatementParserMode.DEFAULT_MODE, supportedFeatures);
}
/**
- * Creates a new effective schema context containing the specified YANG sources.
+ * Creates a new effective schema context containing the specified YANG source.
*
+ * @param resource relative path to the YANG file to be parsed
* @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
- * models are resolved
- * @param statementParserMode mode of statement parser
- * @param sources YANG sources to be parsed
- *
+ * model are resolved
+ * @param parserMode mode of statement parser
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
*/
- public static SchemaContext parseYangSources(final Set<QName> supportedFeatures,
- final StatementParserMode statementParserMode, final YangStatementSourceImpl... sources)
- throws ReactorException {
- final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(
- statementParserMode, supportedFeatures);
- reactor.addSources(sources);
-
- return reactor.buildEffective();
+ public static SchemaContext parseYangResource(final String resource, final StatementParserMode parserMode,
+ final Set<QName> supportedFeatures) {
+ final YangTextSchemaSource source = YangTextSchemaSource.forResource(YangParserTestUtils.class, resource);
+ return parseYangSources(parserMode, supportedFeatures, source);
}
/**
* default mode and all YANG features are supported.
*
* @param files YANG files to be parsed
- *
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if one of the specified files does not exist
*/
- public static SchemaContext parseYangSources(final File... files) throws ReactorException, FileNotFoundException {
- return parseYangSources(StatementParserMode.DEFAULT_MODE, files);
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG sources. Statement parser mode is set to
- * default mode.
- *
- * @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
- * models are resolved
- * @param files YANG files to be parsed
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if one of the specified files does not exist
- */
- public static SchemaContext parseYangSources(final Set<QName> supportedFeatures, final File... files)
- throws ReactorException, FileNotFoundException {
- return parseYangSources(supportedFeatures, StatementParserMode.DEFAULT_MODE, files);
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG sources. All YANG features are supported.
- *
- * @param statementParserMode mode of statement parser
- * @param files YANG files to be parsed
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if one of the specified files does not exist
- */
- public static SchemaContext parseYangSources(final StatementParserMode statementParserMode, final File... files)
- throws ReactorException, FileNotFoundException {
- return parseYangSources(null, statementParserMode, files);
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG sources.
- *
- * @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
- * models are resolved
- * @param statementParserMode mode of statement parser
- * @param files YANG files to be parsed
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if one of the specified files does not exist
- */
- public static SchemaContext parseYangSources(final Set<QName> supportedFeatures,
- final StatementParserMode statementParserMode, final File... files) throws ReactorException,
- FileNotFoundException {
- final YangStatementSourceImpl[] sources = new YangStatementSourceImpl[files.length];
- for (int i = 0; i < files.length; i++) {
- sources[i] = new YangStatementSourceImpl(new NamedFileInputStream(files[i], files[i].getPath()));
- }
-
- return parseYangSources(supportedFeatures, statementParserMode, sources);
+ public static SchemaContext parseYangFiles(final File... files) {
+ return parseYangFiles(Arrays.asList(files));
}
/**
* default mode and all YANG features are supported.
*
* @param files collection of YANG files to be parsed
- *
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if one of the specified files does not exist
*/
- public static SchemaContext parseYangSources(final Collection<File> files) throws ReactorException,
- FileNotFoundException {
- return parseYangSources(files, StatementParserMode.DEFAULT_MODE);
+ public static SchemaContext parseYangFiles(final Collection<File> files) {
+ return parseYangFiles(StatementParserMode.DEFAULT_MODE, files);
}
/**
*
* @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
* models are resolved
- * @param files collection of YANG files to be parsed
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if one of the specified files does not exist
- */
- public static SchemaContext parseYangSources(final Collection<File> files, final Set<QName> supportedFeatures)
- throws ReactorException, FileNotFoundException {
- return parseYangSources(files, supportedFeatures, StatementParserMode.DEFAULT_MODE);
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG sources. All YANG features are supported.
- *
- * @param statementParserMode mode of statement parser
- * @param files collection of YANG files to be parsed
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if one of the specified files does not exist
- */
- public static SchemaContext parseYangSources(final Collection<File> files,
- final StatementParserMode statementParserMode) throws ReactorException, FileNotFoundException {
- return parseYangSources(files, null, statementParserMode);
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG sources.
- *
- * @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
- * models are resolved
- * @param statementParserMode mode of statement parser
- * @param files collection of YANG files to be parsed
- *
+ * @param files YANG files to be parsed
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if one of the specified files does not exist
*/
- public static SchemaContext parseYangSources(final Collection<File> files, final Set<QName> supportedFeatures,
- final StatementParserMode statementParserMode) throws ReactorException, FileNotFoundException {
- return parseYangSources(supportedFeatures, statementParserMode, files.toArray(new File[files.size()]));
+ public static SchemaContext parseYangFiles(final Set<QName> supportedFeatures, final File... files) {
+ return parseYangFiles(supportedFeatures, Arrays.asList(files));
}
- /**
- * Creates a new effective schema context containing the specified YANG sources. Statement parser mode is set to
- * default mode and all YANG features are supported.
- *
- * @param yangSourcesDirectoryPath relative path to the directory with YANG files to be parsed
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if the specified directory does not exist
- * @throws URISyntaxException if the specified directory does not exist
- */
- public static SchemaContext parseYangSources(final String yangSourcesDirectoryPath) throws ReactorException,
- FileNotFoundException, URISyntaxException {
- return parseYangSources(yangSourcesDirectoryPath, StatementParserMode.DEFAULT_MODE);
+ public static SchemaContext parseYangFiles(final Set<QName> supportedFeatures, final Collection<File> files) {
+ return parseYangFiles(supportedFeatures, StatementParserMode.DEFAULT_MODE, files);
}
/**
- * Creates a new effective schema context containing the specified YANG sources. Statement parser mode is set to
- * default mode.
- *
- * @param yangSourcesDirectoryPath relative path to the directory with YANG files to be parsed
- * @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
- * models are resolved
+ * Creates a new effective schema context containing the specified YANG sources. All YANG features are supported.
*
+ * @param parserMode mode of statement parser
+ * @param files YANG files to be parsed
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if the specified directory does not exist
- * @throws URISyntaxException if the specified directory does not exist
*/
- public static SchemaContext parseYangSources(final String yangSourcesDirectoryPath,
- final Set<QName> supportedFeatures) throws ReactorException, FileNotFoundException,
- URISyntaxException {
- return parseYangSources(yangSourcesDirectoryPath, supportedFeatures, StatementParserMode.DEFAULT_MODE);
+ public static SchemaContext parseYangFiles(final StatementParserMode parserMode, final File... files) {
+ return parseYangFiles(parserMode, Arrays.asList(files));
}
/**
* Creates a new effective schema context containing the specified YANG sources. All YANG features are supported.
*
- * @param yangSourcesDirectoryPath relative path to the directory with YANG files to be parsed
- * @param statementParserMode mode of statement parser
- *
+ * @param parserMode mode of statement parser
+ * @param files collection of YANG files to be parsed
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if the specified directory does not exist
- * @throws URISyntaxException if the specified directory does not exist
*/
- public static SchemaContext parseYangSources(final String yangSourcesDirectoryPath,
- final StatementParserMode statementParserMode) throws ReactorException, FileNotFoundException,
- URISyntaxException {
- return parseYangSources(yangSourcesDirectoryPath, null, statementParserMode);
+ public static SchemaContext parseYangFiles(final StatementParserMode parserMode, final Collection<File> files) {
+ return parseYangFiles(null, parserMode, files);
}
/**
* Creates a new effective schema context containing the specified YANG sources.
*
- * @param yangSourcesDirectoryPath relative path to the directory with YANG files to be parsed
* @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
* models are resolved
- * @param statementParserMode mode of statement parser
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if the specified directory does not exist
- * @throws URISyntaxException if the specified directory does not exist
- */
- public static SchemaContext parseYangSources(final String yangSourcesDirectoryPath,
- final Set<QName> supportedFeatures, final StatementParserMode statementParserMode)
- throws ReactorException, FileNotFoundException, URISyntaxException {
- final URI directoryPath = YangParserTestUtils.class.getResource(yangSourcesDirectoryPath).toURI();
- final File dir = new File(directoryPath);
-
- return parseYangSources(supportedFeatures, statementParserMode, dir.listFiles(YANG_FILE_FILTER));
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG source. Statement parser mode is set to
- * default mode and all YANG features are supported.
- *
- * @param yangSourcePath relative path to the YANG file to be parsed
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in the parsed YANG source
- * @throws FileNotFoundException if the specified file does not exist
- * @throws URISyntaxException if the specified file does not exist
- */
- public static SchemaContext parseYangSource(final String yangSourcePath) throws ReactorException,
- FileNotFoundException, URISyntaxException {
- return parseYangSource(yangSourcePath, StatementParserMode.DEFAULT_MODE);
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG source. Statement parser mode is set to
- * default mode.
- *
- * @param yangSourcePath relative path to the YANG file to be parsed
- * @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
- * model are resolved
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in the parsed YANG source
- * @throws FileNotFoundException if the specified file does not exist
- * @throws URISyntaxException if the specified file does not exist
- */
- public static SchemaContext parseYangSource(final String yangSourcePath, final Set<QName> supportedFeatures)
- throws ReactorException, FileNotFoundException, URISyntaxException {
- return parseYangSource(yangSourcePath, supportedFeatures, StatementParserMode.DEFAULT_MODE);
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG source. All YANG features are supported.
- *
- * @param yangSourcePath relative path to the YANG file to be parsed
- * @param statementParserMode mode of statement parser
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in the parsed YANG source
- * @throws FileNotFoundException if the specified file does not exist
- * @throws URISyntaxException if the specified file does not exist
- */
- public static SchemaContext parseYangSource(final String yangSourcePath,
- final StatementParserMode statementParserMode) throws ReactorException, FileNotFoundException,
- URISyntaxException {
- return parseYangSource(yangSourcePath, null, statementParserMode);
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG source.
- *
- * @param yangSourcePath relative path to the YANG file to be parsed
- * @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
- * model are resolved
- * @param statementParserMode mode of statement parser
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in the parsed YANG source
- * @throws FileNotFoundException if the specified file does not exist
- * @throws URISyntaxException if the specified file does not exist
- */
- public static SchemaContext parseYangSource(final String yangSourcePath, final Set<QName> supportedFeatures,
- final StatementParserMode statementParserMode) throws ReactorException, FileNotFoundException,
- URISyntaxException {
- final URI sourcePath = YangParserTestUtils.class.getResource(yangSourcePath).toURI();
- final File sourceFile = new File(sourcePath);
- return parseYangSources(supportedFeatures, statementParserMode, sourceFile);
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG sources. Statement parser mode is set to
- * default mode and all YANG features are supported.
- *
- * @param yangDirs relative paths to the directories containing YANG files to be parsed
- * @param yangFiles relative paths to the YANG files to be parsed
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if one of the specified directories or files does not exist
- * @throws URISyntaxException if one of the specified directories or files does not exist
- */
- public static SchemaContext parseYangSources(final List<String> yangDirs, final List<String> yangFiles)
- throws FileNotFoundException, ReactorException, URISyntaxException {
- return parseYangSources(yangDirs, yangFiles, StatementParserMode.DEFAULT_MODE);
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG sources. Statement parser mode is set to
- * default mode.
- *
- * @param yangDirs relative paths to the directories containing YANG files to be parsed
- * @param yangFiles relative paths to the YANG files to be parsed
- * @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
- * models are resolved
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if one of the specified directories or files does not exist
- * @throws URISyntaxException if one of the specified directories or files does not exist
- */
- public static SchemaContext parseYangSources(final List<String> yangDirs, final List<String> yangFiles,
- final Set<QName> supportedFeatures) throws FileNotFoundException, ReactorException,
- URISyntaxException {
- return parseYangSources(yangDirs, yangFiles, supportedFeatures, StatementParserMode.DEFAULT_MODE);
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG sources. All YANG features are supported.
- *
- * @param yangDirs relative paths to the directories containing YANG files to be parsed
- * @param yangFiles relative paths to the YANG files to be parsed
- * @param statementParserMode mode of statement parser
- *
+ * @param parserMode mode of statement parser
+ * @param files YANG files to be parsed
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if one of the specified directories or files does not exist
- * @throws URISyntaxException if one of the specified directories or files does not exist
*/
- public static SchemaContext parseYangSources(final List<String> yangDirs, final List<String> yangFiles,
- final StatementParserMode statementParserMode) throws FileNotFoundException, ReactorException,
- URISyntaxException {
- return parseYangSources(yangDirs, yangFiles, null, statementParserMode);
+ public static SchemaContext parseYangFiles(final Set<QName> supportedFeatures,
+ final StatementParserMode parserMode, final File... files) {
+ return parseYangFiles(supportedFeatures, parserMode, Arrays.asList(files));
}
/**
* Creates a new effective schema context containing the specified YANG sources.
*
- * @param yangDirs relative paths to the directories containing YANG files to be parsed
- * @param yangFiles relative paths to the YANG files to be parsed
* @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
* models are resolved
- * @param statementParserMode mode of statement parser
- *
+ * @param parserMode mode of statement parser
+ * @param files YANG files to be parsed
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- * @throws FileNotFoundException if one of the specified directories or files does not exist
- * @throws URISyntaxException if one of the specified directories or files does not exist
*/
- public static SchemaContext parseYangSources(final List<String> yangDirs, final List<String> yangFiles,
- final Set<QName> supportedFeatures, final StatementParserMode statementParserMode)
- throws FileNotFoundException, ReactorException, URISyntaxException {
- final List<File> allYangFiles = new ArrayList<>();
- for (final String yangDir : yangDirs) {
- allYangFiles.addAll(getYangFiles(yangDir));
- }
-
- for (final String yangFile : yangFiles) {
- final URI filePath = YangParserTestUtils.class.getResource(yangFile).toURI();
- allYangFiles.add(new File(filePath));
- }
-
- return parseYangSources(allYangFiles, supportedFeatures, statementParserMode);
- }
-
- private static Collection<File> getYangFiles(final String yangSourcesDirectoryPath) throws URISyntaxException {
- final URI directoryPath = YangParserTestUtils.class.getResource(yangSourcesDirectoryPath).toURI();
- final File dir = new File(directoryPath);
-
- return Arrays.asList(dir.listFiles(YANG_FILE_FILTER));
+ public static SchemaContext parseYangFiles(final Set<QName> supportedFeatures,
+ final StatementParserMode parserMode, final Collection<File> files) {
+ return parseSources(parserMode, supportedFeatures,
+ files.stream().map(YangTextSchemaSource::forFile).collect(Collectors.toList()));
}
/**
* Creates a new effective schema context containing the specified YANG sources. Statement parser mode is set to
* default mode and all YANG features are supported.
*
- * @param filePaths relative paths to the YANG files to be parsed
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- */
- public static SchemaContext parseYangSources(final List<String> filePaths) throws ReactorException {
- return parseYangSources(filePaths, StatementParserMode.DEFAULT_MODE);
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG sources. Statement parser mode is set to
- * default mode.
- *
- * @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
- * models are resolved
- * @param filePaths relative paths to the YANG files to be parsed
- *
+ * @param resourcePath relative path to the directory with YANG files to be parsed
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
*/
- public static SchemaContext parseYangSources(final List<String> filePaths, final Set<QName> supportedFeatures)
- throws ReactorException {
- return parseYangSources(filePaths, supportedFeatures, StatementParserMode.DEFAULT_MODE);
+ public static SchemaContext parseYangResourceDirectory(final String resourcePath) {
+ return parseYangResourceDirectory(resourcePath, StatementParserMode.DEFAULT_MODE);
}
/**
* Creates a new effective schema context containing the specified YANG sources. All YANG features are supported.
*
- * @param statementParserMode mode of statement parser
- * @param filePaths relative paths to the YANG files to be parsed
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- */
- public static SchemaContext parseYangSources(final List<String> filePaths,
- final StatementParserMode statementParserMode) throws ReactorException {
- return parseYangSources(filePaths, (Set<QName>) null, statementParserMode);
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG sources.
- *
- * @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
- * models are resolved
- * @param statementParserMode mode of statement parser
- * @param filePaths relative paths to the YANG files to be parsed
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- */
- public static SchemaContext parseYangSources(final List<String> filePaths,
- final Set<QName> supportedFeatures, final StatementParserMode statementParserMode)
- throws ReactorException {
- final YangStatementSourceImpl[] sources = new YangStatementSourceImpl[filePaths.size()];
-
- for (int i = 0; i < filePaths.size(); i++) {
- sources[i] = new YangStatementSourceImpl(YangParserTestUtils.class.getResourceAsStream(filePaths.get(i)));
- }
-
- return parseYangSources(supportedFeatures, statementParserMode, sources);
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG sources. Statement parser mode is set to
- * default mode and all YANG features are supported.
- *
- * @param streams input streams containing YANG sources to be parsed
- *
+ * @param resourcePath relative path to the directory with YANG files to be parsed
+ * @param parserMode mode of statement parser
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
*/
- public static SchemaContext parseYangStreams(final List<InputStream> streams) throws ReactorException {
- return parseYangStreams(streams, StatementParserMode.DEFAULT_MODE);
+ public static SchemaContext parseYangResourceDirectory(final String resourcePath,
+ final StatementParserMode parserMode) {
+ return parseYangResourceDirectory(resourcePath, null, parserMode);
}
/**
* Creates a new effective schema context containing the specified YANG sources. Statement parser mode is set to
* default mode.
*
- * @param streams input streams containing YANG sources to be parsed
+ * @param resourcePath relative path to the directory with YANG files to be parsed
* @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
* models are resolved
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- */
- public static SchemaContext parseYangStreams(final List<InputStream> streams, final Set<QName> supportedFeatures)
- throws ReactorException {
- return parseYangStreams(streams, supportedFeatures, StatementParserMode.DEFAULT_MODE);
- }
-
- /**
- * Creates a new effective schema context containing the specified YANG sources. All YANG features are supported.
- *
- * @param streams input streams containing YANG sources to be parsed
- * @param statementParserMode mode of statement parser
- *
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
*/
- public static SchemaContext parseYangStreams(final List<InputStream> streams,
- final StatementParserMode statementParserMode) throws ReactorException {
- return parseYangStreams(streams, null, statementParserMode);
+ public static SchemaContext parseYangResourceDirectory(final String resourcePath,
+ final Set<QName> supportedFeatures) {
+ return parseYangResourceDirectory(resourcePath, supportedFeatures, StatementParserMode.DEFAULT_MODE);
}
/**
* Creates a new effective schema context containing the specified YANG sources.
*
+ * @param resourcePath relative path to the directory with YANG files to be parsed
* @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
* models are resolved
- * @param statementParserMode mode of statement parser
- * @param streams input streams containing YANG sources to be parsed
- *
+ * @param parserMode mode of statement parser
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
*/
- public static SchemaContext parseYangStreams(final List<InputStream> streams, final Set<QName> supportedFeatures,
- final StatementParserMode statementParserMode) throws ReactorException {
- final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(
- statementParserMode, supportedFeatures);
- return reactor.buildEffective(streams);
+ @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE", justification = "Wrong inferent on listFiles")
+ public static SchemaContext parseYangResourceDirectory(final String resourcePath,
+ final Set<QName> supportedFeatures, final StatementParserMode parserMode) {
+ final URI directoryPath;
+ try {
+ directoryPath = YangParserTestUtils.class.getResource(resourcePath).toURI();
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException("Failed to open resource " + resourcePath, e);
+ }
+ return parseYangFiles(supportedFeatures, parserMode, new File(directoryPath).listFiles(YANG_FILE_FILTER));
}
/**
*
* @param clazz Resource lookup base
* @param resources Resource names to be looked up
- *
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
*/
- public static SchemaContext parseYangResources(final Class<?> clazz, final String... resources)
- throws ReactorException {
- final List<InputStream> streams = new ArrayList<>(resources.length);
- for (final String r : resources) {
- final InputStream is = clazz.getResourceAsStream(r);
- Preconditions.checkArgument(is != null, "Resource %s not found", r);
- streams.add(is);
- }
-
- return parseYangStreams(streams);
+ public static SchemaContext parseYangResources(final Class<?> clazz, final String... resources) {
+ return parseYangResources(clazz, Arrays.asList(resources));
}
- /**
- * Creates a new effective schema context containing the specified YANG sources. Statement parser mode is set to
- * default mode and all YANG features are supported.
- *
- * @param streams input streams containing YANG sources to be parsed
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
- */
- public static SchemaContext parseYangStreams(final InputStream... streams) throws ReactorException {
- return parseYangStreams(Arrays.asList(streams));
+ public static SchemaContext parseYangResources(final Class<?> clazz, final Collection<String> resources) {
+ final List<YangTextSchemaSource> sources = new ArrayList<>(resources.size());
+ for (final String r : resources) {
+ sources.add(YangTextSchemaSource.forResource(clazz, r));
+ }
+ return parseSources(StatementParserMode.DEFAULT_MODE, null, sources);
}
/**
* Creates a new effective schema context containing the specified YANG sources. Statement parser mode is set to
* default mode.
*
+ * @param yangDirs relative paths to the directories containing YANG files to be parsed
+ * @param yangFiles relative paths to the YANG files to be parsed
* @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
* models are resolved
- * @param streams input streams containing YANG sources to be parsed
- *
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
*/
- public static SchemaContext parseYangStreams(final Set<QName> supportedFeatures,
- final InputStream... streams) throws ReactorException {
- return parseYangStreams(Arrays.asList(streams), supportedFeatures);
+ public static SchemaContext parseYangResources(final List<String> yangDirs, final List<String> yangFiles,
+ final Set<QName> supportedFeatures) {
+ return parseYangResources(yangDirs, yangFiles, supportedFeatures, StatementParserMode.DEFAULT_MODE);
}
/**
* Creates a new effective schema context containing the specified YANG sources. All YANG features are supported.
*
+ * @param yangResourceDirs relative paths to the directories containing YANG files to be parsed
+ * @param yangResources relative paths to the YANG files to be parsed
* @param statementParserMode mode of statement parser
- * @param streams input streams containing YANG sources to be parsed
- *
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
*/
- public static SchemaContext parseYangStreams(final StatementParserMode statementParserMode,
- final InputStream... streams) throws ReactorException {
- return parseYangStreams(Arrays.asList(streams), statementParserMode);
+ public static SchemaContext parseYangResources(final List<String> yangResourceDirs,
+ final List<String> yangResources, final StatementParserMode statementParserMode) {
+ return parseYangResources(yangResourceDirs, yangResources, null, statementParserMode);
}
/**
* Creates a new effective schema context containing the specified YANG sources.
*
+ * @param yangResourceDirs relative paths to the directories containing YANG files to be parsed
+ * @param yangResources relative paths to the YANG files to be parsed
* @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YANG
* models are resolved
* @param statementParserMode mode of statement parser
- * @param streams input streams containing YANG sources to be parsed
- *
* @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YANG sources
*/
- public static SchemaContext parseYangStreams(final Set<QName> supportedFeatures,
- final StatementParserMode statementParserMode, final InputStream... streams) throws ReactorException {
- return parseYangStreams(Arrays.asList(streams), supportedFeatures, statementParserMode);
- }
+ public static SchemaContext parseYangResources(final List<String> yangResourceDirs,
+ final List<String> yangResources, final Set<QName> supportedFeatures,
+ final StatementParserMode statementParserMode) {
+ final List<File> allYangFiles = new ArrayList<>();
+ for (final String yangDir : yangResourceDirs) {
+ allYangFiles.addAll(getYangFiles(yangDir));
+ }
- /**
- * Creates a new effective schema context containing the specified YIN sources. Statement parser mode is set to
- * default mode and all YANG features are supported.
- *
- * @param sources YIN sources to be parsed
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YIN sources
- */
- public static SchemaContext parseYinSources(final YinStatementStreamSource... sources) throws ReactorException {
- return parseYinSources(StatementParserMode.DEFAULT_MODE, sources);
+ for (final String yangFile : yangResources) {
+ try {
+ allYangFiles.add(new File(YangParserTestUtils.class.getResource(yangFile).toURI()));
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException("Invalid resource " + yangFile, e);
+ }
+ }
+
+ return parseYangFiles(supportedFeatures, statementParserMode, allYangFiles);
}
- /**
- * Creates a new effective schema context containing the specified YIN sources. Statement parser mode is set to
- * default mode.
- *
- * @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YIN
- * models are resolved
- * @param sources YIN sources to be parsed
- *
- * @return effective schema context
- * @throws ReactorException if there is an error in one of the parsed YIN sources
- */
- public static SchemaContext parseYinSources(final Set<QName> supportedFeatures,
- final YinStatementStreamSource... sources) throws ReactorException {
- return parseYinSources(supportedFeatures, StatementParserMode.DEFAULT_MODE, sources);
+ public static SchemaContext parseYangSources(final StatementParserMode parserMode,
+ final Set<QName> supportedFeatures, final YangTextSchemaSource... sources) {
+ return parseSources(parserMode, supportedFeatures, Arrays.asList(sources));
}
- /**
- * Creates a new effective schema context containing the specified YIN sources. All YANG features are supported.
- *
- * @param statementParserMode mode of statement parser
- * @param sources YIN sources to be parsed
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YIN sources
- */
- public static SchemaContext parseYinSources(final StatementParserMode statementParserMode,
- final YinStatementStreamSource... sources) throws ReactorException {
- return parseYinSources(null, statementParserMode, sources);
+ public static SchemaContext parseSources(final StatementParserMode parserMode, final Set<QName> supportedFeatures,
+ final Collection<? extends SchemaSourceRepresentation> sources) {
+ final YangParser parser = PARSER_FACTORY.createParser(parserMode);
+ if (supportedFeatures != null) {
+ parser.setSupportedFeatures(supportedFeatures);
+ }
+
+ try {
+ parser.addSources(sources);
+ } catch (YangSyntaxErrorException e) {
+ throw new IllegalArgumentException("Malformed source", e);
+ } catch (IOException e) {
+ throw new IllegalArgumentException("Failed to read a source", e);
+ }
+
+ try {
+ return parser.buildSchemaContext();
+ } catch (YangParserException e) {
+ throw new IllegalStateException("Failed to assemble SchemaContext", e);
+ }
}
- /**
- * Creates a new effective schema context containing the specified YIN sources.
- *
- * @param supportedFeatures set of supported features based on which all if-feature statements in the parsed YIN
- * models are resolved
- * @param statementParserMode mode of statement parser
- * @param sources YIN sources to be parsed
- *
- * @return effective schema context
- *
- * @throws ReactorException if there is an error in one of the parsed YIN sources
- */
- public static SchemaContext parseYinSources(final Set<QName> supportedFeatures,
- final StatementParserMode statementParserMode, final YinStatementStreamSource... sources)
- throws ReactorException {
- final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(
- statementParserMode, supportedFeatures);
- reactor.addSources(sources);
-
- return reactor.buildEffective();
+ @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE", justification = "Wrong inferent on listFiles")
+ private static Collection<File> getYangFiles(final String resourcePath) {
+ final URI directoryPath;
+ try {
+ directoryPath = YangParserTestUtils.class.getResource(resourcePath).toURI();
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException("Failed to open resource directory " + resourcePath, e);
+ }
+ return Arrays.asList(new File(directoryPath).listFiles(YANG_FILE_FILTER));
}
}
Code Review / yangtools.git / blobdiff