*/
package org.opendaylight.yangtools.yang.parser.repo;
-import static com.google.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
import com.google.common.annotations.Beta;
import org.opendaylight.yangtools.concepts.Registration;
import org.opendaylight.yangtools.util.concurrent.FluentFutures;
import org.opendaylight.yangtools.yang.common.QNameModule;
+import org.opendaylight.yangtools.yang.ir.YangIRSchemaSource;
import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.model.api.source.SourceIdentifier;
import org.opendaylight.yangtools.yang.model.api.stmt.FeatureSet;
import org.opendaylight.yangtools.yang.model.repo.api.MissingSchemaSourceException;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactoryConfiguration;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaRepository;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaResolutionException;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException;
-import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode;
-import org.opendaylight.yangtools.yang.model.repo.api.YangIRSchemaSource;
-import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
import org.opendaylight.yangtools.yang.model.repo.spi.GuavaSchemaSourceCache;
import org.opendaylight.yangtools.yang.model.repo.spi.PotentialSchemaSource;
import org.opendaylight.yangtools.yang.model.repo.spi.PotentialSchemaSource.Costs;
import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceProvider;
import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceRegistry;
+import org.opendaylight.yangtools.yang.model.spi.source.YangTextSource;
import org.opendaylight.yangtools.yang.parser.api.YangParserFactory;
import org.opendaylight.yangtools.yang.parser.api.YangSyntaxErrorException;
import org.opendaylight.yangtools.yang.parser.rfc7950.repo.TextToIRTransformer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public final class YangTextSchemaContextResolver implements AutoCloseable, SchemaSourceProvider<YangTextSchemaSource> {
+public final class YangTextSchemaContextResolver implements AutoCloseable, SchemaSourceProvider<YangTextSource> {
private static final Logger LOG = LoggerFactory.getLogger(YangTextSchemaContextResolver.class);
private static final Duration SOURCE_LIFETIME = Duration.ofSeconds(60);
private final Collection<SourceIdentifier> requiredSources = new ConcurrentLinkedDeque<>();
- private final Multimap<SourceIdentifier, YangTextSchemaSource> texts = ArrayListMultimap.create();
+ private final Multimap<SourceIdentifier, YangTextSource> texts = ArrayListMultimap.create();
@GuardedBy("this")
private final Map<QNameModule, List<ImmutableSet<String>>> registeredFeatures = new HashMap<>();
private final AtomicReference<Optional<EffectiveModelContext>> currentSchemaContext =
}
/**
- * Register a {@link YangTextSchemaSource}.
+ * Register a {@link YangTextSource}.
*
* @param source YANG text source
- * @return a YangTextSchemaSourceRegistration
+ * @return a {@link Registration}
* @throws YangSyntaxErrorException When the YANG file is syntactically invalid
* @throws IOException when the URL is not readable
* @throws SchemaSourceException When parsing encounters general error
+ * @throws NullPointerException if {@code source} is {@code null}
*/
- public @NonNull YangTextSchemaSourceRegistration registerSource(final @NonNull YangTextSchemaSource source)
+ public @NonNull Registration registerSource(final @NonNull YangTextSource source)
throws SchemaSourceException, IOException, YangSyntaxErrorException {
- checkArgument(source != null);
-
final var ast = TextToIRTransformer.transformText(source);
LOG.trace("Resolved source {} to source {}", source, ast);
// AST carries an accurate identifier, check if it matches the one supplied by the source. If it
// does not, check how much it differs and emit a warning.
- final var providedId = source.getIdentifier();
- final var parsedId = ast.getIdentifier();
- final YangTextSchemaSource text;
+ final var providedId = source.sourceId();
+ final var parsedId = ast.sourceId();
+ final YangTextSource text;
if (!parsedId.equals(providedId)) {
if (!parsedId.name().equals(providedId.name())) {
LOG.info("Provided module name {} does not match actual text {}, corrected",
}
}
- text = YangTextSchemaSource.delegateForCharSource(parsedId, source);
+ text = YangTextSource.delegateForCharSource(parsedId, source);
} else {
text = source;
}
LOG.debug("Populated {} with text", parsedId);
final var reg = registry.registerSchemaSource(this,
- PotentialSchemaSource.create(parsedId, YangTextSchemaSource.class, Costs.IMMEDIATE.getValue()));
+ PotentialSchemaSource.create(parsedId, YangTextSource.class, Costs.IMMEDIATE.getValue()));
requiredSources.add(parsedId);
cache.schemaSourceEncountered(ast);
LOG.debug("Added source {} to schema context requirements", parsedId);
version = new Object();
- return new AbstractYangTextSchemaSourceRegistration(text) {
+ return new AbstractRegistration() {
@Override
protected void removeRegistration() {
synchronized (YangTextSchemaContextResolver.this) {
* @throws YangSyntaxErrorException When the YANG file is syntactically invalid
* @throws IOException when the URL is not readable
* @throws SchemaSourceException When parsing encounters general error
+ * @throws NullPointerException if {@code url} is {@code null}
*/
- public @NonNull YangTextSchemaSourceRegistration registerSource(final @NonNull URL url)
+ public @NonNull Registration registerSource(final @NonNull URL url)
throws SchemaSourceException, IOException, YangSyntaxErrorException {
- checkArgument(url != null, "Supplied URL must not be null");
-
final String path = url.getPath();
final String fileName = path.substring(path.lastIndexOf('/') + 1);
- return registerSource(YangTextSchemaSource.forURL(url, guessSourceIdentifier(fileName)));
+ return registerSource(YangTextSource.forURL(url, guessSourceIdentifier(fileName)));
}
/**
private static SourceIdentifier guessSourceIdentifier(final @NonNull String fileName) {
try {
- return YangTextSchemaSource.identifierFromFilename(fileName);
+ return YangTextSource.identifierFromFilename(fileName);
} catch (IllegalArgumentException e) {
LOG.warn("Invalid file name format in '{}'", fileName, e);
return new SourceIdentifier(fileName);
}
@Override
- public synchronized @NonNull FluentFuture<YangTextSchemaSource> getSource(
- final SourceIdentifier sourceIdentifier) {
+ public synchronized @NonNull FluentFuture<YangTextSource> getSource(final SourceIdentifier sourceIdentifier) {
final var ret = texts.get(sourceIdentifier);
LOG.debug("Lookup {} result {}", sourceIdentifier, ret);
if (ret.isEmpty()) {
return FluentFutures.immediateFailedFluentFuture(
- new MissingSchemaSourceException("URL for " + sourceIdentifier + " not registered", sourceIdentifier));
+ new MissingSchemaSourceException(sourceIdentifier, "URL for " + sourceIdentifier + " not registered"));
}
return FluentFutures.immediateFluentFuture(ret.iterator().next());
}
@Beta
- public synchronized Collection<YangTextSchemaSource> getSourceTexts(final SourceIdentifier sourceIdentifier) {
+ public synchronized Collection<YangTextSource> getSourceTexts(final SourceIdentifier sourceIdentifier) {
return ImmutableSet.copyOf(texts.get(sourceIdentifier));
}
@Beta
- public EffectiveModelContext trySchemaContext() throws SchemaResolutionException {
+ public EffectiveModelContext trySchemaContext() throws SchemaResolutionException, ExecutionException {
return trySchemaContext(StatementParserMode.DEFAULT_MODE);
}
@Beta
@SuppressWarnings("checkstyle:avoidHidingCauseException")
public EffectiveModelContext trySchemaContext(final StatementParserMode statementParserMode)
- throws SchemaResolutionException {
+ throws SchemaResolutionException, ExecutionException {
final var future = repository
.createEffectiveModelContextFactory(config(statementParserMode, getSupportedFeatures()))
.createEffectiveModelContext(ImmutableSet.copyOf(requiredSources));
} catch (InterruptedException e) {
throw new IllegalStateException("Interrupted while waiting for SchemaContext assembly", e);
} catch (ExecutionException e) {
- final var cause = e.getCause();
- if (cause instanceof SchemaResolutionException resolutionException) {
- throw resolutionException;
+ if (e.getCause() instanceof SchemaResolutionException sre) {
+ throw sre;
}
- throw new SchemaResolutionException("Failed to assemble SchemaContext", e);
+ throw e;
}
}
Code Review / yangtools.git / blobdiff