Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions UserFront/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.4.RELEASE</version>
<version>2.7.18</version>
Comment thread
devin-ai-integration[bot] marked this conversation as resolved.
Resolved
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand Down Expand Up @@ -46,8 +46,8 @@
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ protected void configure(HttpSecurity http) throws Exception {



@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
@Override
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
// auth.inMemoryAuthentication().withUser("user").password("password").roles("USER"); //This is in-memory authentication
auth.userDetailsService(userSecurityService).passwordEncoder(passwordEncoder());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public List<Appointment> findAll() {
}

public Appointment findAppointment(Long id) {
return appointmentDao.findOne(id);
return appointmentDao.findById(id).orElse(null);
}

public void confirmAppointment(Long id) {
Expand Down
10 changes: 10 additions & 0 deletions UserFront/src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# ===============================
# = SPRING
# ===============================

# UserServiceImpl and AccountServiceImpl depend on each other
spring.main.allow-circular-references = true

# ===============================
# = DATA SOURCE
# ===============================
Expand Down Expand Up @@ -30,6 +37,9 @@ spring.jpa.show-sql = true
# the project
spring.jpa.hibernate.ddl-auto = update

# Keep Boot 1.5's IDENTITY mapping for GenerationType.AUTO (no 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

Original file line number Diff line number Diff line change
@@ -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 {

Expand Down