Merge pull request #239 from eclipse/fixes-repository

Fixes specialization repositories when it uses CrudRepository

Author: otaviojava

CHANGELOG.adoc

@@ -8,6 +8,10 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version
 
 == [Unreleased]
 
+=== Fixed
+
+- Fixes Repositories specializations when use methods from CrudRepository
+
 === Added
 
 - Add BucketManagerFactory by injection to Redis

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBBucketManager.java

@@ -16,17 +16,13 @@
 
 
 import com.arangodb.ArangoDB;
-
 import com.arangodb.entity.BaseDocument;
+import jakarta.json.bind.Jsonb;
 import org.eclipse.jnosql.communication.Value;
-import org.eclipse.jnosql.communication.keyvalue.BucketManager;
-import org.eclipse.jnosql.communication.keyvalue.KeyValueEntity;
 import org.eclipse.jnosql.communication.driver.JsonbSupplier;
 import org.eclipse.jnosql.communication.driver.ValueJSON;
-
-import jakarta.json.bind.Jsonb;
-
-
+import org.eclipse.jnosql.communication.keyvalue.BucketManager;
+import org.eclipse.jnosql.communication.keyvalue.KeyValueEntity;
 
 import java.time.Duration;
 import java.util.Objects;

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBBucketManagerFactory.java

@@ -17,7 +17,6 @@
 import com.arangodb.ArangoDB;
 import org.eclipse.jnosql.communication.keyvalue.BucketManagerFactory;
 
-
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBBuilders.java

@@ -17,7 +17,6 @@
 import com.arangodb.Protocol;
 import com.arangodb.entity.LoadBalancingStrategy;
 import org.eclipse.jnosql.communication.Configurations;
-
 import org.eclipse.jnosql.communication.Settings;
 
 import java.util.Arrays;

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBConfiguration.java

@@ -19,7 +19,6 @@
 import com.arangodb.entity.LoadBalancingStrategy;
 import org.eclipse.jnosql.communication.Settings;
 
-
 import static java.util.Objects.requireNonNull;
 
 /**

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBDocumentConfiguration.java

@@ -19,7 +19,6 @@
 import org.eclipse.jnosql.communication.Settings;
 import org.eclipse.jnosql.communication.document.DocumentConfiguration;
 
-
 import static java.util.Objects.requireNonNull;
 
 /**

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/communication/ArangoDBDocumentManager.java

@@ -15,10 +15,8 @@
 package org.eclipse.jnosql.databases.arangodb.communication;
 
 import org.eclipse.jnosql.communication.document.DocumentEntity;
-
 import org.eclipse.jnosql.communication.document.DocumentManager;
 
-
 import java.util.Map;
 import java.util.stream.Stream;
 

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/communication/QueryAQLConverter.java

@@ -15,7 +15,6 @@
 package org.eclipse.jnosql.databases.arangodb.communication;
 
 import jakarta.data.repository.Direction;
-
 import jakarta.data.repository.Sort;
 import org.eclipse.jnosql.communication.TypeReference;
 import org.eclipse.jnosql.communication.document.Document;

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBDocumentRepositoryProxy.java

@@ -16,9 +16,13 @@
 
 
 import jakarta.data.repository.PageableRepository;
+import org.eclipse.jnosql.mapping.Converters;
+import org.eclipse.jnosql.mapping.document.JNoSQLDocumentTemplate;
+import org.eclipse.jnosql.mapping.document.query.AbstractDocumentRepositoryProxy;
+import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
+import org.eclipse.jnosql.mapping.metadata.EntityMetadata;
 import org.eclipse.jnosql.mapping.repository.DynamicReturn;
 
-import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.util.Map;
@@ -28,25 +32,60 @@
 import static java.util.Collections.emptyMap;
 import static org.eclipse.jnosql.mapping.repository.DynamicReturn.toSingleResult;
 
-class ArangoDBDocumentRepositoryProxy<T> implements InvocationHandler {
+class ArangoDBDocumentRepositoryProxy<T> extends AbstractDocumentRepositoryProxy<T> {
 
     private final Class<T> typeClass;
 
     private final ArangoDBTemplate template;
 
     private final PageableRepository<?, ?> repository;
 
+    private final Class<?> repositoryType;
 
-    ArangoDBDocumentRepositoryProxy(ArangoDBTemplate template, Class<?> repositoryType, PageableRepository<?, ?> repository) {
+    private final Converters converters;
+
+    private final EntityMetadata entityMetadata;
+
+    ArangoDBDocumentRepositoryProxy(ArangoDBTemplate template, Class<?> repositoryType,
+                                    PageableRepository<?, ?> repository, Converters converters,
+                                    EntitiesMetadata entitiesMetadata) {
         this.template = template;
         this.typeClass = Class.class.cast(ParameterizedType.class.cast(repositoryType.getGenericInterfaces()[0])
                 .getActualTypeArguments()[0]);
         this.repository = repository;
+        this.repositoryType = repositoryType;
+        this.converters = converters;
+        this.entityMetadata = entitiesMetadata.get(typeClass);
+    }
+
+
+    @Override
+    protected PageableRepository getRepository() {
+        return repository;
+    }
+
+    @Override
+    protected Class<?> repositoryType() {
+        return repositoryType;
     }
 
+    @Override
+    protected Converters getConverters() {
+        return converters;
+    }
 
     @Override
-    public Object invoke(Object o, Method method, Object[] args) throws Throwable {
+    protected EntityMetadata getEntityMetadata() {
+        return entityMetadata;
+    }
+
+    @Override
+    protected JNoSQLDocumentTemplate getTemplate() {
+        return template;
+    }
+
+    @Override
+    public Object invoke(Object instance, Method method, Object[] args) throws Throwable {
 
         AQL aql = method.getAnnotation(AQL.class);
         if (Objects.nonNull(aql)) {
@@ -64,8 +103,9 @@ public Object invoke(Object o, Method method, Object[] args) throws Throwable {
                     .withSingleResult(toSingleResult(method).apply(() -> result))
                     .build().execute();
         }
-        return method.invoke(repository, args);
+        return super.invoke(instance, method, args);
     }
 
 
+
 }

jnosql-arangodb/src/main/java/org/eclipse/jnosql/databases/arangodb/mapping/ArangoDBRepositoryBean.java

@@ -18,7 +18,9 @@
 import jakarta.enterprise.context.spi.CreationalContext;
 import jakarta.enterprise.inject.Default;
 import jakarta.enterprise.util.AnnotationLiteral;
+import org.eclipse.jnosql.mapping.Converters;
 import org.eclipse.jnosql.mapping.document.query.DocumentRepositoryProducer;
+import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 import org.eclipse.jnosql.mapping.spi.AbstractBean;
 
 import java.lang.annotation.Annotation;
@@ -52,10 +54,11 @@ public Class<?> getBeanClass() {
     public ArangoDBRepository create(CreationalContext<ArangoDBRepository> creationalContext) {
         ArangoDBTemplate template = getInstance(ArangoDBTemplate.class);
         DocumentRepositoryProducer producer = getInstance(DocumentRepositoryProducer.class);
-
+        Converters converters = getInstance(Converters.class);
+        EntitiesMetadata entitiesMetadata = getInstance(EntitiesMetadata.class);
         PageableRepository<Object, Object> repository = producer.get((Class<PageableRepository<Object, Object>>) type, template);
 
-        ArangoDBDocumentRepositoryProxy handler = new ArangoDBDocumentRepositoryProxy(template,type, repository);
+        ArangoDBDocumentRepositoryProxy handler = new ArangoDBDocumentRepositoryProxy(template,type, repository, converters, entitiesMetadata);
         return (ArangoDBRepository) Proxy.newProxyInstance(type.getClassLoader(),
                 new Class[]{type},
                 handler);