Drop ContainerResolver interface

The abstraction doesn't provide any value
immutables · Dec 7, 2019 · cb9d064 · cb9d064
1 parent 6b724a7
commit cb9d064
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 34 deletions.
diff --git a/criteria/common/src/org/immutables/criteria/backend/ContainerResolver.java b/criteria/common/src/org/immutables/criteria/backend/ContainerResolver.java
diff --git a/criteria/elasticsearch/src/org/immutables/criteria/elasticsearch/IndexResolver.java b/criteria/elasticsearch/src/org/immutables/criteria/elasticsearch/IndexResolver.java
@@ -17,11 +17,13 @@
 package org.immutables.criteria.elasticsearch;
 
 import org.immutables.criteria.backend.ContainerNaming;
-import org.immutables.criteria.backend.ContainerResolver;
 
-public interface IndexResolver extends ContainerResolver<String> {
+public interface IndexResolver {
 
-  @Override
+  /**
+   * Resolve elastic index name given a class
+   * @param entityType
+   */
   String resolve(Class<?> entityType);
 
   /**

diff --git a/criteria/geode/src/org/immutables/criteria/geode/RegionResolver.java b/criteria/geode/src/org/immutables/criteria/geode/RegionResolver.java
@@ -19,11 +19,16 @@
 import org.apache.geode.cache.GemFireCache;
 import org.apache.geode.cache.Region;
 import org.immutables.criteria.backend.ContainerNaming;
-import org.immutables.criteria.backend.ContainerResolver;
 
 import java.util.Objects;
 
-public interface RegionResolver extends ContainerResolver<Region<?, ?>> {
+public interface RegionResolver {
+
+  /**
+   * Given a class resolve associated geode {@link Region}
+   * @param entityType type
+   */
+  Region<?, ?> resolve(Class<?> entityType);
 
   /**
    * Resolve region using default {@link ContainerNaming#DEFAULT} naming convention.

diff --git a/criteria/mongo/src/org/immutables/criteria/mongo/CollectionResolver.java b/criteria/mongo/src/org/immutables/criteria/mongo/CollectionResolver.java
@@ -20,14 +20,21 @@
 import com.mongodb.reactivestreams.client.MongoDatabase;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.immutables.criteria.backend.ContainerNaming;
-import org.immutables.criteria.backend.ContainerResolver;
 
 import java.util.Objects;
 
 /**
  * {@link MongoCollection} resolver for a particular class
  */
-public interface CollectionResolver extends ContainerResolver<MongoCollection<?>> {
+public interface CollectionResolver {
+
+  /**
+   * Given a class resolve associated collection with document class and
+   * {@link CodecRegistry} already set
+   *
+   * @param entityType type
+   */
+  MongoCollection<?> resolve(Class<?> entityType);
 
   static CollectionResolver defaultResolver(MongoDatabase database, CodecRegistry registry) {
     Objects.requireNonNull(database, "database");