Jakarta Data

buildSrc/src/main/groovy/io.micronaut.build.internal.data-native-example.gradle

@@ -33,9 +33,9 @@ graalvmNative {
         enabled = true
     }
     binaries {
-        all {
-            logger.quiet("GRAALVM_HOME:  {}", (String) System.getenv("GRAALVM_HOME"))
+        configureEach {
             if (System.getenv("GRAALVM_HOME")?.contains("graal") && System.getenv("GRAALVM_HOME")?.contains("21")) {
+                logger.quiet("GRAALVM_HOME:  {}", (String) System.getenv("GRAALVM_HOME"))
                 logger.quiet("Enabling strict image heap!")
                 buildArgs.add("--strict-image-heap")
             }

config/checkstyle/custom-suppressions.xml

@@ -6,4 +6,5 @@
 
 <suppressions>
     <suppress checks="FileLength" files=".*AbstractSqlLikeQueryBuilder.*" />
+    <suppress files="[\\/]generated-src[\\/]" checks="[a-zA-Z0-9]*"/>
 </suppressions>

data-azure-cosmos/src/main/java/io/micronaut/data/cosmos/operations/CosmosSqlStoredQuery.java

@@ -16,6 +16,7 @@
 package io.micronaut.data.cosmos.operations;
 
 import io.micronaut.core.annotation.Internal;
+import io.micronaut.core.convert.ConversionService;
 import io.micronaut.data.model.query.builder.sql.SqlQueryBuilder2;
 import io.micronaut.data.model.runtime.RuntimePersistentEntity;
 import io.micronaut.data.model.runtime.StoredQuery;
@@ -40,10 +41,12 @@ final class CosmosSqlStoredQuery<E, R> extends DefaultSqlStoredQuery<E, R> {
      * @param runtimePersistentEntity The persistent entity
      * @param queryBuilder            The query builder
      * @param update                  The update statement. In this case list of properties to update via API.
+     * @param conversionService       The conversion service
      */
     public CosmosSqlStoredQuery(StoredQuery<E, R> storedQuery, RuntimePersistentEntity<E> runtimePersistentEntity, SqlQueryBuilder2 queryBuilder,
-                                String update) {
-        super(storedQuery, runtimePersistentEntity, queryBuilder);
+                                String update,
+                                ConversionService conversionService) {
+        super(storedQuery, runtimePersistentEntity, queryBuilder, conversionService);
         this.update = update;
     }
 

data-azure-cosmos/src/main/java/io/micronaut/data/cosmos/operations/DefaultReactiveCosmosRepositoryOperations.java

@@ -183,7 +183,7 @@ public <E, R> StoredQuery<E, R> decorate(MethodInvocationContext<?, ?> context,
             update = queryResultStoredQuery.getQueryResult().getUpdate();
         }
         RuntimePersistentEntity<E> runtimePersistentEntity = runtimeEntityRegistry.getEntity(storedQuery.getRootEntity());
-        return new CosmosSqlStoredQuery<>(storedQuery, runtimePersistentEntity, defaultCosmosSqlQueryBuilder, update);
+        return new CosmosSqlStoredQuery<>(storedQuery, runtimePersistentEntity, defaultCosmosSqlQueryBuilder, update, getConversionService());
     }
 
     @Override
@@ -218,7 +218,7 @@ public <T> Mono<T> findOne(@NonNull Class<T> type, Object id) {
     @Override
     public <T> Mono<Boolean> exists(@NonNull PreparedQuery<T, Boolean> pq) {
         SqlPreparedQuery<T, Boolean> preparedQuery = getSqlPreparedQuery(pq);
-        preparedQuery.attachPageable(preparedQuery.getPageable(), true);
+        preparedQuery.attachPageable(preparedQuery.getPageable(), preparedQuery.getQueryLimit(), preparedQuery.getSort(), true);
         preparedQuery.prepare(null);
         SqlQuerySpec querySpec = new SqlQuerySpec(preparedQuery.getQuery(), new ParameterBinder().bindParameters(preparedQuery));
         logQuery(querySpec);
@@ -235,7 +235,7 @@ public <T> Mono<Boolean> exists(@NonNull PreparedQuery<T, Boolean> pq) {
     @NonNull
     public <T, R> Mono<R> findOne(@NonNull PreparedQuery<T, R> pq) {
         SqlPreparedQuery<T, R> preparedQuery = getSqlPreparedQuery(pq);
-        preparedQuery.attachPageable(preparedQuery.getPageable(), true);
+        preparedQuery.attachPageable(preparedQuery.getPageable(), preparedQuery.getQueryLimit(), preparedQuery.getSort(), true);
         preparedQuery.prepare(null);
         SqlQuerySpec querySpec = new SqlQuerySpec(preparedQuery.getQuery(), new ParameterBinder().bindParameters(preparedQuery));
         logQuery(querySpec);
@@ -276,7 +276,7 @@ public <T> Mono<Long> count(PagedQuery<T> pagedQuery) {
     @NonNull
     public <T, R> Flux<R> findAll(@NonNull PreparedQuery<T, R> pq) {
         SqlPreparedQuery<T, R> preparedQuery = getSqlPreparedQuery(pq);
-        preparedQuery.attachPageable(preparedQuery.getPageable(), false);
+        preparedQuery.attachPageable(preparedQuery.getPageable(), preparedQuery.getQueryLimit(), preparedQuery.getSort(), false);
         preparedQuery.prepare(null);
         boolean dtoProjection = preparedQuery.isDtoProjection();
         boolean isEntity = preparedQuery.getResultDataType() == DataType.ENTITY;