From 733aff08d76258e04aa7c9d4cff7e6cd1cccbfc7 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2026 13:37:15 +0000
Subject: [PATCH] bug: upgrade Spring Boot to 2.5.15 to fix spring-expression
CVE-2023-20861
---
UserFront/pom.xml | 2 +-
.../service/UserServiceImpl/AppointmentServiceImpl.java | 2 +-
UserFront/src/main/resources/application.properties | 3 +++
.../test/java/com/userFront/UserFrontApplicationTests.java | 5 +----
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/UserFront/pom.xml b/UserFront/pom.xml
index 902ec2b3..72513625 100644
--- a/UserFront/pom.xml
+++ b/UserFront/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.4.RELEASE
+ 2.5.15
diff --git a/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java b/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java
index 838ad223..0d62b84c 100644
--- a/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java
+++ b/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java
@@ -24,7 +24,7 @@ public List findAll() {
}
public Appointment findAppointment(Long id) {
- return appointmentDao.findOne(id);
+ return appointmentDao.findById(id).orElse(null);
}
public void confirmAppointment(Long id) {
diff --git a/UserFront/src/main/resources/application.properties b/UserFront/src/main/resources/application.properties
index d7e04942..5076beda 100644
--- a/UserFront/src/main/resources/application.properties
+++ b/UserFront/src/main/resources/application.properties
@@ -30,6 +30,9 @@ spring.jpa.show-sql = true
# the project
spring.jpa.hibernate.ddl-auto = update
+# Keep GenerationType.AUTO on MySQL AUTO_INCREMENT columns instead of a hibernate_sequence table
+spring.jpa.hibernate.use-new-id-generator-mappings = false
+
# Allows Hibernate to generate SQL optimized for a particular DBMS
spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
diff --git a/UserFront/src/test/java/com/userFront/UserFrontApplicationTests.java b/UserFront/src/test/java/com/userFront/UserFrontApplicationTests.java
index 81fed97b..3e51f21d 100644
--- a/UserFront/src/test/java/com/userFront/UserFrontApplicationTests.java
+++ b/UserFront/src/test/java/com/userFront/UserFrontApplicationTests.java
@@ -1,11 +1,8 @@
package com.userFront;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-@RunWith(SpringRunner.class)
@SpringBootTest
public class UserFrontApplicationTests {