From 0aaa56c4492ec5d90e571df579e4a96f2a055534 Mon Sep 17 00:00:00 2001 From: cordier Date: Thu, 9 Jan 2020 11:07:16 +0100 Subject: [PATCH] renommage pour simplifier la lecture (rest,batch,web) --- README.md | 51 ++++------ .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../go.cmd | 0 {service_batchmail => application_batch}/mvnw | 0 .../mvnw.cmd | 0 .../pom.xml | 4 +- .../main/java/fr/ocr/ApplicationBatch.java | 6 +- .../fr/ocr/model/InfosBatchMailDtoBatch.java | 0 .../fr/ocr/model/OuvrageBatchDtoBatch.java | 0 .../java/fr/ocr/model/PretBatchDtoBatch.java | 0 .../java/fr/ocr/model/UserBatchDtoBatch.java | 0 .../java/fr/ocr/task/ScheduledMailer.java | 0 .../ApplicationPropertiesConfiguration.java | 0 ...itional-spring-configuration-metadata.json | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback-spring.xml | 0 .../.gitignore | 0 .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 {service_frontmvc => application_web}/mvnw | 0 .../mvnw.cmd | 0 {service_frontmvc => application_web}/pom.xml | 6 +- .../java/fr/ocr/front_mvc/ApplicationWeb.java | 4 +- .../CustomAuthenticationProvider.java | 0 .../front_mvc/configuration/MvcConfig.java | 0 .../configuration/WebSecurityConfig.java | 0 .../controller/CustomErrorController.java | 0 .../controller/DispatchController.java | 16 ++- .../customAnnotation/PriorityCtrl.java | 0 .../customAnnotation/PriorityValidator.java | 0 .../customAnnotation/RatingCtrl.java | 0 .../customAnnotation/RatingCtrlValidator.java | 0 .../fr/ocr/front_mvc/model/OuvrageWeb.java | 0 .../java/fr/ocr/front_mvc/model/PretWeb.java | 0 .../java/fr/ocr/front_mvc/model/UserWeb.java | 0 .../ocr/front_mvc/service/UserWebService.java | 0 .../userdetails/UserWebUserDetails.java | 0 .../UserWebUserDetailsService.java | 0 .../front_mvc/utility/InfosConnexionUser.java | 0 .../ocr/front_mvc/utility/InfosPretWeb.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback-spring.xml | 0 .../main/resources/templates/connexion.html | 0 .../src/main/resources/templates/error.html | 2 +- .../templates/fragment/frag_barenav.html | 0 .../templates/fragment/frag_header.html | 0 .../src/main/resources/templates/home.html | 0 .../main/resources/templates/ouvrages.html | 0 .../src/main/resources/templates/prets.html | 0 .../main/resources/templates/recherche.html | 0 logs/service_batch.log | 91 +++++++++++++++--- logs/service_crud.log | 70 +++++++------- logs/service_frontmvc.log | 87 ++++++++++++----- pom.xml | 6 +- .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 {service_crud => service_rest}/go.cmd | 0 {service_crud => service_rest}/mvnw | 0 {service_crud => service_rest}/mvnw.cmd | 0 {service_crud => service_rest}/pom.xml | 4 +- .../java/fr/ocr/ServiceCrudApplication.java | 0 .../fr/ocr/application/ouvrage/Ouvrage.java | 0 .../ouvrage/OuvrageCrudController.java | 0 .../ouvrage/OuvrageCrudDtoBatch.java | 0 .../ouvrage/OuvrageCrudRepository.java | 0 .../ouvrage/OuvrageCrudService.java | 0 .../java/fr/ocr/application/package-info.java | 0 .../application/pret/InfosRecherchePret.java | 0 .../java/fr/ocr/application/pret/Pret.java | 0 .../application/pret/PretCrudController.java | 0 .../application/pret/PretCrudDtoBatch.java | 0 .../ocr/application/pret/PretCrudDtoWeb.java | 0 .../application/pret/PretCrudRepository.java | 0 .../ocr/application/pret/PretCrudService.java | 0 .../java/fr/ocr/application/pret/PretPK.java | 0 .../java/fr/ocr/application/user/User.java | 0 .../application/user/UserCrudController.java | 0 .../fr/ocr/application/user/UserCrudDto.java | 0 .../ocr/application/user/UserCrudDtoWeb.java | 0 .../application/user/UserCrudRepository.java | 0 .../ocr/application/user/UserCrudService.java | 0 .../fr/ocr/utility/EntityJacksonFilters.java | 0 .../fr/ocr/utility/OuvrageJacksonFilters.java | 0 .../fr/ocr/utility/PretJacksonFilters.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback-spring.xml | 0 93 files changed, 223 insertions(+), 124 deletions(-) rename {service_batchmail => application_batch}/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename {service_batchmail => application_batch}/.mvn/wrapper/maven-wrapper.jar (100%) rename {service_batchmail => application_batch}/.mvn/wrapper/maven-wrapper.properties (100%) rename {service_batchmail => application_batch}/go.cmd (100%) rename {service_batchmail => application_batch}/mvnw (100%) rename {service_batchmail => application_batch}/mvnw.cmd (100%) rename {service_batchmail => application_batch}/pom.xml (97%) rename service_batchmail/src/main/java/fr/ocr/ServiceBatchmailApplication.java => application_batch/src/main/java/fr/ocr/ApplicationBatch.java (86%) rename {service_batchmail => application_batch}/src/main/java/fr/ocr/model/InfosBatchMailDtoBatch.java (100%) rename {service_batchmail => application_batch}/src/main/java/fr/ocr/model/OuvrageBatchDtoBatch.java (100%) rename {service_batchmail => application_batch}/src/main/java/fr/ocr/model/PretBatchDtoBatch.java (100%) rename {service_batchmail => application_batch}/src/main/java/fr/ocr/model/UserBatchDtoBatch.java (100%) rename {service_batchmail => application_batch}/src/main/java/fr/ocr/task/ScheduledMailer.java (100%) rename {service_batchmail => application_batch}/src/main/java/fr/ocr/utility/ApplicationPropertiesConfiguration.java (100%) rename {service_batchmail => application_batch}/src/main/resources/META-INF/additional-spring-configuration-metadata.json (100%) rename {service_batchmail => application_batch}/src/main/resources/application.properties (100%) rename {service_batchmail => application_batch}/src/main/resources/application.yml (100%) rename {service_batchmail => application_batch}/src/main/resources/logback-spring.xml (100%) rename {service_frontmvc => application_web}/.gitignore (100%) rename {service_frontmvc => application_web}/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename {service_frontmvc => application_web}/.mvn/wrapper/maven-wrapper.jar (100%) rename {service_frontmvc => application_web}/.mvn/wrapper/maven-wrapper.properties (100%) rename {service_frontmvc => application_web}/mvnw (100%) rename {service_frontmvc => application_web}/mvnw.cmd (100%) rename {service_frontmvc => application_web}/pom.xml (95%) rename service_frontmvc/src/main/java/fr/ocr/front_mvc/ServiceFrontMvcApplication.java => application_web/src/main/java/fr/ocr/front_mvc/ApplicationWeb.java (90%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/authentication/CustomAuthenticationProvider.java (100%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/configuration/MvcConfig.java (100%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/configuration/WebSecurityConfig.java (100%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/controller/CustomErrorController.java (100%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/controller/DispatchController.java (94%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/customAnnotation/PriorityCtrl.java (100%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/customAnnotation/PriorityValidator.java (100%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/customAnnotation/RatingCtrl.java (100%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/customAnnotation/RatingCtrlValidator.java (100%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/model/OuvrageWeb.java (100%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/model/PretWeb.java (100%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/model/UserWeb.java (100%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/service/UserWebService.java (100%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/userdetails/UserWebUserDetails.java (100%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/userdetails/UserWebUserDetailsService.java (100%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/utility/InfosConnexionUser.java (100%) rename {service_frontmvc => application_web}/src/main/java/fr/ocr/front_mvc/utility/InfosPretWeb.java (100%) rename {service_frontmvc => application_web}/src/main/resources/application.properties (100%) rename {service_frontmvc => application_web}/src/main/resources/application.yml (100%) rename {service_frontmvc => application_web}/src/main/resources/logback-spring.xml (100%) rename {service_frontmvc => application_web}/src/main/resources/templates/connexion.html (100%) rename {service_frontmvc => application_web}/src/main/resources/templates/error.html (89%) rename {service_frontmvc => application_web}/src/main/resources/templates/fragment/frag_barenav.html (100%) rename {service_frontmvc => application_web}/src/main/resources/templates/fragment/frag_header.html (100%) rename {service_frontmvc => application_web}/src/main/resources/templates/home.html (100%) rename {service_frontmvc => application_web}/src/main/resources/templates/ouvrages.html (100%) rename {service_frontmvc => application_web}/src/main/resources/templates/prets.html (100%) rename {service_frontmvc => application_web}/src/main/resources/templates/recherche.html (100%) rename {service_crud => service_rest}/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename {service_crud => service_rest}/.mvn/wrapper/maven-wrapper.jar (100%) rename {service_crud => service_rest}/.mvn/wrapper/maven-wrapper.properties (100%) rename {service_crud => service_rest}/go.cmd (100%) rename {service_crud => service_rest}/mvnw (100%) rename {service_crud => service_rest}/mvnw.cmd (100%) rename {service_crud => service_rest}/pom.xml (97%) rename {service_crud => service_rest}/src/main/java/fr/ocr/ServiceCrudApplication.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/ouvrage/Ouvrage.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudController.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudDtoBatch.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudRepository.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudService.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/package-info.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/pret/InfosRecherchePret.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/pret/Pret.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/pret/PretCrudController.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/pret/PretCrudDtoBatch.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/pret/PretCrudDtoWeb.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/pret/PretCrudRepository.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/pret/PretCrudService.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/pret/PretPK.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/user/User.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/user/UserCrudController.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/user/UserCrudDto.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/user/UserCrudDtoWeb.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/user/UserCrudRepository.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/application/user/UserCrudService.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/utility/EntityJacksonFilters.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/utility/OuvrageJacksonFilters.java (100%) rename {service_crud => service_rest}/src/main/java/fr/ocr/utility/PretJacksonFilters.java (100%) rename {service_crud => service_rest}/src/main/resources/application.properties (100%) rename {service_crud => service_rest}/src/main/resources/application.yml (100%) rename {service_crud => service_rest}/src/main/resources/logback-spring.xml (100%) diff --git a/README.md b/README.md index 7d82c91..8513517 100644 --- a/README.md +++ b/README.md @@ -1,64 +1,49 @@ Projet Bibliothèque - projet 07 = -Technique -== Référence --- * https://openclassrooms.com/fr/courses/5684146-create-web-applications-efficiently-with-the-spring-boot-mvc-framework Environnement --- -* Spring Boot, PostgreSql, httpClient, Git, Maven - -Starters Spring Boot ---- -* Web, Security, Data/Jpa, Hibernate, Mail +* Spring Boot ( Web, Security, Data/Jpa, Hibernate, Mail), PostgreSql, httpClient, Git, Maven Jars executables --- -* Un service REST pour les méthodes de persistence - JPA/Hibernate et PostgreSql. +* Un service REST pour les méthodes de persistence - Spring Data/JPA et Hibernate. * Un batch pour envoi de email - "@Scheduled" * Une Web application MVC - template engine : ThymeLeaf -Communication entre services ---- -* Httpclient (jdk 11) placée dans une lib déployeé dans un repo local - -Build, gestion de source +Installation sous Windows --- * Git version 2.24.0.windows.2 * Apache Maven 3.6.0 * Intellij IDEA 2019.3.1 Ultimate +* Oracle JDK 11.04 +* PostgreSql 12 +* Projet à Cloner depuis https://github.com/lco3004/ocr-projet07-v3.git -Installation sous Windows -== -Installation de l'environnement +Création de la base PostgreSql --- -* Installer Apache Maven V3 et Oracle JDK 11 -* Modifier la policy pour autoriser l'exécution des scripts 'Set-ExecutionPolicy Unrestricted' -* Verifier avec mvn --version - -Clone depuis GitHub ---- -* Cloner depu is https://github.com/lco3004/ocr-projet07-v3.git - -Création de la base PostgresSql ---- -* Lancer le service windows PostgreSql (barre de recherche Windows, saisir services.msc) * Créer le répertoire des tablespaces :'c:\bd_data' * Sous pgsql, exécuter le script sql_uml/prep_projet07.sql -* Installer pgadmin v4 * Sous pgadmin, attribuer le password projet07 au role rl_projet07 * Choisir la base db_projet07 - mdp identique au role rl_projet07 * Enfin , exécuter sql_uml/create_tbl.sql Lancement des applications -== -Application Web et Service Rest +-- +Service Rest --- -* Ouvrir un terminal puis se placer dans le répertoire de l'application ( ex : service_crud) -* Lancer l'application avec mvn spring-boot:run' +* Ouvrir un terminal puis se placer dans le répertoire du service_crud +* Lancer l'application avec mvn spring-boot:run (c'est une démo...) + +Application Web +--- +* Ouvrir un terminal puis se placer dans le répertoire de l'application Web +* Lancer l'application avec mvn spring-boot:run (c'est une démo...) + Application Batch --- @@ -67,7 +52,7 @@ Application Batch * lancer le service avec mvn spring-boot:run -Dspring-boot.run.arguments="immediat" Utilisation de l'application -== +-- Login --- * connexion avec un des usagers du jeu de test (ex : juie / julie) diff --git a/service_batchmail/.mvn/wrapper/MavenWrapperDownloader.java b/application_batch/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from service_batchmail/.mvn/wrapper/MavenWrapperDownloader.java rename to application_batch/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/service_batchmail/.mvn/wrapper/maven-wrapper.jar b/application_batch/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from service_batchmail/.mvn/wrapper/maven-wrapper.jar rename to application_batch/.mvn/wrapper/maven-wrapper.jar diff --git a/service_batchmail/.mvn/wrapper/maven-wrapper.properties b/application_batch/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from service_batchmail/.mvn/wrapper/maven-wrapper.properties rename to application_batch/.mvn/wrapper/maven-wrapper.properties diff --git a/service_batchmail/go.cmd b/application_batch/go.cmd similarity index 100% rename from service_batchmail/go.cmd rename to application_batch/go.cmd diff --git a/service_batchmail/mvnw b/application_batch/mvnw similarity index 100% rename from service_batchmail/mvnw rename to application_batch/mvnw diff --git a/service_batchmail/mvnw.cmd b/application_batch/mvnw.cmd similarity index 100% rename from service_batchmail/mvnw.cmd rename to application_batch/mvnw.cmd diff --git a/service_batchmail/pom.xml b/application_batch/pom.xml similarity index 97% rename from service_batchmail/pom.xml rename to application_batch/pom.xml index ac1be5d..781d1ec 100644 --- a/service_batchmail/pom.xml +++ b/application_batch/pom.xml @@ -12,7 +12,7 @@ service_batchmail 1.0-SNAPSHOT - service_batchmail + application_batch projet 07 batch mail scheduleur jar @@ -83,7 +83,7 @@ - service_batchmail + application_batch org.springframework.boot diff --git a/service_batchmail/src/main/java/fr/ocr/ServiceBatchmailApplication.java b/application_batch/src/main/java/fr/ocr/ApplicationBatch.java similarity index 86% rename from service_batchmail/src/main/java/fr/ocr/ServiceBatchmailApplication.java rename to application_batch/src/main/java/fr/ocr/ApplicationBatch.java index 2556a50..c41808f 100644 --- a/service_batchmail/src/main/java/fr/ocr/ServiceBatchmailApplication.java +++ b/application_batch/src/main/java/fr/ocr/ApplicationBatch.java @@ -22,16 +22,16 @@ @PropertySources( { @PropertySource(value = "classpath:application.properties"), @PropertySource(value = "classpath:application.yml")}) -public class ServiceBatchmailApplication implements CommandLineRunner{ +public class ApplicationBatch implements CommandLineRunner{ @Autowired private ScheduledMailer scheduledMailer; - private static final Logger log = LoggerFactory.getLogger(ServiceBatchmailApplication.class); + private static final Logger log = LoggerFactory.getLogger(ApplicationBatch.class); public static void main(String[] args) { - SpringApplication.run(ServiceBatchmailApplication.class, args); + SpringApplication.run(ApplicationBatch.class, args); } diff --git a/service_batchmail/src/main/java/fr/ocr/model/InfosBatchMailDtoBatch.java b/application_batch/src/main/java/fr/ocr/model/InfosBatchMailDtoBatch.java similarity index 100% rename from service_batchmail/src/main/java/fr/ocr/model/InfosBatchMailDtoBatch.java rename to application_batch/src/main/java/fr/ocr/model/InfosBatchMailDtoBatch.java diff --git a/service_batchmail/src/main/java/fr/ocr/model/OuvrageBatchDtoBatch.java b/application_batch/src/main/java/fr/ocr/model/OuvrageBatchDtoBatch.java similarity index 100% rename from service_batchmail/src/main/java/fr/ocr/model/OuvrageBatchDtoBatch.java rename to application_batch/src/main/java/fr/ocr/model/OuvrageBatchDtoBatch.java diff --git a/service_batchmail/src/main/java/fr/ocr/model/PretBatchDtoBatch.java b/application_batch/src/main/java/fr/ocr/model/PretBatchDtoBatch.java similarity index 100% rename from service_batchmail/src/main/java/fr/ocr/model/PretBatchDtoBatch.java rename to application_batch/src/main/java/fr/ocr/model/PretBatchDtoBatch.java diff --git a/service_batchmail/src/main/java/fr/ocr/model/UserBatchDtoBatch.java b/application_batch/src/main/java/fr/ocr/model/UserBatchDtoBatch.java similarity index 100% rename from service_batchmail/src/main/java/fr/ocr/model/UserBatchDtoBatch.java rename to application_batch/src/main/java/fr/ocr/model/UserBatchDtoBatch.java diff --git a/service_batchmail/src/main/java/fr/ocr/task/ScheduledMailer.java b/application_batch/src/main/java/fr/ocr/task/ScheduledMailer.java similarity index 100% rename from service_batchmail/src/main/java/fr/ocr/task/ScheduledMailer.java rename to application_batch/src/main/java/fr/ocr/task/ScheduledMailer.java diff --git a/service_batchmail/src/main/java/fr/ocr/utility/ApplicationPropertiesConfiguration.java b/application_batch/src/main/java/fr/ocr/utility/ApplicationPropertiesConfiguration.java similarity index 100% rename from service_batchmail/src/main/java/fr/ocr/utility/ApplicationPropertiesConfiguration.java rename to application_batch/src/main/java/fr/ocr/utility/ApplicationPropertiesConfiguration.java diff --git a/service_batchmail/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/application_batch/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from service_batchmail/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to application_batch/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/service_batchmail/src/main/resources/application.properties b/application_batch/src/main/resources/application.properties similarity index 100% rename from service_batchmail/src/main/resources/application.properties rename to application_batch/src/main/resources/application.properties diff --git a/service_batchmail/src/main/resources/application.yml b/application_batch/src/main/resources/application.yml similarity index 100% rename from service_batchmail/src/main/resources/application.yml rename to application_batch/src/main/resources/application.yml diff --git a/service_batchmail/src/main/resources/logback-spring.xml b/application_batch/src/main/resources/logback-spring.xml similarity index 100% rename from service_batchmail/src/main/resources/logback-spring.xml rename to application_batch/src/main/resources/logback-spring.xml diff --git a/service_frontmvc/.gitignore b/application_web/.gitignore similarity index 100% rename from service_frontmvc/.gitignore rename to application_web/.gitignore diff --git a/service_frontmvc/.mvn/wrapper/MavenWrapperDownloader.java b/application_web/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from service_frontmvc/.mvn/wrapper/MavenWrapperDownloader.java rename to application_web/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/service_frontmvc/.mvn/wrapper/maven-wrapper.jar b/application_web/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from service_frontmvc/.mvn/wrapper/maven-wrapper.jar rename to application_web/.mvn/wrapper/maven-wrapper.jar diff --git a/service_frontmvc/.mvn/wrapper/maven-wrapper.properties b/application_web/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from service_frontmvc/.mvn/wrapper/maven-wrapper.properties rename to application_web/.mvn/wrapper/maven-wrapper.properties diff --git a/service_frontmvc/mvnw b/application_web/mvnw similarity index 100% rename from service_frontmvc/mvnw rename to application_web/mvnw diff --git a/service_frontmvc/mvnw.cmd b/application_web/mvnw.cmd similarity index 100% rename from service_frontmvc/mvnw.cmd rename to application_web/mvnw.cmd diff --git a/service_frontmvc/pom.xml b/application_web/pom.xml similarity index 95% rename from service_frontmvc/pom.xml rename to application_web/pom.xml index e0db0e3..a76c9a7 100644 --- a/service_frontmvc/pom.xml +++ b/application_web/pom.xml @@ -12,8 +12,8 @@ service_frontmvc 1.0-SNAPSHOT - service_frontmvc - projet 07 - service web + application_web + projet 07 - application_web jar @@ -74,7 +74,7 @@ - service_frontmvc + application_web org.springframework.boot diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/ServiceFrontMvcApplication.java b/application_web/src/main/java/fr/ocr/front_mvc/ApplicationWeb.java similarity index 90% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/ServiceFrontMvcApplication.java rename to application_web/src/main/java/fr/ocr/front_mvc/ApplicationWeb.java index 397a1c8..7606d26 100644 --- a/service_frontmvc/src/main/java/fr/ocr/front_mvc/ServiceFrontMvcApplication.java +++ b/application_web/src/main/java/fr/ocr/front_mvc/ApplicationWeb.java @@ -15,11 +15,11 @@ @PropertySource(value = "classpath:application.properties"), @PropertySource(value = "classpath:application.yml")}) @EnableSwagger2 -public class ServiceFrontMvcApplication { +public class ApplicationWeb { public static void main(String[] args) { - SpringApplication.run(ServiceFrontMvcApplication.class, args); + SpringApplication.run(ApplicationWeb.class, args); } @Bean public RestClient libHttpClient() { diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/authentication/CustomAuthenticationProvider.java b/application_web/src/main/java/fr/ocr/front_mvc/authentication/CustomAuthenticationProvider.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/authentication/CustomAuthenticationProvider.java rename to application_web/src/main/java/fr/ocr/front_mvc/authentication/CustomAuthenticationProvider.java diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/configuration/MvcConfig.java b/application_web/src/main/java/fr/ocr/front_mvc/configuration/MvcConfig.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/configuration/MvcConfig.java rename to application_web/src/main/java/fr/ocr/front_mvc/configuration/MvcConfig.java diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/configuration/WebSecurityConfig.java b/application_web/src/main/java/fr/ocr/front_mvc/configuration/WebSecurityConfig.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/configuration/WebSecurityConfig.java rename to application_web/src/main/java/fr/ocr/front_mvc/configuration/WebSecurityConfig.java diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/controller/CustomErrorController.java b/application_web/src/main/java/fr/ocr/front_mvc/controller/CustomErrorController.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/controller/CustomErrorController.java rename to application_web/src/main/java/fr/ocr/front_mvc/controller/CustomErrorController.java diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/controller/DispatchController.java b/application_web/src/main/java/fr/ocr/front_mvc/controller/DispatchController.java similarity index 94% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/controller/DispatchController.java rename to application_web/src/main/java/fr/ocr/front_mvc/controller/DispatchController.java index 5746870..aaf702e 100644 --- a/service_frontmvc/src/main/java/fr/ocr/front_mvc/controller/DispatchController.java +++ b/application_web/src/main/java/fr/ocr/front_mvc/controller/DispatchController.java @@ -10,6 +10,8 @@ import fr.ocr.front_mvc.service.UserWebService; import fr.ocr.front_mvc.userdetails.UserWebUserDetails; import io.swagger.annotations.Api; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -42,6 +44,8 @@ public class DispatchController { private final UserWebService userWebService; private final Map model; + private static final Logger log = LoggerFactory.getLogger(DispatchController.class); + public DispatchController(RestClient restClient, ObjectMapper objectMapper, UserWebService userWebService, Map model){ this.restClient = restClient; @@ -194,8 +198,16 @@ public ModelAndView getListePrestCtrl() throws RuntimeException, IOException, In Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal(); assert principal instanceof UserWebUserDetails; - UserWebUserDetails userWebUserDetails = (UserWebUserDetails)principal; - String username = ((UserWebUserDetails)principal).getUserWeb().getUsername(); + UserWebUserDetails userWebUserDetails =null; + String username = ""; + try { + userWebUserDetails = (UserWebUserDetails)principal; + username = ((UserWebUserDetails)principal).getUserWeb().getUsername(); + + }catch (RuntimeException e) { + log.warn("Accès aux prêts impossible car pas connecté"); + throw new RuntimeException("Accès aux prêts impossible car pas connecté"); + } HttpRequest request = restClient.requestBuilder(URI.create(uriPretByNomUsager + username), null).GET().build(); diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/customAnnotation/PriorityCtrl.java b/application_web/src/main/java/fr/ocr/front_mvc/customAnnotation/PriorityCtrl.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/customAnnotation/PriorityCtrl.java rename to application_web/src/main/java/fr/ocr/front_mvc/customAnnotation/PriorityCtrl.java diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/customAnnotation/PriorityValidator.java b/application_web/src/main/java/fr/ocr/front_mvc/customAnnotation/PriorityValidator.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/customAnnotation/PriorityValidator.java rename to application_web/src/main/java/fr/ocr/front_mvc/customAnnotation/PriorityValidator.java diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/customAnnotation/RatingCtrl.java b/application_web/src/main/java/fr/ocr/front_mvc/customAnnotation/RatingCtrl.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/customAnnotation/RatingCtrl.java rename to application_web/src/main/java/fr/ocr/front_mvc/customAnnotation/RatingCtrl.java diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/customAnnotation/RatingCtrlValidator.java b/application_web/src/main/java/fr/ocr/front_mvc/customAnnotation/RatingCtrlValidator.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/customAnnotation/RatingCtrlValidator.java rename to application_web/src/main/java/fr/ocr/front_mvc/customAnnotation/RatingCtrlValidator.java diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/model/OuvrageWeb.java b/application_web/src/main/java/fr/ocr/front_mvc/model/OuvrageWeb.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/model/OuvrageWeb.java rename to application_web/src/main/java/fr/ocr/front_mvc/model/OuvrageWeb.java diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/model/PretWeb.java b/application_web/src/main/java/fr/ocr/front_mvc/model/PretWeb.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/model/PretWeb.java rename to application_web/src/main/java/fr/ocr/front_mvc/model/PretWeb.java diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/model/UserWeb.java b/application_web/src/main/java/fr/ocr/front_mvc/model/UserWeb.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/model/UserWeb.java rename to application_web/src/main/java/fr/ocr/front_mvc/model/UserWeb.java diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/service/UserWebService.java b/application_web/src/main/java/fr/ocr/front_mvc/service/UserWebService.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/service/UserWebService.java rename to application_web/src/main/java/fr/ocr/front_mvc/service/UserWebService.java diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/userdetails/UserWebUserDetails.java b/application_web/src/main/java/fr/ocr/front_mvc/userdetails/UserWebUserDetails.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/userdetails/UserWebUserDetails.java rename to application_web/src/main/java/fr/ocr/front_mvc/userdetails/UserWebUserDetails.java diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/userdetails/UserWebUserDetailsService.java b/application_web/src/main/java/fr/ocr/front_mvc/userdetails/UserWebUserDetailsService.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/userdetails/UserWebUserDetailsService.java rename to application_web/src/main/java/fr/ocr/front_mvc/userdetails/UserWebUserDetailsService.java diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/utility/InfosConnexionUser.java b/application_web/src/main/java/fr/ocr/front_mvc/utility/InfosConnexionUser.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/utility/InfosConnexionUser.java rename to application_web/src/main/java/fr/ocr/front_mvc/utility/InfosConnexionUser.java diff --git a/service_frontmvc/src/main/java/fr/ocr/front_mvc/utility/InfosPretWeb.java b/application_web/src/main/java/fr/ocr/front_mvc/utility/InfosPretWeb.java similarity index 100% rename from service_frontmvc/src/main/java/fr/ocr/front_mvc/utility/InfosPretWeb.java rename to application_web/src/main/java/fr/ocr/front_mvc/utility/InfosPretWeb.java diff --git a/service_frontmvc/src/main/resources/application.properties b/application_web/src/main/resources/application.properties similarity index 100% rename from service_frontmvc/src/main/resources/application.properties rename to application_web/src/main/resources/application.properties diff --git a/service_frontmvc/src/main/resources/application.yml b/application_web/src/main/resources/application.yml similarity index 100% rename from service_frontmvc/src/main/resources/application.yml rename to application_web/src/main/resources/application.yml diff --git a/service_frontmvc/src/main/resources/logback-spring.xml b/application_web/src/main/resources/logback-spring.xml similarity index 100% rename from service_frontmvc/src/main/resources/logback-spring.xml rename to application_web/src/main/resources/logback-spring.xml diff --git a/service_frontmvc/src/main/resources/templates/connexion.html b/application_web/src/main/resources/templates/connexion.html similarity index 100% rename from service_frontmvc/src/main/resources/templates/connexion.html rename to application_web/src/main/resources/templates/connexion.html diff --git a/service_frontmvc/src/main/resources/templates/error.html b/application_web/src/main/resources/templates/error.html similarity index 89% rename from service_frontmvc/src/main/resources/templates/error.html rename to application_web/src/main/resources/templates/error.html index 9750afc..9a9f8f0 100644 --- a/service_frontmvc/src/main/resources/templates/error.html +++ b/application_web/src/main/resources/templates/error.html @@ -17,7 +17,7 @@

Oops!

-

This is embarrassing!😔 Please contact our support! 🙏

+

Vous n'êtes pas identifié .

diff --git a/service_frontmvc/src/main/resources/templates/fragment/frag_barenav.html b/application_web/src/main/resources/templates/fragment/frag_barenav.html similarity index 100% rename from service_frontmvc/src/main/resources/templates/fragment/frag_barenav.html rename to application_web/src/main/resources/templates/fragment/frag_barenav.html diff --git a/service_frontmvc/src/main/resources/templates/fragment/frag_header.html b/application_web/src/main/resources/templates/fragment/frag_header.html similarity index 100% rename from service_frontmvc/src/main/resources/templates/fragment/frag_header.html rename to application_web/src/main/resources/templates/fragment/frag_header.html diff --git a/service_frontmvc/src/main/resources/templates/home.html b/application_web/src/main/resources/templates/home.html similarity index 100% rename from service_frontmvc/src/main/resources/templates/home.html rename to application_web/src/main/resources/templates/home.html diff --git a/service_frontmvc/src/main/resources/templates/ouvrages.html b/application_web/src/main/resources/templates/ouvrages.html similarity index 100% rename from service_frontmvc/src/main/resources/templates/ouvrages.html rename to application_web/src/main/resources/templates/ouvrages.html diff --git a/service_frontmvc/src/main/resources/templates/prets.html b/application_web/src/main/resources/templates/prets.html similarity index 100% rename from service_frontmvc/src/main/resources/templates/prets.html rename to application_web/src/main/resources/templates/prets.html diff --git a/service_frontmvc/src/main/resources/templates/recherche.html b/application_web/src/main/resources/templates/recherche.html similarity index 100% rename from service_frontmvc/src/main/resources/templates/recherche.html rename to application_web/src/main/resources/templates/recherche.html diff --git a/logs/service_batch.log b/logs/service_batch.log index c30d647..722a2be 100644 --- a/logs/service_batch.log +++ b/logs/service_batch.log @@ -1,14 +1,77 @@ -[2020-01-09T08:14:59.059Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [55] [INFO ] Starting ServiceBatchmailApplication on DESKTOP-HE1TMKM with PID 5068 (D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4\service_batchmail\target\classes started by cordier in D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4) -[2020-01-09T08:14:59.059Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [56] [DEBUG] Running with Spring Boot v2.2.0.RELEASE, Spring v5.2.0.RELEASE -[2020-01-09T08:14:59.059Z] [org.springframework.boot.SpringApplication] [restartedMain] [651] [INFO ] No active profile set, falling back to default profiles: default -[2020-01-09T08:14:59.059Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] Devtools property defaults active! Set 'spring.devtools.add-properties' to 'false' to disable -[2020-01-09T08:14:59.059Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] For additional web related logging consider setting the 'logging.level.web' property to 'DEBUG' -[2020-01-09T08:15:00.000Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [92] [INFO ] Tomcat initialized with port(s): 9092 (http) -[2020-01-09T08:15:00.000Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting service [Tomcat] -[2020-01-09T08:15:00.000Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting Servlet engine: [Apache Tomcat/9.0.27] -[2020-01-09T08:15:00.000Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Initializing Spring embedded WebApplicationContext -[2020-01-09T08:15:00.000Z] [org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext] [restartedMain] [284] [INFO ] Root WebApplicationContext: initialization completed in 743 ms -[2020-01-09T08:15:00.000Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [restartedMain] [171] [INFO ] Initializing ExecutorService 'applicationTaskExecutor' -[2020-01-09T08:15:00.000Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [restartedMain] [171] [INFO ] Initializing ExecutorService 'taskScheduler' -[2020-01-09T08:15:00.000Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [204] [INFO ] Tomcat started on port(s): 9092 (http) with context path '' -[2020-01-09T08:15:00.000Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [61] [INFO ] Started ServiceBatchmailApplication in 1.614 seconds (JVM running for 2.341) +[2020-01-09T11:00:38.038Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [55] [INFO ] Starting ApplicationBatch on DESKTOP-HE1TMKM with PID 12104 (D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4\application_batch\target\classes started by cordier in D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4) +[2020-01-09T11:00:38.038Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [56] [DEBUG] Running with Spring Boot v2.2.0.RELEASE, Spring v5.2.0.RELEASE +[2020-01-09T11:00:38.038Z] [org.springframework.boot.SpringApplication] [restartedMain] [651] [INFO ] No active profile set, falling back to default profiles: default +[2020-01-09T11:00:38.038Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] Devtools property defaults active! Set 'spring.devtools.add-properties' to 'false' to disable +[2020-01-09T11:00:38.038Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] For additional web related logging consider setting the 'logging.level.web' property to 'DEBUG' +[2020-01-09T11:00:39.039Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [92] [INFO ] Tomcat initialized with port(s): 9092 (http) +[2020-01-09T11:00:39.039Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting service [Tomcat] +[2020-01-09T11:00:39.039Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting Servlet engine: [Apache Tomcat/9.0.27] +[2020-01-09T11:00:39.039Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Initializing Spring embedded WebApplicationContext +[2020-01-09T11:00:39.039Z] [org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext] [restartedMain] [284] [INFO ] Root WebApplicationContext: initialization completed in 733 ms +[2020-01-09T11:00:39.039Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [restartedMain] [171] [INFO ] Initializing ExecutorService 'applicationTaskExecutor' +[2020-01-09T11:00:39.039Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [restartedMain] [171] [INFO ] Initializing ExecutorService 'taskScheduler' +[2020-01-09T11:00:39.039Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [204] [INFO ] Tomcat started on port(s): 9092 (http) with context path '' +[2020-01-09T11:00:39.039Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [61] [INFO ] Started ApplicationBatch in 1.585 seconds (JVM running for 2.341) +[2020-01-09T11:01:09.009Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [SpringContextShutdownHook] [208] [INFO ] Shutting down ExecutorService 'taskScheduler' +[2020-01-09T11:01:09.009Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [SpringContextShutdownHook] [208] [INFO ] Shutting down ExecutorService 'applicationTaskExecutor' +[2020-01-09T11:01:17.017Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [55] [INFO ] Starting ApplicationBatch on DESKTOP-HE1TMKM with PID 10832 (D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4\application_batch\target\classes started by cordier in D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4) +[2020-01-09T11:01:17.017Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [56] [DEBUG] Running with Spring Boot v2.2.0.RELEASE, Spring v5.2.0.RELEASE +[2020-01-09T11:01:17.017Z] [org.springframework.boot.SpringApplication] [restartedMain] [651] [INFO ] No active profile set, falling back to default profiles: default +[2020-01-09T11:01:17.017Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] Devtools property defaults active! Set 'spring.devtools.add-properties' to 'false' to disable +[2020-01-09T11:01:17.017Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] For additional web related logging consider setting the 'logging.level.web' property to 'DEBUG' +[2020-01-09T11:01:18.018Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [92] [INFO ] Tomcat initialized with port(s): 9092 (http) +[2020-01-09T11:01:18.018Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting service [Tomcat] +[2020-01-09T11:01:18.018Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting Servlet engine: [Apache Tomcat/9.0.27] +[2020-01-09T11:01:18.018Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Initializing Spring embedded WebApplicationContext +[2020-01-09T11:01:18.018Z] [org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext] [restartedMain] [284] [INFO ] Root WebApplicationContext: initialization completed in 779 ms +[2020-01-09T11:01:18.018Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [restartedMain] [171] [INFO ] Initializing ExecutorService 'applicationTaskExecutor' +[2020-01-09T11:01:18.018Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [restartedMain] [171] [INFO ] Initializing ExecutorService 'taskScheduler' +[2020-01-09T11:01:18.018Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [204] [INFO ] Tomcat started on port(s): 9092 (http) with context path '' +[2020-01-09T11:01:18.018Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [61] [INFO ] Started ApplicationBatch in 1.622 seconds (JVM running for 2.35) +[2020-01-09T11:01:18.018Z] [fr.ocr.task.ScheduledMailer] [restartedMain] [116] [INFO ] InfosBatchMailDtoBatch(username=julie, email=laurent.cordier3004@gmail.com, titre=micro services with spring boot, auteur=Ranga rao karanam, dateEmprunt=Mon Nov 04 01:00:00 CET 2019) +[2020-01-09T11:01:18.018Z] [fr.ocr.task.ScheduledMailer] [restartedMain] [116] [INFO ] InfosBatchMailDtoBatch(username=lola, email=laurent.cordier3004@gmail.com, titre=Java JEE developpez des applications Web en Java, auteur=Thierry richard, dateEmprunt=Thu Dec 05 01:00:00 CET 2019) +[2020-01-09T11:01:18.018Z] [fr.ocr.task.ScheduledMailer] [restartedMain] [116] [INFO ] InfosBatchMailDtoBatch(username=lola, email=laurent.cordier3004@gmail.com, titre=JPA et Java Hibernate Apprenez le ORM avec Java, auteur=Martial Banon, dateEmprunt=Mon Dec 09 01:00:00 CET 2019) +[2020-01-09T11:01:18.018Z] [fr.ocr.task.ScheduledMailer] [restartedMain] [84] [INFO ] +********************************************* + + Bonjour, vous avez emprunté l'ouvrage : + Titre..: micro services with spring boot + De.....: Ranga rao karanam + Le.....: Mon Nov 04 01:00:00 CET 2019 + + Le délai de 4 semaines est dépassé. + Merci de nous retourner cet ouvrage + L'equipe Municipale +********************************************* + +[2020-01-09T11:01:18.018Z] [fr.ocr.task.ScheduledMailer] [restartedMain] [88] [WARN ] Erreur : javalMail to [Ljava.lang.String;@3bde1fd0 - cause :Authentication failed; nested exception is javax.mail.AuthenticationFailedException: failed to connect, no password specified? +[2020-01-09T11:01:18.018Z] [fr.ocr.task.ScheduledMailer] [restartedMain] [84] [INFO ] +********************************************* + + Bonjour, vous avez emprunté l'ouvrage : + Titre..: Java JEE developpez des applications Web en Java + De.....: Thierry richard + Le.....: Thu Dec 05 01:00:00 CET 2019 + + Le délai de 4 semaines est dépassé. + Merci de nous retourner cet ouvrage + L'equipe Municipale +********************************************* + +[2020-01-09T11:01:18.018Z] [fr.ocr.task.ScheduledMailer] [restartedMain] [88] [WARN ] Erreur : javalMail to [Ljava.lang.String;@1b9fd553 - cause :Authentication failed; nested exception is javax.mail.AuthenticationFailedException: failed to connect, no password specified? +[2020-01-09T11:01:18.018Z] [fr.ocr.task.ScheduledMailer] [restartedMain] [84] [INFO ] +********************************************* + + Bonjour, vous avez emprunté l'ouvrage : + Titre..: JPA et Java Hibernate Apprenez le ORM avec Java + De.....: Martial Banon + Le.....: Mon Dec 09 01:00:00 CET 2019 + + Le délai de 4 semaines est dépassé. + Merci de nous retourner cet ouvrage + L'equipe Municipale +********************************************* + +[2020-01-09T11:01:18.018Z] [fr.ocr.task.ScheduledMailer] [restartedMain] [88] [WARN ] Erreur : javalMail to [Ljava.lang.String;@3cf322de - cause :Authentication failed; nested exception is javax.mail.AuthenticationFailedException: failed to connect, no password specified? +[2020-01-09T11:05:20.020Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [SpringContextShutdownHook] [208] [INFO ] Shutting down ExecutorService 'taskScheduler' +[2020-01-09T11:05:20.020Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [SpringContextShutdownHook] [208] [INFO ] Shutting down ExecutorService 'applicationTaskExecutor' diff --git a/logs/service_crud.log b/logs/service_crud.log index 60d5bf0..acec613 100644 --- a/logs/service_crud.log +++ b/logs/service_crud.log @@ -1,4 +1,4 @@ -[2020-01-09T08:14:36.036Z] [org.springframework.boot.SpringApplicationBannerPrinter] [restartedMain] [61] [INFO ] +[2020-01-09T11:00:12.012Z] [org.springframework.boot.SpringApplicationBannerPrinter] [restartedMain] [61] [INFO ] . ____ _ __ _ _ /\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \ ( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \ @@ -8,35 +8,39 @@  :: Spring Boot ::   (v2.2.0.RELEASE) -[2020-01-09T08:14:36.036Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [55] [INFO ] Starting ServiceCrudApplication on DESKTOP-HE1TMKM with PID 1412 (D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4\service_crud\target\classes started by cordier in D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4) -[2020-01-09T08:14:36.036Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [56] [DEBUG] Running with Spring Boot v2.2.0.RELEASE, Spring v5.2.0.RELEASE -[2020-01-09T08:14:36.036Z] [org.springframework.boot.SpringApplication] [restartedMain] [651] [INFO ] No active profile set, falling back to default profiles: default -[2020-01-09T08:14:37.037Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] The Class-Path manifest attribute in C:\Users\cordier\.m2\repository\org\glassfish\jaxb\jaxb-runtime\2.3.2\jaxb-runtime-2.3.2.jar referenced one or more files that do not exist: file:/C:/Users/cordier/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.2/jakarta.xml.bind-api-2.3.2.jar,file:/C:/Users/cordier/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.2/txw2-2.3.2.jar,file:/C:/Users/cordier/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.2/istack-commons-runtime-3.0.8.jar,file:/C:/Users/cordier/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.2/stax-ex-1.8.1.jar,file:/C:/Users/cordier/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.2/FastInfoset-1.2.16.jar,file:/C:/Users/cordier/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.2/jakarta.activation-api-1.2.1.jar -[2020-01-09T08:14:37.037Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] Devtools property defaults active! Set 'spring.devtools.add-properties' to 'false' to disable -[2020-01-09T08:14:37.037Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] For additional web related logging consider setting the 'logging.level.web' property to 'DEBUG' -[2020-01-09T08:14:37.037Z] [org.springframework.data.repository.config.RepositoryConfigurationDelegate] [restartedMain] [126] [INFO ] Bootstrapping Spring Data repositories in DEFAULT mode. -[2020-01-09T08:14:37.037Z] [org.springframework.data.repository.config.RepositoryConfigurationDelegate] [restartedMain] [182] [INFO ] Finished Spring Data repository scanning in 47ms. Found 3 repository interfaces. -[2020-01-09T08:14:37.037Z] [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] [restartedMain] [330] [INFO ] Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) -[2020-01-09T08:14:38.038Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [92] [INFO ] Tomcat initialized with port(s): 9090 (http) -[2020-01-09T08:14:38.038Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting service [Tomcat] -[2020-01-09T08:14:38.038Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting Servlet engine: [Apache Tomcat/9.0.27] -[2020-01-09T08:14:38.038Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Initializing Spring embedded WebApplicationContext -[2020-01-09T08:14:38.038Z] [org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext] [restartedMain] [284] [INFO ] Root WebApplicationContext: initialization completed in 1286 ms -[2020-01-09T08:14:38.038Z] [com.zaxxer.hikari.HikariDataSource] [restartedMain] [110] [INFO ] HikariPool-1 - Starting... -[2020-01-09T08:14:38.038Z] [com.zaxxer.hikari.HikariDataSource] [restartedMain] [123] [INFO ] HikariPool-1 - Start completed. -[2020-01-09T08:14:38.038Z] [org.hibernate.jpa.internal.util.LogHelper] [restartedMain] [31] [INFO ] HHH000204: Processing PersistenceUnitInfo [name: default] -[2020-01-09T08:14:38.038Z] [org.hibernate.Version] [restartedMain] [46] [INFO ] HHH000412: Hibernate Core {5.4.6.Final} -[2020-01-09T08:14:38.038Z] [org.hibernate.annotations.common.reflection.java.JavaReflectionManager] [restartedMain] [49] [INFO ] HCANN000001: Hibernate Commons Annotations {5.1.0.Final} -[2020-01-09T08:14:38.038Z] [org.hibernate.dialect.Dialect] [restartedMain] [172] [INFO ] HHH000400: Using dialect: org.hibernate.dialect.PostgreSQL95Dialect -[2020-01-09T08:14:39.039Z] [org.hibernate.engine.transaction.jta.platform.internal.JtaPlatformInitiator] [restartedMain] [52] [INFO ] HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform] -[2020-01-09T08:14:39.039Z] [org.springframework.orm.jpa.AbstractEntityManagerFactoryBean] [restartedMain] [416] [INFO ] Initialized JPA EntityManagerFactory for persistence unit 'default' -[2020-01-09T08:14:39.039Z] [springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper] [restartedMain] [160] [INFO ] Context refreshed -[2020-01-09T08:14:39.039Z] [springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper] [restartedMain] [163] [INFO ] Found 1 custom documentation plugin(s) -[2020-01-09T08:14:39.039Z] [springfox.documentation.spring.web.scanners.ApiListingReferenceScanner] [restartedMain] [41] [INFO ] Scanning for api listing references -[2020-01-09T08:14:39.039Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [204] [INFO ] Tomcat started on port(s): 9090 (http) with context path '' -[2020-01-09T08:14:39.039Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [61] [INFO ] Started ServiceCrudApplication in 3.36 seconds (JVM running for 4.317) -[2020-01-09T08:16:18.018Z] [org.apache.juli.logging.DirectJDKLog] [http-nio-9090-exec-1] [173] [INFO ] Initializing Spring DispatcherServlet 'dispatcherServlet' -[2020-01-09T08:16:18.018Z] [org.springframework.web.servlet.FrameworkServlet] [http-nio-9090-exec-1] [525] [INFO ] Initializing Servlet 'dispatcherServlet' -[2020-01-09T08:16:18.018Z] [springfox.documentation.spring.web.PropertySourcedRequestMappingHandlerMapping] [http-nio-9090-exec-1] [69] [INFO ] Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)] -[2020-01-09T08:16:18.018Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [http-nio-9090-exec-1] [171] [INFO ] Initializing ExecutorService 'applicationTaskExecutor' -[2020-01-09T08:16:18.018Z] [org.springframework.web.servlet.FrameworkServlet] [http-nio-9090-exec-1] [547] [INFO ] Completed initialization in 146 ms +[2020-01-09T11:00:12.012Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [55] [INFO ] Starting ServiceCrudApplication on DESKTOP-HE1TMKM with PID 4076 (D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4\service_rest\target\classes started by cordier in D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4) +[2020-01-09T11:00:12.012Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [56] [DEBUG] Running with Spring Boot v2.2.0.RELEASE, Spring v5.2.0.RELEASE +[2020-01-09T11:00:12.012Z] [org.springframework.boot.SpringApplication] [restartedMain] [651] [INFO ] No active profile set, falling back to default profiles: default +[2020-01-09T11:00:12.012Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] The Class-Path manifest attribute in C:\Users\cordier\.m2\repository\org\glassfish\jaxb\jaxb-runtime\2.3.2\jaxb-runtime-2.3.2.jar referenced one or more files that do not exist: file:/C:/Users/cordier/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.2/jakarta.xml.bind-api-2.3.2.jar,file:/C:/Users/cordier/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.2/txw2-2.3.2.jar,file:/C:/Users/cordier/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.2/istack-commons-runtime-3.0.8.jar,file:/C:/Users/cordier/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.2/stax-ex-1.8.1.jar,file:/C:/Users/cordier/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.2/FastInfoset-1.2.16.jar,file:/C:/Users/cordier/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.2/jakarta.activation-api-1.2.1.jar +[2020-01-09T11:00:12.012Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] Devtools property defaults active! Set 'spring.devtools.add-properties' to 'false' to disable +[2020-01-09T11:00:12.012Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] For additional web related logging consider setting the 'logging.level.web' property to 'DEBUG' +[2020-01-09T11:00:12.012Z] [org.springframework.data.repository.config.RepositoryConfigurationDelegate] [restartedMain] [126] [INFO ] Bootstrapping Spring Data repositories in DEFAULT mode. +[2020-01-09T11:00:12.012Z] [org.springframework.data.repository.config.RepositoryConfigurationDelegate] [restartedMain] [182] [INFO ] Finished Spring Data repository scanning in 48ms. Found 3 repository interfaces. +[2020-01-09T11:00:13.013Z] [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] [restartedMain] [330] [INFO ] Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +[2020-01-09T11:00:13.013Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [92] [INFO ] Tomcat initialized with port(s): 9090 (http) +[2020-01-09T11:00:13.013Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting service [Tomcat] +[2020-01-09T11:00:13.013Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting Servlet engine: [Apache Tomcat/9.0.27] +[2020-01-09T11:00:13.013Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Initializing Spring embedded WebApplicationContext +[2020-01-09T11:00:13.013Z] [org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext] [restartedMain] [284] [INFO ] Root WebApplicationContext: initialization completed in 1243 ms +[2020-01-09T11:00:13.013Z] [com.zaxxer.hikari.HikariDataSource] [restartedMain] [110] [INFO ] HikariPool-1 - Starting... +[2020-01-09T11:00:13.013Z] [com.zaxxer.hikari.HikariDataSource] [restartedMain] [123] [INFO ] HikariPool-1 - Start completed. +[2020-01-09T11:00:13.013Z] [org.hibernate.jpa.internal.util.LogHelper] [restartedMain] [31] [INFO ] HHH000204: Processing PersistenceUnitInfo [name: default] +[2020-01-09T11:00:13.013Z] [org.hibernate.Version] [restartedMain] [46] [INFO ] HHH000412: Hibernate Core {5.4.6.Final} +[2020-01-09T11:00:13.013Z] [org.hibernate.annotations.common.reflection.java.JavaReflectionManager] [restartedMain] [49] [INFO ] HCANN000001: Hibernate Commons Annotations {5.1.0.Final} +[2020-01-09T11:00:13.013Z] [org.hibernate.dialect.Dialect] [restartedMain] [172] [INFO ] HHH000400: Using dialect: org.hibernate.dialect.PostgreSQL95Dialect +[2020-01-09T11:00:14.014Z] [org.hibernate.engine.transaction.jta.platform.internal.JtaPlatformInitiator] [restartedMain] [52] [INFO ] HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform] +[2020-01-09T11:00:14.014Z] [org.springframework.orm.jpa.AbstractEntityManagerFactoryBean] [restartedMain] [416] [INFO ] Initialized JPA EntityManagerFactory for persistence unit 'default' +[2020-01-09T11:00:14.014Z] [springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper] [restartedMain] [160] [INFO ] Context refreshed +[2020-01-09T11:00:14.014Z] [springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper] [restartedMain] [163] [INFO ] Found 1 custom documentation plugin(s) +[2020-01-09T11:00:14.014Z] [springfox.documentation.spring.web.scanners.ApiListingReferenceScanner] [restartedMain] [41] [INFO ] Scanning for api listing references +[2020-01-09T11:00:14.014Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [204] [INFO ] Tomcat started on port(s): 9090 (http) with context path '' +[2020-01-09T11:00:14.014Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [61] [INFO ] Started ServiceCrudApplication in 3.29 seconds (JVM running for 4.096) +[2020-01-09T11:01:18.018Z] [org.apache.juli.logging.DirectJDKLog] [http-nio-9090-exec-1] [173] [INFO ] Initializing Spring DispatcherServlet 'dispatcherServlet' +[2020-01-09T11:01:18.018Z] [org.springframework.web.servlet.FrameworkServlet] [http-nio-9090-exec-1] [525] [INFO ] Initializing Servlet 'dispatcherServlet' +[2020-01-09T11:01:18.018Z] [springfox.documentation.spring.web.PropertySourcedRequestMappingHandlerMapping] [http-nio-9090-exec-1] [69] [INFO ] Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)] +[2020-01-09T11:01:18.018Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [http-nio-9090-exec-1] [171] [INFO ] Initializing ExecutorService 'applicationTaskExecutor' +[2020-01-09T11:01:18.018Z] [org.springframework.web.servlet.FrameworkServlet] [http-nio-9090-exec-1] [547] [INFO ] Completed initialization in 144 ms +[2020-01-09T11:05:18.018Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [SpringContextShutdownHook] [208] [INFO ] Shutting down ExecutorService 'applicationTaskExecutor' +[2020-01-09T11:05:18.018Z] [org.springframework.orm.jpa.AbstractEntityManagerFactoryBean] [SpringContextShutdownHook] [598] [INFO ] Closing JPA EntityManagerFactory for persistence unit 'default' +[2020-01-09T11:05:18.018Z] [com.zaxxer.hikari.HikariDataSource] [SpringContextShutdownHook] [350] [INFO ] HikariPool-1 - Shutdown initiated... +[2020-01-09T11:05:18.018Z] [com.zaxxer.hikari.HikariDataSource] [SpringContextShutdownHook] [352] [INFO ] HikariPool-1 - Shutdown completed. diff --git a/logs/service_frontmvc.log b/logs/service_frontmvc.log index 41ffd72..00bf06b 100644 --- a/logs/service_frontmvc.log +++ b/logs/service_frontmvc.log @@ -1,4 +1,4 @@ -[2020-01-09T08:14:49.049Z] [org.springframework.boot.SpringApplicationBannerPrinter] [restartedMain] [61] [INFO ] +[2020-01-09T11:00:26.026Z] [org.springframework.boot.SpringApplicationBannerPrinter] [restartedMain] [61] [INFO ] . ____ _ __ _ _ /\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \ ( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \ @@ -8,31 +8,65 @@  :: Spring Boot ::   (v2.2.0.RELEASE) -[2020-01-09T08:14:49.049Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [55] [INFO ] Starting ServiceFrontMvcApplication on DESKTOP-HE1TMKM with PID 2864 (D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4\service_frontmvc\target\classes started by cordier in D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4) -[2020-01-09T08:14:49.049Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [56] [DEBUG] Running with Spring Boot v2.2.0.RELEASE, Spring v5.2.0.RELEASE -[2020-01-09T08:14:49.049Z] [org.springframework.boot.SpringApplication] [restartedMain] [651] [INFO ] No active profile set, falling back to default profiles: default -[2020-01-09T08:14:49.049Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] Devtools property defaults active! Set 'spring.devtools.add-properties' to 'false' to disable -[2020-01-09T08:14:49.049Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] For additional web related logging consider setting the 'logging.level.web' property to 'DEBUG' -[2020-01-09T08:14:50.050Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [92] [INFO ] Tomcat initialized with port(s): 80 (http) -[2020-01-09T08:14:50.050Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting service [Tomcat] -[2020-01-09T08:14:50.050Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting Servlet engine: [Apache Tomcat/9.0.27] -[2020-01-09T08:14:50.050Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Initializing Spring embedded WebApplicationContext -[2020-01-09T08:14:50.050Z] [org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext] [restartedMain] [284] [INFO ] Root WebApplicationContext: initialization completed in 1010 ms -[2020-01-09T08:14:51.051Z] [springfox.documentation.spring.web.PropertySourcedRequestMappingHandlerMapping] [restartedMain] [69] [INFO ] Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)] -[2020-01-09T08:14:51.051Z] [org.springframework.security.web.DefaultSecurityFilterChain] [restartedMain] [43] [INFO ] Creating filter chain: any request, [org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@614dcbc8, org.springframework.security.web.context.SecurityContextPersistenceFilter@7979205, org.springframework.security.web.header.HeaderWriterFilter@4106b5a5, org.springframework.web.filter.CorsFilter@51864070, org.springframework.security.web.authentication.logout.LogoutFilter@70dc3f7c, org.springframework.security.web.session.ConcurrentSessionFilter@7809564a, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@787552de, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@686ed5ed, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@527ced03, org.springframework.security.web.session.SessionManagementFilter@6cc3ec1f, org.springframework.security.web.access.ExceptionTranslationFilter@3d0049f0, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@32486a2c] -[2020-01-09T08:14:51.051Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [restartedMain] [171] [INFO ] Initializing ExecutorService 'applicationTaskExecutor' -[2020-01-09T08:14:51.051Z] [springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper] [restartedMain] [160] [INFO ] Context refreshed -[2020-01-09T08:14:51.051Z] [springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper] [restartedMain] [163] [INFO ] Found 1 custom documentation plugin(s) -[2020-01-09T08:14:51.051Z] [springfox.documentation.spring.web.scanners.ApiListingReferenceScanner] [restartedMain] [41] [INFO ] Scanning for api listing references -[2020-01-09T08:14:51.051Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [204] [INFO ] Tomcat started on port(s): 80 (http) with context path '' -[2020-01-09T08:14:51.051Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [61] [INFO ] Started ServiceFrontMvcApplication in 2.337 seconds (JVM running for 3.09) -[2020-01-09T08:16:11.011Z] [org.apache.juli.logging.DirectJDKLog] [http-nio-80-exec-1] [173] [INFO ] Initializing Spring DispatcherServlet 'dispatcherServlet' -[2020-01-09T08:16:11.011Z] [org.springframework.web.servlet.FrameworkServlet] [http-nio-80-exec-1] [525] [INFO ] Initializing Servlet 'dispatcherServlet' -[2020-01-09T08:16:11.011Z] [org.springframework.web.servlet.FrameworkServlet] [http-nio-80-exec-1] [547] [INFO ] Completed initialization in 4 ms -[2020-01-09T08:16:18.018Z] [org.apache.juli.logging.DirectJDKLog] [http-nio-80-exec-4] [173] [WARN ] Creation of SecureRandom instance for session ID generation using [SHA1PRNG] took [118] milliseconds. -[2020-01-09T08:16:40.040Z] [org.apache.juli.logging.DirectJDKLog] [http-nio-80-exec-10] [175] [ERROR] Servlet.service() for servlet [dispatcherServlet] in context with path [] threw exception [Request processing failed; nested exception is java.lang.ClassCastException: class java.lang.String cannot be cast to class fr.ocr.front_mvc.userdetails.UserWebUserDetails (java.lang.String is in module java.base of loader 'bootstrap'; fr.ocr.front_mvc.userdetails.UserWebUserDetails is in unnamed module of loader org.springframework.boot.devtools.restart.classloader.RestartClassLoader @76e9cc61)] with root cause -java.lang.ClassCastException: class java.lang.String cannot be cast to class fr.ocr.front_mvc.userdetails.UserWebUserDetails (java.lang.String is in module java.base of loader 'bootstrap'; fr.ocr.front_mvc.userdetails.UserWebUserDetails is in unnamed module of loader org.springframework.boot.devtools.restart.classloader.RestartClassLoader @76e9cc61) - at fr.ocr.front_mvc.controller.DispatchController.getListePrestCtrl(DispatchController.java:197) +[2020-01-09T11:00:26.026Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [55] [INFO ] Starting ApplicationWeb on DESKTOP-HE1TMKM with PID 4660 (D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4\application_web\target\classes started by cordier in D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4) +[2020-01-09T11:00:26.026Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [56] [DEBUG] Running with Spring Boot v2.2.0.RELEASE, Spring v5.2.0.RELEASE +[2020-01-09T11:00:26.026Z] [org.springframework.boot.SpringApplication] [restartedMain] [651] [INFO ] No active profile set, falling back to default profiles: default +[2020-01-09T11:00:26.026Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] Devtools property defaults active! Set 'spring.devtools.add-properties' to 'false' to disable +[2020-01-09T11:00:26.026Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] For additional web related logging consider setting the 'logging.level.web' property to 'DEBUG' +[2020-01-09T11:00:27.027Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [92] [INFO ] Tomcat initialized with port(s): 80 (http) +[2020-01-09T11:00:27.027Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting service [Tomcat] +[2020-01-09T11:00:27.027Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting Servlet engine: [Apache Tomcat/9.0.27] +[2020-01-09T11:00:27.027Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Initializing Spring embedded WebApplicationContext +[2020-01-09T11:00:27.027Z] [org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext] [restartedMain] [284] [INFO ] Root WebApplicationContext: initialization completed in 1010 ms +[2020-01-09T11:00:27.027Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [WARN ] Cannot deserialize session attribute [SPRING_SECURITY_CONTEXT] for session [7D84D720541A5358285F5D91A489FDFC] +[2020-01-09T11:00:28.028Z] [springfox.documentation.spring.web.PropertySourcedRequestMappingHandlerMapping] [restartedMain] [69] [INFO ] Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)] +[2020-01-09T11:00:28.028Z] [org.springframework.security.web.DefaultSecurityFilterChain] [restartedMain] [43] [INFO ] Creating filter chain: any request, [org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@b40c98d, org.springframework.security.web.context.SecurityContextPersistenceFilter@7221e8c2, org.springframework.security.web.header.HeaderWriterFilter@6f631a25, org.springframework.web.filter.CorsFilter@61075107, org.springframework.security.web.authentication.logout.LogoutFilter@7c9bb5ac, org.springframework.security.web.session.ConcurrentSessionFilter@50efec8, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@5273688f, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@3fe6eca9, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@3b1bcd02, org.springframework.security.web.session.SessionManagementFilter@316bb3b1, org.springframework.security.web.access.ExceptionTranslationFilter@6159b448, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@5691987f] +[2020-01-09T11:00:28.028Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [restartedMain] [171] [INFO ] Initializing ExecutorService 'applicationTaskExecutor' +[2020-01-09T11:00:28.028Z] [springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper] [restartedMain] [160] [INFO ] Context refreshed +[2020-01-09T11:00:28.028Z] [springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper] [restartedMain] [163] [INFO ] Found 1 custom documentation plugin(s) +[2020-01-09T11:00:28.028Z] [springfox.documentation.spring.web.scanners.ApiListingReferenceScanner] [restartedMain] [41] [INFO ] Scanning for api listing references +[2020-01-09T11:00:28.028Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [204] [INFO ] Tomcat started on port(s): 80 (http) with context path '' +[2020-01-09T11:00:28.028Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [61] [INFO ] Started ApplicationWeb in 2.355 seconds (JVM running for 3.131) +[2020-01-09T11:01:24.024Z] [org.apache.juli.logging.DirectJDKLog] [http-nio-80-exec-1] [173] [INFO ] Initializing Spring DispatcherServlet 'dispatcherServlet' +[2020-01-09T11:01:24.024Z] [org.springframework.web.servlet.FrameworkServlet] [http-nio-80-exec-1] [525] [INFO ] Initializing Servlet 'dispatcherServlet' +[2020-01-09T11:01:24.024Z] [org.springframework.web.servlet.FrameworkServlet] [http-nio-80-exec-1] [547] [INFO ] Completed initialization in 6 ms +[2020-01-09T11:01:26.026Z] [fr.ocr.front_mvc.controller.DispatchController] [http-nio-80-exec-2] [208] [WARN ] Accès aux prêts impossible car pas connecté +[2020-01-09T11:01:54.054Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [SpringContextShutdownHook] [208] [INFO ] Shutting down ExecutorService 'applicationTaskExecutor' +[2020-01-09T11:03:02.002Z] [org.springframework.boot.SpringApplicationBannerPrinter] [restartedMain] [61] [INFO ] + . ____ _ __ _ _ + /\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \ +( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \ + \\/ ___)| |_)| | | | | || (_| | ) ) ) ) + ' |____| .__|_| |_|_| |_\__, | / / / / + =========|_|==============|___/=/_/_/_/ + :: Spring Boot ::   (v2.2.0.RELEASE) + + +[2020-01-09T11:03:02.002Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [55] [INFO ] Starting ApplicationWeb on DESKTOP-HE1TMKM with PID 8908 (D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4\application_web\target\classes started by cordier in D:\OpenClassRooms\OCR-Projet07\ocr-projet07-v4) +[2020-01-09T11:03:02.002Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [56] [DEBUG] Running with Spring Boot v2.2.0.RELEASE, Spring v5.2.0.RELEASE +[2020-01-09T11:03:02.002Z] [org.springframework.boot.SpringApplication] [restartedMain] [651] [INFO ] No active profile set, falling back to default profiles: default +[2020-01-09T11:03:02.002Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] Devtools property defaults active! Set 'spring.devtools.add-properties' to 'false' to disable +[2020-01-09T11:03:02.002Z] [org.springframework.boot.logging.DeferredLog] [restartedMain] [225] [INFO ] For additional web related logging consider setting the 'logging.level.web' property to 'DEBUG' +[2020-01-09T11:03:03.003Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [92] [INFO ] Tomcat initialized with port(s): 80 (http) +[2020-01-09T11:03:03.003Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting service [Tomcat] +[2020-01-09T11:03:03.003Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Starting Servlet engine: [Apache Tomcat/9.0.27] +[2020-01-09T11:03:03.003Z] [org.apache.juli.logging.DirectJDKLog] [restartedMain] [173] [INFO ] Initializing Spring embedded WebApplicationContext +[2020-01-09T11:03:03.003Z] [org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext] [restartedMain] [284] [INFO ] Root WebApplicationContext: initialization completed in 985 ms +[2020-01-09T11:03:04.004Z] [springfox.documentation.spring.web.PropertySourcedRequestMappingHandlerMapping] [restartedMain] [69] [INFO ] Mapped URL path [/v2/api-docs] onto method [springfox.documentation.swagger2.web.Swagger2Controller#getDocumentation(String, HttpServletRequest)] +[2020-01-09T11:03:04.004Z] [org.springframework.security.web.DefaultSecurityFilterChain] [restartedMain] [43] [INFO ] Creating filter chain: any request, [org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@328ab562, org.springframework.security.web.context.SecurityContextPersistenceFilter@40775a2d, org.springframework.security.web.header.HeaderWriterFilter@894f9dc, org.springframework.web.filter.CorsFilter@3f38180, org.springframework.security.web.authentication.logout.LogoutFilter@2d897f9c, org.springframework.security.web.session.ConcurrentSessionFilter@770fc496, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@5bda66e6, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@aec0072, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@35fd4b19, org.springframework.security.web.session.SessionManagementFilter@4ad67773, org.springframework.security.web.access.ExceptionTranslationFilter@117692e6, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@57e7bfb7] +[2020-01-09T11:03:04.004Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [restartedMain] [171] [INFO ] Initializing ExecutorService 'applicationTaskExecutor' +[2020-01-09T11:03:04.004Z] [springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper] [restartedMain] [160] [INFO ] Context refreshed +[2020-01-09T11:03:04.004Z] [springfox.documentation.spring.web.plugins.DocumentationPluginsBootstrapper] [restartedMain] [163] [INFO ] Found 1 custom documentation plugin(s) +[2020-01-09T11:03:04.004Z] [springfox.documentation.spring.web.scanners.ApiListingReferenceScanner] [restartedMain] [41] [INFO ] Scanning for api listing references +[2020-01-09T11:03:04.004Z] [org.springframework.boot.web.embedded.tomcat.TomcatWebServer] [restartedMain] [204] [INFO ] Tomcat started on port(s): 80 (http) with context path '' +[2020-01-09T11:03:04.004Z] [org.springframework.boot.StartupInfoLogger] [restartedMain] [61] [INFO ] Started ApplicationWeb in 2.314 seconds (JVM running for 3.361) +[2020-01-09T11:03:45.045Z] [org.apache.juli.logging.DirectJDKLog] [http-nio-80-exec-1] [173] [INFO ] Initializing Spring DispatcherServlet 'dispatcherServlet' +[2020-01-09T11:03:45.045Z] [org.springframework.web.servlet.FrameworkServlet] [http-nio-80-exec-1] [525] [INFO ] Initializing Servlet 'dispatcherServlet' +[2020-01-09T11:03:45.045Z] [org.springframework.web.servlet.FrameworkServlet] [http-nio-80-exec-1] [547] [INFO ] Completed initialization in 4 ms +[2020-01-09T11:03:50.050Z] [fr.ocr.front_mvc.controller.DispatchController] [http-nio-80-exec-4] [208] [WARN ] Accès aux prêts impossible car pas connecté +[2020-01-09T11:03:50.050Z] [org.apache.juli.logging.DirectJDKLog] [http-nio-80-exec-4] [175] [ERROR] Servlet.service() for servlet [dispatcherServlet] in context with path [] threw exception [Request processing failed; nested exception is java.lang.RuntimeException: Accès aux prêts impossible car pas connecté] with root cause +java.lang.RuntimeException: Accès aux prêts impossible car pas connecté + at fr.ocr.front_mvc.controller.DispatchController.getListePrestCtrl(DispatchController.java:209) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) @@ -119,3 +153,4 @@ java.lang.ClassCastException: class java.lang.String cannot be cast to class fr. at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.base/java.lang.Thread.run(Thread.java:834) +[2020-01-09T11:05:16.016Z] [org.springframework.scheduling.concurrent.ExecutorConfigurationSupport] [SpringContextShutdownHook] [208] [INFO ] Shutting down ExecutorService 'applicationTaskExecutor' diff --git a/pom.xml b/pom.xml index 0bf00ea..d80a0f2 100644 --- a/pom.xml +++ b/pom.xml @@ -18,10 +18,10 @@ Projet 07 - Librairie - pom parent - service_crud - service_batchmail + service_rest + application_batch lib_httpclient - service_frontmvc + application_web diff --git a/service_crud/.mvn/wrapper/MavenWrapperDownloader.java b/service_rest/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from service_crud/.mvn/wrapper/MavenWrapperDownloader.java rename to service_rest/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/service_crud/.mvn/wrapper/maven-wrapper.jar b/service_rest/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from service_crud/.mvn/wrapper/maven-wrapper.jar rename to service_rest/.mvn/wrapper/maven-wrapper.jar diff --git a/service_crud/.mvn/wrapper/maven-wrapper.properties b/service_rest/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from service_crud/.mvn/wrapper/maven-wrapper.properties rename to service_rest/.mvn/wrapper/maven-wrapper.properties diff --git a/service_crud/go.cmd b/service_rest/go.cmd similarity index 100% rename from service_crud/go.cmd rename to service_rest/go.cmd diff --git a/service_crud/mvnw b/service_rest/mvnw similarity index 100% rename from service_crud/mvnw rename to service_rest/mvnw diff --git a/service_crud/mvnw.cmd b/service_rest/mvnw.cmd similarity index 100% rename from service_crud/mvnw.cmd rename to service_rest/mvnw.cmd diff --git a/service_crud/pom.xml b/service_rest/pom.xml similarity index 97% rename from service_crud/pom.xml rename to service_rest/pom.xml index fb7222d..d717a10 100644 --- a/service_crud/pom.xml +++ b/service_rest/pom.xml @@ -11,7 +11,7 @@ service_crud 1.0-SNAPSHOT - service_crud + service_rest projet 07 - service CRUD jar @@ -77,7 +77,7 @@ - service_crud + service_rest diff --git a/service_crud/src/main/java/fr/ocr/ServiceCrudApplication.java b/service_rest/src/main/java/fr/ocr/ServiceCrudApplication.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/ServiceCrudApplication.java rename to service_rest/src/main/java/fr/ocr/ServiceCrudApplication.java diff --git a/service_crud/src/main/java/fr/ocr/application/ouvrage/Ouvrage.java b/service_rest/src/main/java/fr/ocr/application/ouvrage/Ouvrage.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/ouvrage/Ouvrage.java rename to service_rest/src/main/java/fr/ocr/application/ouvrage/Ouvrage.java diff --git a/service_crud/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudController.java b/service_rest/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudController.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudController.java rename to service_rest/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudController.java diff --git a/service_crud/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudDtoBatch.java b/service_rest/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudDtoBatch.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudDtoBatch.java rename to service_rest/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudDtoBatch.java diff --git a/service_crud/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudRepository.java b/service_rest/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudRepository.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudRepository.java rename to service_rest/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudRepository.java diff --git a/service_crud/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudService.java b/service_rest/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudService.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudService.java rename to service_rest/src/main/java/fr/ocr/application/ouvrage/OuvrageCrudService.java diff --git a/service_crud/src/main/java/fr/ocr/application/package-info.java b/service_rest/src/main/java/fr/ocr/application/package-info.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/package-info.java rename to service_rest/src/main/java/fr/ocr/application/package-info.java diff --git a/service_crud/src/main/java/fr/ocr/application/pret/InfosRecherchePret.java b/service_rest/src/main/java/fr/ocr/application/pret/InfosRecherchePret.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/pret/InfosRecherchePret.java rename to service_rest/src/main/java/fr/ocr/application/pret/InfosRecherchePret.java diff --git a/service_crud/src/main/java/fr/ocr/application/pret/Pret.java b/service_rest/src/main/java/fr/ocr/application/pret/Pret.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/pret/Pret.java rename to service_rest/src/main/java/fr/ocr/application/pret/Pret.java diff --git a/service_crud/src/main/java/fr/ocr/application/pret/PretCrudController.java b/service_rest/src/main/java/fr/ocr/application/pret/PretCrudController.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/pret/PretCrudController.java rename to service_rest/src/main/java/fr/ocr/application/pret/PretCrudController.java diff --git a/service_crud/src/main/java/fr/ocr/application/pret/PretCrudDtoBatch.java b/service_rest/src/main/java/fr/ocr/application/pret/PretCrudDtoBatch.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/pret/PretCrudDtoBatch.java rename to service_rest/src/main/java/fr/ocr/application/pret/PretCrudDtoBatch.java diff --git a/service_crud/src/main/java/fr/ocr/application/pret/PretCrudDtoWeb.java b/service_rest/src/main/java/fr/ocr/application/pret/PretCrudDtoWeb.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/pret/PretCrudDtoWeb.java rename to service_rest/src/main/java/fr/ocr/application/pret/PretCrudDtoWeb.java diff --git a/service_crud/src/main/java/fr/ocr/application/pret/PretCrudRepository.java b/service_rest/src/main/java/fr/ocr/application/pret/PretCrudRepository.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/pret/PretCrudRepository.java rename to service_rest/src/main/java/fr/ocr/application/pret/PretCrudRepository.java diff --git a/service_crud/src/main/java/fr/ocr/application/pret/PretCrudService.java b/service_rest/src/main/java/fr/ocr/application/pret/PretCrudService.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/pret/PretCrudService.java rename to service_rest/src/main/java/fr/ocr/application/pret/PretCrudService.java diff --git a/service_crud/src/main/java/fr/ocr/application/pret/PretPK.java b/service_rest/src/main/java/fr/ocr/application/pret/PretPK.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/pret/PretPK.java rename to service_rest/src/main/java/fr/ocr/application/pret/PretPK.java diff --git a/service_crud/src/main/java/fr/ocr/application/user/User.java b/service_rest/src/main/java/fr/ocr/application/user/User.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/user/User.java rename to service_rest/src/main/java/fr/ocr/application/user/User.java diff --git a/service_crud/src/main/java/fr/ocr/application/user/UserCrudController.java b/service_rest/src/main/java/fr/ocr/application/user/UserCrudController.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/user/UserCrudController.java rename to service_rest/src/main/java/fr/ocr/application/user/UserCrudController.java diff --git a/service_crud/src/main/java/fr/ocr/application/user/UserCrudDto.java b/service_rest/src/main/java/fr/ocr/application/user/UserCrudDto.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/user/UserCrudDto.java rename to service_rest/src/main/java/fr/ocr/application/user/UserCrudDto.java diff --git a/service_crud/src/main/java/fr/ocr/application/user/UserCrudDtoWeb.java b/service_rest/src/main/java/fr/ocr/application/user/UserCrudDtoWeb.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/user/UserCrudDtoWeb.java rename to service_rest/src/main/java/fr/ocr/application/user/UserCrudDtoWeb.java diff --git a/service_crud/src/main/java/fr/ocr/application/user/UserCrudRepository.java b/service_rest/src/main/java/fr/ocr/application/user/UserCrudRepository.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/user/UserCrudRepository.java rename to service_rest/src/main/java/fr/ocr/application/user/UserCrudRepository.java diff --git a/service_crud/src/main/java/fr/ocr/application/user/UserCrudService.java b/service_rest/src/main/java/fr/ocr/application/user/UserCrudService.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/application/user/UserCrudService.java rename to service_rest/src/main/java/fr/ocr/application/user/UserCrudService.java diff --git a/service_crud/src/main/java/fr/ocr/utility/EntityJacksonFilters.java b/service_rest/src/main/java/fr/ocr/utility/EntityJacksonFilters.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/utility/EntityJacksonFilters.java rename to service_rest/src/main/java/fr/ocr/utility/EntityJacksonFilters.java diff --git a/service_crud/src/main/java/fr/ocr/utility/OuvrageJacksonFilters.java b/service_rest/src/main/java/fr/ocr/utility/OuvrageJacksonFilters.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/utility/OuvrageJacksonFilters.java rename to service_rest/src/main/java/fr/ocr/utility/OuvrageJacksonFilters.java diff --git a/service_crud/src/main/java/fr/ocr/utility/PretJacksonFilters.java b/service_rest/src/main/java/fr/ocr/utility/PretJacksonFilters.java similarity index 100% rename from service_crud/src/main/java/fr/ocr/utility/PretJacksonFilters.java rename to service_rest/src/main/java/fr/ocr/utility/PretJacksonFilters.java diff --git a/service_crud/src/main/resources/application.properties b/service_rest/src/main/resources/application.properties similarity index 100% rename from service_crud/src/main/resources/application.properties rename to service_rest/src/main/resources/application.properties diff --git a/service_crud/src/main/resources/application.yml b/service_rest/src/main/resources/application.yml similarity index 100% rename from service_crud/src/main/resources/application.yml rename to service_rest/src/main/resources/application.yml diff --git a/service_crud/src/main/resources/logback-spring.xml b/service_rest/src/main/resources/logback-spring.xml similarity index 100% rename from service_crud/src/main/resources/logback-spring.xml rename to service_rest/src/main/resources/logback-spring.xml