From d8bc7cc9b6fce7dbad3695546053adb848007b0e Mon Sep 17 00:00:00 2001 From: Pierre Tellier Date: Wed, 26 Feb 2025 14:28:31 +0100 Subject: [PATCH] feat: added log4j. It's way better than System.stderr. --- MyINPulse-back/build.gradle | 34 +++++----- .../database/AdministratorService.java | 4 ++ .../service/database/UserService.java | 4 ++ .../AdministratorController.java | 38 ----------- .../UserController.java | 67 ------------------- MyINPulse-back/src/main/resources/log4j2.xml | 14 ++++ 6 files changed, 40 insertions(+), 121 deletions(-) create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/AdministratorService.java create mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/UserService.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AdministratorController.java delete mode 100644 MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/UserController.java create mode 100644 MyINPulse-back/src/main/resources/log4j2.xml diff --git a/MyINPulse-back/build.gradle b/MyINPulse-back/build.gradle index abb4635..367d3ec 100644 --- a/MyINPulse-back/build.gradle +++ b/MyINPulse-back/build.gradle @@ -1,33 +1,35 @@ plugins { - id 'java' - id 'org.springframework.boot' version '3.4.2' - id 'io.spring.dependency-management' version '1.1.7' + id 'java' + id 'org.springframework.boot' version '3.4.2' + id 'io.spring.dependency-management' version '1.1.7' } group = 'enseirb' version = '0.0.1-SNAPSHOT' java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } } repositories { - mavenCentral() + mavenCentral() } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'org.springframework.boot:spring-boot-starter-data-rest' - implementation 'org.postgresql:postgresql' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-data-rest' + implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.16.0' + implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.16.0' + implementation 'org.postgresql:postgresql' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } tasks.named('test') { - useJUnitPlatform() + useJUnitPlatform() } diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/AdministratorService.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/AdministratorService.java new file mode 100644 index 0000000..de9f1ef --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/AdministratorService.java @@ -0,0 +1,4 @@ +package enseirb.myinpulse.service.database; + +public class AdministratorService { +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/UserService.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/UserService.java new file mode 100644 index 0000000..5ddc9a5 --- /dev/null +++ b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/UserService.java @@ -0,0 +1,4 @@ +package enseirb.myinpulse.service.database; + +public class UserService { +} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AdministratorController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AdministratorController.java deleted file mode 100644 index 7e2706a..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/AdministratorController.java +++ /dev/null @@ -1,38 +0,0 @@ -package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; - -import enseirb.myinpulse.model.Administrator; -import enseirb.myinpulse.repository.AdministratorRepository; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.server.ResponseStatusException; - -import java.util.Optional; - -@RestController -public class AdministratorController { - - @Autowired AdministratorRepository administratorRepository; - - @GetMapping("/Administrator") - @ResponseBody - public Iterable allAdministrators() { - return this.administratorRepository.findAll(); - } - - @GetMapping("/Administrator/{id}") - public Administrator getAdministratorById(@PathVariable Long id) { - Optional administrator = this.administratorRepository.findById(id); - if (administrator.isEmpty()) { - throw new ResponseStatusException( - HttpStatus.NOT_FOUND, "Cet administrateur n'existe pas"); - } - return administrator.get(); - } - - @PostMapping("/Administrateurs") - public Administrator addAdministrator(@RequestBody Administrator administrator) { - return this.administratorRepository.save(administrator); - } -} diff --git a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/UserController.java b/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/UserController.java deleted file mode 100644 index a9abc1f..0000000 --- a/MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/old_controllers_to_convert_to_services/UserController.java +++ /dev/null @@ -1,67 +0,0 @@ -package enseirb.myinpulse.service.database.old_controllers_to_convert_to_services; - -import enseirb.myinpulse.model.User; -import enseirb.myinpulse.repository.UserRepository; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.server.ResponseStatusException; - -import java.util.Optional; - -@RestController -public class UserController { - - @Autowired UserRepository userRepository; - - @GetMapping("/User") - @ResponseBody - public Iterable allUsers() { - return this.userRepository.findAll(); - } - - @GetMapping("/User/{id}") - public User getUserById(@PathVariable Long id) { - Optional user = userRepository.findById(id); - if (user.isEmpty()) { - throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cet utilisateur n'existe pas"); - } - return user.get(); - } - - @PostMapping("/User") - public User addUser(@RequestBody User user) { - return this.userRepository.save(user); - } - - @PostMapping("/User/{id}") - public User updateUser( - @PathVariable Long id, - String userSurname, - String userName, - String mainMail, - String secondaryMail, - String phoneNumber) { - Optional user = userRepository.findById(id); - if (user.isEmpty()) { - throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Cet utilisateur n'existe pas"); - } - if (userName != null) { - user.get().setUserName(userName); - } - if (userSurname != null) { - user.get().setUserSurname(userSurname); - } - if (mainMail != null) { - user.get().setMainMail(mainMail); - } - if (secondaryMail != null) { - user.get().setSecondaryMail(secondaryMail); - } - if (phoneNumber != null) { - user.get().setPhoneNumber(phoneNumber); - } - return this.userRepository.save(user.get()); - } -} diff --git a/MyINPulse-back/src/main/resources/log4j2.xml b/MyINPulse-back/src/main/resources/log4j2.xml new file mode 100644 index 0000000..5616b9b --- /dev/null +++ b/MyINPulse-back/src/main/resources/log4j2.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file