diff --git a/jnosql-communication/jnosql-communication-semistructured/src/test/java/org/eclipse/jnosql/communication/semistructured/DatabaseManagerTest.java b/jnosql-communication/jnosql-communication-semistructured/src/test/java/org/eclipse/jnosql/communication/semistructured/DatabaseManagerTest.java index 1e1265e5a..58b70eeed 100644 --- a/jnosql-communication/jnosql-communication-semistructured/src/test/java/org/eclipse/jnosql/communication/semistructured/DatabaseManagerTest.java +++ b/jnosql-communication/jnosql-communication-semistructured/src/test/java/org/eclipse/jnosql/communication/semistructured/DatabaseManagerTest.java @@ -137,7 +137,8 @@ void shouldReturnPaginationAfterKeySingleElementWhenConditionIsNull() { var id = UUID.randomUUID().toString(); CursoredPage entities = databaseManager.selectCursor(query, - PageRequest.ofSize(10).afterKey("Ada", 20, id)); + PageRequest.afterCursor(PageRequest.Cursor.forKey("Ada", 20, id), 1, 10 ,false)); + ArgumentCaptor captor = ArgumentCaptor.forClass(SelectQuery.class); Mockito.verify(databaseManager).select(captor.capture()); @@ -192,7 +193,8 @@ void shouldReturnPaginationAfterKeySingleElementWhenThereIsCondition() { var id = UUID.randomUUID().toString(); CursoredPage entities = databaseManager.selectCursor(query, - PageRequest.ofSize(10).afterKey("Ada", 20, id)); + PageRequest.afterCursor(PageRequest.Cursor.forKey("Ada", 20, id), 1, 10 ,false)); + ArgumentCaptor 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 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 entities = databaseManager.selectCursor(query, - PageRequest.ofSize(10).beforeKey("Ada", 20, id)); + PageRequest.beforeCursor(PageRequest.Cursor.forKey("Ada", 20, id), 1, 10 ,false)); ArgumentCaptor captor = ArgumentCaptor.forClass(SelectQuery.class); Mockito.verify(databaseManager).select(captor.capture()); @@ -332,7 +331,8 @@ void shouldReturnPaginationBeforeKeySingleElementWhenThereIsCondition() { var id = UUID.randomUUID().toString(); CursoredPage entities = databaseManager.selectCursor(query, - PageRequest.ofSize(10).beforeKey("Ada", 20, id)); + PageRequest.beforeCursor(PageRequest.Cursor.forKey("Ada", 20, id), 1, 10 ,false)); + ArgumentCaptor captor = ArgumentCaptor.forClass(SelectQuery.class); Mockito.verify(databaseManager).select(captor.capture()); @@ -394,7 +394,7 @@ void shouldReturnPaginationAfterKeyAndReturnEmpty() { var id = UUID.randomUUID().toString(); CursoredPage 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 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/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnTemplate.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnTemplate.java index 941b1da70..027bf87da 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnTemplate.java +++ b/jnosql-mapping/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. *

* 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. *

* - * @see SemistructuredTemplate + * @see SemiStructuredTemplate */ -public interface ColumnTemplate extends SemistructuredTemplate { +public interface ColumnTemplate extends SemiStructuredTemplate { } diff --git a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnTemplateProducer.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnTemplateProducer.java index 7d33d843f..603442951 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/ColumnTemplateProducer.java +++ b/jnosql-mapping/jnosql-mapping-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/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplate.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplate.java index b304a31f9..0508fa5aa 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/DefaultColumnTemplate.java +++ b/jnosql-mapping/jnosql-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/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/RepositoryColumnBean.java b/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/RepositoryColumnBean.java index 18b6dc78d..23db3bbcb 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/main/java/org/eclipse/jnosql/mapping/column/query/RepositoryColumnBean.java +++ b/jnosql-mapping/jnosql-mapping-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 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/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryExtensionTest.java b/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryExtensionTest.java index dffe50ed4..f12452ef1 100644 --- a/jnosql-mapping/jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/query/ColumnRepositoryExtensionTest.java +++ b/jnosql-mapping/jnosql-mapping-column/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/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/NoSQLPage.java b/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/NoSQLPage.java index 632618414..594ef2ac4 100644 --- a/jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/NoSQLPage.java +++ b/jnosql-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/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplate.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplate.java index 525cca055..cf9d3d838 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DefaultDocumentTemplate.java +++ b/jnosql-mapping/jnosql-mapping-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/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentTemplate.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentTemplate.java index 926f025e1..095382010 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentTemplate.java +++ b/jnosql-mapping/jnosql-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. *

* 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. *

* - * @see SemistructuredTemplate + * @see SemiStructuredTemplate */ -public interface DocumentTemplate extends SemistructuredTemplate { +public interface DocumentTemplate extends SemiStructuredTemplate { } diff --git a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentTemplateProducer.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentTemplateProducer.java index 8574fa28d..c0b866626 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/DocumentTemplateProducer.java +++ b/jnosql-mapping/jnosql-mapping-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/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/RepositoryDocumentBean.java b/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/RepositoryDocumentBean.java index 466aea436..37823ca0d 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/main/java/org/eclipse/jnosql/mapping/document/query/RepositoryDocumentBean.java +++ b/jnosql-mapping/jnosql-mapping-document/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 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/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryExtensionTest.java b/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryExtensionTest.java index 5af0ed01b..f1967f4ba 100644 --- a/jnosql-mapping/jnosql-mapping-document/src/test/java/org/eclipse/jnosql/mapping/document/query/DocumentRepositoryExtensionTest.java +++ b/jnosql-mapping/jnosql-mapping-document/src/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/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractGraphTemplate.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractGraphTemplate.java index 3931f33e4..6b2ac1a6e 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/AbstractGraphTemplate.java +++ b/jnosql-mapping/jnosql-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> INITIAL_VERTEX = g -> (GraphTraversal) g; diff --git a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphTemplate.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphTemplate.java index 2e22f0faa..7416b1d53 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/GraphTemplate.java +++ b/jnosql-mapping/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/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/RepositoryGraphBean.java b/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/RepositoryGraphBean.java index dcb762d33..263f582c1 100644 --- a/jnosql-mapping/jnosql-mapping-graph/src/main/java/org/eclipse/jnosql/mapping/graph/query/RepositoryGraphBean.java +++ b/jnosql-mapping/jnosql-mapping-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 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/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/AbstractMapperQuery.java b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/AbstractMapperQuery.java index 928c8c975..bb0616eee 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/AbstractMapperQuery.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/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/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/AbstractSemistructuredTemplate.java b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/AbstractSemiStructuredTemplate.java similarity index 98% rename from jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/AbstractSemistructuredTemplate.java rename to jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/AbstractSemiStructuredTemplate.java index 1e29bf9a2..1eda600b4 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/AbstractSemistructuredTemplate.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/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(); diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/EventPersistManager.java b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/EventPersistManager.java index 08f92589e..c2a1f4afe 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/EventPersistManager.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/EventPersistManager.java @@ -27,7 +27,7 @@ * 1) {@link EntityPrePersist} event fired before the entity is persisted. * 2) {@link EntityPostPersist} event fired after the entity is persisted. * - * @see AbstractSemistructuredTemplate + * @see AbstractSemiStructuredTemplate */ @ApplicationScoped public class EventPersistManager { diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/MapperDelete.java b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/MapperDelete.java index b37cdcac9..3c738bc7c 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/MapperDelete.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/MapperDelete.java @@ -28,7 +28,7 @@ final class MapperDelete extends AbstractMapperQuery implements MapperDeleteFrom MapperDeleteWhere, MapperDeleteNameCondition, MapperDeleteNotCondition { - MapperDelete(EntityMetadata mapping, Converters converters, SemistructuredTemplate template) { + MapperDelete(EntityMetadata mapping, Converters converters, SemiStructuredTemplate template) { super(mapping, converters, template); } diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/MapperSelect.java b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/MapperSelect.java index 7a1260857..73f50945a 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/MapperSelect.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/MapperSelect.java @@ -41,7 +41,7 @@ final class MapperSelect extends AbstractMapperQuery implements MapperFrom, Mapp private final List> sorts = new ArrayList<>(); - MapperSelect(EntityMetadata mapping, Converters converters, SemistructuredTemplate template) { + MapperSelect(EntityMetadata mapping, Converters converters, SemiStructuredTemplate template) { super(mapping, converters, template); } diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/SemistructuredTemplate.java b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/SemiStructuredTemplate.java similarity index 99% rename from jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/SemistructuredTemplate.java rename to jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/SemiStructuredTemplate.java index 0bfe280a6..48a28aa0b 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/SemistructuredTemplate.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/SemiStructuredTemplate.java @@ -27,7 +27,7 @@ * It extends the {@link Template} interface. * This interface provides methods for executing queries, counting elements, and preparing statements. */ -public interface SemistructuredTemplate extends Template { +public interface SemiStructuredTemplate extends Template { diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/package-info.java b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/package-info.java index c5ae7f758..72285eebe 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/package-info.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/package-info.java @@ -20,7 +20,7 @@ *

* The main components of this package include: *

    - *
  • {@link org.eclipse.jnosql.mapping.semistructured.AbstractSemistructuredTemplate}: + *
  • {@link org.eclipse.jnosql.mapping.semistructured.AbstractSemiStructuredTemplate}: * An abstract template class that serves as the foundation for implementing semistructured database operations.
    • *
  • {@link org.eclipse.jnosql.mapping.semistructured.EventPersistManager}: * A manager class responsible for firing events before and after entity persistence operations.
    • @@ -37,7 +37,7 @@ * in a consistent and efficient manner, abstracting away the complexities of the underlying database operations. *

    * - * @see org.eclipse.jnosql.mapping.semistructured.AbstractSemistructuredTemplate + * @see org.eclipse.jnosql.mapping.semistructured.AbstractSemiStructuredTemplate * @see org.eclipse.jnosql.mapping.semistructured.EventPersistManager * @see org.eclipse.jnosql.mapping.semistructured.EntityConverter * @see org.eclipse.jnosql.mapping.semistructured.AttributeFieldValue diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/AbstractSemistructuredRepository.java b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/AbstractSemiStructuredRepository.java similarity index 92% rename from jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/AbstractSemistructuredRepository.java rename to jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/AbstractSemiStructuredRepository.java index d43cabd38..1cc9a6bc3 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/AbstractSemistructuredRepository.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/AbstractSemiStructuredRepository.java @@ -21,7 +21,7 @@ import org.eclipse.jnosql.communication.semistructured.SelectQuery; import org.eclipse.jnosql.mapping.core.NoSQLPage; -import org.eclipse.jnosql.mapping.semistructured.SemistructuredTemplate; +import org.eclipse.jnosql.mapping.semistructured.SemiStructuredTemplate; import org.eclipse.jnosql.mapping.semistructured.MappingQuery; import org.eclipse.jnosql.mapping.core.query.AbstractRepository; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; @@ -34,9 +34,9 @@ /** * The {@link org.eclipse.jnosql.mapping.NoSQLRepository} template method */ -public abstract class AbstractSemistructuredRepository extends AbstractRepository { +public abstract class AbstractSemiStructuredRepository extends AbstractRepository { - protected abstract SemistructuredTemplate template(); + protected abstract SemiStructuredTemplate template(); @Override public long countBy() { diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/AbstractSemistructuredRepositoryProxy.java b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/AbstractSemiStructuredRepositoryProxy.java similarity index 96% rename from jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/AbstractSemistructuredRepositoryProxy.java rename to jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/AbstractSemiStructuredRepositoryProxy.java index edf860042..ee5c16200 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/AbstractSemistructuredRepositoryProxy.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/AbstractSemiStructuredRepositoryProxy.java @@ -36,7 +36,7 @@ * @param the entity type * @param the K entity */ -public abstract class AbstractSemistructuredRepositoryProxy extends BaseSemistructuredRepository { +public abstract class AbstractSemiStructuredRepositoryProxy extends BaseSemistructuredRepository { @Override protected Object executeQuery(Object instance, Method method, Object[] params) { @@ -60,7 +60,7 @@ protected Object executeCursorPagination(Object instance, Method method, Object[ return this.template().selectCursor(query, pageRequest); } else { Map parameters = RepositoryReflectionUtils.INSTANCE.getBy(method, params); - var query = SemistructuredParameterBasedQuery.INSTANCE.toQuery(parameters, getSorts(method), entityMetadata()); + var query = SemiStructuredParameterBasedQuery.INSTANCE.toQuery(parameters, getSorts(method), entityMetadata()); SpecialParameters special = DynamicReturn.findSpecialParameters(params); PageRequest pageRequest = special.pageRequest() .orElseThrow(() -> new IllegalArgumentException("Pageable is required in the method signature as parameter at " + method)); @@ -103,7 +103,7 @@ protected Object executeFindByQuery(Object instance, Method method, Object[] par protected Object executeParameterBased(Object instance, Method method, Object[] params) { Class type = entityMetadata().type(); Map parameters = RepositoryReflectionUtils.INSTANCE.getBy(method, params); - var query = SemistructuredParameterBasedQuery.INSTANCE.toQuery(parameters, getSorts(method), entityMetadata()); + var query = SemiStructuredParameterBasedQuery.INSTANCE.toQuery(parameters, getSorts(method), entityMetadata()); return executeFindByQuery(method, params, type, updateQueryDynamically(params, query)); } diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/BaseSemistructuredRepository.java b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/BaseSemistructuredRepository.java index 87a34070d..f424b9fcf 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/BaseSemistructuredRepository.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/BaseSemistructuredRepository.java @@ -38,7 +38,7 @@ import org.eclipse.jnosql.mapping.metadata.EntityMetadata; import org.eclipse.jnosql.mapping.metadata.InheritanceMetadata; import org.eclipse.jnosql.mapping.semistructured.MappingQuery; -import org.eclipse.jnosql.mapping.semistructured.SemistructuredTemplate; +import org.eclipse.jnosql.mapping.semistructured.SemiStructuredTemplate; import java.lang.reflect.Method; import java.util.ArrayList; @@ -81,7 +81,7 @@ public abstract class BaseSemistructuredRepository extends AbstractReposit * * @return The SemistructuredTemplate instance. */ - protected abstract SemistructuredTemplate template(); + protected abstract SemiStructuredTemplate template(); private CommunicationObserverParser parser; @@ -120,7 +120,7 @@ protected org.eclipse.jnosql.communication.semistructured.DeleteQuery deleteQuer protected CommunicationObserverParser parser() { if (parser == null) { - this.parser = new RepositorySemistructuredObserverParser(entityMetadata()); + this.parser = new RepositorySemiStructuredObserverParser(entityMetadata()); } return parser; } diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/RepositorySemistructuredObserverParser.java b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/RepositorySemiStructuredObserverParser.java similarity index 89% rename from jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/RepositorySemistructuredObserverParser.java rename to jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/RepositorySemiStructuredObserverParser.java index de583c0c1..050bd4b09 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/RepositorySemistructuredObserverParser.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/RepositorySemiStructuredObserverParser.java @@ -23,11 +23,11 @@ /** * The {@link CommunicationObserverParser} to {@link RepositoryObserverParser} */ -public final class RepositorySemistructuredObserverParser implements CommunicationObserverParser { +public final class RepositorySemiStructuredObserverParser implements CommunicationObserverParser { private final RepositoryObserverParser parser; - RepositorySemistructuredObserverParser(EntityMetadata entityMetadata) { + RepositorySemiStructuredObserverParser(EntityMetadata entityMetadata) { this.parser = RepositoryObserverParser.of(entityMetadata); } @@ -47,6 +47,6 @@ public String fireField(String entity, String field) { */ public static CommunicationObserverParser of(EntityMetadata entityMetadata) { Objects.requireNonNull(entityMetadata, "entityMetadata is required"); - return new RepositorySemistructuredObserverParser(entityMetadata); + return new RepositorySemiStructuredObserverParser(entityMetadata); } } diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/SemistructuredParameterBasedQuery.java b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/SemiStructuredParameterBasedQuery.java similarity index 98% rename from jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/SemistructuredParameterBasedQuery.java rename to jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/SemiStructuredParameterBasedQuery.java index dfd6471b8..30549b114 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/SemistructuredParameterBasedQuery.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/SemiStructuredParameterBasedQuery.java @@ -34,7 +34,7 @@ * It leverages the provided parameters, PageRequest information, and entity metadata to construct a ColumnQuery object * tailored for querying a specific entity'sort columns. */ -public enum SemistructuredParameterBasedQuery { +public enum SemiStructuredParameterBasedQuery { INSTANCE; diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/SemistructuredRepositoryProxy.java b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/SemiStructuredRepositoryProxy.java similarity index 81% rename from jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/SemistructuredRepositoryProxy.java rename to jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/SemiStructuredRepositoryProxy.java index fa09ac0ce..be0dd2e0a 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/SemistructuredRepositoryProxy.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/SemiStructuredRepositoryProxy.java @@ -16,7 +16,7 @@ import org.eclipse.jnosql.mapping.core.Converters; -import org.eclipse.jnosql.mapping.semistructured.SemistructuredTemplate; +import org.eclipse.jnosql.mapping.semistructured.SemiStructuredTemplate; import org.eclipse.jnosql.mapping.core.query.AbstractRepository; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; import org.eclipse.jnosql.mapping.metadata.EntityMetadata; @@ -31,11 +31,11 @@ * @param The entity type managed by the repository. * @param The key type used for column-based operations. */ -public class SemistructuredRepositoryProxy extends AbstractSemistructuredRepositoryProxy { +public class SemiStructuredRepositoryProxy extends AbstractSemiStructuredRepositoryProxy { - private final SemistructuredTemplate template; + private final SemiStructuredTemplate template; - private final SemistructuredRepository repository; + private final SemiStructuredRepository repository; private final EntityMetadata entityMetadata; @@ -55,14 +55,14 @@ public class SemistructuredRepositoryProxy extends AbstractSemistructuredR * @throws NullPointerException If either the template, metadata, or repository type is {@code null}. */ @SuppressWarnings({"unchecked", "rawtypes"}) - public SemistructuredRepositoryProxy(SemistructuredTemplate template, + public SemiStructuredRepositoryProxy(SemiStructuredTemplate template, EntitiesMetadata entities, Class repositoryType, Converters converters) { this.template = template; Class typeClass = (Class) ((ParameterizedType) repositoryType.getGenericInterfaces()[0]) .getActualTypeArguments()[0]; this.entityMetadata = entities.get(typeClass); - this.repository = new SemistructuredRepository<>(template, entityMetadata); + this.repository = new SemiStructuredRepository<>(template, entityMetadata); this.converters = converters; this.repositoryType = repositoryType; } @@ -78,7 +78,7 @@ protected EntityMetadata entityMetadata() { } @Override - protected SemistructuredTemplate template() { + protected SemiStructuredTemplate template() { return template; } @@ -99,19 +99,19 @@ protected Class repositoryType() { * @param The entity type managed by the repository. * @param The key type used for column-based operations. */ - public static class SemistructuredRepository extends AbstractSemistructuredRepository { + public static class SemiStructuredRepository extends AbstractSemiStructuredRepository { - private final SemistructuredTemplate template; + private final SemiStructuredTemplate template; private final EntityMetadata entityMetadata; - SemistructuredRepository(SemistructuredTemplate template, EntityMetadata entityMetadata) { + SemiStructuredRepository(SemiStructuredTemplate template, EntityMetadata entityMetadata) { this.template = template; this.entityMetadata = entityMetadata; } @Override - protected SemistructuredTemplate template() { + protected SemiStructuredTemplate template() { return template; } @@ -130,10 +130,10 @@ protected EntityMetadata entityMetadata() { * @return A new instance of ColumnRepository. * @throws NullPointerException If either the template or metadata is {@code null}. */ - public static SemistructuredRepository of(SemistructuredTemplate template, EntityMetadata metadata) { + public static SemiStructuredRepository of(SemiStructuredTemplate template, EntityMetadata metadata) { Objects.requireNonNull(template,"template is required"); Objects.requireNonNull(metadata,"metadata is required"); - return new SemistructuredRepository<>(template, metadata); + return new SemiStructuredRepository<>(template, metadata); } } } diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/SemistructuredTokenProcessor.java b/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/SemistructuredTokenProcessor.java deleted file mode 100644 index b5a4b68d4..000000000 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/SemistructuredTokenProcessor.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2022 Contributors to the Eclipse Foundation - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and Apache License v2.0 which accompanies this distribution. - * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html - * and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php. - * - * You may elect to redistribute this code under either of these licenses. - * - * Contributors: - * - * Otavio Santana - */ -package org.eclipse.jnosql.mapping.semistructured.query; - -import org.eclipse.jnosql.communication.semistructured.CriteriaCondition; -import org.eclipse.jnosql.mapping.core.Converters; -import org.eclipse.jnosql.mapping.metadata.EntityMetadata; - -interface SemistructuredTokenProcessor { - - CriteriaCondition process(String token, - int index, - Object[] args, - String methodName, - EntityMetadata mapping, - Converters converters); -} diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/DefaultColumnTemplateTest.java b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/DefaultColumnTemplateTest.java index 88b10c788..fbbf65417 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/DefaultColumnTemplateTest.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/DefaultColumnTemplateTest.java @@ -91,7 +91,7 @@ class DefaultColumnTemplateTest { private DatabaseManager managerMock; - private DefaultSemistructuredTemplate template; + private DefaultSemiStructuredTemplate template; private ArgumentCaptor captor; @@ -105,7 +105,7 @@ void setUp() { captor = ArgumentCaptor.forClass(CommunicationEntity.class); Instance instance = Mockito.mock(Instance.class); Mockito.when(instance.get()).thenReturn(managerMock); - this.template = new DefaultSemistructuredTemplate(converter, instance, + this.template = new DefaultSemiStructuredTemplate(converter, instance, eventPersistManager, entities, converters); } @@ -448,8 +448,8 @@ void shouldDeleteAll(){ @Test void shouldSelectCursor(){ PageRequest request = PageRequest.ofSize(2); - PageRequest afterKey = PageRequest.ofSize(2) - .afterKey("Ada"); + + PageRequest afterKey = PageRequest.afterCursor(PageRequest.Cursor.forKey("Ada"), 1, 2, false); SelectQuery query = select().from("Person").orderBy("name").asc().build(); Mockito.when(managerMock.selectCursor(query, request)) diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/DefaultSemistructuredTemplate.java b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/DefaultSemiStructuredTemplate.java similarity index 89% rename from jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/DefaultSemistructuredTemplate.java rename to jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/DefaultSemiStructuredTemplate.java index 744ea1f87..cdd933d38 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/DefaultSemistructuredTemplate.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/DefaultSemiStructuredTemplate.java @@ -20,13 +20,11 @@ import jakarta.inject.Inject; import org.eclipse.jnosql.communication.semistructured.DatabaseManager; import org.eclipse.jnosql.mapping.core.Converters; -import org.eclipse.jnosql.mapping.Database; -import org.eclipse.jnosql.mapping.DatabaseType; import org.eclipse.jnosql.mapping.metadata.EntitiesMetadata; @Default @ApplicationScoped -class DefaultSemistructuredTemplate extends AbstractSemistructuredTemplate { +class DefaultSemiStructuredTemplate extends AbstractSemiStructuredTemplate { private EntityConverter converter; @@ -39,7 +37,7 @@ class DefaultSemistructuredTemplate extends AbstractSemistructuredTemplate { private Converters converters; @Inject - DefaultSemistructuredTemplate(EntityConverter converter, Instance manager, + DefaultSemiStructuredTemplate(EntityConverter converter, Instance manager, EventPersistManager eventManager, EntitiesMetadata entities, Converters converters) { this.converter = converter; @@ -49,7 +47,7 @@ class DefaultSemistructuredTemplate extends AbstractSemistructuredTemplate { this.converters = converters; } - DefaultSemistructuredTemplate(){ + DefaultSemiStructuredTemplate(){ } @Override diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/MapperDeleteTest.java b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/MapperDeleteTest.java index 7736153cc..94dda1125 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/MapperDeleteTest.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/MapperDeleteTest.java @@ -58,7 +58,7 @@ class MapperDeleteTest { private DatabaseManager managerMock; - private DefaultSemistructuredTemplate template; + private DefaultSemiStructuredTemplate template; private ArgumentCaptor captor; @@ -70,7 +70,7 @@ void setUp() { Instance instance = Mockito.mock(Instance.class); this.captor = ArgumentCaptor.forClass(DeleteQuery.class); when(instance.get()).thenReturn(managerMock); - this.template = new DefaultSemistructuredTemplate(converter, instance, + this.template = new DefaultSemiStructuredTemplate(converter, instance, persistManager, entities, converters); } diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/MapperSelectTest.java b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/MapperSelectTest.java index 8314aca92..bc05be92f 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/MapperSelectTest.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/MapperSelectTest.java @@ -64,7 +64,7 @@ class MapperSelectTest { private DatabaseManager managerMock; - private DefaultSemistructuredTemplate template; + private DefaultSemiStructuredTemplate template; private ArgumentCaptor captor; @@ -75,7 +75,7 @@ public void setUp() { Instance instance = Mockito.mock(Instance.class); this.captor = ArgumentCaptor.forClass(SelectQuery.class); when(instance.get()).thenReturn(managerMock); - this.template = new DefaultSemistructuredTemplate(converter, instance, + this.template = new DefaultSemiStructuredTemplate(converter, instance, persistManager, entities, converters); } diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/TemplateInheritanceTest.java b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/TemplateInheritanceTest.java index fd204e275..7eaf2f04b 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/TemplateInheritanceTest.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/TemplateInheritanceTest.java @@ -60,7 +60,7 @@ class TemplateInheritanceTest { private DatabaseManager managerMock; - private DefaultSemistructuredTemplate template; + private DefaultSemiStructuredTemplate template; @BeforeEach @@ -70,7 +70,7 @@ void setUp() { Instance instance = Mockito.mock(Instance.class); when(instance.get()).thenReturn(managerMock); - this.template = new DefaultSemistructuredTemplate(converter, instance, + this.template = new DefaultSemiStructuredTemplate(converter, instance, documentEventPersistManager, entities, converters); } diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/CrudInheritanceRepositoryProxyTest.java b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/CrudInheritanceRepositoryProxyTest.java index 89fd96aaf..7b6222e3f 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/CrudInheritanceRepositoryProxyTest.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/CrudInheritanceRepositoryProxyTest.java @@ -22,7 +22,7 @@ import org.eclipse.jnosql.communication.semistructured.SelectQuery; import org.eclipse.jnosql.mapping.NoSQLRepository; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; -import org.eclipse.jnosql.mapping.semistructured.SemistructuredTemplate; +import org.eclipse.jnosql.mapping.semistructured.SemiStructuredTemplate; import org.eclipse.jnosql.mapping.semistructured.MockProducer; import org.eclipse.jnosql.mapping.semistructured.entities.inheritance.EmailNotification; import org.eclipse.jnosql.mapping.core.Converters; @@ -51,7 +51,7 @@ @AddExtensions({EntityMetadataExtension.class}) class CrudInheritanceRepositoryProxyTest { - private SemistructuredTemplate template; + private SemiStructuredTemplate template; @Inject private EntitiesMetadata entities; @@ -65,9 +65,9 @@ class CrudInheritanceRepositoryProxyTest { @BeforeEach public void setUp() { - this.template = Mockito.mock(SemistructuredTemplate.class); + this.template = Mockito.mock(SemiStructuredTemplate.class); - SemistructuredRepositoryProxy personHandler = new SemistructuredRepositoryProxy<>(template, + SemiStructuredRepositoryProxy personHandler = new SemiStructuredRepositoryProxy<>(template, entities, EmailRepository.class, converters); diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/CrudRepositoryProxyTest.java b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/CrudRepositoryProxyTest.java index f1a325fc7..743d1486f 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/CrudRepositoryProxyTest.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/CrudRepositoryProxyTest.java @@ -32,7 +32,7 @@ import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; import org.eclipse.jnosql.mapping.semistructured.MockProducer; -import org.eclipse.jnosql.mapping.semistructured.SemistructuredTemplate; +import org.eclipse.jnosql.mapping.semistructured.SemiStructuredTemplate; import org.eclipse.jnosql.mapping.semistructured.entities.Address; import org.eclipse.jnosql.mapping.semistructured.entities.Person; import org.eclipse.jnosql.mapping.semistructured.entities.Vendor; @@ -74,7 +74,7 @@ @AddExtensions({EntityMetadataExtension.class}) class CrudRepositoryProxyTest { - private SemistructuredTemplate template; + private SemiStructuredTemplate template; @Inject private EntitiesMetadata entities; @@ -91,15 +91,15 @@ class CrudRepositoryProxyTest { @BeforeEach public void setUp() { - this.template = Mockito.mock(SemistructuredTemplate.class); + this.template = Mockito.mock(SemiStructuredTemplate.class); - SemistructuredRepositoryProxy personHandler = new SemistructuredRepositoryProxy(template, + SemiStructuredRepositoryProxy personHandler = new SemiStructuredRepositoryProxy(template, entities, PersonRepository.class, converters); - SemistructuredRepositoryProxy vendorHandler = new SemistructuredRepositoryProxy(template, + SemiStructuredRepositoryProxy vendorHandler = new SemiStructuredRepositoryProxy(template, entities, VendorRepository.class, converters); - SemistructuredRepositoryProxy addressHandler = new SemistructuredRepositoryProxy(template, + SemiStructuredRepositoryProxy addressHandler = new SemiStructuredRepositoryProxy(template, entities, AddressRepository.class, converters); diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/ParamsBinderTest.java b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/ParamsBinderTest.java index 070396659..87987ce18 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/ParamsBinderTest.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/ParamsBinderTest.java @@ -66,7 +66,7 @@ void shouldConvert() { Method method = Stream.of(PersonRepository.class.getMethods()) .filter(m -> m.getName().equals("findByAge")).findFirst().get(); EntityMetadata entityMetadata = mappings.get(Person.class); - RepositorySemistructuredObserverParser parser = new RepositorySemistructuredObserverParser(entityMetadata); + RepositorySemiStructuredObserverParser parser = new RepositorySemiStructuredObserverParser(entityMetadata); paramsBinder = new ParamsBinder(entityMetadata, converters); SelectMethodProvider selectMethodFactory = SelectMethodProvider.INSTANCE; @@ -89,7 +89,7 @@ void shouldConvert2() { Method method = Stream.of(PersonRepository.class.getMethods()) .filter(m -> m.getName().equals("findByAgeAndName")).findFirst().get(); EntityMetadata entityMetadata = mappings.get(Person.class); - RepositorySemistructuredObserverParser parser = new RepositorySemistructuredObserverParser(entityMetadata); + RepositorySemiStructuredObserverParser parser = new RepositorySemiStructuredObserverParser(entityMetadata); paramsBinder = new ParamsBinder(entityMetadata, converters); SelectMethodProvider selectMethodFactory = SelectMethodProvider.INSTANCE; diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/RepositoryProxyPageRequestTest.java b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/RepositoryProxyPageRequestTest.java index 88c0090c0..323281703 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/RepositoryProxyPageRequestTest.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/RepositoryProxyPageRequestTest.java @@ -23,7 +23,6 @@ import jakarta.data.Sort; import jakarta.data.repository.By; import jakarta.data.repository.Find; -import jakarta.data.repository.Param; import jakarta.inject.Inject; import org.assertj.core.api.SoftAssertions; import org.eclipse.jnosql.communication.Condition; @@ -35,7 +34,7 @@ import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.core.NoSQLPage; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; -import org.eclipse.jnosql.mapping.semistructured.SemistructuredTemplate; +import org.eclipse.jnosql.mapping.semistructured.SemiStructuredTemplate; import org.eclipse.jnosql.mapping.semistructured.MockProducer; import org.eclipse.jnosql.mapping.semistructured.entities.Person; import org.eclipse.jnosql.mapping.semistructured.entities.Vendor; @@ -77,7 +76,7 @@ @AddExtensions({EntityMetadataExtension.class}) public class RepositoryProxyPageRequestTest { - private SemistructuredTemplate template; + private SemiStructuredTemplate template; @Inject private EntitiesMetadata entities; @@ -92,12 +91,12 @@ public class RepositoryProxyPageRequestTest { @BeforeEach public void setUp() { - this.template = Mockito.mock(SemistructuredTemplate.class); + this.template = Mockito.mock(SemiStructuredTemplate.class); - SemistructuredRepositoryProxy personHandler = new SemistructuredRepositoryProxy(template, + SemiStructuredRepositoryProxy personHandler = new SemiStructuredRepositoryProxy(template, entities, PersonRepository.class, converters); - SemistructuredRepositoryProxy vendorHandler = new SemistructuredRepositoryProxy(template, + SemiStructuredRepositoryProxy vendorHandler = new SemiStructuredRepositoryProxy(template, entities, VendorRepository.class, converters); when(template.insert(any(Person.class))).thenReturn(Person.builder().build()); @@ -623,7 +622,7 @@ public void shouldFindByNameOrderByName() { any(PageRequest.class))).thenReturn(mock); CursoredPage page = personRepository.findByNameOrderByName("name", - PageRequest.ofSize(10).afterKey("Ada")); + PageRequest.afterCursor(PageRequest.Cursor.forKey("Ada"), 1, 10, false)); SoftAssertions.assertSoftly(s -> { s.assertThat(page).isEqualTo(mock); @@ -664,7 +663,7 @@ public void shouldParameterMatch() { any(PageRequest.class))).thenReturn(mock); CursoredPage page = personRepository.findPageParameter("name", - PageRequest.ofSize(10).afterKey("Ada")); + PageRequest.afterCursor(PageRequest.Cursor.forKey("Ada"), 1, 10, false)); SoftAssertions.assertSoftly(s -> s.assertThat(page).isEqualTo(mock)); diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/RepositoryProxyTest.java b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/RepositoryProxyTest.java index bade6ac79..72e9e3841 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/RepositoryProxyTest.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/RepositoryProxyTest.java @@ -39,7 +39,7 @@ import org.eclipse.jnosql.mapping.NoSQLRepository; import org.eclipse.jnosql.mapping.core.Converters; import org.eclipse.jnosql.mapping.semistructured.EntityConverter; -import org.eclipse.jnosql.mapping.semistructured.SemistructuredTemplate; +import org.eclipse.jnosql.mapping.semistructured.SemiStructuredTemplate; import org.eclipse.jnosql.mapping.semistructured.MockProducer; import org.eclipse.jnosql.mapping.semistructured.entities.Person; import org.eclipse.jnosql.mapping.semistructured.entities.PersonStatisticRepository; @@ -86,7 +86,7 @@ @AddExtensions({EntityMetadataExtension.class}) class RepositoryProxyTest { - private SemistructuredTemplate template; + private SemiStructuredTemplate template; @Inject private EntitiesMetadata entities; @@ -101,12 +101,12 @@ class RepositoryProxyTest { @BeforeEach void setUp() { - this.template = Mockito.mock(SemistructuredTemplate.class); + this.template = Mockito.mock(SemiStructuredTemplate.class); - SemistructuredRepositoryProxy personHandler = new SemistructuredRepositoryProxy(template, + SemiStructuredRepositoryProxy personHandler = new SemiStructuredRepositoryProxy(template, entities, PersonRepository.class, converters); - SemistructuredRepositoryProxy vendorHandler = new SemistructuredRepositoryProxy(template, + SemiStructuredRepositoryProxy vendorHandler = new SemiStructuredRepositoryProxy(template, entities, VendorRepository.class, converters); when(template.insert(any(Person.class))).thenReturn(Person.builder().build()); diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/RepositorySemistructuredObserverParserTest.java b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/RepositorySemiStructuredObserverParserTest.java similarity index 89% rename from jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/RepositorySemistructuredObserverParserTest.java rename to jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/RepositorySemiStructuredObserverParserTest.java index bbec17b21..fed3d8ff9 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/RepositorySemistructuredObserverParserTest.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/RepositorySemiStructuredObserverParserTest.java @@ -20,12 +20,12 @@ import static org.junit.jupiter.api.Assertions.*; -class RepositorySemistructuredObserverParserTest { +class RepositorySemiStructuredObserverParserTest { @Test void shouldCreateFromRepository() { EntityMetadata entityMetadata = Mockito.mock(EntityMetadata.class); - var parser = RepositorySemistructuredObserverParser.of(entityMetadata); + var parser = RepositorySemiStructuredObserverParser.of(entityMetadata); assertNotNull(parser); } } \ No newline at end of file diff --git a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/SemistructuredParameterBasedQueryTest.java b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/SemiStructuredParameterBasedQueryTest.java similarity index 94% rename from jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/SemistructuredParameterBasedQueryTest.java rename to jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/SemiStructuredParameterBasedQueryTest.java index 2b5e4ff25..fe01eda3d 100644 --- a/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/SemistructuredParameterBasedQueryTest.java +++ b/jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/SemiStructuredParameterBasedQueryTest.java @@ -45,7 +45,7 @@ @AddPackages(MockProducer.class) @AddPackages(Reflections.class) @AddExtensions({EntityMetadataExtension.class}) -class SemistructuredParameterBasedQueryTest { +class SemiStructuredParameterBasedQueryTest { @Inject private EntitiesMetadata entitiesMetadata; @@ -59,7 +59,7 @@ void setUp(){ @Test void shouldCreateQuerySingleParameter(){ Map params = Map.of("name", "Ada"); - var query = SemistructuredParameterBasedQuery.INSTANCE.toQuery(params, Collections.emptyList(), metadata); + var query = SemiStructuredParameterBasedQuery.INSTANCE.toQuery(params, Collections.emptyList(), metadata); SoftAssertions.assertSoftly(soft ->{ soft.assertThat(query.limit()).isEqualTo(0L); @@ -74,7 +74,7 @@ void shouldCreateQuerySingleParameter(){ @Test void shouldCreateQueryMultipleParams(){ Map params = Map.of("name", "Ada", "age", 10); - var query = SemistructuredParameterBasedQuery.INSTANCE.toQuery(params, Collections.emptyList(), metadata); + var query = SemiStructuredParameterBasedQuery.INSTANCE.toQuery(params, Collections.emptyList(), metadata); SoftAssertions.assertSoftly(soft ->{ soft.assertThat(query.limit()).isEqualTo(0L); @@ -94,7 +94,7 @@ void shouldCreateQueryMultipleParams(){ @Test void shouldCreateQueryEmptyParams(){ Map params = Collections.emptyMap(); - var query = SemistructuredParameterBasedQuery.INSTANCE.toQuery(params, Collections.emptyList(), metadata); + var query = SemiStructuredParameterBasedQuery.INSTANCE.toQuery(params, Collections.emptyList(), metadata); SoftAssertions.assertSoftly(soft ->{ soft.assertThat(query.limit()).isEqualTo(0L); @@ -108,7 +108,7 @@ void shouldCreateQueryEmptyParams(){ @Test void shouldAddSort(){ Map params = Collections.emptyMap(); - var query = SemistructuredParameterBasedQuery.INSTANCE.toQuery(params, List.of(Sort.asc("name")), metadata); + var query = SemiStructuredParameterBasedQuery.INSTANCE.toQuery(params, List.of(Sort.asc("name")), metadata); SoftAssertions.assertSoftly(soft ->{ soft.assertThat(query.limit()).isEqualTo(0L);