diff --git a/UserFront/pom.xml b/UserFront/pom.xml
index 902ec2b3..b97d5def 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.2.11.RELEASE
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..53402edd 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 MySQL auto-increment ids for GenerationType.AUTO (Boot 2 defaults to hibernate_sequence)
+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