diff --git a/UserFront/pom.xml b/UserFront/pom.xml index 902ec2b3..9f473e89 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.7.18 @@ -22,6 +22,7 @@ UTF-8 UTF-8 1.8 + 5.3.39 @@ -46,8 +47,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j 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..45738ece 100644 --- a/UserFront/src/main/resources/application.properties +++ b/UserFront/src/main/resources/application.properties @@ -12,8 +12,10 @@ spring.datasource.username = root spring.datasource.password = avengers1993 # Keep the connection alive if idle for a long time (needed in production) -spring.datasource.testWhileIdle = true -spring.datasource.validationQuery = SELECT 1 +spring.datasource.hikari.connection-test-query = SELECT 1 + +# UserServiceImpl and AccountServiceImpl depend on each other +spring.main.allow-circular-references = true # =============================== # = JPA / HIBERNATE @@ -30,6 +32,9 @@ spring.jpa.show-sql = true # the project spring.jpa.hibernate.ddl-auto = update +# Keep GenerationType.AUTO mapped to MySQL auto-increment columns +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 {