From e45892a083acd271d729721e07513be6fb97c3d5 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 25 Feb 2019 16:54:59 +0100 Subject: [PATCH] Remove deprecated SchemaRepository.createSchemaContextFactory() Filter-based createSchemaContextFactory() has been deprecated, remove it in the next major release. Change-Id: I3033670b833cf3f6d5c7fc21fed7921255d516c6 Signed-off-by: Robert Varga --- .../yang/model/repo/api/SchemaRepository.java | 19 ++++++++----------- .../yang/model/export/SimpleModuleTest.java | 3 +-- .../repo/util/AbstractSchemaRepository.java | 6 ++---- .../util/SchemaSourceTransformerTest.java | 13 ------------- .../repo/SharedSchemaContextFactory.java | 9 --------- .../parser/repo/SharedSchemaRepository.java | 16 ---------------- .../repo/YangTextSchemaContextResolver.java | 10 +++++++--- .../repo/MultipleRevImportBug6875Test.java | 14 +++----------- ...enconfigVerSharedSchemaRepositoryTest.java | 8 ++------ .../repo/SharedSchemaContextFactoryTest.java | 13 +++++++------ .../repo/SharedSchemaRepositoryTest.java | 16 +++++++--------- ...haredSchemaRepositoryWithFeaturesTest.java | 13 +++---------- 12 files changed, 40 insertions(+), 100 deletions(-) diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaRepository.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaRepository.java index 5418e49c63..6959d0aded 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaRepository.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/repo/api/SchemaRepository.java @@ -19,24 +19,21 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; @Beta public interface SchemaRepository { /** - * Instantiate a new {@link SchemaContextFactory}, which will filter available schema sources using the provided - * filter. + * Returns {@link SchemaContextFactory} with supplied configuration. * - * @param filter Filter which acts as the gating function before a schema source is considered by the factory - * for inclusion in the {@link SchemaContext} it produces. - * @return A new schema context factory. - * @deprecated Use {@link #createSchemaContextFactory(SchemaContextFactoryConfiguration)} instead. + * @param config configuration of schema context factory. + * @return schema context factory. */ - @Deprecated - @NonNull SchemaContextFactory createSchemaContextFactory(@NonNull SchemaSourceFilter filter); + @NonNull SchemaContextFactory createSchemaContextFactory(@NonNull SchemaContextFactoryConfiguration config); /** - * Returns {@link SchemaContextFactory} with supplied configuration. + * Returns {@link SchemaContextFactory} with {@link SchemaContextFactoryConfiguration#getDefault()}. * - * @param config configuration of schema context factory. * @return schema context factory. */ - @NonNull SchemaContextFactory createSchemaContextFactory(@NonNull SchemaContextFactoryConfiguration config); + default @NonNull SchemaContextFactory createSchemaContextFactory() { + return createSchemaContextFactory(SchemaContextFactoryConfiguration.getDefault()); + } @NonNull ListenableFuture getSchemaSource(@NonNull SourceIdentifier id, @NonNull Class represetation); diff --git a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.java b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.java index c0571174a3..a6096d2876 100644 --- a/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.java +++ b/yang/yang-model-export/src/test/java/org/opendaylight/yangtools/yang/model/export/SimpleModuleTest.java @@ -18,7 +18,6 @@ import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory; -import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceFilter; import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceRepresentation; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.spi.PotentialSchemaSource; @@ -38,7 +37,7 @@ public class SimpleModuleTest { final TextToASTTransformer astTransformer = TextToASTTransformer.create(schemaRegistry, schemaRegistry); schemaRegistry.registerSchemaSourceListener(astTransformer); - schemaContextFactory = schemaRegistry.createSchemaContextFactory(SchemaSourceFilter.ALWAYS_ACCEPT); + schemaContextFactory = schemaRegistry.createSchemaContextFactory(); allTestSources = new HashSet<>(); final SchemaListenerRegistration reg = schemaRegistry.registerSchemaSourceListener(new SchemaSourceListener() { diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java index c84f852720..3c3b4ab222 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java @@ -30,7 +30,6 @@ import java.util.Map; import javax.annotation.concurrent.GuardedBy; import org.opendaylight.yangtools.yang.model.repo.api.MissingSchemaSourceException; import org.opendaylight.yangtools.yang.model.repo.api.SchemaRepository; -import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceFilter; import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceRepresentation; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.spi.PotentialSchemaSource; @@ -43,9 +42,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Abstract base class for {@link SchemaRepository} implementations. It handles registration - * and lookup of schema sources, subclasses need only to provide their own - * {@link #createSchemaContextFactory(SchemaSourceFilter)} implementation. + * Abstract base class for {@link SchemaRepository} implementations. It handles registration and lookup of schema + * sources, subclasses need only to provide their own {@link #createSchemaContextFactory()} implementation. */ @Beta public abstract class AbstractSchemaRepository implements SchemaRepository, SchemaSourceRegistry { diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java index 31e0c88e25..3bafc0f274 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/SchemaSourceTransformerTest.java @@ -24,7 +24,6 @@ import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory; 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.SchemaSourceFilter; import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceRepresentation; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangSchemaSourceRepresentation; @@ -142,12 +141,6 @@ public class SchemaSourceTransformerTest { } private class Provider extends AbstractSchemaRepository { - @Deprecated - @Override - public SchemaContextFactory createSchemaContextFactory(final SchemaSourceFilter filter) { - return mock(SchemaContextFactory.class); - } - @Override public SchemaContextFactory createSchemaContextFactory(final SchemaContextFactoryConfiguration config) { return mock(SchemaContextFactory.class); @@ -155,12 +148,6 @@ public class SchemaSourceTransformerTest { } private class Consumer extends AbstractSchemaRepository { - @Deprecated - @Override - public SchemaContextFactory createSchemaContextFactory(final SchemaSourceFilter filter) { - return mock(SchemaContextFactory.class); - } - @Override public SchemaContextFactory createSchemaContextFactory(final SchemaContextFactoryConfiguration config) { return mock(SchemaContextFactory.class); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java index 3b45991776..466b0387fb 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactory.java @@ -40,7 +40,6 @@ import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory; 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.SchemaSourceFilter; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; import org.opendaylight.yangtools.yang.parser.impl.DefaultReactors; @@ -62,14 +61,6 @@ final class SharedSchemaContextFactory implements SchemaContextFactory { private final @NonNull SchemaRepository repository; private final @NonNull SchemaContextFactoryConfiguration config; - // FIXME SchemaRepository should be the type for repository parameter instead of SharedSchemaRepository - // (final implementation) - @Deprecated - SharedSchemaContextFactory(final @NonNull SharedSchemaRepository repository, - final @NonNull SchemaSourceFilter filter) { - this(repository, SchemaContextFactoryConfiguration.builder().setFilter(filter).build()); - } - SharedSchemaContextFactory(final @NonNull SchemaRepository repository, final @NonNull SchemaContextFactoryConfiguration config) { this.repository = requireNonNull(repository); diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepository.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepository.java index d47217b254..86e9503d66 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepository.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepository.java @@ -20,7 +20,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory; 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.SchemaSourceFilter; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.util.AbstractSchemaRepository; @@ -33,15 +32,6 @@ import org.opendaylight.yangtools.yang.model.repo.util.AbstractSchemaRepository; @Beta @MetaInfServices(value = SchemaRepository.class) public final class SharedSchemaRepository extends AbstractSchemaRepository implements Identifiable { - @Deprecated - private final LoadingCache cacheByFilter = CacheBuilder.newBuilder() - .softValues().build(new CacheLoader() { - @Override - public SchemaContextFactory load(final SchemaSourceFilter key) { - return new SharedSchemaContextFactory(SharedSchemaRepository.this, key); - } - }); - private final LoadingCache cacheByConfig = CacheBuilder .newBuilder().softValues() .build(new CacheLoader() { @@ -62,12 +52,6 @@ public final class SharedSchemaRepository extends AbstractSchemaRepository imple return id; } - @Override - @Deprecated - public @NonNull SchemaContextFactory createSchemaContextFactory(final @NonNull SchemaSourceFilter filter) { - return cacheByFilter.getUnchecked(filter); - } - @Override public @NonNull SchemaContextFactory createSchemaContextFactory( final @NonNull SchemaContextFactoryConfiguration config) { diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java index 1955136d16..dba5d2e1a7 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/repo/YangTextSchemaContextResolver.java @@ -37,10 +37,10 @@ import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException import org.opendaylight.yangtools.yang.model.repo.api.MissingSchemaSourceException; import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory; +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.SchemaSourceFilter; 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.YangTextSchemaSource; @@ -212,7 +212,7 @@ public final class YangTextSchemaContextResolver implements AutoCloseable, Schem * new schema context was successfully built. */ public Optional getSchemaContext(final StatementParserMode statementParserMode) { - final SchemaContextFactory factory = repository.createSchemaContextFactory(SchemaSourceFilter.ALWAYS_ACCEPT); + final SchemaContextFactory factory = repository.createSchemaContextFactory(config(statementParserMode)); Optional sc; Object ver; do { @@ -299,7 +299,7 @@ public final class YangTextSchemaContextResolver implements AutoCloseable, Schem public SchemaContext trySchemaContext(final StatementParserMode statementParserMode) throws SchemaResolutionException { final ListenableFuture future = repository - .createSchemaContextFactory(SchemaSourceFilter.ALWAYS_ACCEPT) + .createSchemaContextFactory(config(statementParserMode)) .createSchemaContext(ImmutableSet.copyOf(requiredSources), statementParserMode); try { @@ -320,4 +320,8 @@ public final class YangTextSchemaContextResolver implements AutoCloseable, Schem public void close() { transReg.close(); } + + private static SchemaContextFactoryConfiguration config(final StatementParserMode statementParserMode) { + return SchemaContextFactoryConfiguration.builder().setStatementParserMode(statementParserMode).build(); + } } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/MultipleRevImportBug6875Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/MultipleRevImportBug6875Test.java index 1b178e389b..8aa53ed2ba 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/MultipleRevImportBug6875Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/MultipleRevImportBug6875Test.java @@ -5,7 +5,6 @@ * 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.parser.repo; import static org.junit.Assert.assertEquals; @@ -22,8 +21,6 @@ import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; -import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory; -import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceFilter; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; import org.opendaylight.yangtools.yang.parser.rfc7950.repo.ASTSchemaSource; @@ -55,10 +52,7 @@ public class MultipleRevImportBug6875Test { setAndRegister(sharedSchemaRepository, bar2); setAndRegister(sharedSchemaRepository, bar3); - final SchemaContextFactory fact = sharedSchemaRepository - .createSchemaContextFactory(SchemaSourceFilter.ALWAYS_ACCEPT); - - final ListenableFuture schemaContextFuture = fact + final ListenableFuture schemaContextFuture = sharedSchemaRepository.createSchemaContextFactory() .createSchemaContext(ImmutableList.of(foo.getId(), bar1.getId(), bar2.getId(), bar3.getId())); assertTrue(schemaContextFuture.isDone()); @@ -98,10 +92,8 @@ public class MultipleRevImportBug6875Test { setAndRegister(sharedSchemaRepository, bar1); setAndRegister(sharedSchemaRepository, bar2); - final SchemaContextFactory fact = sharedSchemaRepository.createSchemaContextFactory( - SchemaSourceFilter.ALWAYS_ACCEPT); - final ListenableFuture schemaContextFuture = fact.createSchemaContext( - ImmutableList.of(foo.getId(), bar1.getId(), bar2.getId())); + final ListenableFuture schemaContextFuture = sharedSchemaRepository.createSchemaContextFactory() + .createSchemaContext(ImmutableList.of(foo.getId(), bar1.getId(), bar2.getId())); assertTrue(schemaContextFuture.isDone()); try { diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/OpenconfigVerSharedSchemaRepositoryTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/OpenconfigVerSharedSchemaRepositoryTest.java index 0db8d53045..166dccabdc 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/OpenconfigVerSharedSchemaRepositoryTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/OpenconfigVerSharedSchemaRepositoryTest.java @@ -17,7 +17,6 @@ import com.google.common.util.concurrent.ListenableFuture; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory; -import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceFilter; import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; import org.opendaylight.yangtools.yang.parser.rfc7950.repo.ASTSchemaSource; @@ -43,8 +42,7 @@ public class OpenconfigVerSharedSchemaRepositoryTest { semVer.register(sharedSchemaRepository); semVer.setResult(); - final SchemaContextFactory fact = sharedSchemaRepository - .createSchemaContextFactory(SchemaSourceFilter.ALWAYS_ACCEPT); + final SchemaContextFactory fact = sharedSchemaRepository.createSchemaContextFactory(); final ListenableFuture inetAndTopologySchemaContextFuture = fact.createSchemaContext(ImmutableList.of(bar.getId(), foo.getId(), semVer.getId()), @@ -75,9 +73,7 @@ public class OpenconfigVerSharedSchemaRepositoryTest { semVer.register(sharedSchemaRepository); semVer.setResult(); - final SchemaContextFactory fact = sharedSchemaRepository - .createSchemaContextFactory(SchemaSourceFilter.ALWAYS_ACCEPT); - + final SchemaContextFactory fact = sharedSchemaRepository.createSchemaContextFactory(); final ListenableFuture inetAndTopologySchemaContextFuture = fact.createSchemaContext(ImmutableList.of(bar.getId(), foo.getId(), semVer.getId())); assertTrue(inetAndTopologySchemaContextFuture.isDone()); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactoryTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactoryTest.java index 2cc14f856e..1cc3298c66 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactoryTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaContextFactoryTest.java @@ -15,24 +15,25 @@ import java.util.Arrays; import java.util.concurrent.ExecutionException; import org.junit.Before; import org.junit.Test; -import org.mockito.Mock; +import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; -import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceFilter; +import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactoryConfiguration; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; import org.opendaylight.yangtools.yang.model.repo.spi.PotentialSchemaSource; import org.opendaylight.yangtools.yang.parser.rfc7950.repo.ASTSchemaSource; import org.opendaylight.yangtools.yang.parser.rfc7950.repo.TextToASTTransformer; +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class SharedSchemaContextFactoryTest { private final SharedSchemaRepository repository = new SharedSchemaRepository("test"); - @Mock - private SchemaSourceFilter filter; + private final SchemaContextFactoryConfiguration config = SchemaContextFactoryConfiguration.getDefault(); private SourceIdentifier s1; private SourceIdentifier s2; @@ -58,7 +59,7 @@ public class SharedSchemaContextFactoryTest { @Test public void testCreateSchemaContextWithDuplicateRequiredSources() throws InterruptedException, ExecutionException { final SharedSchemaContextFactory sharedSchemaContextFactory = new SharedSchemaContextFactory(repository, - filter); + config); final ListenableFuture schemaContext = sharedSchemaContextFactory.createSchemaContext(Arrays.asList(s1, s1, s2)); assertNotNull(schemaContext.get()); @@ -83,7 +84,7 @@ public class SharedSchemaContextFactoryTest { sIdWithoutRevision, ASTSchemaSource.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue())); final SharedSchemaContextFactory sharedSchemaContextFactory = new SharedSchemaContextFactory(repository, - filter); + config); final ListenableFuture schemaContext = sharedSchemaContextFactory.createSchemaContext(Arrays.asList(sIdWithoutRevision, provider.getId())); assertNotNull(schemaContext.get()); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java index c659ceec47..5583e1f2bb 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryTest.java @@ -20,7 +20,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateFluentFuture; -import static org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceFilter.ALWAYS_ACCEPT; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableList; @@ -94,7 +93,7 @@ public class SharedSchemaRepositoryTest { remoteInetTypesYang.getId(), ASTSchemaSource.class); assertFalse(registeredSourceFuture.isDone()); - final SchemaContextFactory fact = sharedSchemaRepository.createSchemaContextFactory(ALWAYS_ACCEPT); + final SchemaContextFactory fact = sharedSchemaRepository.createSchemaContextFactory(); final ListenableFuture schemaContextFuture = fact.createSchemaContext(ImmutableList.of(remoteInetTypesYang.getId())); @@ -110,8 +109,7 @@ public class SharedSchemaRepositoryTest { assertSchemaContext(firstSchemaContext, 1); // Try same schema second time - final ListenableFuture secondSchemaFuture = sharedSchemaRepository - .createSchemaContextFactory(ALWAYS_ACCEPT) + final ListenableFuture secondSchemaFuture = sharedSchemaRepository.createSchemaContextFactory() .createSchemaContext(ImmutableList.of(remoteInetTypesYang.getId())); // Verify second schema created successfully immediately @@ -136,7 +134,7 @@ public class SharedSchemaRepositoryTest { getImmediateYangSourceProviderFromResource("/no-revision/module-without-revision.yang"); remoteModuleNoRevYang.register(sharedSchemaRepository); - final SchemaContextFactory fact = sharedSchemaRepository.createSchemaContextFactory(ALWAYS_ACCEPT); + final SchemaContextFactory fact = sharedSchemaRepository.createSchemaContextFactory(); final ListenableFuture inetAndTopologySchemaContextFuture = fact .createSchemaContext(ImmutableList.of(remoteInetTypesYang.getId(), remoteTopologyYang.getId())); assertTrue(inetAndTopologySchemaContextFuture.isDone()); @@ -159,7 +157,7 @@ public class SharedSchemaRepositoryTest { "/ietf/ietf-inet-types@2010-09-24.yang"); remoteInetTypesYang.register(sharedSchemaRepository); - final SchemaContextFactory fact = sharedSchemaRepository.createSchemaContextFactory(ALWAYS_ACCEPT); + final SchemaContextFactory fact = sharedSchemaRepository.createSchemaContextFactory(); // Make source appear final Throwable ex = new IllegalStateException("failed schema"); @@ -194,8 +192,7 @@ public class SharedSchemaRepositoryTest { remoteInetTypesYang.register(sharedSchemaRepository); remoteInetTypesYang.setResult(); - final SchemaContextFactory fact = sharedSchemaRepository.createSchemaContextFactory(ALWAYS_ACCEPT); - + final SchemaContextFactory fact = sharedSchemaRepository.createSchemaContextFactory(); final ListenableFuture schemaContextFuture = fact.createSchemaContext(ImmutableList.of(remoteInetTypesYang.getId())); @@ -292,7 +289,8 @@ public class SharedSchemaRepositoryTest { // Request schema to make repository notify the cache final ListenableFuture schemaFuture = sharedSchemaRepository - .createSchemaContextFactory(ALWAYS_ACCEPT).createSchemaContext(ImmutableList.of(runningId)); + .createSchemaContextFactory() + .createSchemaContext(ImmutableList.of(runningId)); Futures.addCallback(schemaFuture, new FutureCallback() { @Override public void onSuccess(final SchemaContext result) { diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java index d1a2b5cd04..f6832e463a 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/repo/SharedSchemaRepositoryWithFeaturesTest.java @@ -24,7 +24,6 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory; -import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceFilter; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; import org.opendaylight.yangtools.yang.parser.rfc7950.repo.ASTSchemaSource; import org.opendaylight.yangtools.yang.parser.rfc7950.repo.TextToASTTransformer; @@ -43,9 +42,7 @@ public class SharedSchemaRepositoryWithFeaturesTest { foobar.register(sharedSchemaRepository); foobar.setResult(); - final SchemaContextFactory fact = sharedSchemaRepository - .createSchemaContextFactory(SchemaSourceFilter.ALWAYS_ACCEPT); - + final SchemaContextFactory fact = sharedSchemaRepository.createSchemaContextFactory(); final ListenableFuture testSchemaContextFuture = fact.createSchemaContext(ImmutableList.of(foobar.getId()), supportedFeatures); assertTrue(testSchemaContextFuture.isDone()); @@ -84,9 +81,7 @@ public class SharedSchemaRepositoryWithFeaturesTest { foobar.register(sharedSchemaRepository); foobar.setResult(); - final SchemaContextFactory fact = sharedSchemaRepository - .createSchemaContextFactory(SchemaSourceFilter.ALWAYS_ACCEPT); - + final SchemaContextFactory fact = sharedSchemaRepository.createSchemaContextFactory(); final ListenableFuture testSchemaContextFuture = fact.createSchemaContext(ImmutableList.of(foobar.getId())); assertTrue(testSchemaContextFuture.isDone()); @@ -130,9 +125,7 @@ public class SharedSchemaRepositoryWithFeaturesTest { foobar.register(sharedSchemaRepository); foobar.setResult(); - final SchemaContextFactory fact = sharedSchemaRepository - .createSchemaContextFactory(SchemaSourceFilter.ALWAYS_ACCEPT); - + final SchemaContextFactory fact = sharedSchemaRepository.createSchemaContextFactory(); final ListenableFuture testSchemaContextFuture = fact.createSchemaContext(ImmutableList.of(foobar.getId()), supportedFeatures); assertTrue(testSchemaContextFuture.isDone()); -- 2.36.6