Remove deprecated SchemaRepository.createSchemaContextFactory()

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / repo / SharedSchemaRepository.java

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 6e4bf20070968f3cc006153be3b2a1fec6dfcb99..86e9503d6614a673f2c143a602bd68f588658845 100644 (file)
--- 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,19 +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.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;
 
@@ -32,43 +32,29 @@ import org.opendaylight.yangtools.yang.model.repo.util.AbstractSchemaRepository;
 @Beta
 @MetaInfServices(value = SchemaRepository.class)
 public final class SharedSchemaRepository extends AbstractSchemaRepository implements Identifiable<String> {
-    @Deprecated
-    private final LoadingCache<SchemaSourceFilter, SchemaContextFactory> cacheByFilter = CacheBuilder.newBuilder()
-            .softValues().build(new CacheLoader<SchemaSourceFilter, SchemaContextFactory>() {
-                @Override
-                public SchemaContextFactory load(@Nonnull final SchemaSourceFilter key) {
-                    return new SharedSchemaContextFactory(SharedSchemaRepository.this, key);
-                }
-            });
-
     private final LoadingCache<SchemaContextFactoryConfiguration, SchemaContextFactory> cacheByConfig = CacheBuilder
             .newBuilder().softValues()
             .build(new CacheLoader<SchemaContextFactoryConfiguration, SchemaContextFactory>() {
                 @Override
-                public SchemaContextFactory load(@Nonnull final SchemaContextFactoryConfiguration key) {
+                public SchemaContextFactory 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
-    @Deprecated
-    public SchemaContextFactory createSchemaContextFactory(@Nonnull final SchemaSourceFilter filter) {
-        return cacheByFilter.getUnchecked(filter);
-    }
-
-    @Override
-    public SchemaContextFactory createSchemaContextFactory(@Nonnull final SchemaContextFactoryConfiguration config) {
+    public @NonNull SchemaContextFactory createSchemaContextFactory(
+            final @NonNull SchemaContextFactoryConfiguration config) {
         return cacheByConfig.getUnchecked(config);
     }