From 971a6482edbe2f602fc0247b04fe6680aa98301a Mon Sep 17 00:00:00 2001 From: Thomas <37211499+thomascardon35@users.noreply.github.com> Date: Wed, 16 Feb 2022 15:42:57 +0100 Subject: [PATCH 1/5] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index c2065bc..8dc0cdd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,8 @@ build/ !**/src/main/**/build/ !**/src/test/**/build/ +/src/main/resources/application.properties + ### STS ### .apt_generated .classpath From 362ab67c9aba27a91989a29eb449b50c3fa00c44 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 3 Mar 2022 11:32:03 +0100 Subject: [PATCH 2/5] modif --- settings.gradle | 2 +- src/main/resources/application.properties | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/settings.gradle b/settings.gradle index c74741c..e76d701 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'simpleat' +rootProject.name = 'simpleat-back' diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 19011c0..30cfcf0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -6,9 +6,9 @@ spring.main.allow-circular-references=true # =============================== # base de données MySQL # =============================== -spring.datasource.url=jdbc:mysql://localhost:3308/simpleat?useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=CET +spring.datasource.url=jdbc:mysql://localhost:3306/simpleat?useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=CET spring.datasource.username=root -spring.datasource.password=root +spring.datasource.password=BOHmilaresol02 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver # log #logging.level.root=INFO @@ -25,4 +25,5 @@ spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDial # Permet d'exécuter le data.sql # =============================== spring.sql.init.mode=always -spring.jpa.defer-datasource-initialization=true \ No newline at end of file +spring.jpa.defer-datasource-initialization=true +server.port=8081 \ No newline at end of file From 2cb10cfd8c9aa9422fd3306dbc352fe9d4d1d15e Mon Sep 17 00:00:00 2001 From: Thomas Cardon Date: Fri, 11 Mar 2022 16:28:25 +0100 Subject: [PATCH 3/5] modif sql --- src/main/resources/data.sql | 2 +- src/main/resources/script-simpleat.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 88426d8..233989d 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -84,7 +84,7 @@ INSERT INTO restaurant (`a_emporter`,`accespmr`,`adresse`,`latitude`,`longitude` INSERT INTO restaurant (`a_emporter`,`accespmr`,`adresse`,`latitude`,`longitude`,`nom`,`prix`,`sur_place`,`telephone`,`website`) VALUES (1,NULL,'78 Av. de la Résistance, 93100 Montreuil','48.86260826926845','2.4370469579964404','O Bon Coin',1,1,'0953523586',''); INSERT INTO restaurant (`a_emporter`,`accespmr`,`adresse`,`latitude`,`longitude`,`nom`,`prix`,`sur_place`,`telephone`,`website`) VALUES (1,NULL,'14 Rue du Capitaine Dreyfus, 93100 Montreuil','48.85828992238344','2.437848545198565','Kashmir Café',2,1,'0143633386','http://www.kashmircafe.fr/'); INSERT INTO restaurant (`a_emporter`,`accespmr`,`adresse`,`latitude`,`longitude`,`nom`,`prix`,`sur_place`,`telephone`,`website`) VALUES (1,NULL,'45 Bd Paul Vaillant Couturier, 93100 Montreuil','48.86615467929139','2.4442899980905284','Le Marrakech',3,1,'0148589402',''); -INSERT INTO restaurant (`a_emporter`,`accespmr`,`adresse`,`latitude`,`longitude`,`nom`,`prix`,`sur_place`,`telephone`,`website`) VALUES (1,NULL,'7 Bd Rouget de Lisle, 93100 Montreuil','48.86133951184523','2.4407883330629856','BOLKIRI Montreuil Street Food Viêt',2,1,'0184671708','http://bolkiri.fr/'); +INSERT INTO restaurant (`a_emporter`,`accespmr`,`adresse`,`latitude`,`longitude`,`nom`,`prix`,`sur_place`,`telephone`,`website`) VALUES (1,NULL,'7 Bd Rouget de Lisle, 93100 Montreuil','48.86133951184523','2.4407883330629856','BOLKIRI',2,1,'0184671708','http://bolkiri.fr/'); diff --git a/src/main/resources/script-simpleat.sql b/src/main/resources/script-simpleat.sql index 1066505..86a47cb 100644 --- a/src/main/resources/script-simpleat.sql +++ b/src/main/resources/script-simpleat.sql @@ -166,7 +166,7 @@ INSERT INTO restaurant (`a_emporter`,`accespmr`,`adresse`,`latitude`,`longitude` INSERT INTO restaurant (`a_emporter`,`accespmr`,`adresse`,`latitude`,`longitude`,`nom`,`prix`,`sur_place`,`telephone`,`website`) VALUES (1,NULL,'78 Av. de la Résistance, 93100 Montreuil','48.86260826926845','2.4370469579964404','O Bon Coin',1,1,'0953523586',''); INSERT INTO restaurant (`a_emporter`,`accespmr`,`adresse`,`latitude`,`longitude`,`nom`,`prix`,`sur_place`,`telephone`,`website`) VALUES (1,NULL,'14 Rue du Capitaine Dreyfus, 93100 Montreuil','48.85828992238344','2.437848545198565','Kashmir Café',2,1,'0143633386','http://www.kashmircafe.fr/'); INSERT INTO restaurant (`a_emporter`,`accespmr`,`adresse`,`latitude`,`longitude`,`nom`,`prix`,`sur_place`,`telephone`,`website`) VALUES (1,NULL,'45 Bd Paul Vaillant Couturier, 93100 Montreuil','48.86615467929139','2.4442899980905284','Le Marrakech',3,1,'0148589402',''); -INSERT INTO restaurant (`a_emporter`,`accespmr`,`adresse`,`latitude`,`longitude`,`nom`,`prix`,`sur_place`,`telephone`,`website`) VALUES (1,NULL,'7 Bd Rouget de Lisle, 93100 Montreuil','48.86133951184523','2.4407883330629856','BOLKIRI Montreuil Street Food Viêt',2,1,'0184671708','http://bolkiri.fr/'); +INSERT INTO restaurant (`a_emporter`,`accespmr`,`adresse`,`latitude`,`longitude`,`nom`,`prix`,`sur_place`,`telephone`,`website`) VALUES (1,NULL,'7 Bd Rouget de Lisle, 93100 Montreuil','48.86133951184523','2.4407883330629856','BOLKIRI',2,1,'0184671708','http://bolkiri.fr/'); From 254517f3793ce3b1ec26bb5261a9478e154f9e3e Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 1 Jun 2022 13:52:28 +0200 Subject: [PATCH 4/5] first commit --- settings.gradle | 2 +- src/main/resources/application.properties | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/settings.gradle b/settings.gradle index c74741c..e76d701 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'simpleat' +rootProject.name = 'simpleat-back' diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 19011c0..30cfcf0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -6,9 +6,9 @@ spring.main.allow-circular-references=true # =============================== # base de données MySQL # =============================== -spring.datasource.url=jdbc:mysql://localhost:3308/simpleat?useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=CET +spring.datasource.url=jdbc:mysql://localhost:3306/simpleat?useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=CET spring.datasource.username=root -spring.datasource.password=root +spring.datasource.password=BOHmilaresol02 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver # log #logging.level.root=INFO @@ -25,4 +25,5 @@ spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDial # Permet d'exécuter le data.sql # =============================== spring.sql.init.mode=always -spring.jpa.defer-datasource-initialization=true \ No newline at end of file +spring.jpa.defer-datasource-initialization=true +server.port=8081 \ No newline at end of file From d69fb2a5c24203ec2cbe7da871c8888c279cc4a0 Mon Sep 17 00:00:00 2001 From: VincentRamiere Date: Tue, 19 Sep 2023 16:30:00 +0200 Subject: [PATCH 5/5] Rename Project --- .../simpleatBack}/SimpleatApplication.java | 10 +++++----- .../controller/PersonneController.java | 14 +++++++------- .../controller/PreferenceController.java | 12 ++++++------ .../controller/RestaurantController.java | 6 +++--- .../controller/TypeRestauController.java | 8 ++++---- .../simpleatBack}/dto/JsonWebToken.java | 2 +- .../simpleatBack}/dto/PersonneDto.java | 2 +- .../exception/ExistingUsernameException.java | 2 +- .../exception/InvalidCredentialsException.java | 2 +- .../exception/InvalidJWTException.java | 2 +- .../simpleatBack}/model/EnumRole.java | 2 +- .../simpleatBack}/model/Personne.java | 2 +- .../simpleatBack}/model/Preference.java | 2 +- .../simpleatBack}/model/PreferencePK.java | 2 +- .../simpleatBack}/model/Reservation.java | 2 +- .../simpleatBack}/model/ReservationPK.java | 2 +- .../simpleatBack}/model/Restaurant.java | 2 +- .../simpleatBack}/model/TypeRestau.java | 2 +- .../repository/PersonneRepository.java | 4 ++-- .../repository/PreferenceRepository.java | 6 +++--- .../repository/ReservationRepository.java | 6 +++--- .../repository/RestaurantRepository.java | 4 ++-- .../repository/TypeRestauRepository.java | 4 ++-- .../simpleatBack}/security/JwtTokenFilter.java | 4 ++-- .../simpleatBack}/security/JwtTokenProvider.java | 8 ++++---- .../simpleatBack}/security/WebSecurityConfig.java | 2 +- .../simpleatBack}/service/PersonneService.java | 8 ++++---- .../simpleatBack}/service/PersonneServiceImpl.java | 14 ++++++-------- .../service/UserDetailsServiceImpl.java | 7 +++---- src/main/resources/application.properties | 6 +++--- 30 files changed, 73 insertions(+), 76 deletions(-) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/SimpleatApplication.java (67%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/controller/PersonneController.java (90%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/controller/PreferenceController.java (88%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/controller/RestaurantController.java (91%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/controller/TypeRestauController.java (90%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/dto/JsonWebToken.java (87%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/dto/PersonneDto.java (91%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/exception/ExistingUsernameException.java (87%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/exception/InvalidCredentialsException.java (86%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/exception/InvalidJWTException.java (85%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/model/EnumRole.java (83%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/model/Personne.java (98%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/model/Preference.java (95%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/model/PreferencePK.java (96%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/model/Reservation.java (94%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/model/ReservationPK.java (96%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/model/Restaurant.java (98%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/model/TypeRestau.java (96%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/repository/PersonneRepository.java (77%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/repository/PreferenceRepository.java (57%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/repository/ReservationRepository.java (56%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/repository/RestaurantRepository.java (69%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/repository/TypeRestauRepository.java (69%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/security/JwtTokenFilter.java (93%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/security/JwtTokenProvider.java (96%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/security/WebSecurityConfig.java (98%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/service/PersonneService.java (82%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/service/PersonneServiceImpl.java (86%) rename src/main/java/fr/{cardon/simpleat => vincentRamiere/simpleatBack}/service/UserDetailsServiceImpl.java (88%) diff --git a/src/main/java/fr/cardon/simpleat/SimpleatApplication.java b/src/main/java/fr/vincentRamiere/simpleatBack/SimpleatApplication.java similarity index 67% rename from src/main/java/fr/cardon/simpleat/SimpleatApplication.java rename to src/main/java/fr/vincentRamiere/simpleatBack/SimpleatApplication.java index 37dea51..85feeda 100644 --- a/src/main/java/fr/cardon/simpleat/SimpleatApplication.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/SimpleatApplication.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat; +package fr.vincentRamiere.simpleatBack; import java.util.ArrayList; import java.util.Arrays; @@ -8,10 +8,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import fr.cardon.simpleat.exception.ExistingUsernameException; -import fr.cardon.simpleat.model.EnumRole; -import fr.cardon.simpleat.model.Personne; -import fr.cardon.simpleat.service.PersonneService; +import fr.vincentRamiere.simpleatBack.exception.ExistingUsernameException; +import fr.vincentRamiere.simpleatBack.model.EnumRole; +import fr.vincentRamiere.simpleatBack.model.Personne; +import fr.vincentRamiere.simpleatBack.service.PersonneService; @SpringBootApplication public class SimpleatApplication { diff --git a/src/main/java/fr/cardon/simpleat/controller/PersonneController.java b/src/main/java/fr/vincentRamiere/simpleatBack/controller/PersonneController.java similarity index 90% rename from src/main/java/fr/cardon/simpleat/controller/PersonneController.java rename to src/main/java/fr/vincentRamiere/simpleatBack/controller/PersonneController.java index 29a9c7d..48dfc88 100644 --- a/src/main/java/fr/cardon/simpleat/controller/PersonneController.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/controller/PersonneController.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.controller; +package fr.vincentRamiere.simpleatBack.controller; import java.util.Collection; @@ -17,12 +17,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import fr.cardon.simpleat.dto.JsonWebToken; -import fr.cardon.simpleat.exception.ExistingUsernameException; -import fr.cardon.simpleat.exception.InvalidCredentialsException; -import fr.cardon.simpleat.model.Personne; -import fr.cardon.simpleat.repository.PersonneRepository; -import fr.cardon.simpleat.service.PersonneService; +import fr.vincentRamiere.simpleatBack.dto.JsonWebToken; +import fr.vincentRamiere.simpleatBack.exception.ExistingUsernameException; +import fr.vincentRamiere.simpleatBack.exception.InvalidCredentialsException; +import fr.vincentRamiere.simpleatBack.model.Personne; +import fr.vincentRamiere.simpleatBack.repository.PersonneRepository; +import fr.vincentRamiere.simpleatBack.service.PersonneService; @RestController @CrossOrigin("http://localhost:4200") diff --git a/src/main/java/fr/cardon/simpleat/controller/PreferenceController.java b/src/main/java/fr/vincentRamiere/simpleatBack/controller/PreferenceController.java similarity index 88% rename from src/main/java/fr/cardon/simpleat/controller/PreferenceController.java rename to src/main/java/fr/vincentRamiere/simpleatBack/controller/PreferenceController.java index 2869041..fe04600 100644 --- a/src/main/java/fr/cardon/simpleat/controller/PreferenceController.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/controller/PreferenceController.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.controller; +package fr.vincentRamiere.simpleatBack.controller; import java.util.Collection; import java.util.Optional; @@ -15,11 +15,11 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import fr.cardon.simpleat.model.Preference; -import fr.cardon.simpleat.model.PreferencePK; -import fr.cardon.simpleat.repository.PersonneRepository; -import fr.cardon.simpleat.repository.PreferenceRepository; -import fr.cardon.simpleat.repository.RestaurantRepository; +import fr.vincentRamiere.simpleatBack.model.Preference; +import fr.vincentRamiere.simpleatBack.model.PreferencePK; +import fr.vincentRamiere.simpleatBack.repository.PersonneRepository; +import fr.vincentRamiere.simpleatBack.repository.PreferenceRepository; +import fr.vincentRamiere.simpleatBack.repository.RestaurantRepository; @RestController @CrossOrigin("*") diff --git a/src/main/java/fr/cardon/simpleat/controller/RestaurantController.java b/src/main/java/fr/vincentRamiere/simpleatBack/controller/RestaurantController.java similarity index 91% rename from src/main/java/fr/cardon/simpleat/controller/RestaurantController.java rename to src/main/java/fr/vincentRamiere/simpleatBack/controller/RestaurantController.java index 65ec55b..bcf3928 100644 --- a/src/main/java/fr/cardon/simpleat/controller/RestaurantController.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/controller/RestaurantController.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.controller; +package fr.vincentRamiere.simpleatBack.controller; import java.util.Collection; @@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import fr.cardon.simpleat.model.Restaurant; -import fr.cardon.simpleat.repository.RestaurantRepository; +import fr.vincentRamiere.simpleatBack.model.Restaurant; +import fr.vincentRamiere.simpleatBack.repository.RestaurantRepository; @RestController @CrossOrigin("*") diff --git a/src/main/java/fr/cardon/simpleat/controller/TypeRestauController.java b/src/main/java/fr/vincentRamiere/simpleatBack/controller/TypeRestauController.java similarity index 90% rename from src/main/java/fr/cardon/simpleat/controller/TypeRestauController.java rename to src/main/java/fr/vincentRamiere/simpleatBack/controller/TypeRestauController.java index e44be43..f61e589 100644 --- a/src/main/java/fr/cardon/simpleat/controller/TypeRestauController.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/controller/TypeRestauController.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.controller; +package fr.vincentRamiere.simpleatBack.controller; import java.util.Collection; @@ -17,9 +17,9 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import fr.cardon.simpleat.model.Restaurant; -import fr.cardon.simpleat.model.TypeRestau; -import fr.cardon.simpleat.repository.TypeRestauRepository; +import fr.vincentRamiere.simpleatBack.model.Restaurant; +import fr.vincentRamiere.simpleatBack.model.TypeRestau; +import fr.vincentRamiere.simpleatBack.repository.TypeRestauRepository; @RestController @CrossOrigin("*") diff --git a/src/main/java/fr/cardon/simpleat/dto/JsonWebToken.java b/src/main/java/fr/vincentRamiere/simpleatBack/dto/JsonWebToken.java similarity index 87% rename from src/main/java/fr/cardon/simpleat/dto/JsonWebToken.java rename to src/main/java/fr/vincentRamiere/simpleatBack/dto/JsonWebToken.java index 021837a..1620f16 100644 --- a/src/main/java/fr/cardon/simpleat/dto/JsonWebToken.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/dto/JsonWebToken.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.dto; +package fr.vincentRamiere.simpleatBack.dto; /** * Classe spécifique DTO (Data Transfer Object) qui retourne un Jeton au format JSON (REST response) diff --git a/src/main/java/fr/cardon/simpleat/dto/PersonneDto.java b/src/main/java/fr/vincentRamiere/simpleatBack/dto/PersonneDto.java similarity index 91% rename from src/main/java/fr/cardon/simpleat/dto/PersonneDto.java rename to src/main/java/fr/vincentRamiere/simpleatBack/dto/PersonneDto.java index 7c68180..f451985 100644 --- a/src/main/java/fr/cardon/simpleat/dto/PersonneDto.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/dto/PersonneDto.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.dto; +package fr.vincentRamiere.simpleatBack.dto; import java.util.List; diff --git a/src/main/java/fr/cardon/simpleat/exception/ExistingUsernameException.java b/src/main/java/fr/vincentRamiere/simpleatBack/exception/ExistingUsernameException.java similarity index 87% rename from src/main/java/fr/cardon/simpleat/exception/ExistingUsernameException.java rename to src/main/java/fr/vincentRamiere/simpleatBack/exception/ExistingUsernameException.java index 4ca7c65..874263e 100644 --- a/src/main/java/fr/cardon/simpleat/exception/ExistingUsernameException.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/exception/ExistingUsernameException.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.exception; +package fr.vincentRamiere.simpleatBack.exception; /** * Classe personnalisée pour gérer un message si l'utilisateur (User) existe en Base de données diff --git a/src/main/java/fr/cardon/simpleat/exception/InvalidCredentialsException.java b/src/main/java/fr/vincentRamiere/simpleatBack/exception/InvalidCredentialsException.java similarity index 86% rename from src/main/java/fr/cardon/simpleat/exception/InvalidCredentialsException.java rename to src/main/java/fr/vincentRamiere/simpleatBack/exception/InvalidCredentialsException.java index 82cf0cc..a1050e8 100644 --- a/src/main/java/fr/cardon/simpleat/exception/InvalidCredentialsException.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/exception/InvalidCredentialsException.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.exception; +package fr.vincentRamiere.simpleatBack.exception; /** * Specific exception that should be thrown when user credentials are not valid. diff --git a/src/main/java/fr/cardon/simpleat/exception/InvalidJWTException.java b/src/main/java/fr/vincentRamiere/simpleatBack/exception/InvalidJWTException.java similarity index 85% rename from src/main/java/fr/cardon/simpleat/exception/InvalidJWTException.java rename to src/main/java/fr/vincentRamiere/simpleatBack/exception/InvalidJWTException.java index 82036fc..0432b20 100644 --- a/src/main/java/fr/cardon/simpleat/exception/InvalidJWTException.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/exception/InvalidJWTException.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.exception; +package fr.vincentRamiere.simpleatBack.exception; /** * Specific exception that should be thrown when a JWT has an invalid format. diff --git a/src/main/java/fr/cardon/simpleat/model/EnumRole.java b/src/main/java/fr/vincentRamiere/simpleatBack/model/EnumRole.java similarity index 83% rename from src/main/java/fr/cardon/simpleat/model/EnumRole.java rename to src/main/java/fr/vincentRamiere/simpleatBack/model/EnumRole.java index 436033d..57a1256 100644 --- a/src/main/java/fr/cardon/simpleat/model/EnumRole.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/model/EnumRole.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.model; +package fr.vincentRamiere.simpleatBack.model; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/fr/cardon/simpleat/model/Personne.java b/src/main/java/fr/vincentRamiere/simpleatBack/model/Personne.java similarity index 98% rename from src/main/java/fr/cardon/simpleat/model/Personne.java rename to src/main/java/fr/vincentRamiere/simpleatBack/model/Personne.java index 7d2ed29..d0b435a 100644 --- a/src/main/java/fr/cardon/simpleat/model/Personne.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/model/Personne.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.model; +package fr.vincentRamiere.simpleatBack.model; import java.util.ArrayList; diff --git a/src/main/java/fr/cardon/simpleat/model/Preference.java b/src/main/java/fr/vincentRamiere/simpleatBack/model/Preference.java similarity index 95% rename from src/main/java/fr/cardon/simpleat/model/Preference.java rename to src/main/java/fr/vincentRamiere/simpleatBack/model/Preference.java index ba10672..7903ae6 100644 --- a/src/main/java/fr/cardon/simpleat/model/Preference.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/model/Preference.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.model; +package fr.vincentRamiere.simpleatBack.model; import javax.persistence.Column; import javax.persistence.EmbeddedId; diff --git a/src/main/java/fr/cardon/simpleat/model/PreferencePK.java b/src/main/java/fr/vincentRamiere/simpleatBack/model/PreferencePK.java similarity index 96% rename from src/main/java/fr/cardon/simpleat/model/PreferencePK.java rename to src/main/java/fr/vincentRamiere/simpleatBack/model/PreferencePK.java index 65bb12c..faf4f70 100644 --- a/src/main/java/fr/cardon/simpleat/model/PreferencePK.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/model/PreferencePK.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.model; +package fr.vincentRamiere.simpleatBack.model; import java.io.Serializable; diff --git a/src/main/java/fr/cardon/simpleat/model/Reservation.java b/src/main/java/fr/vincentRamiere/simpleatBack/model/Reservation.java similarity index 94% rename from src/main/java/fr/cardon/simpleat/model/Reservation.java rename to src/main/java/fr/vincentRamiere/simpleatBack/model/Reservation.java index ec3f048..ea9fad6 100644 --- a/src/main/java/fr/cardon/simpleat/model/Reservation.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/model/Reservation.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.model; +package fr.vincentRamiere.simpleatBack.model; import javax.persistence.Column; import javax.persistence.EmbeddedId; diff --git a/src/main/java/fr/cardon/simpleat/model/ReservationPK.java b/src/main/java/fr/vincentRamiere/simpleatBack/model/ReservationPK.java similarity index 96% rename from src/main/java/fr/cardon/simpleat/model/ReservationPK.java rename to src/main/java/fr/vincentRamiere/simpleatBack/model/ReservationPK.java index d3dd845..9d2daf0 100644 --- a/src/main/java/fr/cardon/simpleat/model/ReservationPK.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/model/ReservationPK.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.model; +package fr.vincentRamiere.simpleatBack.model; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/fr/cardon/simpleat/model/Restaurant.java b/src/main/java/fr/vincentRamiere/simpleatBack/model/Restaurant.java similarity index 98% rename from src/main/java/fr/cardon/simpleat/model/Restaurant.java rename to src/main/java/fr/vincentRamiere/simpleatBack/model/Restaurant.java index ee69cc4..502f90c 100644 --- a/src/main/java/fr/cardon/simpleat/model/Restaurant.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/model/Restaurant.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.model; +package fr.vincentRamiere.simpleatBack.model; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/fr/cardon/simpleat/model/TypeRestau.java b/src/main/java/fr/vincentRamiere/simpleatBack/model/TypeRestau.java similarity index 96% rename from src/main/java/fr/cardon/simpleat/model/TypeRestau.java rename to src/main/java/fr/vincentRamiere/simpleatBack/model/TypeRestau.java index eea110f..93ecee6 100644 --- a/src/main/java/fr/cardon/simpleat/model/TypeRestau.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/model/TypeRestau.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.model; +package fr.vincentRamiere.simpleatBack.model; import java.util.List; diff --git a/src/main/java/fr/cardon/simpleat/repository/PersonneRepository.java b/src/main/java/fr/vincentRamiere/simpleatBack/repository/PersonneRepository.java similarity index 77% rename from src/main/java/fr/cardon/simpleat/repository/PersonneRepository.java rename to src/main/java/fr/vincentRamiere/simpleatBack/repository/PersonneRepository.java index 0df6572..f84b076 100644 --- a/src/main/java/fr/cardon/simpleat/repository/PersonneRepository.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/repository/PersonneRepository.java @@ -1,11 +1,11 @@ -package fr.cardon.simpleat.repository; +package fr.vincentRamiere.simpleatBack.repository; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import fr.cardon.simpleat.model.Personne; +import fr.vincentRamiere.simpleatBack.model.Personne; @Repository public interface PersonneRepository extends JpaRepository { diff --git a/src/main/java/fr/cardon/simpleat/repository/PreferenceRepository.java b/src/main/java/fr/vincentRamiere/simpleatBack/repository/PreferenceRepository.java similarity index 57% rename from src/main/java/fr/cardon/simpleat/repository/PreferenceRepository.java rename to src/main/java/fr/vincentRamiere/simpleatBack/repository/PreferenceRepository.java index d035e49..81700a8 100644 --- a/src/main/java/fr/cardon/simpleat/repository/PreferenceRepository.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/repository/PreferenceRepository.java @@ -1,10 +1,10 @@ -package fr.cardon.simpleat.repository; +package fr.vincentRamiere.simpleatBack.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import fr.cardon.simpleat.model.Preference; -import fr.cardon.simpleat.model.PreferencePK; +import fr.vincentRamiere.simpleatBack.model.Preference; +import fr.vincentRamiere.simpleatBack.model.PreferencePK; @Repository public interface PreferenceRepository extends JpaRepository { diff --git a/src/main/java/fr/cardon/simpleat/repository/ReservationRepository.java b/src/main/java/fr/vincentRamiere/simpleatBack/repository/ReservationRepository.java similarity index 56% rename from src/main/java/fr/cardon/simpleat/repository/ReservationRepository.java rename to src/main/java/fr/vincentRamiere/simpleatBack/repository/ReservationRepository.java index b52d836..7896918 100644 --- a/src/main/java/fr/cardon/simpleat/repository/ReservationRepository.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/repository/ReservationRepository.java @@ -1,10 +1,10 @@ -package fr.cardon.simpleat.repository; +package fr.vincentRamiere.simpleatBack.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import fr.cardon.simpleat.model.Reservation; -import fr.cardon.simpleat.model.ReservationPK; +import fr.vincentRamiere.simpleatBack.model.Reservation; +import fr.vincentRamiere.simpleatBack.model.ReservationPK; @Repository public interface ReservationRepository extends JpaRepository { diff --git a/src/main/java/fr/cardon/simpleat/repository/RestaurantRepository.java b/src/main/java/fr/vincentRamiere/simpleatBack/repository/RestaurantRepository.java similarity index 69% rename from src/main/java/fr/cardon/simpleat/repository/RestaurantRepository.java rename to src/main/java/fr/vincentRamiere/simpleatBack/repository/RestaurantRepository.java index 7bd6041..7fc50f9 100644 --- a/src/main/java/fr/cardon/simpleat/repository/RestaurantRepository.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/repository/RestaurantRepository.java @@ -1,9 +1,9 @@ -package fr.cardon.simpleat.repository; +package fr.vincentRamiere.simpleatBack.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import fr.cardon.simpleat.model.Restaurant; +import fr.vincentRamiere.simpleatBack.model.Restaurant; @Repository public interface RestaurantRepository extends JpaRepository { diff --git a/src/main/java/fr/cardon/simpleat/repository/TypeRestauRepository.java b/src/main/java/fr/vincentRamiere/simpleatBack/repository/TypeRestauRepository.java similarity index 69% rename from src/main/java/fr/cardon/simpleat/repository/TypeRestauRepository.java rename to src/main/java/fr/vincentRamiere/simpleatBack/repository/TypeRestauRepository.java index 4eb0ce5..08f8692 100644 --- a/src/main/java/fr/cardon/simpleat/repository/TypeRestauRepository.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/repository/TypeRestauRepository.java @@ -1,9 +1,9 @@ -package fr.cardon.simpleat.repository; +package fr.vincentRamiere.simpleatBack.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import fr.cardon.simpleat.model.TypeRestau; +import fr.vincentRamiere.simpleatBack.model.TypeRestau; @Repository public interface TypeRestauRepository extends JpaRepository { diff --git a/src/main/java/fr/cardon/simpleat/security/JwtTokenFilter.java b/src/main/java/fr/vincentRamiere/simpleatBack/security/JwtTokenFilter.java similarity index 93% rename from src/main/java/fr/cardon/simpleat/security/JwtTokenFilter.java rename to src/main/java/fr/vincentRamiere/simpleatBack/security/JwtTokenFilter.java index bd0e495..fdb0196 100644 --- a/src/main/java/fr/cardon/simpleat/security/JwtTokenFilter.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/security/JwtTokenFilter.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.security; +package fr.vincentRamiere.simpleatBack.security; import java.io.IOException; @@ -12,7 +12,7 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.filter.OncePerRequestFilter; -import fr.cardon.simpleat.exception.InvalidJWTException; +import fr.vincentRamiere.simpleatBack.exception.InvalidJWTException; diff --git a/src/main/java/fr/cardon/simpleat/security/JwtTokenProvider.java b/src/main/java/fr/vincentRamiere/simpleatBack/security/JwtTokenProvider.java similarity index 96% rename from src/main/java/fr/cardon/simpleat/security/JwtTokenProvider.java rename to src/main/java/fr/vincentRamiere/simpleatBack/security/JwtTokenProvider.java index 551d565..216d958 100644 --- a/src/main/java/fr/cardon/simpleat/security/JwtTokenProvider.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/security/JwtTokenProvider.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.security; +package fr.vincentRamiere.simpleatBack.security; import java.util.Base64; import java.util.Date; @@ -20,9 +20,9 @@ import org.springframework.stereotype.Component; import com.fasterxml.jackson.core.JsonProcessingException; -import fr.cardon.simpleat.exception.InvalidJWTException; -import fr.cardon.simpleat.model.EnumRole; -import fr.cardon.simpleat.repository.PersonneRepository; +import fr.vincentRamiere.simpleatBack.exception.InvalidJWTException; +import fr.vincentRamiere.simpleatBack.model.EnumRole; +import fr.vincentRamiere.simpleatBack.repository.PersonneRepository; import io.jsonwebtoken.Claims; import io.jsonwebtoken.JwtException; import io.jsonwebtoken.Jwts; diff --git a/src/main/java/fr/cardon/simpleat/security/WebSecurityConfig.java b/src/main/java/fr/vincentRamiere/simpleatBack/security/WebSecurityConfig.java similarity index 98% rename from src/main/java/fr/cardon/simpleat/security/WebSecurityConfig.java rename to src/main/java/fr/vincentRamiere/simpleatBack/security/WebSecurityConfig.java index 07a43c4..764a4cf 100644 --- a/src/main/java/fr/cardon/simpleat/security/WebSecurityConfig.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/security/WebSecurityConfig.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.security; +package fr.vincentRamiere.simpleatBack.security; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/fr/cardon/simpleat/service/PersonneService.java b/src/main/java/fr/vincentRamiere/simpleatBack/service/PersonneService.java similarity index 82% rename from src/main/java/fr/cardon/simpleat/service/PersonneService.java rename to src/main/java/fr/vincentRamiere/simpleatBack/service/PersonneService.java index 99a7a4f..4418352 100644 --- a/src/main/java/fr/cardon/simpleat/service/PersonneService.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/service/PersonneService.java @@ -1,13 +1,13 @@ -package fr.cardon.simpleat.service; +package fr.vincentRamiere.simpleatBack.service; import java.util.List; import java.util.Optional; import org.springframework.stereotype.Service; -import fr.cardon.simpleat.exception.ExistingUsernameException; -import fr.cardon.simpleat.exception.InvalidCredentialsException; -import fr.cardon.simpleat.model.Personne; +import fr.vincentRamiere.simpleatBack.exception.ExistingUsernameException; +import fr.vincentRamiere.simpleatBack.exception.InvalidCredentialsException; +import fr.vincentRamiere.simpleatBack.model.Personne; diff --git a/src/main/java/fr/cardon/simpleat/service/PersonneServiceImpl.java b/src/main/java/fr/vincentRamiere/simpleatBack/service/PersonneServiceImpl.java similarity index 86% rename from src/main/java/fr/cardon/simpleat/service/PersonneServiceImpl.java rename to src/main/java/fr/vincentRamiere/simpleatBack/service/PersonneServiceImpl.java index 8371fa5..75e87c0 100644 --- a/src/main/java/fr/cardon/simpleat/service/PersonneServiceImpl.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/service/PersonneServiceImpl.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.service; +package fr.vincentRamiere.simpleatBack.service; import java.util.List; import java.util.Optional; @@ -11,13 +11,11 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; - - -import fr.cardon.simpleat.exception.ExistingUsernameException; -import fr.cardon.simpleat.exception.InvalidCredentialsException; -import fr.cardon.simpleat.model.Personne; -import fr.cardon.simpleat.repository.PersonneRepository; -import fr.cardon.simpleat.security.JwtTokenProvider; +import fr.vincentRamiere.simpleatBack.exception.ExistingUsernameException; +import fr.vincentRamiere.simpleatBack.exception.InvalidCredentialsException; +import fr.vincentRamiere.simpleatBack.model.Personne; +import fr.vincentRamiere.simpleatBack.repository.PersonneRepository; +import fr.vincentRamiere.simpleatBack.security.JwtTokenProvider; diff --git a/src/main/java/fr/cardon/simpleat/service/UserDetailsServiceImpl.java b/src/main/java/fr/vincentRamiere/simpleatBack/service/UserDetailsServiceImpl.java similarity index 88% rename from src/main/java/fr/cardon/simpleat/service/UserDetailsServiceImpl.java rename to src/main/java/fr/vincentRamiere/simpleatBack/service/UserDetailsServiceImpl.java index 25129e1..eedca94 100644 --- a/src/main/java/fr/cardon/simpleat/service/UserDetailsServiceImpl.java +++ b/src/main/java/fr/vincentRamiere/simpleatBack/service/UserDetailsServiceImpl.java @@ -1,4 +1,4 @@ -package fr.cardon.simpleat.service; +package fr.vincentRamiere.simpleatBack.service; import java.util.Optional; @@ -10,9 +10,8 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; -import fr.cardon.simpleat.model.Personne; - -import fr.cardon.simpleat.repository.PersonneRepository; +import fr.vincentRamiere.simpleatBack.model.Personne; +import fr.vincentRamiere.simpleatBack.repository.PersonneRepository; @Service diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 30cfcf0..f08ad83 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -8,7 +8,7 @@ spring.main.allow-circular-references=true # =============================== spring.datasource.url=jdbc:mysql://localhost:3306/simpleat?useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=CET spring.datasource.username=root -spring.datasource.password=BOHmilaresol02 +spring.datasource.password=bbLouis1+Noe2 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver # log #logging.level.root=INFO @@ -19,11 +19,11 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver # =============================== spring.jpa.show-sql=true ##spring.jpa.hibernate.ddl-auto=update -spring.jpa.hibernate.ddl-auto=create-drop +spring.jpa.hibernate.ddl-auto=none spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect # =============================== # Permet d'exécuter le data.sql # =============================== -spring.sql.init.mode=always +# spring.sql.init.mode=always spring.jpa.defer-datasource-initialization=true server.port=8081 \ No newline at end of file