Merge 4.1

data-hibernate-jpa/src/test/groovy/io/micronaut/data/hibernate/AbstractHibernateQuerySpec.groovy

@@ -83,6 +83,8 @@ abstract class AbstractHibernateQuerySpec extends AbstractQuerySpec {
             def found = userWithWhereRepository.findById(e.id)
         then:
             found.isPresent()
+        cleanup:
+            userWithWhereRepository.deleteById(e.id)
     }
 
     void "test @where on find one deleted"() {
@@ -729,6 +731,28 @@ abstract class AbstractHibernateQuerySpec extends AbstractQuerySpec {
             result.size() == 0
     }
 
+    void "test order by embedded field"() {
+        when:
+            def e1 = userWithWhereRepository.save(new UserWithWhere(id: UUID.randomUUID(), email: "where1@somewhere.com", deleted: false))
+            def u2 = new UserWithWhere(id: UUID.randomUUID(), email: "where2@somewhere.com", deleted: false)
+            u2.audit.createdTime = u2.audit.createdTime.plusSeconds(30)
+            def e2 = userWithWhereRepository.save(u2)
+            def found1 = userWithWhereRepository.findById(e1.id)
+            def found2 = userWithWhereRepository.findById(e2.id)
+        then:
+            found1.present
+            found2.present
+        when:"Sorted by embedded field works"
+            def sortedItems = userWithWhereRepository.findAllByIdInList(List.of(e1.id, e2.id), Sort.of(Sort.Order.desc("audit.createdTime", false)))
+        then:
+            sortedItems
+            sortedItems.size() == 2
+            sortedItems[0].id == e2.id
+            sortedItems[1].id == e1.id
+        cleanup:
+            userWithWhereRepository.deleteAll(List.of(e1, e2))
+    }
+
     private static Specification<Book> testJoin(String value) {
         return ((root, query, criteriaBuilder) -> criteriaBuilder.equal(root.join("author").get("name"), value))
     }

data-hibernate-jpa/src/test/java/io/micronaut/data/hibernate/UserWithWhereRepository.java

@@ -1,11 +1,16 @@
 package io.micronaut.data.hibernate;
 
+import io.micronaut.core.annotation.NonNull;
 import io.micronaut.data.annotation.Repository;
 import io.micronaut.data.hibernate.entities.UserWithWhere;
+import io.micronaut.data.model.Sort;
 import io.micronaut.data.repository.CrudRepository;
 
+import java.util.List;
 import java.util.UUID;
 
 @Repository
 public interface UserWithWhereRepository extends CrudRepository<UserWithWhere, UUID> {
+
+    List<UserWithWhere> findAllByIdInList(List<UUID> ids, @NonNull Sort sort);
 }

data-hibernate-jpa/src/test/java/io/micronaut/data/hibernate/entities/Audit.java

@@ -0,0 +1,29 @@
+package io.micronaut.data.hibernate.entities;
+
+import io.micronaut.data.annotation.Embeddable;
+
+import java.time.Instant;
+
+@Embeddable
+public class Audit {
+
+    private Instant createdTime = Instant.now();
+
+    private String createdBy = "current";
+
+    public Instant getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(Instant createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+}

data-hibernate-jpa/src/test/java/io/micronaut/data/hibernate/entities/UserWithWhere.java

@@ -1,8 +1,10 @@
 package io.micronaut.data.hibernate.entities;
 
+import io.micronaut.data.annotation.Embeddable;
 import io.micronaut.data.annotation.Where;
 
 import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
@@ -17,6 +19,8 @@ public class UserWithWhere {
     private UUID id;
     private String email;
     private Boolean deleted;
+    @Embedded
+    private Audit audit = new Audit();
 
     public UUID getId() {
         return id;
@@ -41,4 +45,12 @@ public Boolean getDeleted() {
     public void setDeleted(Boolean deleted) {
         this.deleted = deleted;
     }
+
+    public Audit getAudit() {
+        return audit;
+    }
+
+    public void setAudit(Audit audit) {
+        this.audit = audit;
+    }
 }

data-model/src/main/java/io/micronaut/data/model/query/builder/AbstractSqlLikeQueryBuilder.java

@@ -1928,7 +1928,8 @@ public QueryResult buildOrderBy(String query, @NonNull PersistentEntity entity,
             List<Association> associations = new ArrayList<>(path.getAssociations());
             int assocCount = associations.size();
             // If last association is embedded, it does not need to be joined to the alias since it will be in the destination table
-            if (assocCount > 0 && associations.get(assocCount - 1) instanceof Embedded) {
+            // JPA/Hibernate is special case and in that case we leave association for specific handling below
+            if (assocCount > 0 && computePropertyPaths() && associations.get(assocCount - 1) instanceof Embedded) {
                 associations.remove(assocCount - 1);
             }
             if (associations.isEmpty()) {

doc-examples/jdbc-spring-template-example-groovy/src/main/groovy/example/AbstractBookRepository.groovy

@@ -18,15 +18,15 @@ import javax.sql.DataSource
 @JdbcRepository(dialect = Dialect.H2)
 abstract class AbstractBookRepository implements CrudRepository<@Valid Book, @NotNull Long> {
 
-    private final JdbcTemplate jdbcTemplate
+    private final JdbcTemplate jdbcTemplate;
 
-    AbstractBookRepository(JdbcTemplate jdbcTemplate) { // <1>
-        this.jdbcTemplate = jdbcTemplate
+    AbstractBookRepository(DataSource dataSource) { // <1>
+        this.jdbcTemplate = new JdbcTemplate(DelegatingDataSource.unwrapDataSource(dataSource)); //<2>
     }
 
     @Transactional
     List<Book> findByTitle(@NonNull @NotNull String title) {
-        return jdbcTemplate.queryForList('SELECT * FROM Book AS book WHERE book.title = ?', title) // <2>
+        return jdbcTemplate.queryForList('SELECT * FROM Book AS book WHERE book.title = ?', title) // <3>
             .collect(m -> new Book(m.id as Long, m.title as String, m.pages as Integer))
     }
 }

doc-examples/jdbc-spring-template-example-groovy/src/test/groovy/example/BookRepositorySpec.groovy

@@ -8,7 +8,7 @@ import spock.lang.Specification
 @MicronautTest(transactional = false)
 @Property(name = 'spec.name', value = 'BookRepositorySpec')
 @Property(name = 'datasources.default.name', value = 'mydb')
-@Property(name = 'datasources.default.transaction-manager', value = 'springJdbc')
+@Property(name = 'datasources.default.transactionManager', value = 'springJdbc')
 @Property(name = 'jpa.default.properties.hibernate.hbm2ddl.auto', value = 'create-drop')
 class BookRepositorySpec extends Specification {
 

doc-examples/jdbc-spring-template-example-java/src/main/java/example/AbstractBookRepository.java

@@ -2,6 +2,7 @@
 
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.core.annotation.NonNull;
+import io.micronaut.data.connection.jdbc.advice.DelegatingDataSource;
 import io.micronaut.data.jdbc.annotation.JdbcRepository;
 import io.micronaut.data.model.query.builder.sql.Dialect;
 import io.micronaut.data.repository.CrudRepository;
@@ -20,13 +21,13 @@ public abstract class AbstractBookRepository implements CrudRepository<@Valid Bo
 
     private final JdbcTemplate jdbcTemplate;
 
-    public AbstractBookRepository(JdbcTemplate jdbcTemplate) { // <1>
-        this.jdbcTemplate = jdbcTemplate;
+    public AbstractBookRepository(DataSource dataSource) { // <1>
+        this.jdbcTemplate = new JdbcTemplate(DelegatingDataSource.unwrapDataSource(dataSource)); //<2>
     }
 
     @Transactional
     public List<Book> findByTitle(@NonNull @NotNull String title) {
-        return jdbcTemplate.queryForList("SELECT * FROM Book AS book WHERE book.title = ?", title) // <2>
+        return jdbcTemplate.queryForList("SELECT * FROM Book AS book WHERE book.title = ?", title) // <3>
             .stream()
             .map(m -> new Book((Long) m.get("id"), (String) m.get("title"), (Integer) m.get("pages")))
             .toList();

doc-examples/jdbc-spring-template-example-java/src/test/java/example/BookRepositoryTest.java

@@ -15,7 +15,7 @@
 @MicronautTest
 @Property(name = "spec.name", value = "BookRepositoryTest")
 @Property(name = "datasources.default.name", value = "mydb")
-@Property(name = "datasources.default.transaction-manager", value = "springJdbc")
+@Property(name = "datasources.default.transactionManager", value = "springJdbc")
 @Property(name = "jpa.default.properties.hibernate.hbm2ddl.auto", value = "create-drop")
 class BookRepositoryTest {
 

doc-examples/jdbc-spring-template-example-kotlin/src/main/kotlin/example/AbstractBookRepository.kt

@@ -13,11 +13,13 @@ import org.springframework.jdbc.core.JdbcTemplate
 @Requires(property = "spec.name", value = "BookRepositoryTest") // tag::clazz[]
 // tag::clazz[]
 @JdbcRepository(dialect = Dialect.H2)
-abstract class AbstractBookRepository(val jdbcTemplate: JdbcTemplate) : CrudRepository<@Valid Book, Long> {  //<1>
+abstract class AbstractBookRepository(dataSource: DataSource) : CrudRepository<@Valid Book, Long> { // <1>
+
+    private val jdbcTemplate: JdbcTemplate = JdbcTemplate(DelegatingDataSource.unwrapDataSource(dataSource)) //<2>
 
     @Transactional
     open fun findByTitle(title: String) = jdbcTemplate
-        .queryForList("SELECT * FROM Book AS book WHERE book.title = ?", title) // <2>
+        .queryForList("SELECT * FROM Book AS book WHERE book.title = ?", title) // <3>
         .map { m -> Book(m["id"] as Long, m["title"] as String, m["pages"] as Int) }
 }
 // end::clazz[]

doc-examples/jdbc-spring-template-example-kotlin/src/test/kotlin/example/BookRepositoryTest.kt

@@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test
 @MicronautTest
 @Property(name = "spec.name", value = "BookRepositoryTest")
 @Property(name = "datasources.default.name", value = "mydb")
-@Property(name = "datasources.default.transaction-manager", value = "springJdbc")
+@Property(name = "datasources.default.transactionManager", value = "springJdbc")
 @Property(name = "jpa.default.properties.hibernate.hbm2ddl.auto", value = "create-drop")
 internal class BookRepositoryTest {
 

src/main/docs/guide/dbc/dbcRepositories.adoc

@@ -46,8 +46,9 @@ The following code illustrates an example that integrates a `JdbcTemplate` insta
 
 snippet::example.AbstractBookRepository[project-base="doc-examples/jdbc-spring-template-example",source="main",tags="clazz"]
 
-<1> Inject the `org.springframework.jdbc.core.JdbcTemplate` configured by the application.
-<2> Now the `JdbcTemplate` API can be used to implement repository methods.
+<1> Inject the `java.sql.DataSource` configured by the application.
+<2> Instantiate a `JdbcTemplate` object using the injected `DataSource`.
+<3> Now the `JdbcTemplate` API can be used to implement repository methods.
 
 In addition, the transaction manager for Spring JDBC needs to be set in application configuration.