X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Frepo%2FSharedSchemaRepository.java;h=b25cbeed8890c95b373069eb9de154ccab330c79;hb=ec7bce2e607ae67c783df0490c03ec0bc61d598c;hp=6c615b58a9414613e9fc7eac24ed92b13657ac04;hpb=30d51f4c77264c9b3904caf3a544d38345f7a462;p=yangtools.git

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 6c615b58a9..b25cbeed88 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
@@ -7,17 +7,19 @@
  */
 package org.opendaylight.yangtools.yang.parser.repo;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
+import org.kohsuke.MetaInfServices;
 import org.opendaylight.yangtools.concepts.Identifiable;
 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.EffectiveModelContextFactory;
+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;
 
@@ -28,28 +30,32 @@ import org.opendaylight.yangtools.yang.model.repo.util.AbstractSchemaRepository;
  * Note: for current implementation, "same" means the same filter and the same set of {@link SourceIdentifier}s.
  */
 @Beta
+@MetaInfServices(value = SchemaRepository.class)
 public final class SharedSchemaRepository extends AbstractSchemaRepository implements Identifiable<String> {
-    private final LoadingCache<SchemaSourceFilter, SchemaContextFactory> cache =
-            CacheBuilder.newBuilder().softValues().build(new CacheLoader<SchemaSourceFilter, SchemaContextFactory>() {
+    private final LoadingCache<SchemaContextFactoryConfiguration, EffectiveModelContextFactory> cacheByConfig =
+            CacheBuilder.newBuilder().softValues()
+            .build(new CacheLoader<SchemaContextFactoryConfiguration, EffectiveModelContextFactory>() {
                 @Override
-                public SchemaContextFactory load(@Nonnull final SchemaSourceFilter key) {
+                public EffectiveModelContextFactory load(final SchemaContextFactoryConfiguration key) {
                     return new SharedSchemaContextFactory(SharedSchemaRepository.this, key);
                 }
             });
-    private final String id;
+
+    private final @NonNull String id;
 
     public SharedSchemaRepository(final String id) {
-        this.id = Preconditions.checkNotNull(id);
+        this.id = requireNonNull(id);
     }
 
     @Override
-    public String getIdentifier() {
+    public @NonNull String getIdentifier() {
         return id;
     }
 
     @Override
-    public SchemaContextFactory createSchemaContextFactory(@Nonnull final SchemaSourceFilter filter) {
-        return cache.getUnchecked(filter);
+    public @NonNull EffectiveModelContextFactory createEffectiveModelContextFactory(
+            final @NonNull SchemaContextFactoryConfiguration config) {
+        return cacheByConfig.getUnchecked(config);
     }
 
     @Override