Upgrade dependencies & polish code (#21)

- Spring Boot 3.4.4
- MySQL 9.2

Author: maciejwalkowiak

docker-compose.yml

@@ -1,8 +1,6 @@
-version: "2.2"
-
 services:
   mysql:
-    image: mysql:8.0
+    image: mysql:9.2
     ports:
       - "3306:3306"
     environment:

pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.5</version>
+        <version>3.4.4</version>
     </parent>
     <name>petclinic</name>
 
@@ -64,7 +64,6 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>mysql</artifactId>
-            <version>1.17.6</version>
             <scope>test</scope>
         </dependency>
 
@@ -138,8 +137,7 @@
                             <additionalProperties>
                                 <encoding.source>${project.build.sourceEncoding}</encoding.source>
                                 <encoding.reporting>${project.reporting.outputEncoding}</encoding.reporting>
-                                <java.source>${maven.compiler.source}</java.source>
-                                <java.target>${maven.compiler.target}</java.target>
+                                <java.version>${maven.compiler.release}</java.version>
                             </additionalProperties>
                         </configuration>
                     </execution>

src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java

@@ -141,10 +141,10 @@ public ModelAndView showOwner(@PathVariable("ownerId") int ownerId) {
 		return mav;
 	}
 
-	static record OwnerDetails(Owner owner, List<Pet> pets) {
+	record OwnerDetails(Owner owner, List<Pet> pets) {
 	}
 
-	static record PetDetails(Pet pet, PetType type, List<Visit> visits) {
+	record PetDetails(Pet pet, PetType type, List<Visit> visits) {
 	}
 
 }

src/main/java/org/springframework/samples/petclinic/owner/OwnerRepository.java

@@ -24,7 +24,7 @@
 /**
  * Repository class for <code>Owner</code> domain objects All method names are compliant with Spring Data naming
  * conventions so this interface can easily be extended for Spring Data See here:
- * http://static.springsource.org/spring-data/jpa/docs/current/reference/html/jpa.repositories.html#jpa.query-methods.query-creation
+ * <a href="https://docs.spring.io/spring-data/jpa/reference/repositories/query-methods-details.html#repositories.query-methods.query-creation">Query Creation</a>
  *
  * @author Ken Krebs
  * @author Juergen Hoeller
@@ -37,7 +37,7 @@ public interface OwnerRepository extends Repository<Owner, Integer> {
 	/**
 	 * Retrieve {@link Owner}s from the data store by last name, returning all owners whose last name <i>starts</i> with
 	 * the given name.
-	 * 
+	 *
 	 * @param lastName Value to search for
 	 * @return a Collection of matching {@link Owner}s (or an empty Collection if none found)
 	 */
@@ -47,7 +47,7 @@ public interface OwnerRepository extends Repository<Owner, Integer> {
 
 	/**
 	 * Retrieve an {@link Owner} from the data store by id.
-	 * 
+	 *
 	 * @param id the id to search for
 	 * @return the {@link Owner} if found
 	 */
@@ -56,7 +56,7 @@ public interface OwnerRepository extends Repository<Owner, Integer> {
 
 	/**
 	 * Save an {@link Owner} to the data store, either inserting or updating it.
-	 * 
+	 *
 	 * @param owner the {@link Owner} to save
 	 */
 	void save(Owner owner);

src/main/java/org/springframework/samples/petclinic/owner/PetRepository.java

@@ -24,7 +24,7 @@
 /**
  * Repository class for <code>Pet</code> domain objects All method names are compliant with Spring Data naming
  * conventions so this interface can easily be extended for Spring Data See here:
- * http://static.springsource.org/spring-data/jpa/docs/current/reference/html/jpa.repositories.html#jpa.query-methods.query-creation
+ * <a href="https://docs.spring.io/spring-data/jpa/reference/repositories/query-methods-details.html#repositories.query-methods.query-creation">Query Creation</a>
  *
  * @author Ken Krebs
  * @author Juergen Hoeller
@@ -36,7 +36,7 @@ public interface PetRepository extends Repository<Pet, Integer> {
 
 	/**
 	 * Retrieve all {@link PetType}s from the data store.
-	 * 
+	 *
 	 * @return a Collection of {@link PetType}s.
 	 */
 	@Query("select * from pet_type order by name")
@@ -48,7 +48,7 @@ public interface PetRepository extends Repository<Pet, Integer> {
 
 	/**
 	 * Retrieve a {@link Pet} from the data store by id.
-	 * 
+	 *
 	 * @param id the id to search for
 	 * @return the {@link Pet} if found
 	 */
@@ -57,7 +57,7 @@ public interface PetRepository extends Repository<Pet, Integer> {
 
 	/**
 	 * Save a {@link Pet} to the data store, either inserting or updating it.
-	 * 
+	 *
 	 * @param pet the {@link Pet} to save
 	 */
 	void save(Pet pet);

src/main/java/org/springframework/samples/petclinic/owner/PetTypeFormatter.java

@@ -18,18 +18,16 @@
 import java.text.ParseException;
 import java.util.Collection;
 import java.util.Locale;
-import org.springframework.beans.factory.annotation.Autowired;
+import java.util.stream.Collectors;
+
 import org.springframework.format.Formatter;
 import org.springframework.stereotype.Component;
 
 /**
  * Instructs Spring MVC on how to parse and print elements of type 'PetType'. Starting from Spring 3.0, Formatters have
  * come as an improvement in comparison to legacy PropertyEditors. See the following links for more details: - The
  * Spring ref doc:
- * http://static.springsource.org/spring/docs/current/spring-framework-reference/html/validation.html#format-Formatter-SPI
- * - A nice blog entry from Gordon Dickens:
- * http://gordondickens.com/wordpress/2010/09/30/using-spring-3-0-custom-type-converter/
- * <p/>
+ * <a href="https://docs.spring.io/spring-framework/reference/core/validation/format.html#format-Formatter-SPI">Formatter SPI</a>
  *
  * @author Mark Fisher
  * @author Juergen Hoeller
@@ -40,7 +38,6 @@ public class PetTypeFormatter implements Formatter<PetType> {
 
 	private final PetRepository pets;
 
-	@Autowired
 	public PetTypeFormatter(PetRepository pets) {
 		this.pets = pets;
 	}
@@ -52,13 +49,11 @@ public String print(PetType petType, Locale locale) {
 
 	@Override
 	public PetType parse(String text, Locale locale) throws ParseException {
-		Collection<PetType> findPetTypes = this.pets.findPetTypes();
-		for (PetType type : findPetTypes) {
-			if (type.name().equals(text)) {
-				return type;
-			}
-		}
-		throw new ParseException("type not found: " + text, 0);
+		return this.pets.findPetTypes()
+            .stream()
+            .filter(t -> t.name().equals(text))
+            .findFirst()
+            .orElseThrow(() -> new ParseException("type not found: " + text, 0));
 	}
 
 }

src/main/java/org/springframework/samples/petclinic/owner/VisitController.java

@@ -59,7 +59,7 @@ public void setAllowedFields(WebDataBinder dataBinder) {
 	 * Since we do not use the session scope, make sure that Pet object always has an id (Even though id is not part of
 	 * the form fields)
 	 *
-	 * @param petId
+	 * @param petId - pet id
 	 * @return Pet
 	 */
 	@ModelAttribute("visit")

src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java

@@ -26,7 +26,7 @@
 /**
  * Repository class for <code>Vet</code> domain objects All method names are compliant with Spring Data naming
  * conventions so this interface can easily be extended for Spring Data See here:
- * http://static.springsource.org/spring-data/jpa/docs/current/reference/html/jpa.repositories.html#jpa.query-methods.query-creation
+ * <a href="https://docs.spring.io/spring-data/jpa/reference/repositories/query-methods-details.html#repositories.query-methods.query-creation">Query Creation</a>
  *
  * @author Ken Krebs
  * @author Juergen Hoeller

src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java

@@ -24,7 +24,7 @@
 /**
  * Repository class for <code>Visit</code> domain objects All method names are compliant with Spring Data naming
  * conventions so this interface can easily be extended for Spring Data See here:
- * http://static.springsource.org/spring-data/jpa/docs/current/reference/html/jpa.repositories.html#jpa.query-methods.query-creation
+ * <a href="https://docs.spring.io/spring-data/jpa/reference/repositories/query-methods-details.html#repositories.query-methods.query-creation">Query Creation</a>
  *
  * @author Ken Krebs
  * @author Juergen Hoeller

src/main/resources/application-test.properties

@@ -1,2 +1,2 @@
 # use test containers to spin up mysql
-spring.datasource.url=jdbc:tc:mysql:8.0.25://hostname/databasename
+spring.datasource.url=jdbc:tc:mysql:9.2://hostname/databasename