Progress

Author: dstepanov

data-hibernate-jpa/src/main/java/io/micronaut/data/hibernate/operations/HibernateJpaOperations.java

@@ -24,6 +24,7 @@
 import io.micronaut.core.annotation.NonNull;
 import io.micronaut.core.annotation.Nullable;
 import io.micronaut.core.convert.ConversionService;
+import io.micronaut.core.convert.value.ConvertibleValuesMap;
 import io.micronaut.core.type.Argument;
 import io.micronaut.core.util.ArgumentUtils;
 import io.micronaut.data.annotation.QueryHint;
@@ -117,8 +118,8 @@ final class HibernateJpaOperations extends AbstractHibernateOperations<Session,
     private final TransactionOperations<Session> transactionOperations;
     private ExecutorAsyncOperations asyncOperations;
     private ExecutorService executorService;
-    private boolean uniqueResultOnFindOne = true;
-    private boolean persistOrMergeOnSave = true;
+    private final boolean uniqueResultOnFindOne;
+    private final boolean persistOrMergeOnSave;
 
     /**
      * Default constructor.
@@ -144,6 +145,10 @@ public HibernateJpaOperations(
         this.connectionOperations = connectionOperations;
         this.transactionOperations = transactionOperations;
         this.executorService = executorService;
+        this.uniqueResultOnFindOne = new ConvertibleValuesMap<>(jpaConfiguration.getProperties())
+            .get("uniqueResultOnFindOne", boolean.class, false);
+        this.persistOrMergeOnSave = new ConvertibleValuesMap<>(jpaConfiguration.getProperties())
+            .get("persistOrMergeOnSave", boolean.class, false);
     }
 
     @Override

data-model/src/main/java/io/micronaut/data/model/Page.java

@@ -78,8 +78,7 @@ default int getTotalPages() {
         int size = getSize();
         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 -1;
         }
         return size == 0 ? 1 : (int) Math.ceil((double) totalSize / (double) size);
     }

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

@@ -120,13 +120,8 @@ abstract class AbstractPageSpec extends Specification {
         page.content.every() { it instanceof Person }
         !page.hasTotalSize()
 
-        when:
-        page.getTotalPages()
-
-        then:
-        thrown(IllegalStateException)
-
         and:
+        page.getTotalPages() == -1
         page.getTotalSize() == -1
     }
 

jakarta-data-tck/support/src/main/java/io/micronaut/validation/tck/TckDeployableContainer.java

@@ -42,6 +42,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Map;
 import java.util.Objects;
 
 @Internal
@@ -113,7 +114,6 @@ private static JavaArchive buildSupportLibrary() {
 
     @Override
     public ProtocolMetaData deploy(Archive<?> archive) {
-//        System.setProperty("jakarta.tck.skip.deployment", "true");
         if (archive instanceof LibraryContainer<?> libraryContainer) {
             libraryContainer.addAsLibrary(buildSupportLibrary());
         } else {
@@ -143,6 +143,9 @@ public ProtocolMetaData deploy(Archive<?> archive) {
             ReflectionUtils.setField(defautlBeanIntrospectorClass, "classLoader", shared, classLoader);
 
             ApplicationContext applicationContext = ApplicationContext.builder()
+                .properties(Map.of(
+                    "jpa.default.properties.uniqueResultOnFindOne", "true"
+                ))
                 .classLoader(classLoader)
                 .build()
                 .start();