feat: update structure

Signed-off-by: Otavio Santana <[email protected]>
JNOSQL · Sep 18, 2024 · 153e1d2 · 153e1d2
1 parent a907909
commit 153e1d2
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 240 deletions.
diff --git a/quarkus-jnosql-lite/src/main/java/org/jnosql/demoee/AuthorWithBooksRepository.java b/quarkus-jnosql-lite/src/main/java/org/jnosql/demoee/AuthorWithBooksRepository.java
@@ -1,12 +1,12 @@
 package org.jnosql.demoee;
 
-import jakarta.data.page.Pageable;
-import jakarta.data.repository.PageableRepository;
+import jakarta.data.page.PageRequest;
+import jakarta.data.repository.BasicRepository;
 import jakarta.data.repository.Repository;
 
 import java.util.stream.Stream;
 
 @Repository
-public interface AuthorWithBooksRepository extends PageableRepository<AuthorWithBooks, String> {
-    Stream<AuthorWithBooks> findByName(String name, Pageable pageable);
+public interface AuthorWithBooksRepository extends BasicRepository<AuthorWithBooks, String> {
+    Stream<AuthorWithBooks> findByName(String name, PageRequest pageable);
 }
diff --git a/quarkus-jnosql-lite/src/main/java/org/jnosql/demoee/BookWithAuthorRepository.java b/quarkus-jnosql-lite/src/main/java/org/jnosql/demoee/BookWithAuthorRepository.java
@@ -1,15 +1,14 @@
 package org.jnosql.demoee;
 
-import jakarta.data.page.Pageable;
+import jakarta.data.page.PageRequest;
 import jakarta.data.repository.*;
-import jakarta.ws.rs.QueryParam;
 
 import java.util.stream.Stream;
 
 @Repository
-public interface BookWithAuthorRepository extends PageableRepository<BookWithAuthor, String> {
+public interface BookWithAuthorRepository extends BasicRepository<BookWithAuthor, String> {
     @Query("select * from BookWithAuthor where author._id = @authorId")
     Stream<BookWithAuthor> listBooksByAuthorId(@Param("authorId") String id);
 
-    Stream<BookWithAuthor> findByTitleLike(String title, Pageable pageable);
+    Stream<BookWithAuthor> findByTitleLike(String title, PageRequest pageable);
 }
diff --git a/quarkus-jnosql-lite/src/main/java/org/jnosql/demoee/Bookstore.java b/quarkus-jnosql-lite/src/main/java/org/jnosql/demoee/Bookstore.java
@@ -1,6 +1,7 @@
 package org.jnosql.demoee;
 
-import jakarta.data.page.Pageable;
+import jakarta.data.Order;
+import jakarta.data.page.PageRequest;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 
@@ -36,12 +37,12 @@ public AuthorWithBooks save(AuthorWithBooks author) {
         return author;
     }
 
-    public Stream<AuthorWithBooks> findAuthorsByName(String name, Pageable pageable) {
+    public Stream<AuthorWithBooks> findAuthorsByName(String name, PageRequest pageable) {
         return authorWithBooksRepository.findByName(name, pageable);
     }
 
-    public Stream<AuthorWithBooks> listAuthors(Pageable pageable) {
-        return authorWithBooksRepository.findAll(pageable).stream();
+    public Stream<AuthorWithBooks> listAuthors(PageRequest pageable) {
+        return authorWithBooksRepository.findAll(pageable, Order.by()).stream();
     }
 
     public Optional<AuthorWithBooks> findAuthorById(String authorId) {
@@ -58,11 +59,11 @@ public BookWithAuthor save(BookWithAuthor bookWithAuthor) {
         return bookWithAuthor;
     }
 
-    public Stream<BookWithAuthor> findBooksByTitle(String title, Pageable pageable) {
+    public Stream<BookWithAuthor> findBooksByTitle(String title, PageRequest pageable) {
         return bookWithAuthorRepository.findByTitleLike(title, pageable);
     }
 
-    public Stream<BookWithAuthor> listBooks(Pageable pageable) {
-        return bookWithAuthorRepository.findAll(pageable).stream();
+    public Stream<BookWithAuthor> listBooks(PageRequest pageable) {
+        return bookWithAuthorRepository.findAll(pageable, Order.by()).stream();
     }
 }
diff --git a/quarkus-jnosql-lite/src/main/java/org/jnosql/demoee/PageableResource.java b/quarkus-jnosql-lite/src/main/java/org/jnosql/demoee/PageableResource.java
@@ -2,21 +2,15 @@
 
 
 import jakarta.data.Direction;
-import jakarta.data.page.Pageable;
+import jakarta.data.page.PageRequest;
 import jakarta.data.Sort;
 
-import java.util.Arrays;
-import java.util.Objects;
 
 public interface PageableResource {
 
 
-    default Pageable createPageable(String orderBy, int page, int pageSize) {
-        return Pageable.ofSize(pageSize).page(page)
-                .sortBy(Arrays.stream(orderBy.split(","))
-                        .map(this::convertToSort)
-                        .filter(Objects::nonNull)
-                        .toList());
+    default PageRequest createPageable(String orderBy, int page, int pageSize) {
+        return PageRequest.ofPage(page).size(pageSize);
     }
 
 

diff --git a/quarkus-jnosql-lite/src/test/java/org/jnosql/demoee/AuthorResourceTest.java b/quarkus-jnosql-lite/src/test/java/org/jnosql/demoee/AuthorResourceTest.java
diff --git a/quarkus-jnosql-lite/src/test/java/org/jnosql/demoee/BookResourceTest.java b/quarkus-jnosql-lite/src/test/java/org/jnosql/demoee/BookResourceTest.java
diff --git a/quarkus-mongodb/src/main/java/org/jnosql/demoee/DogRepository.java b/quarkus-mongodb/src/main/java/org/jnosql/demoee/DogRepository.java
@@ -1,8 +1,9 @@
 package org.jnosql.demoee;
 
-import jakarta.data.repository.PageableRepository;
+
+import jakarta.data.repository.BasicRepository;
 import jakarta.data.repository.Repository;
 
 @Repository
-public interface DogRepository extends PageableRepository<Dog, String> {
+public interface DogRepository extends BasicRepository<Dog, String> {
 }
diff --git a/quarkus-mongodb/src/main/java/org/jnosql/demoee/DogResource.java b/quarkus-mongodb/src/main/java/org/jnosql/demoee/DogResource.java
@@ -3,8 +3,9 @@
 import com.github.javafaker.Faker;
 
 
-import jakarta.data.page.Pageable;
+import jakarta.data.Order;
 import jakarta.data.Sort;
+import jakarta.data.page.PageRequest;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.DELETE;
@@ -53,8 +54,10 @@ public List<Dog> random(){
     @GET
     public List<Dog> findAll(@QueryParam("page") @DefaultValue("1") long page,
                              @QueryParam("size") @DefaultValue("10") int size){
-        Pageable pageable = Pageable.ofPage(page).size(size).sortBy(Sort.asc("name"));
-       return this.repository.findAll(pageable).content();
+        PageRequest pageable = PageRequest.ofPage(page).size(size);
+
+        Order<Dog> order = Order.by(Sort.asc("name"));
+       return this.repository.findAll(pageable, order).content();
     }
 
     @POST

diff --git a/quarkus-mongodb/src/main/java/org/jnosql/demoee/FishService.java b/quarkus-mongodb/src/main/java/org/jnosql/demoee/FishService.java
@@ -5,10 +5,9 @@
 import com.github.javafaker.Faker;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
-import jakarta.nosql.document.DocumentTemplate;
-
 
 import org.bson.types.ObjectId;
+import org.eclipse.jnosql.mapping.document.DocumentTemplate;
 
 import java.util.List;
 import java.util.Optional;

diff --git a/tomee-jnosql-sample/src/main/java/org/soujava/Animal.java b/tomee-jnosql-sample/src/main/java/org/soujava/Animal.java
@@ -1,9 +1,9 @@
 package org.soujava;
 
 import jakarta.nosql.Column;
+import jakarta.nosql.Convert;
 import jakarta.nosql.Entity;
 import jakarta.nosql.Id;
-import org.eclipse.jnosql.mapping.Convert;
 
 import java.util.Objects;
 
@@ -57,4 +57,4 @@ public String toString() {
                 ", name='" + name + '\'' +
                 '}';
     }
-}
+}
diff --git a/tomee-jnosql-sample/src/main/java/org/soujava/AnimalRepository.java b/tomee-jnosql-sample/src/main/java/org/soujava/AnimalRepository.java
@@ -1,9 +1,9 @@
 package org.soujava;
 
-import jakarta.data.repository.PageableRepository;
+import jakarta.data.repository.BasicRepository;
 import jakarta.data.repository.Repository;
 
 
 @Repository
-public interface AnimalRepository extends PageableRepository<Animal, String> {
-}
+public interface AnimalRepository extends BasicRepository<Animal, String> {
+}