Progress

Author: dstepanov

Diff for: data-model/src/main/java/io/micronaut/data/model/Page.java

@@ -76,7 +76,12 @@ public interface Page<T> extends Slice<T> {
      */
     default int getTotalPages() {
         int size = getSize();
-        return size == 0 ? 1 : (int) Math.ceil((double) getTotalSize() / (double) size);
+        long totalSize = getTotalSize();
+        if (totalSize == -1) {
+            throw new IllegalStateException("Page does not contain total count. " +
+                "It is likely that the Pageable needs to be modified to request this information.");
+        }
+        return size == 0 ? 1 : (int) Math.ceil((double) totalSize / (double) size);
     }
 
     @Override

Diff for: data-processor/src/test/groovy/io/micronaut/data/processor/sql/BuildQuerySpec.groovy

@@ -28,13 +28,11 @@ import io.micronaut.data.model.entities.Invoice
 import io.micronaut.data.model.query.QueryModel
 import io.micronaut.data.model.query.builder.sql.Dialect
 import io.micronaut.data.model.query.builder.sql.SqlQueryBuilder
-import io.micronaut.data.model.runtime.StoredQuery
 import io.micronaut.data.processor.entity.ActivityPeriodEntity
 import io.micronaut.data.processor.visitors.AbstractDataSpec
 import io.micronaut.data.tck.entities.Author
 import io.micronaut.data.tck.entities.Restaurant
 import io.micronaut.data.tck.jdbc.entities.EmployeeGroup
-import io.micronaut.inject.ExecutableMethod
 import spock.lang.Issue
 import spock.lang.PendingFeature
 import spock.lang.Unroll
@@ -2137,7 +2135,7 @@ interface TestRepository extends GenericRepository<Book, Long> {
 """)
         def findAll = repository.findPossibleMethods("findAll").findFirst().get()
         expect:
-            getQuery(findAll) == """SELECT book_.`id`,book_.`author_id`,book_.`genre_id`,book_.`title`,book_.`total_pages`,book_.`publisher_id`,book_.`last_updated`,book_author_.`name` AS author_name,book_author_.`nick_name` AS author_nick_name FROM `book` book_ INNER JOIN `author` book_author_ ON book_.`author_id`=book_author_.`id` WHERE (book_.`id` IN (SELECT book_book_.`id` FROM `book` book_book_ WHERE (book_book_.`id` IN (SELECT book_book_book_.`id` FROM `book` book_book_book_ INNER JOIN `author` book_book_book_author_ ON book_book_book_.`author_id`=book_book_book_author_.`id` ORDER BY book_book_book_author_.`name` ASC,book_book_book_.`title` ASC))"""
+            getQuery(findAll) == """SELECT book_.`id`,book_.`author_id`,book_.`genre_id`,book_.`title`,book_.`total_pages`,book_.`publisher_id`,book_.`last_updated`,book_author_.`name` AS author_name,book_author_.`nick_name` AS author_nick_name FROM `book` book_ INNER JOIN `author` book_author_ ON book_.`author_id`=book_author_.`id` WHERE (book_.`id` IN (SELECT book_book_.`id` FROM `book` book_book_ WHERE (book_book_.`id` IN (SELECT book_book_book_.`id` FROM `book` book_book_book_ INNER JOIN `author` book_book_book_author_ ON book_book_book_.`author_id`=book_book_book_author_.`id`))"""
             getParameterRoles(findAll) == ["pageableRequired", "sort"]
     }
 

Diff for: data-tck/src/main/groovy/io/micronaut/data/tck/tests/AbstractPageSpec.groovy

@@ -126,11 +126,8 @@ abstract class AbstractPageSpec extends Specification {
         then:
         thrown(IllegalStateException)
 
-        when:
-        page.getTotalSize()
-
-        then:
-        thrown(IllegalStateException)
+        and:
+        page.getTotalSize() == -1
     }
 
     void "test pageable sort"() {

Diff for: data-tck/src/main/groovy/io/micronaut/data/tck/tests/AbstractRepositorySpec.groovy

@@ -683,23 +683,19 @@ abstract class AbstractRepositorySpec extends Specification {
         when:
             def books1 = bookRepository.listPageableCustomQuery(Pageable.from(0).order("author.name").order("title")).getContent()
             def books2 = bookRepository.findAll(Pageable.from(0).order("author.name").order("title")).getContent()
-            // Duplicate order
-            def books3 = bookRepository.findAllSorted(Pageable.from(0).order("author.name").order("title")).getContent()
             // Order defined only by method
-            def books4 = bookRepository.findAllSorted(Pageable.from(0)).getContent()
+            def books3 = bookRepository.findAllSorted(Pageable.from(0)).getContent()
             // Extra order
-            def books5 = bookRepository.findAllSorted2(Pageable.from(0).order("title")).getContent()
+            def books4 = bookRepository.findAllSorted2(Pageable.from(0).order("title")).getContent()
         then:
             books1.size() == 6
             books2.size() == 6
             books3.size() == 6
             books4.size() == 6
-            books5.size() == 6
             books1[0].title == "The Border"
             books2[0].title == "The Border"
             books3[0].title == "The Border"
             books4[0].title == "The Border"
-            books5[0].title == "The Border"
         cleanup:
             cleanupData()
     }