Reformat code.

Also, upgrade to Hibernate 7.0 CR1.
This commit is contained in:
Mark Paluch
2025-05-13 16:00:45 +02:00
parent d40fec53e4
commit 2b82d56ded
7 changed files with 170 additions and 177 deletions

View File

@@ -14,7 +14,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hibernate.version>7.0.0.Beta5</hibernate.version> <hibernate.version>7.0.0.CR1</hibernate.version>
<spring-data-bom.version>2025.1.0-SNAPSHOT</spring-data-bom.version> <spring-data-bom.version>2025.1.0-SNAPSHOT</spring-data-bom.version>
</properties> </properties>

View File

@@ -24,7 +24,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication @SpringBootApplication
public class AotJpaApp { public class AotJpaApp {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(AotJpaApp.class, args); SpringApplication.run(AotJpaApp.class, args);
} }
} }

View File

@@ -31,94 +31,95 @@ import org.springframework.stereotype.Component;
@Component @Component
public class CLR implements CommandLineRunner { public class CLR implements CommandLineRunner {
@Autowired UserRepository repository; @Autowired UserRepository repository;
@Override @Override
public void run(String... args) throws Exception { public void run(String... args) throws Exception {
User luke = new User("id-1", "luke"); User luke = new User("id-1", "luke");
luke.setFirstname("Luke"); luke.setFirstname("Luke");
luke.setLastname("Skywalker"); luke.setLastname("Skywalker");
// Post lukeP1 = new Post("I have a bad feeling about this."); // Post lukeP1 = new Post("I have a bad feeling about this.");
// em.persist(lukeP1); // em.persist(lukeP1);
// luke.setPosts(List.of(lukeP1)); // luke.setPosts(List.of(lukeP1));
User leia = new User("id-2", "leia"); User leia = new User("id-2", "leia");
leia.setFirstname("Leia"); leia.setFirstname("Leia");
leia.setLastname("Organa"); leia.setLastname("Organa");
User han = new User("id-3", "han"); User han = new User("id-3", "han");
han.setFirstname("Han"); han.setFirstname("Han");
han.setLastname("Solo"); han.setLastname("Solo");
// Post hanP1 = new Post("It's the ship that made the Kessel Run in less than 12 Parsecs."); // Post hanP1 = new Post("It's the ship that made the Kessel Run in less than 12 Parsecs.");
// em.persist(hanP1); // em.persist(hanP1);
// han.setPosts(List.of(hanP1)); // han.setPosts(List.of(hanP1));
User chewbacca = new User("id-4", "chewbacca"); User chewbacca = new User("id-4", "chewbacca");
User yoda = new User("id-5", "yoda"); User yoda = new User("id-5", "yoda");
Post yodaP1 = new Post("Do. Or do not. There is no try."); Post yodaP1 = new Post("Do. Or do not. There is no try.");
Post yodaP2 = new Post("Decide you must, how to serve them best. If you leave now, help them you could; but you would destroy all for which they have fought, and suffered."); Post yodaP2 = new Post(
// em.persist(yodaP1); "Decide you must, how to serve them best. If you leave now, help them you could; but you would destroy all for which they have fought, and suffered.");
// em.persist(yodaP2); // em.persist(yodaP1);
// yoda.setPosts(List.of(yodaP1, yodaP2)); // em.persist(yodaP2);
// yoda.setPosts(List.of(yodaP1, yodaP2));
User vader = new User("id-6", "vader"); User vader = new User("id-6", "vader");
vader.setFirstname("Anakin"); vader.setFirstname("Anakin");
vader.setLastname("Skywalker"); vader.setLastname("Skywalker");
// Post vaderP1 = new Post("I am your father"); // Post vaderP1 = new Post("I am your father");
// em.persist(vaderP1); // em.persist(vaderP1);
// vader.setPosts(List.of(vaderP1)); // vader.setPosts(List.of(vaderP1));
User kylo = new User("id-7", "kylo"); User kylo = new User("id-7", "kylo");
kylo.setFirstname("Ben"); kylo.setFirstname("Ben");
kylo.setLastname("Solo"); kylo.setLastname("Solo");
repository.saveAll(List.of(luke, leia, han, chewbacca, yoda, vader, kylo)); repository.saveAll(List.of(luke, leia, han, chewbacca, yoda, vader, kylo));
System.out.println("------- annotated multi -------"); System.out.println("------- annotated multi -------");
System.out.println(repository.usersWithUsernamesStartingWith("l")); System.out.println(repository.usersWithUsernamesStartingWith("l"));
System.out.println("------- derived single -------"); System.out.println("------- derived single -------");
System.out.println(repository.findUserByUsername("yoda")); System.out.println(repository.findUserByUsername("yoda"));
// System.out.println("------- derived nested.path -------"); // System.out.println("------- derived nested.path -------");
// System.out.println(repository.findUserByPostsMessageLike("father")); // System.out.println(repository.findUserByPostsMessageLike("father"));
System.out.println("------- derived optional -------"); System.out.println("------- derived optional -------");
System.out.println(repository.findOptionalUserByUsername("yoda")); System.out.println(repository.findOptionalUserByUsername("yoda"));
System.out.println("------- derived count -------"); System.out.println("------- derived count -------");
Long count = repository.countUsersByLastnameLike("Sky"); Long count = repository.countUsersByLastnameLike("Sky");
System.out.println("user count " + count); System.out.println("user count " + count);
System.out.println("------- derived exists -------"); System.out.println("------- derived exists -------");
Boolean exists = repository.existsByUsername("vader"); Boolean exists = repository.existsByUsername("vader");
System.out.println("user exists " + exists); System.out.println("user exists " + exists);
System.out.println("------- derived multi -------"); System.out.println("------- derived multi -------");
System.out.println(repository.findUserByLastnameStartingWith("Sky")); System.out.println(repository.findUserByLastnameStartingWith("Sky"));
System.out.println("------- derived sorted -------"); System.out.println("------- derived sorted -------");
System.out.println(repository.findUserByLastnameStartingWithOrderByFirstname("Sky")); System.out.println(repository.findUserByLastnameStartingWithOrderByFirstname("Sky"));
System.out.println("------- derived page -------"); System.out.println("------- derived page -------");
Page<User> page0 = repository.findUserByLastnameStartingWith("S", PageRequest.of(0, 2)); Page<User> page0 = repository.findUserByLastnameStartingWith("S", PageRequest.of(0, 2));
System.out.println("page0: " + page0); System.out.println("page0: " + page0);
System.out.println("page0.content: " + page0.getContent()); System.out.println("page0.content: " + page0.getContent());
Page<User> page1 = repository.findUserByLastnameStartingWith("S", PageRequest.of(1, 2)); Page<User> page1 = repository.findUserByLastnameStartingWith("S", PageRequest.of(1, 2));
System.out.println("page1: " + page1); System.out.println("page1: " + page1);
System.out.println("page1.content: " + page1.getContent()); System.out.println("page1.content: " + page1.getContent());
System.out.println("------- derived slice -------"); System.out.println("------- derived slice -------");
Slice<User> slice0 = repository.findUserByUsernameAfter("luke", PageRequest.of(0, 2)); Slice<User> slice0 = repository.findUserByUsernameAfter("luke", PageRequest.of(0, 2));
System.out.println("slice0: " + slice0); System.out.println("slice0: " + slice0);
System.out.println("slice0.content: " + slice0.getContent()); System.out.println("slice0.content: " + slice0.getContent());
System.out.println("------- derived top -------"); System.out.println("------- derived top -------");
System.out.println(repository.findTop2UsersByLastnameStartingWith("S")); System.out.println(repository.findTop2UsersByLastnameStartingWith("S"));
// System.out.println("------- derived with fields -------"); // System.out.println("------- derived with fields -------");
// System.out.println(repository.findJustUsernameBy()); // System.out.println(repository.findJustUsernameBy());
} }
} }

View File

@@ -30,39 +30,37 @@ import java.util.Random;
@Entity @Entity
public class Post { public class Post {
@Id @Id
@GeneratedValue @GeneratedValue private Long id;
private Long id;
private String message; private String message;
private Instant date; private Instant date;
public Post() { public Post() {}
}
public Post(String message) { public Post(String message) {
this.message = message; this.message = message;
this.date = Instant.now().minus(new Random().nextLong(100), ChronoUnit.MINUTES); this.date = Instant.now().minus(new Random().nextLong(100), ChronoUnit.MINUTES);
} }
public String getMessage() { public String getMessage() {
return message; return message;
} }
public void setMessage(String message) { public void setMessage(String message) {
this.message = message; this.message = message;
} }
public Instant getDate() { public Instant getDate() {
return date; return date;
} }
public void setDate(Instant date) { public void setDate(Instant date) {
this.date = date; this.date = date;
} }
@Override @Override
public String toString() { public String toString() {
return message; return message;
} }
} }

View File

@@ -28,85 +28,78 @@ import java.time.Instant;
@Entity(name = "users") @Entity(name = "users")
public class User { public class User {
@Id @Id private String id;
private String id; private String username;
private String username;
@Column(name = "first_name") String firstname; @Column(name = "first_name") String firstname;
@Column(name = "last_name") String lastname; @Column(name = "last_name") String lastname;
// @OneToMany // @OneToMany
// private List<Post> posts; // private List<Post> posts;
Instant registrationDate; Instant registrationDate;
Instant lastSeen; Instant lastSeen;
public User() { public User() {}
}
public User(String id, String username) { public User(String id, String username) {
this.id = id; this.id = id;
this.username = username; this.username = username;
} }
public String getId() { public String getId() {
return id; return id;
} }
public String getUsername() { public String getUsername() {
return username; return username;
} }
public String getFirstname() { public String getFirstname() {
return firstname; return firstname;
} }
public void setFirstname(String firstname) { public void setFirstname(String firstname) {
this.firstname = firstname; this.firstname = firstname;
} }
public String getLastname() { public String getLastname() {
return lastname; return lastname;
} }
public void setLastname(String lastname) { public void setLastname(String lastname) {
this.lastname = lastname; this.lastname = lastname;
} }
public Instant getRegistrationDate() { public Instant getRegistrationDate() {
return registrationDate; return registrationDate;
} }
public void setRegistrationDate(Instant registrationDate) { public void setRegistrationDate(Instant registrationDate) {
this.registrationDate = registrationDate; this.registrationDate = registrationDate;
} }
public Instant getLastSeen() { public Instant getLastSeen() {
return lastSeen; return lastSeen;
} }
public void setLastSeen(Instant lastSeen) { public void setLastSeen(Instant lastSeen) {
this.lastSeen = lastSeen; this.lastSeen = lastSeen;
} }
// public List<Post> getPosts() { // public List<Post> getPosts() {
// return posts; // return posts;
// } // }
// //
// public void setPosts(List<Post> posts) { // public void setPosts(List<Post> posts) {
// this.posts = posts; // this.posts = posts;
// } // }
@Override @Override
public String toString() { public String toString() {
return "User{" + return "User{" + "id='" + id + '\'' + ", username='" + username + '\'' + ", firstname='" + firstname + '\''
"id='" + id + '\'' + + ", lastname='" + lastname + '\'' + ", registrationDate=" + registrationDate + ", lastSeen=" + lastSeen +
", username='" + username + '\'' + // ", posts=" + posts +
", firstname='" + firstname + '\'' + '}';
", lastname='" + lastname + '\'' + }
", registrationDate=" + registrationDate +
", lastSeen=" + lastSeen +
// ", posts=" + posts +
'}';
}
} }

View File

@@ -31,27 +31,27 @@ import org.springframework.data.repository.CrudRepository;
*/ */
public interface UserRepository extends CrudRepository<User, String>, QuerydslPredicateExecutor<User> { public interface UserRepository extends CrudRepository<User, String>, QuerydslPredicateExecutor<User> {
User findUserByUsername(String username); User findUserByUsername(String username);
Optional<User> findOptionalUserByUsername(String username); Optional<User> findOptionalUserByUsername(String username);
Long countUsersByLastnameLike(String lastname); Long countUsersByLastnameLike(String lastname);
Boolean existsByUsername(String username); Boolean existsByUsername(String username);
List<User> findUserByLastnameLike(String lastname); List<User> findUserByLastnameLike(String lastname);
List<User> findUserByLastnameStartingWithOrderByFirstname(String lastname); List<User> findUserByLastnameStartingWithOrderByFirstname(String lastname);
List<User> findTop2UsersByLastnameStartingWith(String lastname); List<User> findTop2UsersByLastnameStartingWith(String lastname);
Slice<User> findUserByUsernameAfter(String username, Pageable pageable); Slice<User> findUserByUsernameAfter(String username, Pageable pageable);
List<User> findUserByLastnameStartingWith(String lastname); List<User> findUserByLastnameStartingWith(String lastname);
Page<User> findUserByLastnameStartingWith(String lastname, Pageable page); Page<User> findUserByLastnameStartingWith(String lastname, Pageable page);
@Query("SELECT u FROM example.springdata.aot.User u WHERE u.username LIKE ?1%") @Query("SELECT u FROM example.springdata.aot.User u WHERE u.username LIKE ?1%")
List<User> usersWithUsernamesStartingWith(String username); List<User> usersWithUsernamesStartingWith(String username);
} }

View File

@@ -1,5 +1,5 @@
spring.jpa.defer-datasource-initialization=true spring.jpa.defer-datasource-initialization=true
spring.jpa.properties.hibernate.boot.allow_jdbc_metadata_access=false
spring.aot.repositories.enabled=true spring.aot.repositories.enabled=true
#spring.aot.jpa.repositories.use-entitymanager=true
#logging.level.org.springframework.data.repository.aot.generate.RepositoryContributor=trace #logging.level.org.springframework.data.repository.aot.generate.RepositoryContributor=trace