diff --git a/jnosql-communication/jnosql-communication-semistructured/src/main/java/org/eclipse/jnosql/communication/semistructured/DatabaseManager.java b/jnosql-communication/jnosql-communication-semistructured/src/main/java/org/eclipse/jnosql/communication/semistructured/DatabaseManager.java
index b9ebdc2af..121d2d285 100644
--- a/jnosql-communication/jnosql-communication-semistructured/src/main/java/org/eclipse/jnosql/communication/semistructured/DatabaseManager.java
+++ b/jnosql-communication/jnosql-communication-semistructured/src/main/java/org/eclipse/jnosql/communication/semistructured/DatabaseManager.java
@@ -266,7 +266,7 @@ default Optional<CommunicationEntity> singleResult(SelectQuery query) {
      * @throws NullPointerException     if the query or pageRequest is null
      * @throws IllegalStateException    if the cursor-based pagination is used without any order key specified
      */
-    default CursoredPage<CommunicationEntity> selectCursor(SelectQuery query, PageRequest<?> pageRequest){
+    default CursoredPage<CommunicationEntity> selectCursor(SelectQuery query, PageRequest pageRequest){
         Objects.requireNonNull(query, "query is required");
         Objects.requireNonNull(pageRequest, "pageRequest is required");
         if(query.sorts().isEmpty()){
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 6bbbd0161..1e1265e5a 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
@@ -41,7 +41,7 @@ class DatabaseManagerTest {
     @Test
     void shouldReturnErrorWhenThereIsNotSort() {
         SelectQuery query = SelectQuery.builder().from("person").build();
-        PageRequest<?> pageRequest = PageRequest.ofSize(10);
+        PageRequest pageRequest = PageRequest.ofSize(10);
         assertThrows(IllegalArgumentException.class, () -> databaseManager.selectCursor(query, pageRequest));
     }
 
@@ -57,8 +57,8 @@ void shouldReturnPaginationOffSet() {
                 PageRequest.ofSize(10));
 
         assertSoftly(soft -> {
-            PageRequest<CommunicationEntity> pageRequest = entities.pageRequest();
-            PageRequest<CommunicationEntity> nextedPageRequest = entities.nextPageRequest();
+            PageRequest pageRequest = entities.pageRequest();
+            PageRequest nextedPageRequest = entities.nextPageRequest();
             PageRequest.Cursor cursor = nextedPageRequest.cursor().orElseThrow();
 
             soft.assertThat(entities).hasSize(2);
@@ -85,7 +85,7 @@ void shouldReturnPaginationOffSetWhenReturnEmpty() {
                 PageRequest.ofSize(10));
 
         assertSoftly(soft -> {
-            PageRequest<CommunicationEntity> pageRequest = entities.pageRequest();
+            PageRequest pageRequest = entities.pageRequest();
             soft.assertThat(entities.hasNext()).isFalse();
             soft.assertThat(entities.hasPrevious()).isFalse();
 
@@ -108,8 +108,8 @@ void shouldReturnPaginationOffSet2() {
                 PageRequest.ofSize(10));
 
         assertSoftly(soft -> {
-            PageRequest<CommunicationEntity> pageRequest = entities.pageRequest();
-            PageRequest<CommunicationEntity> nextedPageRequest = entities.nextPageRequest();
+            PageRequest pageRequest = entities.pageRequest();
+            PageRequest nextedPageRequest = entities.nextPageRequest();
             PageRequest.Cursor cursor = nextedPageRequest.cursor().orElseThrow();
 
             soft.assertThat(entities).hasSize(2);
@@ -160,8 +160,8 @@ void shouldReturnPaginationAfterKeySingleElementWhenConditionIsNull() {
         });
 
         assertSoftly(soft -> {
-            PageRequest<CommunicationEntity> pageRequest = entities.pageRequest();
-            PageRequest<CommunicationEntity> nextedPageRequest = entities.nextPageRequest();
+            PageRequest pageRequest = entities.pageRequest();
+            PageRequest nextedPageRequest = entities.nextPageRequest();
             PageRequest.Cursor cursor = nextedPageRequest.cursor().orElseThrow();
 
             soft.assertThat(entities).hasSize(2);
@@ -223,8 +223,8 @@ void shouldReturnPaginationAfterKeySingleElementWhenThereIsCondition() {
         });
 
         assertSoftly(soft -> {
-            PageRequest<CommunicationEntity> pageRequest = entities.pageRequest();
-            PageRequest<CommunicationEntity> nextedPageRequest = entities.nextPageRequest();
+            PageRequest pageRequest = entities.pageRequest();
+            PageRequest nextedPageRequest = entities.nextPageRequest();
             PageRequest.Cursor cursor = nextedPageRequest.cursor().orElseThrow();
 
             soft.assertThat(entities).hasSize(2);
@@ -254,7 +254,7 @@ void shouldFindSubElement() {
 
 
         assertSoftly(soft -> {
-            PageRequest<CommunicationEntity> nextedPageRequest = entities.nextPageRequest();
+            PageRequest nextedPageRequest = entities.nextPageRequest();
             PageRequest.Cursor cursor = nextedPageRequest.cursor().orElseThrow();
 
             soft.assertThat(entities).hasSize(1);
@@ -300,8 +300,8 @@ void shouldReturnPaginationBeforeKeySingleElementWhenConditionIsNull() {
         });
 
         assertSoftly(soft -> {
-            PageRequest<CommunicationEntity> pageRequest = entities.pageRequest();
-            PageRequest<CommunicationEntity> nextedPageRequest = entities.previousPageRequest();
+            PageRequest pageRequest = entities.pageRequest();
+            PageRequest nextedPageRequest = entities.previousPageRequest();
             PageRequest.Cursor cursor = nextedPageRequest.cursor().orElseThrow();
 
             soft.assertThat(entities).hasSize(2);
@@ -363,8 +363,8 @@ void shouldReturnPaginationBeforeKeySingleElementWhenThereIsCondition() {
         });
 
         assertSoftly(soft -> {
-            PageRequest<CommunicationEntity> pageRequest = entities.pageRequest();
-            PageRequest<CommunicationEntity> nextedPageRequest = entities.previousPageRequest();
+            PageRequest pageRequest = entities.pageRequest();
+            PageRequest nextedPageRequest = entities.previousPageRequest();
             PageRequest.Cursor cursor = nextedPageRequest.cursor().orElseThrow();
 
             soft.assertThat(entities).hasSize(2);
@@ -397,7 +397,7 @@ void shouldReturnPaginationAfterKeyAndReturnEmpty() {
                 PageRequest.ofSize(10).afterKey("Ada", 20, id));
 
         assertSoftly(soft -> {
-            PageRequest<CommunicationEntity> pageRequest = entities.pageRequest();
+            PageRequest pageRequest = entities.pageRequest();
 
             soft.assertThat(entities).isEmpty();
             soft.assertThat(entities.hasNext()).isFalse();
@@ -423,7 +423,7 @@ void shouldReturnPaginationBeforeKeyAndReturnEmpty() {
                 PageRequest.ofSize(10).beforeKey("Ada", 20, id));
 
         assertSoftly(soft -> {
-            PageRequest<CommunicationEntity> pageRequest = entities.pageRequest();
+            PageRequest pageRequest = entities.pageRequest();
 
             soft.assertThat(entities).isEmpty();
             soft.assertThat(entities.hasNext()).isFalse();
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 f22f14618..736698130 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
@@ -447,8 +447,8 @@ void shouldDeleteAll(){
 
     @Test
     void shouldSelectCursor(){
-        PageRequest<CommunicationEntity> request = PageRequest.ofSize(2);
-        PageRequest<CommunicationEntity> afterKey = PageRequest.<CommunicationEntity>ofSize(2)
+        PageRequest request = PageRequest.ofSize(2);
+        PageRequest afterKey = PageRequest.<CommunicationEntity>ofSize(2)
                 .afterKey("Ada");
         SelectQuery query = select().from("Person").orderBy("name").asc().build();