From 6867246a4da411617dd4160ab980d0e68dac2820 Mon Sep 17 00:00:00 2001 From: Pavel Kaplin Date: Sat, 9 Nov 2019 13:49:53 -0800 Subject: [PATCH 1/5] Move everything to root folder --- sweater-FileUpload/.classpath => .classpath | 0 sweater-FileUpload/.gitignore => .gitignore | 0 sweater-FileUpload/.project => .project | 0 .../org.eclipse.core.resources.prefs | 0 .../org.eclipse.jdt.core.prefs | 0 .../org.eclipse.m2e.core.prefs | 0 .../org.springframework.ide.eclipse.prefs | 0 sweater-FileUpload/README.md => README.md | 0 sweater-FileUpload/pom.xml => pom.xml | 0 .../main/java/com/example/sweater/Application.java | 0 .../java/com/example/sweater/config/MailConfig.java | 0 .../java/com/example/sweater/config/MvcConfig.java | 0 .../example/sweater/config/WebSecurityConfig.java | 0 .../example/sweater/controller/ControllerUtils.java | 0 .../example/sweater/controller/MainController.java | 0 .../sweater/controller/RegistrationController.java | 0 .../example/sweater/controller/UserController.java | 0 .../java/com/example/sweater/domain/Message.java | 0 .../main/java/com/example/sweater/domain/Role.java | 0 .../main/java/com/example/sweater/domain/User.java | 0 .../sweater/domain/dto/CaptchaResponseDto.java | 0 .../java/com/example/sweater/repos/MessageRepo.java | 0 .../java/com/example/sweater/repos/UserRepo.java | 0 .../com/example/sweater/service/MailSender.java | 0 .../com/example/sweater/service/UserSevice.java | 0 .../main/resources/application.properties | 0 .../main/resources/db/migration/V1__Init_DB.sql | 0 .../src => src}/main/resources/static/style.css | 0 .../main/resources/templates/greeting.ftl | 0 .../src => src}/main/resources/templates/login.ftl | 0 .../src => src}/main/resources/templates/main.ftl | 0 .../main/resources/templates/parts/common.ftl | 0 .../main/resources/templates/parts/login.ftl | 0 .../main/resources/templates/parts/navbar.ftl | 0 .../main/resources/templates/parts/security.ftl | 0 .../main/resources/templates/profile.ftl | 0 .../main/resources/templates/registration.ftl | 0 .../main/resources/templates/userEdit.ftl | 0 .../main/resources/templates/userList.ftl | 0 sweater-FileUpload/sweater.iml => sweater.iml | 0 .../classes/application.properties | 0 .../classes/com/example/sweater/Application.class | Bin .../com/example/sweater/config/MailConfig.class | Bin .../com/example/sweater/config/MvcConfig.class | Bin .../example/sweater/config/WebSecurityConfig.class | Bin .../sweater/controller/ControllerUtils.class | Bin .../example/sweater/controller/MainController.class | Bin .../sweater/controller/RegistrationController.class | Bin .../example/sweater/controller/UserController.class | Bin .../com/example/sweater/domain/Message.class | Bin .../classes/com/example/sweater/domain/Role.class | Bin .../classes/com/example/sweater/domain/User.class | Bin .../sweater/domain/dto/CaptchaResponseDto.class | Bin .../com/example/sweater/repos/MessageRepo.class | Bin .../com/example/sweater/repos/UserRepo.class | Bin .../com/example/sweater/service/MailSender.class | Bin .../com/example/sweater/service/UserSevice.class | Bin .../classes/db/migration/V1__Init_DB.sql | 0 .../target => target}/classes/static/style.css | 0 .../classes/templates/greeting.ftl | 0 .../target => target}/classes/templates/login.ftl | 0 .../target => target}/classes/templates/main.ftl | 0 .../classes/templates/parts/common.ftl | 0 .../classes/templates/parts/login.ftl | 0 .../classes/templates/parts/navbar.ftl | 0 .../classes/templates/parts/security.ftl | 0 .../target => target}/classes/templates/profile.ftl | 0 .../classes/templates/registration.ftl | 0 .../classes/templates/userEdit.ftl | 0 .../classes/templates/userList.ftl | 0 ...267\320\262\320\260\320\275\320\270\321\217.png" | Bin ...-8133-c3dd6ffdb8d8.photo_2019-08-29_14-32-20.jpg | Bin ...tos_137626418-stock-photo-mercedes-benz-sign.jpg | Bin ...205\320\276\321\207\320\265\321\210\321\214.jpg" | Bin .../21d3df41-d2d1-4e15-9315-89d75892c595.test.png | Bin ...-4d82-8fe9-da9b1beed119.pexels-photo-414612.jpeg | Bin ..._uchiha_mangekyou_sharingan_101428_1920x1080.jpg | Bin ...267\320\262\320\260\320\275\320\270\321\217.png" | Bin ...267\320\262\320\260\320\275\320\270\321\217.png" | Bin .../9e3fc9a7-ff39-4fd7-bf99-cdbcc3570407.test.png | Bin .../9f565921-6796-4d52-a01a-194dacd51873.test.png | Bin ..._uchiha_mangekyou_sharingan_101428_1920x1080.jpg | Bin ..._uchiha_mangekyou_sharingan_101428_1920x1080.jpg | Bin ..._uchiha_mangekyou_sharingan_101428_1920x1080.jpg | Bin ...tos_137626418-stock-photo-mercedes-benz-sign.jpg | Bin ...274\321\217\320\275\320\275\321\213\320\271.png" | Bin 86 files changed, 0 insertions(+), 0 deletions(-) rename sweater-FileUpload/.classpath => .classpath (100%) rename sweater-FileUpload/.gitignore => .gitignore (100%) rename sweater-FileUpload/.project => .project (100%) rename {sweater-FileUpload/.settings => .settings}/org.eclipse.core.resources.prefs (100%) rename {sweater-FileUpload/.settings => .settings}/org.eclipse.jdt.core.prefs (100%) rename {sweater-FileUpload/.settings => .settings}/org.eclipse.m2e.core.prefs (100%) rename {sweater-FileUpload/.settings => .settings}/org.springframework.ide.eclipse.prefs (100%) rename sweater-FileUpload/README.md => README.md (100%) rename sweater-FileUpload/pom.xml => pom.xml (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/Application.java (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/config/MailConfig.java (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/config/MvcConfig.java (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/config/WebSecurityConfig.java (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/controller/ControllerUtils.java (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/controller/MainController.java (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/controller/RegistrationController.java (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/controller/UserController.java (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/domain/Message.java (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/domain/Role.java (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/domain/User.java (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/domain/dto/CaptchaResponseDto.java (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/repos/MessageRepo.java (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/repos/UserRepo.java (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/service/MailSender.java (100%) rename {sweater-FileUpload/src => src}/main/java/com/example/sweater/service/UserSevice.java (100%) rename {sweater-FileUpload/src => src}/main/resources/application.properties (100%) rename {sweater-FileUpload/src => src}/main/resources/db/migration/V1__Init_DB.sql (100%) rename {sweater-FileUpload/src => src}/main/resources/static/style.css (100%) rename {sweater-FileUpload/src => src}/main/resources/templates/greeting.ftl (100%) rename {sweater-FileUpload/src => src}/main/resources/templates/login.ftl (100%) rename {sweater-FileUpload/src => src}/main/resources/templates/main.ftl (100%) rename {sweater-FileUpload/src => src}/main/resources/templates/parts/common.ftl (100%) rename {sweater-FileUpload/src => src}/main/resources/templates/parts/login.ftl (100%) rename {sweater-FileUpload/src => src}/main/resources/templates/parts/navbar.ftl (100%) rename {sweater-FileUpload/src => src}/main/resources/templates/parts/security.ftl (100%) rename {sweater-FileUpload/src => src}/main/resources/templates/profile.ftl (100%) rename {sweater-FileUpload/src => src}/main/resources/templates/registration.ftl (100%) rename {sweater-FileUpload/src => src}/main/resources/templates/userEdit.ftl (100%) rename {sweater-FileUpload/src => src}/main/resources/templates/userList.ftl (100%) rename sweater-FileUpload/sweater.iml => sweater.iml (100%) rename {sweater-FileUpload/target => target}/classes/application.properties (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/Application.class (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/config/MailConfig.class (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/config/MvcConfig.class (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/config/WebSecurityConfig.class (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/controller/ControllerUtils.class (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/controller/MainController.class (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/controller/RegistrationController.class (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/controller/UserController.class (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/domain/Message.class (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/domain/Role.class (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/domain/User.class (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/domain/dto/CaptchaResponseDto.class (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/repos/MessageRepo.class (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/repos/UserRepo.class (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/service/MailSender.class (100%) rename {sweater-FileUpload/target => target}/classes/com/example/sweater/service/UserSevice.class (100%) rename {sweater-FileUpload/target => target}/classes/db/migration/V1__Init_DB.sql (100%) rename {sweater-FileUpload/target => target}/classes/static/style.css (100%) rename {sweater-FileUpload/target => target}/classes/templates/greeting.ftl (100%) rename {sweater-FileUpload/target => target}/classes/templates/login.ftl (100%) rename {sweater-FileUpload/target => target}/classes/templates/main.ftl (100%) rename {sweater-FileUpload/target => target}/classes/templates/parts/common.ftl (100%) rename {sweater-FileUpload/target => target}/classes/templates/parts/login.ftl (100%) rename {sweater-FileUpload/target => target}/classes/templates/parts/navbar.ftl (100%) rename {sweater-FileUpload/target => target}/classes/templates/parts/security.ftl (100%) rename {sweater-FileUpload/target => target}/classes/templates/profile.ftl (100%) rename {sweater-FileUpload/target => target}/classes/templates/registration.ftl (100%) rename {sweater-FileUpload/target => target}/classes/templates/userEdit.ftl (100%) rename {sweater-FileUpload/target => target}/classes/templates/userList.ftl (100%) rename "sweater-FileUpload/uploads/03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" => "uploads/03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" (100%) rename {sweater-FileUpload/uploads => uploads}/1318dc36-a294-48f2-8133-c3dd6ffdb8d8.photo_2019-08-29_14-32-20.jpg (100%) rename {sweater-FileUpload/uploads => uploads}/1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg (100%) rename "sweater-FileUpload/uploads/179b5217-7ae4-4657-8070-c0953f491d81.\320\251\320\276 \321\202\320\270 \320\262\321\226\320\264 \320\274\320\265\320\275\320\265 \321\205\320\276\321\207\320\265\321\210\321\214.jpg" => "uploads/179b5217-7ae4-4657-8070-c0953f491d81.\320\251\320\276 \321\202\320\270 \320\262\321\226\320\264 \320\274\320\265\320\275\320\265 \321\205\320\276\321\207\320\265\321\210\321\214.jpg" (100%) rename {sweater-FileUpload/uploads => uploads}/21d3df41-d2d1-4e15-9315-89d75892c595.test.png (100%) rename {sweater-FileUpload/uploads => uploads}/2bc6d7b2-079d-4d82-8fe9-da9b1beed119.pexels-photo-414612.jpeg (100%) rename {sweater-FileUpload/uploads => uploads}/2c4766fe-400f-465c-af28-ee7087af79c9.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg (100%) rename "sweater-FileUpload/uploads/5eec6065-8e17-4c6e-83e3-5a213f352123.03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" => "uploads/5eec6065-8e17-4c6e-83e3-5a213f352123.03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" (100%) rename "sweater-FileUpload/uploads/78e67aa6-d522-4f57-862e-0a9552ef8bd2.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" => "uploads/78e67aa6-d522-4f57-862e-0a9552ef8bd2.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" (100%) rename {sweater-FileUpload/uploads => uploads}/9e3fc9a7-ff39-4fd7-bf99-cdbcc3570407.test.png (100%) rename {sweater-FileUpload/uploads => uploads}/9f565921-6796-4d52-a01a-194dacd51873.test.png (100%) rename {sweater-FileUpload/uploads => uploads}/aad97305-0e6c-4331-91ef-8caa55765ebe.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg (100%) rename {sweater-FileUpload/uploads => uploads}/af51e229-ea78-43a0-a4f7-74fd8b8e1f89.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg (100%) rename {sweater-FileUpload/uploads => uploads}/b63b231f-b743-4e94-b94a-ff03f05da966.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg (100%) rename {sweater-FileUpload/uploads => uploads}/b937adb2-63c2-4ab5-810b-6a7b9dd20146.1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg (100%) rename "sweater-FileUpload/uploads/f90a83f0-ff53-4d8f-9dea-f804e2e70a2b.\320\221\320\265\320\267\321\213\320\274\321\217\320\275\320\275\321\213\320\271.png" => "uploads/f90a83f0-ff53-4d8f-9dea-f804e2e70a2b.\320\221\320\265\320\267\321\213\320\274\321\217\320\275\320\275\321\213\320\271.png" (100%) diff --git a/sweater-FileUpload/.classpath b/.classpath similarity index 100% rename from sweater-FileUpload/.classpath rename to .classpath diff --git a/sweater-FileUpload/.gitignore b/.gitignore similarity index 100% rename from sweater-FileUpload/.gitignore rename to .gitignore diff --git a/sweater-FileUpload/.project b/.project similarity index 100% rename from sweater-FileUpload/.project rename to .project diff --git a/sweater-FileUpload/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from sweater-FileUpload/.settings/org.eclipse.core.resources.prefs rename to .settings/org.eclipse.core.resources.prefs diff --git a/sweater-FileUpload/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from sweater-FileUpload/.settings/org.eclipse.jdt.core.prefs rename to .settings/org.eclipse.jdt.core.prefs diff --git a/sweater-FileUpload/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from sweater-FileUpload/.settings/org.eclipse.m2e.core.prefs rename to .settings/org.eclipse.m2e.core.prefs diff --git a/sweater-FileUpload/.settings/org.springframework.ide.eclipse.prefs b/.settings/org.springframework.ide.eclipse.prefs similarity index 100% rename from sweater-FileUpload/.settings/org.springframework.ide.eclipse.prefs rename to .settings/org.springframework.ide.eclipse.prefs diff --git a/sweater-FileUpload/README.md b/README.md similarity index 100% rename from sweater-FileUpload/README.md rename to README.md diff --git a/sweater-FileUpload/pom.xml b/pom.xml similarity index 100% rename from sweater-FileUpload/pom.xml rename to pom.xml diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/Application.java b/src/main/java/com/example/sweater/Application.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/Application.java rename to src/main/java/com/example/sweater/Application.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/config/MailConfig.java b/src/main/java/com/example/sweater/config/MailConfig.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/config/MailConfig.java rename to src/main/java/com/example/sweater/config/MailConfig.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/config/MvcConfig.java b/src/main/java/com/example/sweater/config/MvcConfig.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/config/MvcConfig.java rename to src/main/java/com/example/sweater/config/MvcConfig.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/config/WebSecurityConfig.java b/src/main/java/com/example/sweater/config/WebSecurityConfig.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/config/WebSecurityConfig.java rename to src/main/java/com/example/sweater/config/WebSecurityConfig.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/controller/ControllerUtils.java b/src/main/java/com/example/sweater/controller/ControllerUtils.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/controller/ControllerUtils.java rename to src/main/java/com/example/sweater/controller/ControllerUtils.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/controller/MainController.java b/src/main/java/com/example/sweater/controller/MainController.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/controller/MainController.java rename to src/main/java/com/example/sweater/controller/MainController.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/controller/RegistrationController.java b/src/main/java/com/example/sweater/controller/RegistrationController.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/controller/RegistrationController.java rename to src/main/java/com/example/sweater/controller/RegistrationController.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/controller/UserController.java b/src/main/java/com/example/sweater/controller/UserController.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/controller/UserController.java rename to src/main/java/com/example/sweater/controller/UserController.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/domain/Message.java b/src/main/java/com/example/sweater/domain/Message.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/domain/Message.java rename to src/main/java/com/example/sweater/domain/Message.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/domain/Role.java b/src/main/java/com/example/sweater/domain/Role.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/domain/Role.java rename to src/main/java/com/example/sweater/domain/Role.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/domain/User.java b/src/main/java/com/example/sweater/domain/User.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/domain/User.java rename to src/main/java/com/example/sweater/domain/User.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/domain/dto/CaptchaResponseDto.java b/src/main/java/com/example/sweater/domain/dto/CaptchaResponseDto.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/domain/dto/CaptchaResponseDto.java rename to src/main/java/com/example/sweater/domain/dto/CaptchaResponseDto.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/repos/MessageRepo.java b/src/main/java/com/example/sweater/repos/MessageRepo.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/repos/MessageRepo.java rename to src/main/java/com/example/sweater/repos/MessageRepo.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/repos/UserRepo.java b/src/main/java/com/example/sweater/repos/UserRepo.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/repos/UserRepo.java rename to src/main/java/com/example/sweater/repos/UserRepo.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/service/MailSender.java b/src/main/java/com/example/sweater/service/MailSender.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/service/MailSender.java rename to src/main/java/com/example/sweater/service/MailSender.java diff --git a/sweater-FileUpload/src/main/java/com/example/sweater/service/UserSevice.java b/src/main/java/com/example/sweater/service/UserSevice.java similarity index 100% rename from sweater-FileUpload/src/main/java/com/example/sweater/service/UserSevice.java rename to src/main/java/com/example/sweater/service/UserSevice.java diff --git a/sweater-FileUpload/src/main/resources/application.properties b/src/main/resources/application.properties similarity index 100% rename from sweater-FileUpload/src/main/resources/application.properties rename to src/main/resources/application.properties diff --git a/sweater-FileUpload/src/main/resources/db/migration/V1__Init_DB.sql b/src/main/resources/db/migration/V1__Init_DB.sql similarity index 100% rename from sweater-FileUpload/src/main/resources/db/migration/V1__Init_DB.sql rename to src/main/resources/db/migration/V1__Init_DB.sql diff --git a/sweater-FileUpload/src/main/resources/static/style.css b/src/main/resources/static/style.css similarity index 100% rename from sweater-FileUpload/src/main/resources/static/style.css rename to src/main/resources/static/style.css diff --git a/sweater-FileUpload/src/main/resources/templates/greeting.ftl b/src/main/resources/templates/greeting.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/greeting.ftl rename to src/main/resources/templates/greeting.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/login.ftl b/src/main/resources/templates/login.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/login.ftl rename to src/main/resources/templates/login.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/main.ftl b/src/main/resources/templates/main.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/main.ftl rename to src/main/resources/templates/main.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/parts/common.ftl b/src/main/resources/templates/parts/common.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/parts/common.ftl rename to src/main/resources/templates/parts/common.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/parts/login.ftl b/src/main/resources/templates/parts/login.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/parts/login.ftl rename to src/main/resources/templates/parts/login.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/parts/navbar.ftl b/src/main/resources/templates/parts/navbar.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/parts/navbar.ftl rename to src/main/resources/templates/parts/navbar.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/parts/security.ftl b/src/main/resources/templates/parts/security.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/parts/security.ftl rename to src/main/resources/templates/parts/security.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/profile.ftl b/src/main/resources/templates/profile.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/profile.ftl rename to src/main/resources/templates/profile.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/registration.ftl b/src/main/resources/templates/registration.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/registration.ftl rename to src/main/resources/templates/registration.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/userEdit.ftl b/src/main/resources/templates/userEdit.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/userEdit.ftl rename to src/main/resources/templates/userEdit.ftl diff --git a/sweater-FileUpload/src/main/resources/templates/userList.ftl b/src/main/resources/templates/userList.ftl similarity index 100% rename from sweater-FileUpload/src/main/resources/templates/userList.ftl rename to src/main/resources/templates/userList.ftl diff --git a/sweater-FileUpload/sweater.iml b/sweater.iml similarity index 100% rename from sweater-FileUpload/sweater.iml rename to sweater.iml diff --git a/sweater-FileUpload/target/classes/application.properties b/target/classes/application.properties similarity index 100% rename from sweater-FileUpload/target/classes/application.properties rename to target/classes/application.properties diff --git a/sweater-FileUpload/target/classes/com/example/sweater/Application.class b/target/classes/com/example/sweater/Application.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/Application.class rename to target/classes/com/example/sweater/Application.class diff --git a/sweater-FileUpload/target/classes/com/example/sweater/config/MailConfig.class b/target/classes/com/example/sweater/config/MailConfig.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/config/MailConfig.class rename to target/classes/com/example/sweater/config/MailConfig.class diff --git a/sweater-FileUpload/target/classes/com/example/sweater/config/MvcConfig.class b/target/classes/com/example/sweater/config/MvcConfig.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/config/MvcConfig.class rename to target/classes/com/example/sweater/config/MvcConfig.class diff --git a/sweater-FileUpload/target/classes/com/example/sweater/config/WebSecurityConfig.class b/target/classes/com/example/sweater/config/WebSecurityConfig.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/config/WebSecurityConfig.class rename to target/classes/com/example/sweater/config/WebSecurityConfig.class diff --git a/sweater-FileUpload/target/classes/com/example/sweater/controller/ControllerUtils.class b/target/classes/com/example/sweater/controller/ControllerUtils.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/controller/ControllerUtils.class rename to target/classes/com/example/sweater/controller/ControllerUtils.class diff --git a/sweater-FileUpload/target/classes/com/example/sweater/controller/MainController.class b/target/classes/com/example/sweater/controller/MainController.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/controller/MainController.class rename to target/classes/com/example/sweater/controller/MainController.class diff --git a/sweater-FileUpload/target/classes/com/example/sweater/controller/RegistrationController.class b/target/classes/com/example/sweater/controller/RegistrationController.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/controller/RegistrationController.class rename to target/classes/com/example/sweater/controller/RegistrationController.class diff --git a/sweater-FileUpload/target/classes/com/example/sweater/controller/UserController.class b/target/classes/com/example/sweater/controller/UserController.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/controller/UserController.class rename to target/classes/com/example/sweater/controller/UserController.class diff --git a/sweater-FileUpload/target/classes/com/example/sweater/domain/Message.class b/target/classes/com/example/sweater/domain/Message.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/domain/Message.class rename to target/classes/com/example/sweater/domain/Message.class diff --git a/sweater-FileUpload/target/classes/com/example/sweater/domain/Role.class b/target/classes/com/example/sweater/domain/Role.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/domain/Role.class rename to target/classes/com/example/sweater/domain/Role.class diff --git a/sweater-FileUpload/target/classes/com/example/sweater/domain/User.class b/target/classes/com/example/sweater/domain/User.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/domain/User.class rename to target/classes/com/example/sweater/domain/User.class diff --git a/sweater-FileUpload/target/classes/com/example/sweater/domain/dto/CaptchaResponseDto.class b/target/classes/com/example/sweater/domain/dto/CaptchaResponseDto.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/domain/dto/CaptchaResponseDto.class rename to target/classes/com/example/sweater/domain/dto/CaptchaResponseDto.class diff --git a/sweater-FileUpload/target/classes/com/example/sweater/repos/MessageRepo.class b/target/classes/com/example/sweater/repos/MessageRepo.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/repos/MessageRepo.class rename to target/classes/com/example/sweater/repos/MessageRepo.class diff --git a/sweater-FileUpload/target/classes/com/example/sweater/repos/UserRepo.class b/target/classes/com/example/sweater/repos/UserRepo.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/repos/UserRepo.class rename to target/classes/com/example/sweater/repos/UserRepo.class diff --git a/sweater-FileUpload/target/classes/com/example/sweater/service/MailSender.class b/target/classes/com/example/sweater/service/MailSender.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/service/MailSender.class rename to target/classes/com/example/sweater/service/MailSender.class diff --git a/sweater-FileUpload/target/classes/com/example/sweater/service/UserSevice.class b/target/classes/com/example/sweater/service/UserSevice.class similarity index 100% rename from sweater-FileUpload/target/classes/com/example/sweater/service/UserSevice.class rename to target/classes/com/example/sweater/service/UserSevice.class diff --git a/sweater-FileUpload/target/classes/db/migration/V1__Init_DB.sql b/target/classes/db/migration/V1__Init_DB.sql similarity index 100% rename from sweater-FileUpload/target/classes/db/migration/V1__Init_DB.sql rename to target/classes/db/migration/V1__Init_DB.sql diff --git a/sweater-FileUpload/target/classes/static/style.css b/target/classes/static/style.css similarity index 100% rename from sweater-FileUpload/target/classes/static/style.css rename to target/classes/static/style.css diff --git a/sweater-FileUpload/target/classes/templates/greeting.ftl b/target/classes/templates/greeting.ftl similarity index 100% rename from sweater-FileUpload/target/classes/templates/greeting.ftl rename to target/classes/templates/greeting.ftl diff --git a/sweater-FileUpload/target/classes/templates/login.ftl b/target/classes/templates/login.ftl similarity index 100% rename from sweater-FileUpload/target/classes/templates/login.ftl rename to target/classes/templates/login.ftl diff --git a/sweater-FileUpload/target/classes/templates/main.ftl b/target/classes/templates/main.ftl similarity index 100% rename from sweater-FileUpload/target/classes/templates/main.ftl rename to target/classes/templates/main.ftl diff --git a/sweater-FileUpload/target/classes/templates/parts/common.ftl b/target/classes/templates/parts/common.ftl similarity index 100% rename from sweater-FileUpload/target/classes/templates/parts/common.ftl rename to target/classes/templates/parts/common.ftl diff --git a/sweater-FileUpload/target/classes/templates/parts/login.ftl b/target/classes/templates/parts/login.ftl similarity index 100% rename from sweater-FileUpload/target/classes/templates/parts/login.ftl rename to target/classes/templates/parts/login.ftl diff --git a/sweater-FileUpload/target/classes/templates/parts/navbar.ftl b/target/classes/templates/parts/navbar.ftl similarity index 100% rename from sweater-FileUpload/target/classes/templates/parts/navbar.ftl rename to target/classes/templates/parts/navbar.ftl diff --git a/sweater-FileUpload/target/classes/templates/parts/security.ftl b/target/classes/templates/parts/security.ftl similarity index 100% rename from sweater-FileUpload/target/classes/templates/parts/security.ftl rename to target/classes/templates/parts/security.ftl diff --git a/sweater-FileUpload/target/classes/templates/profile.ftl b/target/classes/templates/profile.ftl similarity index 100% rename from sweater-FileUpload/target/classes/templates/profile.ftl rename to target/classes/templates/profile.ftl diff --git a/sweater-FileUpload/target/classes/templates/registration.ftl b/target/classes/templates/registration.ftl similarity index 100% rename from sweater-FileUpload/target/classes/templates/registration.ftl rename to target/classes/templates/registration.ftl diff --git a/sweater-FileUpload/target/classes/templates/userEdit.ftl b/target/classes/templates/userEdit.ftl similarity index 100% rename from sweater-FileUpload/target/classes/templates/userEdit.ftl rename to target/classes/templates/userEdit.ftl diff --git a/sweater-FileUpload/target/classes/templates/userList.ftl b/target/classes/templates/userList.ftl similarity index 100% rename from sweater-FileUpload/target/classes/templates/userList.ftl rename to target/classes/templates/userList.ftl diff --git "a/sweater-FileUpload/uploads/03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" "b/uploads/03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" similarity index 100% rename from "sweater-FileUpload/uploads/03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" rename to "uploads/03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" diff --git a/sweater-FileUpload/uploads/1318dc36-a294-48f2-8133-c3dd6ffdb8d8.photo_2019-08-29_14-32-20.jpg b/uploads/1318dc36-a294-48f2-8133-c3dd6ffdb8d8.photo_2019-08-29_14-32-20.jpg similarity index 100% rename from sweater-FileUpload/uploads/1318dc36-a294-48f2-8133-c3dd6ffdb8d8.photo_2019-08-29_14-32-20.jpg rename to uploads/1318dc36-a294-48f2-8133-c3dd6ffdb8d8.photo_2019-08-29_14-32-20.jpg diff --git a/sweater-FileUpload/uploads/1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg b/uploads/1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg similarity index 100% rename from sweater-FileUpload/uploads/1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg rename to uploads/1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg diff --git "a/sweater-FileUpload/uploads/179b5217-7ae4-4657-8070-c0953f491d81.\320\251\320\276 \321\202\320\270 \320\262\321\226\320\264 \320\274\320\265\320\275\320\265 \321\205\320\276\321\207\320\265\321\210\321\214.jpg" "b/uploads/179b5217-7ae4-4657-8070-c0953f491d81.\320\251\320\276 \321\202\320\270 \320\262\321\226\320\264 \320\274\320\265\320\275\320\265 \321\205\320\276\321\207\320\265\321\210\321\214.jpg" similarity index 100% rename from "sweater-FileUpload/uploads/179b5217-7ae4-4657-8070-c0953f491d81.\320\251\320\276 \321\202\320\270 \320\262\321\226\320\264 \320\274\320\265\320\275\320\265 \321\205\320\276\321\207\320\265\321\210\321\214.jpg" rename to "uploads/179b5217-7ae4-4657-8070-c0953f491d81.\320\251\320\276 \321\202\320\270 \320\262\321\226\320\264 \320\274\320\265\320\275\320\265 \321\205\320\276\321\207\320\265\321\210\321\214.jpg" diff --git a/sweater-FileUpload/uploads/21d3df41-d2d1-4e15-9315-89d75892c595.test.png b/uploads/21d3df41-d2d1-4e15-9315-89d75892c595.test.png similarity index 100% rename from sweater-FileUpload/uploads/21d3df41-d2d1-4e15-9315-89d75892c595.test.png rename to uploads/21d3df41-d2d1-4e15-9315-89d75892c595.test.png diff --git a/sweater-FileUpload/uploads/2bc6d7b2-079d-4d82-8fe9-da9b1beed119.pexels-photo-414612.jpeg b/uploads/2bc6d7b2-079d-4d82-8fe9-da9b1beed119.pexels-photo-414612.jpeg similarity index 100% rename from sweater-FileUpload/uploads/2bc6d7b2-079d-4d82-8fe9-da9b1beed119.pexels-photo-414612.jpeg rename to uploads/2bc6d7b2-079d-4d82-8fe9-da9b1beed119.pexels-photo-414612.jpeg diff --git a/sweater-FileUpload/uploads/2c4766fe-400f-465c-af28-ee7087af79c9.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg b/uploads/2c4766fe-400f-465c-af28-ee7087af79c9.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg similarity index 100% rename from sweater-FileUpload/uploads/2c4766fe-400f-465c-af28-ee7087af79c9.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg rename to uploads/2c4766fe-400f-465c-af28-ee7087af79c9.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg diff --git "a/sweater-FileUpload/uploads/5eec6065-8e17-4c6e-83e3-5a213f352123.03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" "b/uploads/5eec6065-8e17-4c6e-83e3-5a213f352123.03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" similarity index 100% rename from "sweater-FileUpload/uploads/5eec6065-8e17-4c6e-83e3-5a213f352123.03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" rename to "uploads/5eec6065-8e17-4c6e-83e3-5a213f352123.03dddbf1-d89c-4bab-b5d6-e326e1161231.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" diff --git "a/sweater-FileUpload/uploads/78e67aa6-d522-4f57-862e-0a9552ef8bd2.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" "b/uploads/78e67aa6-d522-4f57-862e-0a9552ef8bd2.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" similarity index 100% rename from "sweater-FileUpload/uploads/78e67aa6-d522-4f57-862e-0a9552ef8bd2.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" rename to "uploads/78e67aa6-d522-4f57-862e-0a9552ef8bd2.\320\221\320\265\320\267 \320\275\320\260\320\267\320\262\320\260\320\275\320\270\321\217.png" diff --git a/sweater-FileUpload/uploads/9e3fc9a7-ff39-4fd7-bf99-cdbcc3570407.test.png b/uploads/9e3fc9a7-ff39-4fd7-bf99-cdbcc3570407.test.png similarity index 100% rename from sweater-FileUpload/uploads/9e3fc9a7-ff39-4fd7-bf99-cdbcc3570407.test.png rename to uploads/9e3fc9a7-ff39-4fd7-bf99-cdbcc3570407.test.png diff --git a/sweater-FileUpload/uploads/9f565921-6796-4d52-a01a-194dacd51873.test.png b/uploads/9f565921-6796-4d52-a01a-194dacd51873.test.png similarity index 100% rename from sweater-FileUpload/uploads/9f565921-6796-4d52-a01a-194dacd51873.test.png rename to uploads/9f565921-6796-4d52-a01a-194dacd51873.test.png diff --git a/sweater-FileUpload/uploads/aad97305-0e6c-4331-91ef-8caa55765ebe.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg b/uploads/aad97305-0e6c-4331-91ef-8caa55765ebe.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg similarity index 100% rename from sweater-FileUpload/uploads/aad97305-0e6c-4331-91ef-8caa55765ebe.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg rename to uploads/aad97305-0e6c-4331-91ef-8caa55765ebe.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg diff --git a/sweater-FileUpload/uploads/af51e229-ea78-43a0-a4f7-74fd8b8e1f89.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg b/uploads/af51e229-ea78-43a0-a4f7-74fd8b8e1f89.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg similarity index 100% rename from sweater-FileUpload/uploads/af51e229-ea78-43a0-a4f7-74fd8b8e1f89.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg rename to uploads/af51e229-ea78-43a0-a4f7-74fd8b8e1f89.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg diff --git a/sweater-FileUpload/uploads/b63b231f-b743-4e94-b94a-ff03f05da966.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg b/uploads/b63b231f-b743-4e94-b94a-ff03f05da966.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg similarity index 100% rename from sweater-FileUpload/uploads/b63b231f-b743-4e94-b94a-ff03f05da966.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg rename to uploads/b63b231f-b743-4e94-b94a-ff03f05da966.olggah_naruto_itachi_uchiha_mangekyou_sharingan_101428_1920x1080.jpg diff --git a/sweater-FileUpload/uploads/b937adb2-63c2-4ab5-810b-6a7b9dd20146.1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg b/uploads/b937adb2-63c2-4ab5-810b-6a7b9dd20146.1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg similarity index 100% rename from sweater-FileUpload/uploads/b937adb2-63c2-4ab5-810b-6a7b9dd20146.1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg rename to uploads/b937adb2-63c2-4ab5-810b-6a7b9dd20146.1754e1b5-f9a7-4b2e-8f08-289b504ffc62.depositphotos_137626418-stock-photo-mercedes-benz-sign.jpg diff --git "a/sweater-FileUpload/uploads/f90a83f0-ff53-4d8f-9dea-f804e2e70a2b.\320\221\320\265\320\267\321\213\320\274\321\217\320\275\320\275\321\213\320\271.png" "b/uploads/f90a83f0-ff53-4d8f-9dea-f804e2e70a2b.\320\221\320\265\320\267\321\213\320\274\321\217\320\275\320\275\321\213\320\271.png" similarity index 100% rename from "sweater-FileUpload/uploads/f90a83f0-ff53-4d8f-9dea-f804e2e70a2b.\320\221\320\265\320\267\321\213\320\274\321\217\320\275\320\275\321\213\320\271.png" rename to "uploads/f90a83f0-ff53-4d8f-9dea-f804e2e70a2b.\320\221\320\265\320\267\321\213\320\274\321\217\320\275\320\275\321\213\320\271.png" From f61d6e52d4dd28693fcc13b0fa252d8a192f3ba9 Mon Sep 17 00:00:00 2001 From: Pavel Kaplin Date: Tue, 12 Nov 2019 20:06:05 -0800 Subject: [PATCH 2/5] Test fails b/c there's no DB available --- pom.xml | 22 ----------------- .../example/sweater/MockMvcExampleTests.java | 15 ++++++++++++ .../sweater/MockMvcLoginPageTests.java | 24 ------------------- 3 files changed, 15 insertions(+), 46 deletions(-) create mode 100644 src/test/java/com/example/sweater/MockMvcExampleTests.java delete mode 100644 src/test/java/com/example/sweater/MockMvcLoginPageTests.java diff --git a/pom.xml b/pom.xml index c59c6f0..b5f1820 100644 --- a/pom.xml +++ b/pom.xml @@ -87,29 +87,8 @@ org.springframework.boot spring-boot-starter-test test - - - org.junit.vintage - junit-vintage-engine - - - - - junit - junit - 4.12 - test - - - org.junit.jupiter - junit-jupiter - RELEASE - test - - - @@ -118,7 +97,6 @@ 1.8 - diff --git a/src/test/java/com/example/sweater/MockMvcExampleTests.java b/src/test/java/com/example/sweater/MockMvcExampleTests.java new file mode 100644 index 0000000..a3fbc97 --- /dev/null +++ b/src/test/java/com/example/sweater/MockMvcExampleTests.java @@ -0,0 +1,15 @@ +package com.example.sweater; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class MockMvcExampleTests { + + @Test + public void contextLoads() throws Exception { + } +} diff --git a/src/test/java/com/example/sweater/MockMvcLoginPageTests.java b/src/test/java/com/example/sweater/MockMvcLoginPageTests.java deleted file mode 100644 index bcc90c8..0000000 --- a/src/test/java/com/example/sweater/MockMvcLoginPageTests.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.sweater; - -import org.junit.jupiter.api.Test; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.web.reactive.server.WebTestClient; -import org.springframework.test.web.servlet.MockMvc; - - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -@SpringBootTest -@AutoConfigureMockMvc -class MockMvcExampleTests { - - @Test - void exampleTest(@Autowired WebTestClient webClient){ - webClient.get().uri("/login").exchange().expectStatus().isOk().expectBody(String.class).isEqualTo("login.ftl"); - } -} From 58ebbb18ec2e0c032bf0b6f0ff79f2188e5e0677 Mon Sep 17 00:00:00 2001 From: Pavel Kaplin Date: Tue, 12 Nov 2019 20:29:28 -0800 Subject: [PATCH 3/5] Test load context works --- pom.xml | 7 +++++ src/main/resources/application-test.yml | 13 ++++++++ src/main/resources/application.properties | 20 ------------ src/main/resources/application.yml | 31 +++++++++++++++++++ .../example/sweater/MockMvcExampleTests.java | 2 ++ 5 files changed, 53 insertions(+), 20 deletions(-) create mode 100644 src/main/resources/application-test.yml delete mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/application.yml diff --git a/pom.xml b/pom.xml index b5f1820..a3556f7 100644 --- a/pom.xml +++ b/pom.xml @@ -89,6 +89,13 @@ test + + com.h2database + h2 + 1.4.194 + test + + diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml new file mode 100644 index 0000000..21a25d4 --- /dev/null +++ b/src/main/resources/application-test.yml @@ -0,0 +1,13 @@ +spring.profiles.active: test + +spring: + jpa: + database: h2 + hibernate: + ddl-auto: create + datasource: + url: jdbc:h2:mem:AZ + driver-class-name: org.h2.Driver + h2: + console: + enabled: true \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index c4070d7..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,20 +0,0 @@ -spring.datasource.url=jdbc:mysql://localhost:3306/sweater?useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&useSSL=false -spring.datasource.username=root -spring.datasource.password=0770 -spring.jpa.generate-ddl=false -spring.mustache.expose-request-attributes=true -spring.jpa.show-sql=false -spring.jpa.hibernate.ddl-auto=validate - -upload.path=C:/Users/oleks/Documents/GitHub/sweater/sweater-FileUpload/uploads -spring.mail.host=smtp.gmail.com -spring.mail.username=oleksandr.kaplin@nure.ua -spring.mail.password=Waweqtt541 -spring.mail.port=587 -mail.properties.mail.smtp.auth=true -spring.mail.protocol=smtp -mail.debug=true -mail.smtp.starttls.enable=true - -recaptcha.secret=6LduL7cUAAAAAE46ZeC_04ibNMZqGypgkjeeLYBT - diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..52eeb73 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,31 @@ +mail: + debug: true + properties: + mail: + smtp: + auth: true + smtp: + starttls: + enable: true +recaptcha: + secret: 6LduL7cUAAAAAE46ZeC_04ibNMZqGypgkjeeLYBT +spring: + datasource: + password: 770 + url: jdbc:mysql://localhost:3306/sweater?useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&useSSL=false + username: root + jpa: + generate-ddl: false + hibernate: + ddl-auto: validate + show-sql: false + mail: + host: smtp.gmail.com + password: Waweqtt541 + port: 587 + protocol: smtp + username: oleksandr.kaplin@nure.ua + mustache: + expose-request-attributes: true +upload: + path: C:/Users/oleks/Documents/GitHub/sweater/sweater-FileUpload/uploads diff --git a/src/test/java/com/example/sweater/MockMvcExampleTests.java b/src/test/java/com/example/sweater/MockMvcExampleTests.java index a3fbc97..8a8cdea 100644 --- a/src/test/java/com/example/sweater/MockMvcExampleTests.java +++ b/src/test/java/com/example/sweater/MockMvcExampleTests.java @@ -3,10 +3,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest +@ActiveProfiles("test") public class MockMvcExampleTests { @Test From bb54cacfa7c6f5516f28750865aca4ca3e2b0316 Mon Sep 17 00:00:00 2001 From: Pavel Kaplin Date: Tue, 12 Nov 2019 20:29:51 -0800 Subject: [PATCH 4/5] Delete target directory --- target/classes/application.properties | 20 --- .../com/example/sweater/Application.class | Bin 727 -> 0 bytes .../example/sweater/config/MailConfig.class | Bin 2017 -> 0 bytes .../example/sweater/config/MvcConfig.class | Bin 2455 -> 0 bytes .../sweater/config/WebSecurityConfig.class | Bin 4456 -> 0 bytes .../sweater/controller/ControllerUtils.class | Bin 2504 -> 0 bytes .../sweater/controller/MainController.class | Bin 4473 -> 0 bytes .../controller/RegistrationController.class | Bin 4384 -> 0 bytes .../sweater/controller/UserController.class | Bin 3476 -> 0 bytes .../com/example/sweater/domain/Message.class | Bin 2964 -> 0 bytes .../com/example/sweater/domain/Role.class | Bin 1286 -> 0 bytes .../com/example/sweater/domain/User.class | Bin 3964 -> 0 bytes .../domain/dto/CaptchaResponseDto.class | Bin 888 -> 0 bytes .../example/sweater/repos/MessageRepo.class | Bin 514 -> 0 bytes .../com/example/sweater/repos/UserRepo.class | Bin 502 -> 0 bytes .../example/sweater/service/MailSender.class | Bin 1341 -> 0 bytes .../example/sweater/service/UserSevice.class | Bin 6088 -> 0 bytes target/classes/db/migration/V1__Init_DB.sql | 29 ---- target/classes/static/style.css | 3 - target/classes/templates/greeting.ftl | 5 - target/classes/templates/login.ftl | 16 -- target/classes/templates/main.ftl | 66 --------- target/classes/templates/parts/common.ftl | 140 ------------------ target/classes/templates/parts/login.ftl | 74 --------- target/classes/templates/parts/navbar.ftl | 31 ---- target/classes/templates/parts/security.ftl | 16 -- target/classes/templates/profile.ftl | 24 --- target/classes/templates/registration.ftl | 7 - target/classes/templates/userEdit.ftl | 17 --- target/classes/templates/userList.ftl | 24 --- 30 files changed, 472 deletions(-) delete mode 100644 target/classes/application.properties delete mode 100644 target/classes/com/example/sweater/Application.class delete mode 100644 target/classes/com/example/sweater/config/MailConfig.class delete mode 100644 target/classes/com/example/sweater/config/MvcConfig.class delete mode 100644 target/classes/com/example/sweater/config/WebSecurityConfig.class delete mode 100644 target/classes/com/example/sweater/controller/ControllerUtils.class delete mode 100644 target/classes/com/example/sweater/controller/MainController.class delete mode 100644 target/classes/com/example/sweater/controller/RegistrationController.class delete mode 100644 target/classes/com/example/sweater/controller/UserController.class delete mode 100644 target/classes/com/example/sweater/domain/Message.class delete mode 100644 target/classes/com/example/sweater/domain/Role.class delete mode 100644 target/classes/com/example/sweater/domain/User.class delete mode 100644 target/classes/com/example/sweater/domain/dto/CaptchaResponseDto.class delete mode 100644 target/classes/com/example/sweater/repos/MessageRepo.class delete mode 100644 target/classes/com/example/sweater/repos/UserRepo.class delete mode 100644 target/classes/com/example/sweater/service/MailSender.class delete mode 100644 target/classes/com/example/sweater/service/UserSevice.class delete mode 100644 target/classes/db/migration/V1__Init_DB.sql delete mode 100644 target/classes/static/style.css delete mode 100644 target/classes/templates/greeting.ftl delete mode 100644 target/classes/templates/login.ftl delete mode 100644 target/classes/templates/main.ftl delete mode 100644 target/classes/templates/parts/common.ftl delete mode 100644 target/classes/templates/parts/login.ftl delete mode 100644 target/classes/templates/parts/navbar.ftl delete mode 100644 target/classes/templates/parts/security.ftl delete mode 100644 target/classes/templates/profile.ftl delete mode 100644 target/classes/templates/registration.ftl delete mode 100644 target/classes/templates/userEdit.ftl delete mode 100644 target/classes/templates/userList.ftl diff --git a/target/classes/application.properties b/target/classes/application.properties deleted file mode 100644 index c4070d7..0000000 --- a/target/classes/application.properties +++ /dev/null @@ -1,20 +0,0 @@ -spring.datasource.url=jdbc:mysql://localhost:3306/sweater?useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&useSSL=false -spring.datasource.username=root -spring.datasource.password=0770 -spring.jpa.generate-ddl=false -spring.mustache.expose-request-attributes=true -spring.jpa.show-sql=false -spring.jpa.hibernate.ddl-auto=validate - -upload.path=C:/Users/oleks/Documents/GitHub/sweater/sweater-FileUpload/uploads -spring.mail.host=smtp.gmail.com -spring.mail.username=oleksandr.kaplin@nure.ua -spring.mail.password=Waweqtt541 -spring.mail.port=587 -mail.properties.mail.smtp.auth=true -spring.mail.protocol=smtp -mail.debug=true -mail.smtp.starttls.enable=true - -recaptcha.secret=6LduL7cUAAAAAE46ZeC_04ibNMZqGypgkjeeLYBT - diff --git a/target/classes/com/example/sweater/Application.class b/target/classes/com/example/sweater/Application.class deleted file mode 100644 index 61aa21c089a1c0247c82df38f1f7d09267d4d11d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 727 zcmah{%TC)s6g?9X9Ne^|fzr~4Ds~}@&IYk@g#?khGPG){bkWt=3}(QdiN<5#w^)I? z-~;$5#2teaFH+T#@6~;sbI;7&Km5G|u!Bz_+ISOSBg9+03$V$s{8ee?_869i+f#=2 z*c?lS)mUkHR27M|zeJK#W)PcH|Sha#><%}Kk<;4#-8)U7{^8BOltIr z$|@`Qq;5H&LW3acp@U_H&;Jn};C&At@R8P=EB>CG$<#57{<*;uXM>Nf##VH6$*^&9 z<6M+wwBWF|7iuF(PF^`aewOC%ut7m-UyiVa7QGPvwZObgvH?Y$JR{#3-GE)!F+QK{5G#^ MJHQ%wPrD900$De@v;Y7A diff --git a/target/classes/com/example/sweater/config/MailConfig.class b/target/classes/com/example/sweater/config/MailConfig.class deleted file mode 100644 index 218540e1325bdcdf929715e641b3e0c8f883a6e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2017 zcmb7Fk8=}66#lkNn~+{87%-(K$#%=1d8@iQ-zT$blag6JGp~AV6AJpxzC9Zpc z)6`G>;1|219WS)^oT~AI=eE;dV3(anTQlUy69EcG7hc3`i%rLE6eWpY6*BEm2Ofhd z%>3J-M~G9)2}AByOE~oiI;C2Ez_QdvVk;q{D1mSMs^3UP=@N7rsp(3)t}wpvB1$uw zN_3}f_7zTb&8@(1>A<);jH?Nord1Rd*(WqkU`&H8JK1%Q=$^T#J%_!e=jcV(bIm1% z;oPDe%(`D=A0|q!r?=Y8iVp6Gqa2lAbsA+SaAn>#rp&&}EzXpxe$&>^oMx+`?eM8~ zj1KIo@9nvDdy}1Bk01|XysnKHcC=U10nanHIPgTJZd;?)dGXs;{}ywFyZ(uD&ScC=AYa zK)85SJBXyeW}yh1{Td|ys7L?NEGgB(EaoiS!+i@MW5L2M9$5HLY(I$Yl%O94{e*`U zro=0nfOkq%TV$6a$y)dXb7}l+;SpF!bOyypn-+4IQ#c$g?90%?l2~UCtZ%8$LP2(} zpsH~CeU z(VrOFeTm^xe(4XSIvA00w1c#anGO!gnC)OJ-+{GRm>TEwa0e6j3R9DWM`Acdcr=E` z2&V<+3mqKK|HeJyyjGYE*ozFyo@@4{;%?VLr~Y hTSEr-$*r=MWm+!aOGcMtm8#dGy)H)Iulm+Yz&~Sp``!Qm diff --git a/target/classes/com/example/sweater/config/MvcConfig.class b/target/classes/com/example/sweater/config/MvcConfig.class deleted file mode 100644 index 179ff5cab9aa84a17aab7306551da118f6f3a761..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2455 zcmb_e|8m$d~sA{$s?VU zb{JlQCxIEpouLB{z(aM|^N+-FtC zH}QpqTlmt%R~Ej;qJbq7w=H~wI|lAr$ZC^swY+x*7qDz%MKA7K_zn+Dd~agaz?y-F z1|Bh3&4wR}>Jy=M8Jxm%u_w4Mf*RjYkr&jK7%r|i1Lf6a*^9l3FYg6GsD$#uAZA!7 zgi(#h4Q;v;iMremqn~+2iXi4Y!c}4Pl8XZeUKV~+5@cpiD-2`PzjU^rYta6`GK}8# z0#Dsx7|G3)8PY3ZmCVKqULZ@&dPPQ?f+%RBp)35dh&;XSzD%oKk2qZ`xM7{k7oy(q zC6D)|P%`3f80>g8Ufgq6+8VJKuSvBoW3?&Cl8hL5ZYD9HeOckI@5w;%eh0$1k!Vkw zDfvS6hrUcXA$vzut7T8_6A2ZCzAqzUT+Ah+=v`wO?fFvm==bOH2+F#wd9jLKF6p$H zQFq1g@br)w&K9NG4XIZ2NmEjZ`gw|nQW7>JSFVbn+6kz1l7I$ajzsk61Yr!rqnh7n z^L^myQW`rbi8)>T47U>ZN;uL^AvL3RGc4Ko5LXyxlNw@3{ZPGgKdgCyfr5=9O4J$M z^V*{HE?+zL*H$A^9Bf{UI7#F#XA5pgP9xgI4T5aJc z1KT#9YHy3jx}RNwr22Gy5y!e47kjT6rvFbv9pU=8@?5%#VR=|KhS&9$tQ?$3Gtxn< zzCFm%7VDJ~!?|Pa$56=~pL)Z`z;NP;dv64a>lOX)Tw`959kS(2CNcR9ufNRvV%gq~CMiIZd` zGx=9we~^+Q6kxRd(#A)m+Z_XZjA>die1dCaHAVVOlG@pPjnwuljQmb|zrWMxZ+87P zAC3MgNroI|x>)x~rs$nL>!e%AIHN5XhkW!u5>RYeicNEx?AUfOHOD+=3GX_6%P?AK z@Ee#TvnkSlqb)T+X*T^g%jG%%xCvMKDtE&aG{U{$&QZKx?LNR-kQ!a;a#-_2kV;DJO$lHVqI+Pxy{qoV5d2?^lU!YQd#N0}UPH z_};u*ueY8})Q;)FGqT2hECQAQ@7tk>qPd zKW7)?n6KrU!0vJ&r~OdH>hrDao5I9#oM25gYBh;Xad*f?UBVh3(c2AWspaHNNEDcD z+QU}S_6k;3>F&kuVHN#?>j`vQ>|E|5JEGMuu*(W$!3|aHT!zjHb^CLy{(b`sCR{u; z@JQhC=I|O;T+K1M=th@mdKj{=-VTa7U;V&+62+nxT^Ss&(Pf^8h;75(9QQmKj1<`! zWoV*^f{7A56TW^c3lheAawS`?VshU9t&T=j#}gpNRBug1J&Vi_w2 zo@g~ICXV181K*kW9zU3P7w;MPQLjG{U3Dawhw^rr?Mq;9 zl45JEjzcLkt~+Y4ZX7zoaz;L`$WXD}9Z6DPoL!#%p{y9@nK=Dc1b*Fes=S^o+Z+cQ z!7n>--7Dw%<|tUEwx=d-|GAxoW7$ zGELdu%4(Pe_A!VF&^1)MbV96-E}7>Q#`gHUzP*Uo5AfQQBc%CSg$c}VPw*D?O7C_> zO>~;`HJaavrE4MCq5B)O395B>ZqHCoH+e_to|@btIHFmKNqJM(aPzuq6D|ox2mRz% zlt8w5Y5KBO9|?9%idu(pYKLClD6;vosmo{1v{$=|@iwhLQm#m4yTvdYe~kz{+wvY5 zNJ}&3W5($FWxWu#f+jt(0e`)}>s4K`{q+g6E)30H3U;nk;Q3bG+TuIvzw%VAzBcn1 zj`6egFfV;A{NtpDz)|ixxE_nB9QYe(ZQS#I$mjb!VR02)+xwqE{1&mC z#s|=ce(nTL;WU+L=5uI`eoH+^%UnwFQZUgLM*8s}hd#jFx|fYa0d#p*52B z6z${%rcYJTX8eivxz=#DcTHa}&f}9t`p%QJ6&Ltyp#ev^?&bb7u7mu)NS4p<;u0pgN%KfIu4974 JF|P9v{{nByrg#7V diff --git a/target/classes/com/example/sweater/controller/ControllerUtils.class b/target/classes/com/example/sweater/controller/ControllerUtils.class deleted file mode 100644 index f0b3d05ac3dab9e78a1af07bc4682c7dc778d458..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2504 zcmbtW+fv*{5Iw_9AOx(51BvbU3Jzd{Na9?V;23OTCyVWPF|l)>-JM+oT4_ttV*4$h zl)T`8t5SJR<(pDDBMDXu6o$%!G&4QjJ*T_RwDkACJAVSWfprr(Ob&By4@1B<@gCmq z#|OC4j}P%tKR(7M20k_LnTbA3n#f~L&pz+PydG~F_`<*~fu1?XbE0{H&WXuYfv!cr zq6CHtj;HQ7>m?Pe$dXIRaKSH2cU13Z{jBhSky3(uJ#YpEUe^4@?pC`85vWnLH%0sD> z$Qm%YeMP6{$*38yhU)(%`j|k-6<5|v6*;z7Sf6o#3>1>cWYb=gQ#84mSeA%{f{w{sY?a0g36-T2bLT?_Z{ zm4UA<6tHaIzJ&*PXy6+Qk5D8h+ej)f8m}`EEi@gsq5=ae79L~O!nb%L&>eHY!c*`z z&YbLC5q|5C2c>lq+QfJGUf}9PhBC>{?lp=Lr6LnU_<(5kCo>ZAH5OzL0?3kxvo}JV_zM*Y=>V4CfDSW?}3BnKU??(6$@7|Wh?C z{U!JEuJkId3da(|LmFa+?`?)FY}i@#<8LNM9&MXVUFvyJx^B^l6qC1bSPk`OQaz9C zu-Rz%L1f=nRmrd1vI;|4Q%T?AhtGF6lMnGJ7Pno;fFm$|An}JKO5ps_dbq?EkmGL! z(8>P__C&tl(7zcR1;_5Gmk_^m(t*=__ryXIZ*p!W3K+pCSG{-(Z_|l3u2Z{%`;n7&{de)Mz_E=df3jlVRYax^!`S*&e*jXn^+hm9_@Z4ae*^9%he!d=kN}XJkOOr zI+0x9>>?#}e1^j%J{`E6Gc`>)(`asS)S-;NLf_MuFsHWAzXfY}fUhkKY6RKf1~S2o tVjNewe~}MQ7-yzB@osD|fig#vo+WB1G4?60HRx;9xsGYfq_bJf{0Ed?*w_F7 diff --git a/target/classes/com/example/sweater/controller/MainController.class b/target/classes/com/example/sweater/controller/MainController.class deleted file mode 100644 index 5e9cd08d386eff2276f99cf76e580645c925ed97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4473 zcmb7H>vJ2`75`mX(#rBWA#!YD2q{Sn_#t~sfk5rx#Ez5HV8^MSP14s|x|TPQv|=Bz zT}o-_gFc`I`XnuVx9Pjk={UHV>9^)XzwxEtI+HK`Cpt{0zq>2RQrLLPc)WY}+;h%7 zkKZ}x>L368>)!x8ia)1u2&*YP(u#wy+Het<(kP;&R^=4N+hC)T!toSF(|86>8(es4 z__(Zg)>2q%!#XxJd`2mFHjO>_ta?1B9-m9&d3;_yu4s56jeS^Ek1wR~MfJXt!jnq+ zOG@*X)rl`^_=<+F3bd7^>zV~QD=W6ZLsL1sWXN^1R4GcsU6ZCK9mCCrDoh?&8$b?tG0nMvwTtJypd7bcGtA@R&C}$rH=WhgROH`p=^4-!$3^l zX7B&0H`1%SR3x-kI+YrA=N-JP6e!~&uqmc;7+scVrWd*@+pYzPzCAu0QOvBd*T_be$ zP;<%E^V3v&MOSvv(&~ z7F_9!?8H#*A|sJzvPP|Z&_#@K=AX%)l`d_F=B{TnQkQbML|Ln1I-W6ITb;6)qev{a zO2@Gsm!T)#!yYkV5fQt>bXv9%$TCvCZ{^jRdrn}V`Y5wlh)SOU5IDF~2!a?1XjLEy z^z6i43z$H=s)>3`1coC0zGDn&+)7~d!;x}3#Y^CQ^^$6@9v$JZVoN`{o|BbeG-&v` zQWZ5Fq7Zu4b{mTRzGnE(v(Ysne_xQNb)z8w#IB{L%BjdBU77P8%iAz=wj&#R4F}Sy zR=IgAnLUD+(lSOE3AvLB8OvF zZ)0WG^fPY_hJ@gxl;xf*RlJR0@SkVND=p(2^Cm}fPsC8EY7PePl;wKVx<3lYwXVc` zuwRaOytgd-9$UjigwlpdQ60d2k?^T0<)Me7qS8D_=!`2pg<_k%h|cUF5;P-q@ySLx z(@;xI4Vfpbn(oP2H9=HsTj}$5Gdbg7j*_$9f|@zSGII-raBk+Fg=PLDnO! z?qj!IQ79DUT|-ojsQn#UA~8!JW*nA|S;8o(9`RO_8O(jJd- zS9sawkAOW@;o8JghPDw<+g`?9^D+_rVB;xu{B9R`mBgPb2l?9vi1ClTj#r5X_?6`Q z!GOw6Ri(A@-N*la7XyfM!T!kS5ZMgAc@06L|2o85ft-craq@*~73B$1K1@o2Q;e@+{>Ly9 zc(aRJNBQ4>0m8+TT#e#b_4L0}U7WlV{eMBr7UBYD25w^Cz$Ow`u}2XHwvdeB%r&%c zvt%>c;1*IXSjuKv$)Hx5v@$;)n128o*L_GcRGkdeVR|}92Og*QWAt1_q(3~j?$!j3 z2eGCt^k9tEr|HEwPSC=dt085Al#|rZirBk2tl?B^;CX9|8W4D|a@g$kX?%pVju@Sv zr0S>6<7rH}m?n`fV}{9MCdI#zpjzNomJw*9kGjC?I5_w=+J}?f@$TdncEzyN9nb8} zhHhWO8{LVUc%eJ7g}VfTxcN7*=NzMzxsDEsB{#A6Dq7XMbLnk#ZQ|}>?FROpyN>Q| zZ4>uo?&YJd;GRwFA5L{Al#(i!(xv$BQ+z2t$U@y)I1oct5k8-^1uHY=k^ehMO zJZ@kCH?f3wxce`h4^mq}8})RO>j>leG$cMs?j&VrsHd0UxI&oBbCpuDu0!A!buBU< zinfH0F;8lBj#|~l|5gAC1=d@*fREGScd$DENHPG3s*~{4Pw=d8Z-OfYm3G9l?;@+= zlmEeDCq6}zD&bED!0AlzT<}EjtPnsK_^yG-Bx6`Qr?E_WD?}G<%yFqOwLiiAJQpG$ Xalw@;YBq`sG)a;W!%Drc6oCH$)3nlm diff --git a/target/classes/com/example/sweater/controller/RegistrationController.class b/target/classes/com/example/sweater/controller/RegistrationController.class deleted file mode 100644 index 6693c898fdf6141b915d166ae4c909e983a11436..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4384 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 diff --git a/target/classes/com/example/sweater/domain/Message.class b/target/classes/com/example/sweater/domain/Message.class deleted file mode 100644 index 6718870816b8e7ba4fedcdc58a42d9e5825a4d89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2964 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 Kix9$Fu<<`{<{04s diff --git a/target/classes/com/example/sweater/domain/dto/CaptchaResponseDto.class b/target/classes/com/example/sweater/domain/dto/CaptchaResponseDto.class deleted file mode 100644 index 9eca149ca4d45e95aa8777e3ff742515bee69e79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 888 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 - -<@c.page> -
Hello, guest
- diff --git a/target/classes/templates/login.ftl b/target/classes/templates/login.ftl deleted file mode 100644 index 24d17d3..0000000 --- a/target/classes/templates/login.ftl +++ /dev/null @@ -1,16 +0,0 @@ -<#import "parts/common.ftl" as c> -<#import "parts/login.ftl" as l> - -<@c.page> - <#if Session?? && Session.SPRING_SECURITY_LAST_EXCEPTION??> - - - <#if message??> - - - <@l.login "/login" false/> - \ No newline at end of file diff --git a/target/classes/templates/main.ftl b/target/classes/templates/main.ftl deleted file mode 100644 index 2f9ff58..0000000 --- a/target/classes/templates/main.ftl +++ /dev/null @@ -1,66 +0,0 @@ -<#import "parts/common.ftl" as c> - -<@c.page> -
-
- - -
-
- - -
-
-
-
- - <#if textError??> -
- ${textError} -
- -
-
- - <#if tagError??> -
- ${tagError} -
- -
-
-
- - -
-
- - -
-
-
-
- <#list messages as message> -
- <#if message.filename??> - - -
- ${message.text} - ${message.tag} -
-
- ${message.authorName} -
-
- ${message.ratingValue?ifExists} -
-
- <#else> - No message - -
- diff --git a/target/classes/templates/parts/common.ftl b/target/classes/templates/parts/common.ftl deleted file mode 100644 index 8d3261d..0000000 --- a/target/classes/templates/parts/common.ftl +++ /dev/null @@ -1,140 +0,0 @@ -<#macro page> - - - - - Sweater - - - - - - - - - - - - <#include "navbar.ftl"> -
- <#nested> -
- - - - - - - - - - - - \ No newline at end of file diff --git a/target/classes/templates/parts/login.ftl b/target/classes/templates/parts/login.ftl deleted file mode 100644 index 6b4365b..0000000 --- a/target/classes/templates/parts/login.ftl +++ /dev/null @@ -1,74 +0,0 @@ -<#macro login path isRegisterForm> - - - -<#macro logout> -
- - -
- \ No newline at end of file diff --git a/target/classes/templates/parts/navbar.ftl b/target/classes/templates/parts/navbar.ftl deleted file mode 100644 index 4126da5..0000000 --- a/target/classes/templates/parts/navbar.ftl +++ /dev/null @@ -1,31 +0,0 @@ -<#include "security.ftl"> -<#import "login.ftl" as l> -<#if user??> - - \ No newline at end of file diff --git a/target/classes/templates/parts/security.ftl b/target/classes/templates/parts/security.ftl deleted file mode 100644 index 90136da..0000000 --- a/target/classes/templates/parts/security.ftl +++ /dev/null @@ -1,16 +0,0 @@ -<#assign - known = Session.SPRING_SECURITY_CONTEXT?? -> - -<#if known> - <#assign - user = Session.SPRING_SECURITY_CONTEXT.authentication.principal - name = user.getUsername() - isAdmin = user.isAdmin() - > -<#else > - <#assign - name = "unknown" - isAdmin = false - > - \ No newline at end of file diff --git a/target/classes/templates/profile.ftl b/target/classes/templates/profile.ftl deleted file mode 100644 index cea77ab..0000000 --- a/target/classes/templates/profile.ftl +++ /dev/null @@ -1,24 +0,0 @@ -<#import "parts/common.ftl" as c> - -<@c.page> -${message?ifExists} -
${username}
-
- -
- -
- -
-
-
- -
- -
-
- - -
- - diff --git a/target/classes/templates/registration.ftl b/target/classes/templates/registration.ftl deleted file mode 100644 index 6dc3566..0000000 --- a/target/classes/templates/registration.ftl +++ /dev/null @@ -1,7 +0,0 @@ -<#import "parts/common.ftl" as c> -<#import "parts/login.ftl" as l> - -<@c.page> -${message?ifExists} -<@l.login "/registration" true/> - diff --git a/target/classes/templates/userEdit.ftl b/target/classes/templates/userEdit.ftl deleted file mode 100644 index 4471a3b..0000000 --- a/target/classes/templates/userEdit.ftl +++ /dev/null @@ -1,17 +0,0 @@ -<#import "parts/common.ftl" as c> - -<@c.page> -User editor - -
- - <#list roles as role> -
- -
- - - - -
- diff --git a/target/classes/templates/userList.ftl b/target/classes/templates/userList.ftl deleted file mode 100644 index 6acdf12..0000000 --- a/target/classes/templates/userList.ftl +++ /dev/null @@ -1,24 +0,0 @@ -<#import "parts/common.ftl" as c> - -<@c.page> -List of users - - - - - - - - - - - <#list users as user> - - - - - - - -
NameRole
${user.username}<#list user.roles as role>${role}<#sep>, edit
- From 7c5f94c08df831a0d3641f80ce97d243953ac3cf Mon Sep 17 00:00:00 2001 From: Pavel Kaplin Date: Tue, 12 Nov 2019 20:35:07 -0800 Subject: [PATCH 5/5] Test fails b/c there's no Hello world --- .../example/sweater/MockMvcExampleTests.java | 19 +- sweater.iml | 252 ++++++++---------- 2 files changed, 135 insertions(+), 136 deletions(-) diff --git a/src/test/java/com/example/sweater/MockMvcExampleTests.java b/src/test/java/com/example/sweater/MockMvcExampleTests.java index 8a8cdea..7a9322e 100644 --- a/src/test/java/com/example/sweater/MockMvcExampleTests.java +++ b/src/test/java/com/example/sweater/MockMvcExampleTests.java @@ -2,16 +2,33 @@ import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.web.server.LocalServerPort; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(SpringRunner.class) -@SpringBootTest +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @ActiveProfiles("test") public class MockMvcExampleTests { + @LocalServerPort + private int port; + + @Autowired + private TestRestTemplate restTemplate; + @Test public void contextLoads() throws Exception { } + + @Test + public void greetingShouldReturnDefaultMessage() throws Exception { + assertThat(this.restTemplate.getForObject("http://localhost:" + port + "/", + String.class)).contains("Hello World"); + } } diff --git a/sweater.iml b/sweater.iml index 3759287..28913e8 100644 --- a/sweater.iml +++ b/sweater.iml @@ -1,136 +1,118 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file