feat: update Cassandra repository using proxy

Signed-off-by: Otavio Santana <[email protected]>

Author: otaviojava

jnosql-cassandra/src/main/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraRepositoryBean.java

@@ -30,16 +30,16 @@
 import java.util.Set;
 
 
-class CassandraRepositoryBean extends AbstractBean<CassandraRepository> {
+class CassandraRepositoryBean<T, K> extends AbstractBean<CassandraRepository<T, K>> {
 
-    private final Class<?> type;
+    private final Class<T> type;
 
     private final Set<Type> types;
 
     private final Set<Annotation> qualifiers = Collections.singleton(new AnnotationLiteral<Default>() {
     });
 
-    CassandraRepositoryBean(Class<?> type) {
+    CassandraRepositoryBean(Class<T> type) {
         this.type = type;
         this.types = Collections.singleton(type);
     }
@@ -49,16 +49,15 @@ public Class<?> getBeanClass() {
         return type;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public CassandraRepository create(CreationalContext<CassandraRepository> creationalContext) {
+    public CassandraRepository<T, K> create(CreationalContext<CassandraRepository<T, K>> creationalContext) {
         CassandraTemplate template = getInstance(CassandraTemplate.class);
-        ColumnRepositoryProducer producer = getInstance(ColumnRepositoryProducer.class);
-        PageableRepository<?,?> repository = producer.get((Class<PageableRepository<Object, Object>>) type, template);
         Converters converters = getInstance(Converters.class);
         EntitiesMetadata entitiesMetadata = getInstance(EntitiesMetadata.class);
-        CassandraRepositoryProxy handler = new CassandraRepositoryProxy(template, type, repository,
+        CassandraRepositoryProxy<T, K> handler = new CassandraRepositoryProxy<>(template, type,
                 converters, entitiesMetadata);
-        return (CassandraRepository) Proxy.newProxyInstance(type.getClassLoader(),
+        return (CassandraRepository<T, K>) Proxy.newProxyInstance(type.getClassLoader(),
                 new Class[]{type},
                 handler);
     }

jnosql-cassandra/src/main/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraRepositoryProxy.java

@@ -15,10 +15,11 @@
 package org.eclipse.jnosql.databases.cassandra.mapping;
 
 
-import jakarta.data.repository.PageableRepository;
+import org.eclipse.jnosql.mapping.column.query.ColumnRepositoryProxy;
 import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.column.JNoSQLColumnTemplate;
 import org.eclipse.jnosql.mapping.column.query.AbstractColumnRepositoryProxy;
+import org.eclipse.jnosql.mapping.core.query.AbstractRepository;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 import org.eclipse.jnosql.mapping.metadata.EntityMetadata;
 import org.eclipse.jnosql.mapping.core.repository.DynamicReturn;
@@ -37,7 +38,7 @@ class CassandraRepositoryProxy<T, K> extends AbstractColumnRepositoryProxy<T, K>
 
     private final CassandraTemplate template;
 
-    private final PageableRepository<T,?> repository;
+    private final AbstractRepository<T,K> repository;
 
     private final Converters converters;
 
@@ -46,25 +47,25 @@ class CassandraRepositoryProxy<T, K> extends AbstractColumnRepositoryProxy<T, K>
     private final Class<?> repositoryType;
 
     CassandraRepositoryProxy(CassandraTemplate template, Class<?> repositoryType,
-                             PageableRepository<T, ?> 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.converters = converters;
         this.entityMetadata = entitiesMetadata.get(typeClass);
         this.repositoryType = repositoryType;
+        this.repository = ColumnRepositoryProxy.ColumnRepository.of(template, entityMetadata);
     }
 
     @Override
-    protected PageableRepository getRepository() {
+    protected AbstractRepository<T, K> repository() {
         return repository;
     }
 
     @Override
-    protected Converters getConverters() {
+    protected Converters converters() {
         return converters;
     }
 
@@ -74,12 +75,12 @@ protected Class<?> repositoryType() {
     }
 
     @Override
-    protected EntityMetadata getEntityMetadata() {
+    protected EntityMetadata entityMetadata() {
         return entityMetadata;
     }
 
     @Override
-    protected JNoSQLColumnTemplate getTemplate() {
+    protected JNoSQLColumnTemplate template() {
         return template;
     }
 

jnosql-cassandra/src/test/java/org/eclipse/jnosql/databases/cassandra/mapping/CassandraRepositoryProxyTest.java

@@ -54,9 +54,6 @@ public class CassandraRepositoryProxyTest {
 
     private CassandraTemplate template;
 
-    @Inject
-    private ColumnRepositoryProducer producer;
-
     @Inject
     private Converters converters;
 
@@ -68,9 +65,8 @@ public class CassandraRepositoryProxyTest {
     @BeforeEach
     public void setUp() {
         this.template = Mockito.mock(CassandraTemplate.class);
-        PersonRepository personRepository = producer.get(PersonRepository.class, template);
         CassandraRepositoryProxy handler = new CassandraRepositoryProxy(template,
-                PersonRepository.class, personRepository, converters, entitiesMetadata);
+                PersonRepository.class, converters, entitiesMetadata);
 
         when(template.insert(any(Person.class))).thenReturn(new Person());
         when(template.insert(any(Person.class), any(Duration.class))).thenReturn(new Person());