Refactored Spring Data REST Invokers integration

la-team · Sep 3, 2014 · e4e58fa · e4e58fa
1 parent de42007
commit e4e58fa
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 39 deletions.
diff --git a/...ain/java/org/lightadmin/core/config/context/LightAdminRepositoryRestMvcConfiguration.java b/...ain/java/org/lightadmin/core/config/context/LightAdminRepositoryRestMvcConfiguration.java
@@ -33,7 +33,7 @@
 import org.springframework.data.repository.support.Repositories;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.data.rest.core.event.ValidatingRepositoryEventListener;
-import org.springframework.data.rest.core.invoke.DynamicRepositoryInvokerFactory;
+import org.lightadmin.core.persistence.repository.invoker.DynamicRepositoryInvokerFactory;
 import org.springframework.data.rest.core.invoke.RepositoryInvokerFactory;
 import org.springframework.data.rest.core.support.DomainObjectMerger;
 import org.springframework.data.rest.webmvc.RepositoryRestController;
@@ -93,7 +93,9 @@ public DomainObjectMerger domainObjectMerger() throws Exception {
 
     @Bean
     public RepositoryInvokerFactory repositoryInvokerFactory() {
-        return new DynamicRepositoryInvokerFactory(repositories(), defaultConversionService());
+        RepositoryInvokerFactory repositoryInvokerFactory = super.repositoryInvokerFactory();
+
+        return new DynamicRepositoryInvokerFactory(repositories(), repositoryInvokerFactory);
     }
 
     @Bean

diff --git a/...core/invoke/DynamicRepositoryInvoker.java → ...ory/invoker/DynamicRepositoryInvoker.java b/...core/invoke/DynamicRepositoryInvoker.java → ...ory/invoker/DynamicRepositoryInvoker.java
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.core.invoke;
+package org.lightadmin.core.persistence.repository.invoker;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.rest.core.invoke.RepositoryInvoker;
 
 import java.util.List;
 

diff --git a/...voke/DynamicRepositoryInvokerFactory.java → ...oker/DynamicRepositoryInvokerFactory.java b/...voke/DynamicRepositoryInvokerFactory.java → ...oker/DynamicRepositoryInvokerFactory.java
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.core.invoke;
+package org.lightadmin.core.persistence.repository.invoker;
 
 import org.lightadmin.core.persistence.repository.DynamicJpaRepository;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.support.Repositories;
+import org.springframework.data.rest.core.invoke.RepositoryInvoker;
+import org.springframework.data.rest.core.invoke.RepositoryInvokerFactory;
 import org.springframework.util.Assert;
 
 import java.util.Map;
@@ -27,38 +29,19 @@
 
 public class DynamicRepositoryInvokerFactory implements RepositoryInvokerFactory {
 
+    private final RepositoryInvokerFactory delegate;
     private final Repositories repositories;
-    private final ConversionService conversionService;
-    private final Map<Class<?>, RepositoryInvoker> invokers;
-
-    public DynamicRepositoryInvokerFactory(Repositories repositories, ConversionService conversionService) {
-        Assert.notNull(repositories, "Repositories must not be null!");
-        Assert.notNull(conversionService, "ConversionService must not be null!");
 
+    public DynamicRepositoryInvokerFactory(Repositories repositories, RepositoryInvokerFactory repositoryInvokerFactory) {
         this.repositories = repositories;
-        this.conversionService = conversionService;
-        this.invokers = newHashMap();
-    }
-
-    @SuppressWarnings("unchecked")
-    private RepositoryInvoker prepareInvokers(Class<?> domainType) {
-        DynamicJpaRepository repository = (DynamicJpaRepository) repositories.getRepositoryFor(domainType);
-        RepositoryInformation information = repositories.getRepositoryInformationFor(domainType);
-
-        return new DynamicRepositoryInvokerWrapper(repository, information, conversionService);
+        this.delegate = repositoryInvokerFactory;
     }
 
     @Override
     public RepositoryInvoker getInvokerFor(Class<?> domainType) {
-        RepositoryInvoker invoker = invokers.get(domainType);
+        DynamicJpaRepository dynamicJpaRepository = (DynamicJpaRepository) repositories.getRepositoryFor(domainType);
+        RepositoryInvoker repositoryInvoker = delegate.getInvokerFor(domainType);
 
-        if (invoker != null) {
-            return invoker;
-        }
-
-        invoker = prepareInvokers(domainType);
-        invokers.put(domainType, invoker);
-
-        return invoker;
-    }
+        return new DynamicRepositoryInvokerWrapper(dynamicJpaRepository, repositoryInvoker);
+   }
 }
diff --git a/...voke/DynamicRepositoryInvokerWrapper.java → ...oker/DynamicRepositoryInvokerWrapper.java b/...voke/DynamicRepositoryInvokerWrapper.java → ...oker/DynamicRepositoryInvokerWrapper.java
@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.rest.core.invoke;
+package org.lightadmin.core.persistence.repository.invoker;
 
 import org.lightadmin.core.persistence.repository.DynamicJpaRepository;
-import org.springframework.core.convert.ConversionService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.repository.core.RepositoryInformation;
+import org.springframework.data.rest.core.invoke.RepositoryInvoker;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -31,12 +30,12 @@
 @SuppressWarnings("unchecked")
 public class DynamicRepositoryInvokerWrapper implements DynamicRepositoryInvoker {
 
-    private DynamicJpaRepository<?, ?> repository;
-    private RepositoryInvoker repositoryInvoker;
+    private final DynamicJpaRepository<?, ?> repository;
+    private final RepositoryInvoker repositoryInvoker;
 
-    public DynamicRepositoryInvokerWrapper(DynamicJpaRepository<Object, Serializable> repository, RepositoryInformation information, ConversionService conversionService) {
-        this.repository = repository;
-        this.repositoryInvoker = new PagingAndSortingRepositoryInvoker(repository, information, conversionService);
+    public DynamicRepositoryInvokerWrapper(DynamicJpaRepository dynamicRepository, RepositoryInvoker repositoryInvoker) {
+        this.repository = dynamicRepository;
+        this.repositoryInvoker = repositoryInvoker;
     }
 
     @Override

diff --git a/lightadmin-core/src/main/java/org/lightadmin/core/web/RepositoryScopedSearchController.java b/lightadmin-core/src/main/java/org/lightadmin/core/web/RepositoryScopedSearchController.java
@@ -31,7 +31,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.mapping.PersistentEntity;
-import org.springframework.data.rest.core.invoke.DynamicRepositoryInvoker;
+import org.lightadmin.core.persistence.repository.invoker.DynamicRepositoryInvoker;
 import org.springframework.data.rest.webmvc.PersistentEntityResourceAssembler;
 import org.springframework.data.rest.webmvc.RepositoryRestController;
 import org.springframework.data.rest.webmvc.RootResourceInformation;