Merge pull request #499 from eclipse/upgrade-api

Upgrade jakarta DAta API
eclipse · Apr 10, 2024 · 757c62e · 757c62e
2 parents 2e8fc55 + 10111c4
commit 757c62e
Show file tree

Hide file tree

Showing 41 changed files with 128 additions and 158 deletions.
diff --git a/...ed/src/test/java/org/eclipse/jnosql/communication/semistructured/DatabaseManagerTest.java b/...ed/src/test/java/org/eclipse/jnosql/communication/semistructured/DatabaseManagerTest.java
@@ -137,7 +137,8 @@ void shouldReturnPaginationAfterKeySingleElementWhenConditionIsNull() {
 
         var id = UUID.randomUUID().toString();
         CursoredPage<CommunicationEntity> entities = databaseManager.selectCursor(query,
-                PageRequest.ofSize(10).afterKey("Ada", 20, id));
+                PageRequest.afterCursor(PageRequest.Cursor.forKey("Ada", 20, id), 1, 10 ,false));
+
 
         ArgumentCaptor<SelectQuery> captor = ArgumentCaptor.forClass(SelectQuery.class);
         Mockito.verify(databaseManager).select(captor.capture());
@@ -192,7 +193,8 @@ void shouldReturnPaginationAfterKeySingleElementWhenThereIsCondition() {
 
         var id = UUID.randomUUID().toString();
         CursoredPage<CommunicationEntity> entities = databaseManager.selectCursor(query,
-                PageRequest.ofSize(10).afterKey("Ada", 20, id));
+                PageRequest.afterCursor(PageRequest.Cursor.forKey("Ada", 20, id), 1, 10 ,false));
+
 
         ArgumentCaptor<SelectQuery> captor = ArgumentCaptor.forClass(SelectQuery.class);
         Mockito.verify(databaseManager).select(captor.capture());
@@ -250,8 +252,7 @@ void shouldFindSubElement() {
         Mockito.when(databaseManager.select(Mockito.any(SelectQuery.class)))
                 .thenReturn(streamSubDocument());
         CursoredPage<CommunicationEntity> entities = databaseManager.selectCursor(query,
-                PageRequest.ofSize(10).afterKey("Paulista Avenue"));
-
+                PageRequest.afterCursor(PageRequest.Cursor.forKey("Paulista Avenue"), 1, 10 ,false));
 
         assertSoftly(soft -> {
             PageRequest nextedPageRequest = entities.nextPageRequest();
@@ -263,8 +264,6 @@ void shouldFindSubElement() {
         });
     }
 
-
-
     @Test
     void shouldReturnPaginationBeforeKeySingleElementWhenConditionIsNull() {
         SelectQuery query = SelectQuery.select().from("person")
@@ -277,7 +276,7 @@ void shouldReturnPaginationBeforeKeySingleElementWhenConditionIsNull() {
 
         var id = UUID.randomUUID().toString();
         CursoredPage<CommunicationEntity> entities = databaseManager.selectCursor(query,
-                PageRequest.ofSize(10).beforeKey("Ada", 20, id));
+                PageRequest.beforeCursor(PageRequest.Cursor.forKey("Ada", 20, id), 1, 10 ,false));
 
         ArgumentCaptor<SelectQuery> captor = ArgumentCaptor.forClass(SelectQuery.class);
         Mockito.verify(databaseManager).select(captor.capture());
@@ -332,7 +331,8 @@ void shouldReturnPaginationBeforeKeySingleElementWhenThereIsCondition() {
 
         var id = UUID.randomUUID().toString();
         CursoredPage<CommunicationEntity> entities = databaseManager.selectCursor(query,
-                PageRequest.ofSize(10).beforeKey("Ada", 20, id));
+                PageRequest.beforeCursor(PageRequest.Cursor.forKey("Ada", 20, id), 1, 10 ,false));
+
 
         ArgumentCaptor<SelectQuery> captor = ArgumentCaptor.forClass(SelectQuery.class);
         Mockito.verify(databaseManager).select(captor.capture());
@@ -394,7 +394,7 @@ void shouldReturnPaginationAfterKeyAndReturnEmpty() {
 
         var id = UUID.randomUUID().toString();
         CursoredPage<CommunicationEntity> entities = databaseManager.selectCursor(query,
-                PageRequest.ofSize(10).afterKey("Ada", 20, id));
+                PageRequest.afterCursor(PageRequest.Cursor.forKey("Ada", 20, id), 1, 10 ,false));
 
         assertSoftly(soft -> {
             PageRequest pageRequest = entities.pageRequest();
@@ -420,7 +420,7 @@ void shouldReturnPaginationBeforeKeyAndReturnEmpty() {
 
         var id = UUID.randomUUID().toString();
         CursoredPage<CommunicationEntity> entities = databaseManager.selectCursor(query,
-                PageRequest.ofSize(10).beforeKey("Ada", 20, id));
+                PageRequest.beforeCursor(PageRequest.Cursor.forKey("Ada", 20, id), 1, 10 ,false));
 
         assertSoftly(soft -> {
             PageRequest pageRequest = entities.pageRequest();
@@ -441,7 +441,8 @@ void shouldReturnErrorSortSizeDifferentFromOrderSizeBeforeKey() {
                 .orderBy("id").asc().build();
 
         assertThrows(IllegalArgumentException.class, () -> databaseManager.selectCursor(query,
-                PageRequest.ofSize(10).beforeKey("Ada", 20)));
+                PageRequest.beforeCursor(PageRequest.Cursor.forKey("Ada", 20), 1, 10 ,false)));
+
     }
 
     @Test
@@ -452,7 +453,8 @@ void shouldReturnErrorSortSizeDifferentFromOrderSizeAfterKey() {
                 .orderBy("id").asc().build();
 
         assertThrows(IllegalArgumentException.class, () -> databaseManager.selectCursor(query,
-                PageRequest.ofSize(10).afterKey("Ada", 20)));
+                PageRequest.afterCursor(PageRequest.Cursor.forKey("Ada", 20), 1, 10 ,false)));
+
     }
 
     @Test

diff --git a/...jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnTemplate.java b/...jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnTemplate.java
@@ -18,11 +18,11 @@
 
 
 
-import org.eclipse.jnosql.mapping.semistructured.SemistructuredTemplate;
+import org.eclipse.jnosql.mapping.semistructured.SemiStructuredTemplate;
 
 
 /**
- * This interface extends the {@link SemistructuredTemplate} and represents a template for performing
+ * This interface extends the {@link SemiStructuredTemplate} and represents a template for performing
  * column-based operations in a semistructured database.
  * <p>
  * Implementations of this interface provide methods for CRUD (Create, Read, Update, Delete) operations
@@ -33,9 +33,9 @@
  * abstracting away the complexities of the underlying database operations and providing a unified API for database access.
  * </p>
  *
- * @see SemistructuredTemplate
+ * @see SemiStructuredTemplate
  */
-public interface ColumnTemplate extends SemistructuredTemplate {
+public interface ColumnTemplate extends SemiStructuredTemplate {
 
 
 }
diff --git a/...apping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnTemplateProducer.java b/...apping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnTemplateProducer.java
@@ -20,7 +20,7 @@
 import org.eclipse.jnosql.communication.semistructured.DatabaseManager;
 import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
-import org.eclipse.jnosql.mapping.semistructured.AbstractSemistructuredTemplate;
+import org.eclipse.jnosql.mapping.semistructured.AbstractSemiStructuredTemplate;
 import org.eclipse.jnosql.mapping.semistructured.EntityConverter;
 import org.eclipse.jnosql.mapping.semistructured.EventPersistManager;
 
@@ -73,10 +73,10 @@ public ColumnTemplate apply(DatabaseManager manager) {
 
     /**
      * Inner class that serves as the actual implementation of {@link ColumnTemplate}.
-     * It extends {@link AbstractSemistructuredTemplate} and implements {@link ColumnTemplate}.
+     * It extends {@link AbstractSemiStructuredTemplate} and implements {@link ColumnTemplate}.
      */
     @Vetoed
-    static class ProducerColumnTemplate extends AbstractSemistructuredTemplate implements ColumnTemplate {
+    static class ProducerColumnTemplate extends AbstractSemiStructuredTemplate implements ColumnTemplate {
 
         private final EntityConverter converter;
 

diff --git a/...mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplate.java b/...mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplate.java
@@ -22,14 +22,14 @@
 import org.eclipse.jnosql.mapping.Database;
 import org.eclipse.jnosql.mapping.DatabaseType;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
-import org.eclipse.jnosql.mapping.semistructured.AbstractSemistructuredTemplate;
+import org.eclipse.jnosql.mapping.semistructured.AbstractSemiStructuredTemplate;
 import org.eclipse.jnosql.mapping.semistructured.EntityConverter;
 import org.eclipse.jnosql.mapping.semistructured.EventPersistManager;
 
 
 @Default
 @ApplicationScoped
-class DefaultColumnTemplate extends AbstractSemistructuredTemplate implements ColumnTemplate {
+class DefaultColumnTemplate extends AbstractSemiStructuredTemplate implements ColumnTemplate {
 
 
     private final EntityConverter converter;

diff --git a/...ng-column/src/main/java/org/eclipse/jnosql/mapping/column/query/RepositoryColumnBean.java b/...ng-column/src/main/java/org/eclipse/jnosql/mapping/column/query/RepositoryColumnBean.java
@@ -23,7 +23,7 @@
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 import org.eclipse.jnosql.mapping.core.spi.AbstractBean;
 import org.eclipse.jnosql.mapping.core.util.AnnotationLiteralUtil;
-import org.eclipse.jnosql.mapping.semistructured.query.SemistructuredRepositoryProxy;
+import org.eclipse.jnosql.mapping.semistructured.query.SemiStructuredRepositoryProxy;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Proxy;
@@ -87,7 +87,7 @@ public T create(CreationalContext<T> creationalContext) {
                 getInstance(ColumnTemplate.class, DatabaseQualifier.ofColumn(provider));
         var converters = getInstance(Converters.class);
 
-        var handler = new SemistructuredRepositoryProxy<>(template,
+        var handler = new SemiStructuredRepositoryProxy<>(template,
                 entities, type, converters);
         return (T) Proxy.newProxyInstance(type.getClassLoader(),
                 new Class[]{type},

diff --git a/.../src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryExtensionTest.java b/.../src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryExtensionTest.java
@@ -26,7 +26,7 @@
 import org.eclipse.jnosql.mapping.reflection.Reflections;
 import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension;
 import org.eclipse.jnosql.mapping.semistructured.EntityConverter;
-import org.eclipse.jnosql.mapping.semistructured.query.SemistructuredRepositoryProxy;
+import org.eclipse.jnosql.mapping.semistructured.query.SemiStructuredRepositoryProxy;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -36,7 +36,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @EnableAutoWeld
-@AddPackages(value = {Converters.class, EntityConverter.class, SemistructuredRepositoryProxy.class})
+@AddPackages(value = {Converters.class, EntityConverter.class, SemiStructuredRepositoryProxy.class})
 @AddPackages({MockProducer.class, ColumnTemplate.class, Reflections.class})
 @AddExtensions({EntityMetadataExtension.class, ColumnExtension.class})
 class ColumnRepositoryExtensionTest {

diff --git a/...-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/NoSQLPage.java b/...-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/NoSQLPage.java
@@ -82,13 +82,13 @@ public PageRequest pageRequest() {
 
     @Override
     public PageRequest nextPageRequest() {
-        return this.pageRequest.next();
+        return PageRequest.ofPage(this.pageRequest.page() + 1, this.pageRequest.size(), this.pageRequest.requestTotal());
     }
 
 
     @Override
     public PageRequest previousPageRequest() {
-        return this.pageRequest.previous();
+        return PageRequest.ofPage(this.pageRequest.page() - 1, this.pageRequest.size(), this.pageRequest.requestTotal());
     }
 
 

diff --git a/...g-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplate.java b/...g-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplate.java
@@ -22,14 +22,14 @@
 import org.eclipse.jnosql.mapping.DatabaseType;
 import org.eclipse.jnosql.mapping.core.Converters;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
-import org.eclipse.jnosql.mapping.semistructured.AbstractSemistructuredTemplate;
+import org.eclipse.jnosql.mapping.semistructured.AbstractSemiStructuredTemplate;
 import org.eclipse.jnosql.mapping.semistructured.EntityConverter;
 import org.eclipse.jnosql.mapping.semistructured.EventPersistManager;
 
 
 @Default
 @ApplicationScoped
-class DefaultDocumentTemplate extends AbstractSemistructuredTemplate implements DocumentTemplate {
+class DefaultDocumentTemplate extends AbstractSemiStructuredTemplate implements DocumentTemplate {
 
 
     private final EntityConverter converter;

diff --git a/...-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentTemplate.java b/...-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentTemplate.java
@@ -18,11 +18,11 @@
 
 
 
-import org.eclipse.jnosql.mapping.semistructured.SemistructuredTemplate;
+import org.eclipse.jnosql.mapping.semistructured.SemiStructuredTemplate;
 
 
 /**
- * This interface extends the {@link SemistructuredTemplate} and represents a template for performing
+ * This interface extends the {@link SemiStructuredTemplate} and represents a template for performing
  * document-based operations in a semistructured database.
  * <p>
  * Implementations of this interface provide methods for CRUD (Create, Read, Update, Delete) operations
@@ -33,9 +33,9 @@
  * abstracting away the complexities of the underlying database operations and providing a unified API for database access.
  * </p>
  *
- * @see SemistructuredTemplate
+ * @see SemiStructuredTemplate
  */
-public interface DocumentTemplate extends SemistructuredTemplate {
+public interface DocumentTemplate extends SemiStructuredTemplate {
 
 
 }
diff --git a/...-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentTemplateProducer.java b/...-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentTemplateProducer.java
@@ -21,7 +21,7 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Vetoed;
 import jakarta.inject.Inject;
-import org.eclipse.jnosql.mapping.semistructured.AbstractSemistructuredTemplate;
+import org.eclipse.jnosql.mapping.semistructured.AbstractSemiStructuredTemplate;
 import org.eclipse.jnosql.mapping.semistructured.EntityConverter;
 import org.eclipse.jnosql.mapping.semistructured.EventPersistManager;
 
@@ -56,7 +56,7 @@ public DocumentTemplate apply(DatabaseManager manager) {
     }
 
     @Vetoed
-    static class ProducerDocumentTemplate  extends AbstractSemistructuredTemplate implements DocumentTemplate {
+    static class ProducerDocumentTemplate  extends AbstractSemiStructuredTemplate implements DocumentTemplate {
 
         private final EntityConverter converter;
 

diff --git a/...ument/src/main/java/org/eclipse/jnosql/mapping/document/query/RepositoryDocumentBean.java b/...ument/src/main/java/org/eclipse/jnosql/mapping/document/query/RepositoryDocumentBean.java
@@ -23,7 +23,7 @@
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
 import org.eclipse.jnosql.mapping.core.spi.AbstractBean;
 import org.eclipse.jnosql.mapping.core.util.AnnotationLiteralUtil;
-import org.eclipse.jnosql.mapping.semistructured.query.SemistructuredRepositoryProxy;
+import org.eclipse.jnosql.mapping.semistructured.query.SemiStructuredRepositoryProxy;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Proxy;
@@ -89,7 +89,7 @@ public T create(CreationalContext<T> context) {
 
         Converters converters = getInstance(Converters.class);
 
-        var handler = new SemistructuredRepositoryProxy<>(template,
+        var handler = new SemiStructuredRepositoryProxy<>(template,
                 entities, type, converters);
         return (T) Proxy.newProxyInstance(type.getClassLoader(),
                 new Class[]{type},

diff --git a/.../test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryExtensionTest.java b/.../test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryExtensionTest.java
@@ -26,7 +26,7 @@
 import org.eclipse.jnosql.mapping.document.spi.DocumentExtension;
 import org.eclipse.jnosql.mapping.reflection.Reflections;
 import org.eclipse.jnosql.mapping.semistructured.EntityConverter;
-import org.eclipse.jnosql.mapping.semistructured.query.SemistructuredRepositoryProxy;
+import org.eclipse.jnosql.mapping.semistructured.query.SemiStructuredRepositoryProxy;
 import org.jboss.weld.junit5.auto.AddExtensions;
 import org.jboss.weld.junit5.auto.AddPackages;
 import org.jboss.weld.junit5.auto.EnableAutoWeld;
@@ -36,7 +36,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @EnableAutoWeld
-@AddPackages(value = {Converters.class, EntityConverter.class, SemistructuredRepositoryProxy.class})
+@AddPackages(value = {Converters.class, EntityConverter.class, SemiStructuredRepositoryProxy.class})
 @AddPackages({MockProducer.class, DocumentTemplate.class, Reflections.class})
 @AddExtensions({EntityMetadataExtension.class, DocumentExtension.class})
 class DocumentRepositoryExtensionTest {

diff --git a/...l-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractGraphTemplate.java b/...l-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractGraphTemplate.java
@@ -31,7 +31,7 @@
 import org.eclipse.jnosql.mapping.IdNotFoundException;
 import org.eclipse.jnosql.mapping.metadata.EntityMetadata;
 import org.eclipse.jnosql.mapping.metadata.FieldMetadata;
-import org.eclipse.jnosql.mapping.semistructured.AbstractSemistructuredTemplate;
+import org.eclipse.jnosql.mapping.semistructured.AbstractSemiStructuredTemplate;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -50,7 +50,7 @@
 import static java.util.Objects.requireNonNull;
 import static org.apache.tinkerpop.gremlin.structure.T.id;
 
-abstract class AbstractGraphTemplate extends AbstractSemistructuredTemplate implements GraphTemplate {
+abstract class AbstractGraphTemplate extends AbstractSemiStructuredTemplate implements GraphTemplate {
 
     private static final Function<GraphTraversal<?, ?>, GraphTraversal<Vertex, Vertex>> INITIAL_VERTEX =
             g -> (GraphTraversal<Vertex, Vertex>) g;

diff --git a/...ng/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphTemplate.java b/...ng/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphTemplate.java
@@ -17,7 +17,7 @@
 import org.eclipse.jnosql.mapping.PreparedStatement;
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.eclipse.jnosql.mapping.semistructured.SemistructuredTemplate;
+import org.eclipse.jnosql.mapping.semistructured.SemiStructuredTemplate;
 
 import java.util.Collection;
 import java.util.List;
@@ -35,7 +35,7 @@
  *
  * @see org.apache.tinkerpop.gremlin.structure.Graph
  */
-public interface GraphTemplate extends SemistructuredTemplate {
+public interface GraphTemplate extends SemiStructuredTemplate {
 
     /**
      * Deletes a {@link org.apache.tinkerpop.gremlin.structure.Vertex}

diff --git a/...pping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/RepositoryGraphBean.java b/...pping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/RepositoryGraphBean.java
@@ -23,7 +23,7 @@
 import org.eclipse.jnosql.mapping.core.util.AnnotationLiteralUtil;
 import org.eclipse.jnosql.mapping.graph.GraphTemplate;
 import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata;
-import org.eclipse.jnosql.mapping.semistructured.query.SemistructuredRepositoryProxy;
+import org.eclipse.jnosql.mapping.semistructured.query.SemiStructuredRepositoryProxy;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Proxy;
@@ -89,7 +89,7 @@ public T create(CreationalContext<T> context) {
 
         Converters converters = getInstance(Converters.class);
 
-        var handler = new SemistructuredRepositoryProxy<>(template,
+        var handler = new SemiStructuredRepositoryProxy<>(template,
                 entities, type, converters);
         return (T) Proxy.newProxyInstance(type.getClassLoader(),
                 new Class[]{type},

diff --git a/...ructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/AbstractMapperQuery.java b/...ructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/AbstractMapperQuery.java
@@ -44,14 +44,14 @@ abstract class AbstractMapperQuery {
 
     protected transient final Converters converters;
 
-    protected transient final SemistructuredTemplate template;
+    protected transient final SemiStructuredTemplate template;
 
     protected long start;
 
     protected long limit;
 
 
-    AbstractMapperQuery(EntityMetadata mapping, Converters converters, SemistructuredTemplate template) {
+    AbstractMapperQuery(EntityMetadata mapping, Converters converters, SemiStructuredTemplate template) {
         this.mapping = mapping;
         this.converters = converters;
         this.entity = mapping.name();

diff --git a/...tured/AbstractSemistructuredTemplate.java → ...tured/AbstractSemiStructuredTemplate.java b/...tured/AbstractSemistructuredTemplate.java → ...tured/AbstractSemiStructuredTemplate.java
@@ -50,13 +50,13 @@
 import static java.util.Objects.requireNonNull;
 
 /**
- * An abstract implementation of the {@link SemistructuredTemplate} interface providing
+ * An abstract implementation of the {@link SemiStructuredTemplate} interface providing
  * a template method for working with semi-structured NoSQL databases.
  * Concrete subclasses must implement methods to provide necessary dependencies and configuration.
  *
- * @see SemistructuredTemplate
+ * @see SemiStructuredTemplate
  */
-public abstract class AbstractSemistructuredTemplate implements SemistructuredTemplate {
+public abstract class AbstractSemiStructuredTemplate implements SemiStructuredTemplate {
 
     private static final QueryParser PARSER = new QueryParser();