From b46b97a3e702c2f3bf03d85ef5d9d593ab9297dc Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Sun, 19 Jan 2025 19:43:29 +0100 Subject: [PATCH 1/4] Remove unused Transactional import Signed-off-by: Antoine Rey --- .../springframework/samples/petclinic/owner/OwnerRepository.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java b/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java index 5d7a40fbb..ab594841c 100644 --- a/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java +++ b/src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java @@ -23,7 +23,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import org.springframework.transaction.annotation.Transactional; /** * Repository class for Owner domain objects All method names are compliant From 73d73609b5dafb11e070f19150f66a4fc679d314 Mon Sep 17 00:00:00 2001 From: Antoine Rey Date: Sun, 19 Jan 2025 19:13:56 +0100 Subject: [PATCH 2/4] Use Java Streams to sort the Specialty objects by their name Signed-off-by: Antoine Rey --- .../springframework/samples/petclinic/vet/Vet.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java b/src/main/java/org/springframework/samples/petclinic/vet/Vet.java index d8a1fc84d..00c7ec1c8 100644 --- a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java +++ b/src/main/java/org/springframework/samples/petclinic/vet/Vet.java @@ -15,14 +15,13 @@ */ package org.springframework.samples.petclinic.vet; -import java.util.ArrayList; -import java.util.Collections; +import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; -import org.springframework.beans.support.MutableSortDefinition; -import org.springframework.beans.support.PropertyComparator; +import org.springframework.samples.petclinic.model.NamedEntity; import org.springframework.samples.petclinic.model.Person; import jakarta.persistence.Entity; @@ -59,9 +58,9 @@ public class Vet extends Person { @XmlElement public List getSpecialties() { - List sortedSpecs = new ArrayList<>(getSpecialtiesInternal()); - PropertyComparator.sort(sortedSpecs, new MutableSortDefinition("name", true, true)); - return Collections.unmodifiableList(sortedSpecs); + return getSpecialtiesInternal().stream() + .sorted(Comparator.comparing(NamedEntity::getName)) + .collect(Collectors.toList()); } public int getNrOfSpecialties() { From 1f89996e1ff53eb0d3990bbb68e382b118b1b556 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 4 Feb 2025 08:47:30 +0000 Subject: [PATCH 3/4] Update Spring Boot to 3.4.2 --- build.gradle | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 17c3763e2..b52d8e185 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.4.0' + id 'org.springframework.boot' version '3.4.2' id 'io.spring.dependency-management' version '1.1.6' id 'org.graalvm.buildtools.native' version '0.10.3' id 'org.cyclonedx.bom' version '1.10.0' diff --git a/pom.xml b/pom.xml index 9b9b815df..27fb9a6bd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0 + 3.4.2 From aa2273e955c3a5e9d17201c0f81ad3d25b602a08 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 4 Feb 2025 09:08:45 +0000 Subject: [PATCH 4/4] Make sure MySQL test app works --- .../samples/petclinic/MysqlTestApplication.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/springframework/samples/petclinic/MysqlTestApplication.java b/src/test/java/org/springframework/samples/petclinic/MysqlTestApplication.java index 8c7560a19..f98d892d3 100644 --- a/src/test/java/org/springframework/samples/petclinic/MysqlTestApplication.java +++ b/src/test/java/org/springframework/samples/petclinic/MysqlTestApplication.java @@ -40,7 +40,8 @@ public class MysqlTestApplication { } public static void main(String[] args) { - SpringApplication.run(PetClinicApplication.class, "--spring.profiles.active=mysql"); + SpringApplication.run(PetClinicApplication.class, "--spring.profiles.active=mysql", + "--spring.docker.compose.enabled=false"); } }