From 8ccb0c3abeb619792146bc967b6c9147da26f9ff Mon Sep 17 00:00:00 2001 From: Noah Scharrenberg Date: Sun, 5 May 2019 13:23:18 +0200 Subject: [PATCH] shit ain't working still --- .gitignore | 17 +- .travis.yml | 2 +- Kwetter.iml | 196 +++ angular/src/app/pages/home/home.component.ts | 6 +- .../app/pages/profile/profile.component.ts | 6 +- angular/src/app/pages/user/user.component.ts | 6 +- pom.xml | 167 +- src/main/java/beans/LoginBean.java | 84 - .../nscharrenberg/kwetter}/StartUp.java | 28 +- .../AuthenticationProvider.java | 10 +- .../PasswordAuthentication.java | 2 +- .../authentication/PermissionEnum.java | 2 +- .../authentication/ServletIdentityStore.java | 8 +- .../authentication/TokenProvider.java | 6 +- .../kwetter}/beans/ChangeRoleBean.java | 12 +- .../kwetter}/beans/GeocodeView.java | 2 +- .../kwetter}/beans/LanguageBean.java | 2 +- .../kwetter}/beans/LogonBean.java | 76 +- .../kwetter}/beans/PermissionAttachBean.java | 12 +- .../kwetter}/beans/PermissionBean.java | 8 +- .../kwetter}/beans/PermissionDetachBean.java | 12 +- .../kwetter}/beans/RoleBean.java | 12 +- .../kwetter}/beans/TweetBean.java | 10 +- .../kwetter}/beans/UserBean.java | 8 +- .../controllers/AuthenticationController.java | 16 +- .../kwetter}/controllers/RestConfig.java | 2 +- .../kwetter}/controllers/TweetController.java | 30 +- .../kwetter}/controllers/UserController.java | 28 +- .../kwetter}/domain/Permission.java | 2 +- .../nscharrenberg/kwetter}/domain/Role.java | 2 +- .../nscharrenberg/kwetter}/domain/Tweet.java | 2 +- .../nscharrenberg/kwetter}/domain/User.java | 2 +- .../CreatePermissionRequestObject.java | 2 +- .../EditPermissionRequestObject.java | 2 +- .../dtos/permissions/PermissionCleanDto.java | 2 +- .../dtos/permissions/PermissionDto.java | 6 +- .../dtos/roles/CreateRoleRequestObject.java | 2 +- .../dtos/roles/EditRoleRequestObject.java | 2 +- .../kwetter}/dtos/roles/RoleCleanDto.java | 2 +- .../kwetter}/dtos/roles/RoleDto.java | 4 +- .../dtos/tweets/CreateTweetRequestObject.java | 2 +- .../dtos/tweets/EditTweetRequestObject.java | 2 +- .../dtos/tweets/LikeRequestObject.java | 2 +- .../kwetter}/dtos/tweets/TweetCleanDto.java | 4 +- .../kwetter}/dtos/tweets/TweetDto.java | 4 +- .../dtos/users/CreateUserRequestObject.java | 2 +- .../dtos/users/EditUserRequestObject.java | 2 +- .../dtos/users/FollowRequestObject.java | 2 +- .../dtos/users/LoginRequestObject.java | 2 +- .../dtos/users/RoleRequestObject.java | 2 +- .../kwetter}/dtos/users/TokenDto.java | 4 +- .../kwetter}/dtos/users/UserCleanDto.java | 4 +- .../kwetter}/dtos/users/UserDto.java | 6 +- .../exceptions/ActionForbiddenException.java | 2 +- .../exceptions/CreationFailedException.java | 2 +- .../exceptions/InvalidContentException.java | 2 +- .../exceptions/NameNotUniqueException.java | 2 +- .../exceptions/NotFoundException.java | 2 +- .../collection/PermissionServiceCollImpl.java | 8 +- .../collection/RoleServiceCollImpl.java | 10 +- .../collection/TweetServiceCollImpl.java | 12 +- .../collection/UserServiceCollImpl.java | 10 +- .../kwetter}/repository/interfaces/JPA.java | 2 +- .../interfaces/PermissionRepository.java | 6 +- .../repository/interfaces/RoleRepository.java | 8 +- .../interfaces/TweetRepository.java | 6 +- .../repository/interfaces/UserRepository.java | 6 +- .../jpa/PermissionServiceJPAImpl.java | 10 +- .../repository/jpa/RoleServiceJPAImpl.java | 10 +- .../repository/jpa/TweetServiceJPAImpl.java | 10 +- .../repository/jpa/UserServiceJPAImpl.java | 10 +- .../kwetter}/responses/HttpStatusCodes.java | 2 +- .../kwetter}/responses/JaxResponse.java | 2 +- .../kwetter}/responses/ObjectResponse.java | 2 +- .../kwetter}/service/PermissionService.java | 12 +- .../kwetter}/service/RoleService.java | 18 +- .../kwetter}/service/TweetService.java | 18 +- .../kwetter}/service/UserService.java | 20 +- .../kwetter}/utils/CorsFilter.java | 2 +- .../kwetter}/utils/DetailMessage.java | 2 +- .../kwetter/utils/EmailUtil.java | 28 + .../nscharrenberg/kwetter}/utils/Util.java | 2 +- .../kwetter}/domain/TweetTest.java | 2 +- .../kwetter}/domain/UserTest.java | 2 +- .../kwetter/integration/PermissionTest.java | 57 + .../service/PermissionServiceTest.java | 10 +- .../kwetter}/service/RoleServiceTest.java | 20 +- .../kwetter}/service/TweetServiceTest.java | 16 +- .../kwetter/service/UserServiceTest.java | 1499 +++++++++++++++++ .../KwetterTest.java | 2 +- .../RestConnectionTest.java | 2 +- src/main/test/cucumber/RunCucumberTest.java | 13 + .../container/WorldContainer.java | 2 +- .../feature/GetPermission.feature | 0 .../feature/GetRole.feature | 0 .../feature/GetTweet.feature | 0 .../feature/GetUser.feature | 0 .../steps/GetPermissionStepDef.java | 5 +- .../steps/GetRoleStepDef.java | 4 +- .../steps/GetTweetStepDef.java | 4 +- .../steps/GetUserStepDef.java | 4 +- .../steps/OperationStepDef.java | 6 +- .../test/integration/RunCucumberTest.java | 13 - src/main/test/service/UserServiceTest.java | 1499 ----------------- src/main/webapp/WEB-INF/web.xml | 1 - target/kwetter/WEB-INF/web.xml | 107 ++ .../compile/default-compile/createdFiles.lst | 76 + .../compile/default-compile/inputFiles.lst | 74 + 108 files changed, 2526 insertions(+), 1956 deletions(-) create mode 100644 Kwetter.iml delete mode 100644 src/main/java/beans/LoginBean.java rename src/main/java/{ => com/nscharrenberg/kwetter}/StartUp.java (86%) rename src/main/java/{ => com/nscharrenberg/kwetter}/authentication/AuthenticationProvider.java (87%) rename src/main/java/{ => com/nscharrenberg/kwetter}/authentication/PasswordAuthentication.java (93%) rename src/main/java/{ => com/nscharrenberg/kwetter}/authentication/PermissionEnum.java (93%) rename src/main/java/{ => com/nscharrenberg/kwetter}/authentication/ServletIdentityStore.java (83%) rename src/main/java/{ => com/nscharrenberg/kwetter}/authentication/TokenProvider.java (95%) rename src/main/java/{ => com/nscharrenberg/kwetter}/beans/ChangeRoleBean.java (88%) rename src/main/java/{ => com/nscharrenberg/kwetter}/beans/GeocodeView.java (97%) rename src/main/java/{ => com/nscharrenberg/kwetter}/beans/LanguageBean.java (95%) rename src/main/java/{ => com/nscharrenberg/kwetter}/beans/LogonBean.java (71%) rename src/main/java/{ => com/nscharrenberg/kwetter}/beans/PermissionAttachBean.java (90%) rename src/main/java/{ => com/nscharrenberg/kwetter}/beans/PermissionBean.java (86%) rename src/main/java/{ => com/nscharrenberg/kwetter}/beans/PermissionDetachBean.java (89%) rename src/main/java/{ => com/nscharrenberg/kwetter}/beans/RoleBean.java (88%) rename src/main/java/{ => com/nscharrenberg/kwetter}/beans/TweetBean.java (86%) rename src/main/java/{ => com/nscharrenberg/kwetter}/beans/UserBean.java (91%) rename src/main/java/{ => com/nscharrenberg/kwetter}/controllers/AuthenticationController.java (88%) rename src/main/java/{ => com/nscharrenberg/kwetter}/controllers/RestConfig.java (75%) rename src/main/java/{ => com/nscharrenberg/kwetter}/controllers/TweetController.java (94%) rename src/main/java/{ => com/nscharrenberg/kwetter}/controllers/UserController.java (93%) rename src/main/java/{ => com/nscharrenberg/kwetter}/domain/Permission.java (98%) rename src/main/java/{ => com/nscharrenberg/kwetter}/domain/Role.java (98%) rename src/main/java/{ => com/nscharrenberg/kwetter}/domain/Tweet.java (98%) rename src/main/java/{ => com/nscharrenberg/kwetter}/domain/User.java (99%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/permissions/CreatePermissionRequestObject.java (79%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/permissions/EditPermissionRequestObject.java (86%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/permissions/PermissionCleanDto.java (87%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/permissions/PermissionDto.java (77%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/roles/CreateRoleRequestObject.java (81%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/roles/EditRoleRequestObject.java (88%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/roles/RoleCleanDto.java (87%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/roles/RoleDto.java (83%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/tweets/CreateTweetRequestObject.java (89%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/tweets/EditTweetRequestObject.java (92%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/tweets/LikeRequestObject.java (89%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/tweets/TweetCleanDto.java (61%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/tweets/TweetDto.java (91%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/users/CreateUserRequestObject.java (97%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/users/EditUserRequestObject.java (97%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/users/FollowRequestObject.java (90%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/users/LoginRequestObject.java (89%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/users/RoleRequestObject.java (89%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/users/TokenDto.java (79%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/users/UserCleanDto.java (94%) rename src/main/java/{ => com/nscharrenberg/kwetter}/dtos/users/UserDto.java (94%) rename src/main/java/{ => com/nscharrenberg/kwetter}/exceptions/ActionForbiddenException.java (91%) rename src/main/java/{ => com/nscharrenberg/kwetter}/exceptions/CreationFailedException.java (91%) rename src/main/java/{ => com/nscharrenberg/kwetter}/exceptions/InvalidContentException.java (91%) rename src/main/java/{ => com/nscharrenberg/kwetter}/exceptions/NameNotUniqueException.java (91%) rename src/main/java/{ => com/nscharrenberg/kwetter}/exceptions/NotFoundException.java (91%) rename src/main/java/{ => com/nscharrenberg/kwetter}/repository/collection/PermissionServiceCollImpl.java (84%) rename src/main/java/{ => com/nscharrenberg/kwetter}/repository/collection/RoleServiceCollImpl.java (83%) rename src/main/java/{ => com/nscharrenberg/kwetter}/repository/collection/TweetServiceCollImpl.java (87%) rename src/main/java/{ => com/nscharrenberg/kwetter}/repository/collection/UserServiceCollImpl.java (87%) rename src/main/java/{ => com/nscharrenberg/kwetter}/repository/interfaces/JPA.java (84%) rename src/main/java/{ => com/nscharrenberg/kwetter}/repository/interfaces/PermissionRepository.java (63%) rename src/main/java/{ => com/nscharrenberg/kwetter}/repository/interfaces/RoleRepository.java (61%) rename src/main/java/{ => com/nscharrenberg/kwetter}/repository/interfaces/TweetRepository.java (83%) rename src/main/java/{ => com/nscharrenberg/kwetter}/repository/interfaces/UserRepository.java (75%) rename src/main/java/{ => com/nscharrenberg/kwetter}/repository/jpa/PermissionServiceJPAImpl.java (87%) rename src/main/java/{ => com/nscharrenberg/kwetter}/repository/jpa/RoleServiceJPAImpl.java (90%) rename src/main/java/{ => com/nscharrenberg/kwetter}/repository/jpa/TweetServiceJPAImpl.java (95%) rename src/main/java/{ => com/nscharrenberg/kwetter}/repository/jpa/UserServiceJPAImpl.java (92%) rename src/main/java/{ => com/nscharrenberg/kwetter}/responses/HttpStatusCodes.java (97%) rename src/main/java/{ => com/nscharrenberg/kwetter}/responses/JaxResponse.java (92%) rename src/main/java/{ => com/nscharrenberg/kwetter}/responses/ObjectResponse.java (94%) rename src/main/java/{ => com/nscharrenberg/kwetter}/service/PermissionService.java (93%) rename src/main/java/{ => com/nscharrenberg/kwetter}/service/RoleService.java (94%) rename src/main/java/{ => com/nscharrenberg/kwetter}/service/TweetService.java (97%) rename src/main/java/{ => com/nscharrenberg/kwetter}/service/UserService.java (96%) rename src/main/java/{ => com/nscharrenberg/kwetter}/utils/CorsFilter.java (97%) rename src/main/java/{ => com/nscharrenberg/kwetter}/utils/DetailMessage.java (93%) create mode 100644 src/main/java/com/nscharrenberg/kwetter/utils/EmailUtil.java rename src/main/java/{ => com/nscharrenberg/kwetter}/utils/Util.java (94%) rename src/main/test/{ => com/nscharrenberg/kwetter}/domain/TweetTest.java (98%) rename src/main/test/{ => com/nscharrenberg/kwetter}/domain/UserTest.java (98%) create mode 100644 src/main/test/com/nscharrenberg/kwetter/integration/PermissionTest.java rename src/main/test/{ => com/nscharrenberg/kwetter}/service/PermissionServiceTest.java (97%) rename src/main/test/{ => com/nscharrenberg/kwetter}/service/RoleServiceTest.java (97%) rename src/main/test/{ => com/nscharrenberg/kwetter}/service/TweetServiceTest.java (98%) create mode 100644 src/main/test/com/nscharrenberg/kwetter/service/UserServiceTest.java rename src/main/test/{integration => cucumber}/KwetterTest.java (93%) rename src/main/test/{integration => cucumber}/RestConnectionTest.java (94%) create mode 100644 src/main/test/cucumber/RunCucumberTest.java rename src/main/test/{integration => cucumber}/container/WorldContainer.java (91%) rename src/main/test/{integration => cucumber}/feature/GetPermission.feature (100%) rename src/main/test/{integration => cucumber}/feature/GetRole.feature (100%) rename src/main/test/{integration => cucumber}/feature/GetTweet.feature (100%) rename src/main/test/{integration => cucumber}/feature/GetUser.feature (100%) rename src/main/test/{integration => cucumber}/steps/GetPermissionStepDef.java (93%) rename src/main/test/{integration => cucumber}/steps/GetRoleStepDef.java (95%) rename src/main/test/{integration => cucumber}/steps/GetTweetStepDef.java (96%) rename src/main/test/{integration => cucumber}/steps/GetUserStepDef.java (95%) rename src/main/test/{integration => cucumber}/steps/OperationStepDef.java (92%) delete mode 100644 src/main/test/integration/RunCucumberTest.java delete mode 100644 src/main/test/service/UserServiceTest.java create mode 100644 target/kwetter/WEB-INF/web.xml create mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst diff --git a/.gitignore b/.gitignore index f230709..3ef0888 100644 --- a/.gitignore +++ b/.gitignore @@ -201,4 +201,19 @@ hs_err_pid* # End of https://www.gitignore.io/api/java,angular,webstorm+all,intellij+all -/angular/src/app/_helpers/api-constants.ts \ No newline at end of file +/angular/src/app/_helpers/api-constants.ts +target/kwetter/WEB-INF/web\.xml + +target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles\.lst + +target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles\.lst + +target/test-classes/cucumber/feature/GetPermission\.feature + +target/test-classes/cucumber/feature/GetRole\.feature + +target/test-classes/cucumber/feature/GetTweet\.feature + +target/test-classes/cucumber/feature/GetUser\.feature + +target/failsafe-reports/failsafe-summary\.xml diff --git a/.travis.yml b/.travis.yml index 364646f..7798fc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ jdk: oraclejdk8 deploy: provider: pages skip-cleanup: true - github-token: $GITHUB_TOKEN # Set in the settings page of your repository, as a secure variable + github-token: $GITHUB_TOKEN # Set in the settings page of your com.nscharrenberg.kwetter.repository, as a secure variable keep-history: true on: branch: master diff --git a/Kwetter.iml b/Kwetter.iml new file mode 100644 index 0000000..8efa959 --- /dev/null +++ b/Kwetter.iml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/angular/src/app/pages/home/home.component.ts b/angular/src/app/pages/home/home.component.ts index a47e005..5f0ec17 100644 --- a/angular/src/app/pages/home/home.component.ts +++ b/angular/src/app/pages/home/home.component.ts @@ -39,10 +39,10 @@ export class HomeComponent implements OnInit { (results: google.maps.GeocoderResult[]) => { this.address = results[0].formatted_address; }) - .then(() => console.log('Geocoding service: completed.')) + .then(() => console.log('Geocoding com.nscharrenberg.kwetter.service: completed.')) .catch((error: google.maps.GeocoderStatus) => { if (error === google.maps.GeocoderStatus.ZERO_RESULTS) { - console.log('Geocoding service: geocoder failed due to: ' + error); + console.log('Geocoding com.nscharrenberg.kwetter.service: geocoder failed due to: ' + error); } }); @@ -72,7 +72,7 @@ export class HomeComponent implements OnInit { observer.next(results); observer.complete(); } else { - console.log('Geocoding service: geocoder failed due to: ' + status); + console.log('Geocoding com.nscharrenberg.kwetter.service: geocoder failed due to: ' + status); observer.error(status); } }) diff --git a/angular/src/app/pages/profile/profile.component.ts b/angular/src/app/pages/profile/profile.component.ts index 71520bb..4156758 100644 --- a/angular/src/app/pages/profile/profile.component.ts +++ b/angular/src/app/pages/profile/profile.component.ts @@ -142,10 +142,10 @@ export class ProfileComponent implements OnInit { this.registerForm.controls["address"].setValue(this.address); }) - .then(() => console.log('Geocoding service: completed.')) + .then(() => console.log('Geocoding com.nscharrenberg.kwetter.service: completed.')) .catch((error: google.maps.GeocoderStatus) => { if (error === google.maps.GeocoderStatus.ZERO_RESULTS) { - console.log('Geocoding service: geocoder failed due to: ' + error); + console.log('Geocoding com.nscharrenberg.kwetter.service: geocoder failed due to: ' + error); } }); } @@ -159,7 +159,7 @@ export class ProfileComponent implements OnInit { observer.next(results); observer.complete(); } else { - console.log('Geocoding service: geocoder failed due to: ' + status); + console.log('Geocoding com.nscharrenberg.kwetter.service: geocoder failed due to: ' + status); observer.error(status); } }) diff --git a/angular/src/app/pages/user/user.component.ts b/angular/src/app/pages/user/user.component.ts index 4cafc6d..1a8443c 100644 --- a/angular/src/app/pages/user/user.component.ts +++ b/angular/src/app/pages/user/user.component.ts @@ -54,10 +54,10 @@ export class UserComponent implements OnInit { (results: google.maps.GeocoderResult[]) => { this.address = results[0].formatted_address; }) - .then(() => console.log('Geocoding service: completed.')) + .then(() => console.log('Geocoding com.nscharrenberg.kwetter.service: completed.')) .catch((error: google.maps.GeocoderStatus) => { if (error === google.maps.GeocoderStatus.ZERO_RESULTS) { - console.log('Geocoding service: geocoder failed due to: ' + error); + console.log('Geocoding com.nscharrenberg.kwetter.service: geocoder failed due to: ' + error); } }); }); @@ -73,7 +73,7 @@ export class UserComponent implements OnInit { observer.next(results); observer.complete(); } else { - console.log('Geocoding service: geocoder failed due to: ' + status); + console.log('Geocoding com.nscharrenberg.kwetter.service: geocoder failed due to: ' + status); observer.error(status); } }) diff --git a/pom.xml b/pom.xml index 2937b02..038c67f 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,20 @@ UTF-8 1.8 1.8 + 1.1.15.Final - + + + + + org.jboss.arquillian + arquillian-bom + ${version.org.jboss.arquillian} + pom + import + + + javax @@ -36,6 +48,11 @@ javax.security.enterprise 1.0 + + javax.mail + mail + 1.5.0-b01 + org.eclipse.persistence eclipselink @@ -156,50 +173,86 @@ gson 2.8.5 + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-impl-maven + test + + + org.jboss.arquillian.junit + arquillian-junit-container + test + + + org.slf4j + slf4j-simple + 1.6.4 + test + + + com.github.tomakehurst + wiremock-standalone + 2.12.0 + test + + + com.jayway.restassured + rest-assured + 2.9.0 + test + + + fish.payara.arquillian + arquillian-payara-server-4-embedded + 1.0.Beta2 + test + kwetter + true src/main/resources - - - - maven-clean-plugin - 3.1.0 - - - - maven-resources-plugin - 3.0.2 - - - maven-compiler-plugin - 3.8.0 - - - maven-surefire-plugin - 2.22.1 - - - maven-war-plugin - 3.2.2 - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 2.8.2 - - - + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + + org.apache.maven.plugins + maven-war-plugin + 3.2.0 + + false + + + + + + + + + + + + + + + + + + + + + maven-surefire-plugin + 2.22.1 + org.apache.maven.plugins @@ -212,6 +265,52 @@ + + org.apache.maven.plugins + maven-failsafe-plugin + 2.20.1 + + + + integration-test + verify + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/beans/LoginBean.java b/src/main/java/beans/LoginBean.java deleted file mode 100644 index d74a4dd..0000000 --- a/src/main/java/beans/LoginBean.java +++ /dev/null @@ -1,84 +0,0 @@ -package beans; - -import domain.User; -import org.omnifaces.util.Faces; -import org.omnifaces.util.Messages; -import responses.ObjectResponse; -import service.UserService; - -import javax.annotation.PostConstruct; -import org.omnifaces.cdi.ViewScoped; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.inject.Inject; -import javax.inject.Named; -import javax.servlet.http.HttpServletRequest; -import java.io.Serializable; - -@Named -@ViewScoped -public class LoginBean implements Serializable { - private String username; - private String password; - - @Inject - private UserService userService; - - @PostConstruct - public void init() { - Faces.getExternalContext().getSession(true); - } - - public void login() { - try { - ObjectResponse response = userService.login(this.username, this.password); - - if(response.getObject() == null) { - Messages.create("Invalid Login").error().detail("User with the given credentials not found").add(); - return; - } - - Faces.login(this.username, this.password); - User user = response.getObject(); - - ObjectResponse isAdminResponse = userService.isAdmin(user); - - if(isAdminResponse.getObject() == null || !isAdminResponse.getObject()) { - Messages.create("Access Denied").error().detail("You do not have permission to access this system").add(); - return; - } - - Faces.getSessionMap().put("user", response.getObject()); - Faces.redirect("admin/index.xhtml"); - } catch(Exception e) { - e.printStackTrace(); - Messages.create(String.format("Error - %s", e.getMessage())).error().detail(e.getMessage()).add(); - } - } - - public void logout() { - try { - Faces.logout(); - Faces.redirect("/login.xhtml"); - } catch(Exception e) { - e.printStackTrace(); - Messages.create("Error").error().detail(e.getMessage()).add(); - } - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } -} diff --git a/src/main/java/StartUp.java b/src/main/java/com/nscharrenberg/kwetter/StartUp.java similarity index 86% rename from src/main/java/StartUp.java rename to src/main/java/com/nscharrenberg/kwetter/StartUp.java index db1bd76..3feef1e 100644 --- a/src/main/java/StartUp.java +++ b/src/main/java/com/nscharrenberg/kwetter/StartUp.java @@ -1,16 +1,18 @@ -import domain.Permission; -import domain.Role; -import domain.Tweet; -import domain.User; -import exceptions.CreationFailedException; -import exceptions.InvalidContentException; -import exceptions.NameNotUniqueException; -import exceptions.NotFoundException; -import responses.ObjectResponse; -import service.PermissionService; -import service.RoleService; -import service.TweetService; -import service.UserService; +package com.nscharrenberg.kwetter; + +import com.nscharrenberg.kwetter.domain.Permission; +import com.nscharrenberg.kwetter.domain.Role; +import com.nscharrenberg.kwetter.domain.Tweet; +import com.nscharrenberg.kwetter.domain.User; +import com.nscharrenberg.kwetter.exceptions.CreationFailedException; +import com.nscharrenberg.kwetter.exceptions.InvalidContentException; +import com.nscharrenberg.kwetter.exceptions.NameNotUniqueException; +import com.nscharrenberg.kwetter.exceptions.NotFoundException; +import com.nscharrenberg.kwetter.responses.ObjectResponse; +import com.nscharrenberg.kwetter.service.PermissionService; +import com.nscharrenberg.kwetter.service.RoleService; +import com.nscharrenberg.kwetter.service.TweetService; +import com.nscharrenberg.kwetter.service.UserService; import javax.annotation.PostConstruct; import javax.ejb.Singleton; diff --git a/src/main/java/authentication/AuthenticationProvider.java b/src/main/java/com/nscharrenberg/kwetter/authentication/AuthenticationProvider.java similarity index 87% rename from src/main/java/authentication/AuthenticationProvider.java rename to src/main/java/com/nscharrenberg/kwetter/authentication/AuthenticationProvider.java index 9f87ee3..eeaf4d6 100644 --- a/src/main/java/authentication/AuthenticationProvider.java +++ b/src/main/java/com/nscharrenberg/kwetter/authentication/AuthenticationProvider.java @@ -1,10 +1,10 @@ -package authentication; +package com.nscharrenberg.kwetter.authentication; -import domain.User; +import com.nscharrenberg.kwetter.domain.User; import io.jsonwebtoken.Claims; -import responses.HttpStatusCodes; -import responses.ObjectResponse; -import service.UserService; +import com.nscharrenberg.kwetter.responses.HttpStatusCodes; +import com.nscharrenberg.kwetter.responses.ObjectResponse; +import com.nscharrenberg.kwetter.service.UserService; import javax.ejb.Stateless; import javax.inject.Inject; diff --git a/src/main/java/authentication/PasswordAuthentication.java b/src/main/java/com/nscharrenberg/kwetter/authentication/PasswordAuthentication.java similarity index 93% rename from src/main/java/authentication/PasswordAuthentication.java rename to src/main/java/com/nscharrenberg/kwetter/authentication/PasswordAuthentication.java index 34808b5..1f1a08e 100644 --- a/src/main/java/authentication/PasswordAuthentication.java +++ b/src/main/java/com/nscharrenberg/kwetter/authentication/PasswordAuthentication.java @@ -1,4 +1,4 @@ -package authentication; +package com.nscharrenberg.kwetter.authentication; import com.google.common.hash.Hashing; import org.mindrot.jbcrypt.BCrypt; diff --git a/src/main/java/authentication/PermissionEnum.java b/src/main/java/com/nscharrenberg/kwetter/authentication/PermissionEnum.java similarity index 93% rename from src/main/java/authentication/PermissionEnum.java rename to src/main/java/com/nscharrenberg/kwetter/authentication/PermissionEnum.java index c6f8583..edf6692 100644 --- a/src/main/java/authentication/PermissionEnum.java +++ b/src/main/java/com/nscharrenberg/kwetter/authentication/PermissionEnum.java @@ -1,4 +1,4 @@ -package authentication; +package com.nscharrenberg.kwetter.authentication; public enum PermissionEnum { READ_ROLES("read_roles"), diff --git a/src/main/java/authentication/ServletIdentityStore.java b/src/main/java/com/nscharrenberg/kwetter/authentication/ServletIdentityStore.java similarity index 83% rename from src/main/java/authentication/ServletIdentityStore.java rename to src/main/java/com/nscharrenberg/kwetter/authentication/ServletIdentityStore.java index c19ca43..27662fc 100644 --- a/src/main/java/authentication/ServletIdentityStore.java +++ b/src/main/java/com/nscharrenberg/kwetter/authentication/ServletIdentityStore.java @@ -1,8 +1,8 @@ -package authentication; +package com.nscharrenberg.kwetter.authentication; -import domain.User; -import responses.ObjectResponse; -import service.UserService; +import com.nscharrenberg.kwetter.domain.User; +import com.nscharrenberg.kwetter.responses.ObjectResponse; +import com.nscharrenberg.kwetter.service.UserService; import javax.inject.Inject; import javax.security.enterprise.credential.Credential; diff --git a/src/main/java/authentication/TokenProvider.java b/src/main/java/com/nscharrenberg/kwetter/authentication/TokenProvider.java similarity index 95% rename from src/main/java/authentication/TokenProvider.java rename to src/main/java/com/nscharrenberg/kwetter/authentication/TokenProvider.java index b6000bb..36fe260 100644 --- a/src/main/java/authentication/TokenProvider.java +++ b/src/main/java/com/nscharrenberg/kwetter/authentication/TokenProvider.java @@ -1,12 +1,12 @@ -package authentication; +package com.nscharrenberg.kwetter.authentication; import io.jsonwebtoken.Claims; import io.jsonwebtoken.JwtBuilder; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; -import responses.HttpStatusCodes; -import responses.ObjectResponse; +import com.nscharrenberg.kwetter.responses.HttpStatusCodes; +import com.nscharrenberg.kwetter.responses.ObjectResponse; import javax.crypto.spec.SecretKeySpec; import javax.xml.bind.DatatypeConverter; diff --git a/src/main/java/beans/ChangeRoleBean.java b/src/main/java/com/nscharrenberg/kwetter/beans/ChangeRoleBean.java similarity index 88% rename from src/main/java/beans/ChangeRoleBean.java rename to src/main/java/com/nscharrenberg/kwetter/beans/ChangeRoleBean.java index 7f8a714..4f87e43 100644 --- a/src/main/java/beans/ChangeRoleBean.java +++ b/src/main/java/com/nscharrenberg/kwetter/beans/ChangeRoleBean.java @@ -1,11 +1,11 @@ -package beans; +package com.nscharrenberg.kwetter.beans; -import domain.Role; -import domain.User; +import com.nscharrenberg.kwetter.domain.Role; +import com.nscharrenberg.kwetter.domain.User; import org.omnifaces.util.Messages; -import responses.ObjectResponse; -import service.RoleService; -import service.UserService; +import com.nscharrenberg.kwetter.responses.ObjectResponse; +import com.nscharrenberg.kwetter.service.RoleService; +import com.nscharrenberg.kwetter.service.UserService; import javax.annotation.PostConstruct; import javax.faces.view.ViewScoped; diff --git a/src/main/java/beans/GeocodeView.java b/src/main/java/com/nscharrenberg/kwetter/beans/GeocodeView.java similarity index 97% rename from src/main/java/beans/GeocodeView.java rename to src/main/java/com/nscharrenberg/kwetter/beans/GeocodeView.java index 50da8ba..2b1b376 100644 --- a/src/main/java/beans/GeocodeView.java +++ b/src/main/java/com/nscharrenberg/kwetter/beans/GeocodeView.java @@ -1,4 +1,4 @@ -package beans; +package com.nscharrenberg.kwetter.beans; import org.primefaces.event.map.GeocodeEvent; import org.primefaces.event.map.ReverseGeocodeEvent; diff --git a/src/main/java/beans/LanguageBean.java b/src/main/java/com/nscharrenberg/kwetter/beans/LanguageBean.java similarity index 95% rename from src/main/java/beans/LanguageBean.java rename to src/main/java/com/nscharrenberg/kwetter/beans/LanguageBean.java index 66907dc..0a11239 100644 --- a/src/main/java/beans/LanguageBean.java +++ b/src/main/java/com/nscharrenberg/kwetter/beans/LanguageBean.java @@ -1,4 +1,4 @@ -package beans; +package com.nscharrenberg.kwetter.beans; import sun.util.locale.BaseLocale; diff --git a/src/main/java/beans/LogonBean.java b/src/main/java/com/nscharrenberg/kwetter/beans/LogonBean.java similarity index 71% rename from src/main/java/beans/LogonBean.java rename to src/main/java/com/nscharrenberg/kwetter/beans/LogonBean.java index 82bb178..e6f6781 100644 --- a/src/main/java/beans/LogonBean.java +++ b/src/main/java/com/nscharrenberg/kwetter/beans/LogonBean.java @@ -1,13 +1,15 @@ -package beans; +package com.nscharrenberg.kwetter.beans; import com.github.adminfaces.template.config.AdminConfig; import com.github.adminfaces.template.session.AdminSession; -import domain.User; +import com.nscharrenberg.kwetter.domain.User; import org.omnifaces.util.Faces; import org.omnifaces.util.Messages; -import responses.ObjectResponse; -import service.UserService; +import com.nscharrenberg.kwetter.responses.ObjectResponse; +import com.nscharrenberg.kwetter.service.UserService; +import com.nscharrenberg.kwetter.utils.EmailUtil; +import javax.annotation.Resource; import javax.enterprise.context.SessionScoped; import javax.enterprise.inject.Specializes; import javax.faces.application.FacesMessage; @@ -15,6 +17,12 @@ import javax.faces.context.FacesContext; import javax.inject.Inject; import javax.inject.Named; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeMessage; import javax.security.enterprise.AuthenticationStatus; import javax.security.enterprise.SecurityContext; import javax.security.enterprise.authentication.mechanism.http.AuthenticationParameters; @@ -26,7 +34,7 @@ import java.io.Serializable; import java.security.Principal; -import static utils.DetailMessage.addDetailMessage; +import static com.nscharrenberg.kwetter.utils.DetailMessage.addDetailMessage; @Named @SessionScoped @@ -47,12 +55,19 @@ public class LogonBean extends AdminSession implements Serializable { @Inject private UserService userService; + @Resource(name = "java/mail/kwetter") + private Session mailSession; + private String username; private String password; private boolean remember; - public void login() throws IOException { - + public void login() throws IOException, MessagingException { + if(continueAuthentication() == null) { + Messages.addError(null, "Login failed"); + externalContext.getFlash().setKeepMessages(true); + return; + } switch (continueAuthentication()) { case SEND_CONTINUE: @@ -63,6 +78,7 @@ public void login() throws IOException { externalContext.getFlash().setKeepMessages(true); break; case SUCCESS: +// send(); externalContext.getFlash().setKeepMessages(true); addDetailMessage(String.format("Logged in successfully as %s ", username)); Faces.redirect("admin/index.xhtml"); @@ -72,36 +88,6 @@ public void login() throws IOException { } } -// public void login() throws IOException { -// if(Faces.getRequest().getUserPrincipal() != null) { -// facesContext.responseComplete(); -// return; -// } -// -// try { -// Faces.login(username, password); -// } catch (ServletException e) { -// e.printStackTrace(); -// Messages.addError(null, e.getMessage()); -// externalContext.getFlash().setKeepMessages(true); -// Faces.redirect("login.xhtml"); -// return; -// } -// -// Principal principal = Faces.getRequest().getUserPrincipal(); -// ObjectResponse userByUsernameResponse = userService.getByUsername(principal.getName()); -// -// if(userByUsernameResponse.getCode() != 200) { -// Messages.addError(null, "USER NOT FOUND IN LOGIN"); -// externalContext.getFlash().setKeepMessages(true); -// return; -// } -// -// externalContext.getFlash().setKeepMessages(true); -// addDetailMessage(String.format("Logged in successfully as %s ", username)); -// Faces.redirect("admin/index.xhtml"); -// } - public void logout() throws ServletException, IOException { Faces.logout(); Faces.redirect("/login.xhtml"); @@ -162,5 +148,21 @@ public String getCurrentUser() { } } + public void send() { + mailSession.setDebug(true); + Message message = new MimeMessage(mailSession); + + try { + System.out.println("Send Start"); + message.setSubject("Welcome"); + message.setRecipient(Message.RecipientType.TO, new InternetAddress("nscharrenberg@hotmail.com")); + message.setText("Example Message"); + Transport.send(message); + } catch (MessagingException | NoClassDefFoundError e) { + e.printStackTrace(); + } + + System.out.println("Send Finished"); + } } diff --git a/src/main/java/beans/PermissionAttachBean.java b/src/main/java/com/nscharrenberg/kwetter/beans/PermissionAttachBean.java similarity index 90% rename from src/main/java/beans/PermissionAttachBean.java rename to src/main/java/com/nscharrenberg/kwetter/beans/PermissionAttachBean.java index 3ce12f4..d95e9dc 100644 --- a/src/main/java/beans/PermissionAttachBean.java +++ b/src/main/java/com/nscharrenberg/kwetter/beans/PermissionAttachBean.java @@ -1,12 +1,12 @@ -package beans; +package com.nscharrenberg.kwetter.beans; -import domain.Permission; -import domain.Role; +import com.nscharrenberg.kwetter.domain.Permission; +import com.nscharrenberg.kwetter.domain.Role; import org.omnifaces.util.Faces; import org.omnifaces.util.Messages; -import responses.ObjectResponse; -import service.PermissionService; -import service.RoleService; +import com.nscharrenberg.kwetter.responses.ObjectResponse; +import com.nscharrenberg.kwetter.service.PermissionService; +import com.nscharrenberg.kwetter.service.RoleService; import javax.enterprise.context.RequestScoped; import javax.faces.context.FacesContext; diff --git a/src/main/java/beans/PermissionBean.java b/src/main/java/com/nscharrenberg/kwetter/beans/PermissionBean.java similarity index 86% rename from src/main/java/beans/PermissionBean.java rename to src/main/java/com/nscharrenberg/kwetter/beans/PermissionBean.java index bb9fd3d..d00032c 100644 --- a/src/main/java/beans/PermissionBean.java +++ b/src/main/java/com/nscharrenberg/kwetter/beans/PermissionBean.java @@ -1,8 +1,8 @@ -package beans; +package com.nscharrenberg.kwetter.beans; -import domain.Permission; -import responses.ObjectResponse; -import service.PermissionService; +import com.nscharrenberg.kwetter.domain.Permission; +import com.nscharrenberg.kwetter.responses.ObjectResponse; +import com.nscharrenberg.kwetter.service.PermissionService; import javax.annotation.PostConstruct; import javax.faces.view.ViewScoped; diff --git a/src/main/java/beans/PermissionDetachBean.java b/src/main/java/com/nscharrenberg/kwetter/beans/PermissionDetachBean.java similarity index 89% rename from src/main/java/beans/PermissionDetachBean.java rename to src/main/java/com/nscharrenberg/kwetter/beans/PermissionDetachBean.java index cf19fcb..240c4a5 100644 --- a/src/main/java/beans/PermissionDetachBean.java +++ b/src/main/java/com/nscharrenberg/kwetter/beans/PermissionDetachBean.java @@ -1,11 +1,11 @@ -package beans; +package com.nscharrenberg.kwetter.beans; -import domain.Permission; -import domain.Role; +import com.nscharrenberg.kwetter.domain.Permission; +import com.nscharrenberg.kwetter.domain.Role; import org.omnifaces.util.Messages; -import responses.ObjectResponse; -import service.PermissionService; -import service.RoleService; +import com.nscharrenberg.kwetter.responses.ObjectResponse; +import com.nscharrenberg.kwetter.service.PermissionService; +import com.nscharrenberg.kwetter.service.RoleService; import javax.faces.view.ViewScoped; import javax.inject.Inject; diff --git a/src/main/java/beans/RoleBean.java b/src/main/java/com/nscharrenberg/kwetter/beans/RoleBean.java similarity index 88% rename from src/main/java/beans/RoleBean.java rename to src/main/java/com/nscharrenberg/kwetter/beans/RoleBean.java index 5460282..5414eff 100644 --- a/src/main/java/beans/RoleBean.java +++ b/src/main/java/com/nscharrenberg/kwetter/beans/RoleBean.java @@ -1,12 +1,12 @@ -package beans; +package com.nscharrenberg.kwetter.beans; -import domain.Permission; -import domain.Role; +import com.nscharrenberg.kwetter.domain.Permission; +import com.nscharrenberg.kwetter.domain.Role; import org.omnifaces.util.Faces; import org.omnifaces.util.Messages; -import responses.ObjectResponse; -import service.PermissionService; -import service.RoleService; +import com.nscharrenberg.kwetter.responses.ObjectResponse; +import com.nscharrenberg.kwetter.service.PermissionService; +import com.nscharrenberg.kwetter.service.RoleService; import javax.annotation.PostConstruct; import javax.faces.application.FacesMessage; diff --git a/src/main/java/beans/TweetBean.java b/src/main/java/com/nscharrenberg/kwetter/beans/TweetBean.java similarity index 86% rename from src/main/java/beans/TweetBean.java rename to src/main/java/com/nscharrenberg/kwetter/beans/TweetBean.java index 96beedd..5466d47 100644 --- a/src/main/java/beans/TweetBean.java +++ b/src/main/java/com/nscharrenberg/kwetter/beans/TweetBean.java @@ -1,9 +1,9 @@ -package beans; +package com.nscharrenberg.kwetter.beans; -import domain.Tweet; -import responses.HttpStatusCodes; -import responses.ObjectResponse; -import service.TweetService; +import com.nscharrenberg.kwetter.domain.Tweet; +import com.nscharrenberg.kwetter.responses.HttpStatusCodes; +import com.nscharrenberg.kwetter.responses.ObjectResponse; +import com.nscharrenberg.kwetter.service.TweetService; import javax.annotation.PostConstruct; import javax.faces.view.ViewScoped; diff --git a/src/main/java/beans/UserBean.java b/src/main/java/com/nscharrenberg/kwetter/beans/UserBean.java similarity index 91% rename from src/main/java/beans/UserBean.java rename to src/main/java/com/nscharrenberg/kwetter/beans/UserBean.java index 09fcd7a..0d54b5e 100644 --- a/src/main/java/beans/UserBean.java +++ b/src/main/java/com/nscharrenberg/kwetter/beans/UserBean.java @@ -1,10 +1,10 @@ -package beans; +package com.nscharrenberg.kwetter.beans; -import domain.User; +import com.nscharrenberg.kwetter.domain.User; import org.omnifaces.util.Faces; import org.omnifaces.util.Messages; -import responses.ObjectResponse; -import service.UserService; +import com.nscharrenberg.kwetter.responses.ObjectResponse; +import com.nscharrenberg.kwetter.service.UserService; import javax.annotation.PostConstruct; import javax.faces.view.ViewScoped; diff --git a/src/main/java/controllers/AuthenticationController.java b/src/main/java/com/nscharrenberg/kwetter/controllers/AuthenticationController.java similarity index 88% rename from src/main/java/controllers/AuthenticationController.java rename to src/main/java/com/nscharrenberg/kwetter/controllers/AuthenticationController.java index b6436dc..5a48f44 100644 --- a/src/main/java/controllers/AuthenticationController.java +++ b/src/main/java/com/nscharrenberg/kwetter/controllers/AuthenticationController.java @@ -1,13 +1,13 @@ -package controllers; +package com.nscharrenberg.kwetter.controllers; -import authentication.TokenProvider; -import domain.User; -import dtos.users.*; +import com.nscharrenberg.kwetter.authentication.TokenProvider; +import com.nscharrenberg.kwetter.domain.User; +import com.nscharrenberg.kwetter.dtos.users.*; import org.modelmapper.ModelMapper; -import responses.HttpStatusCodes; -import responses.JaxResponse; -import responses.ObjectResponse; -import service.UserService; +import com.nscharrenberg.kwetter.responses.HttpStatusCodes; +import com.nscharrenberg.kwetter.responses.JaxResponse; +import com.nscharrenberg.kwetter.responses.ObjectResponse; +import com.nscharrenberg.kwetter.service.UserService; import javax.ejb.Stateless; import javax.inject.Inject; import javax.security.enterprise.SecurityContext; diff --git a/src/main/java/controllers/RestConfig.java b/src/main/java/com/nscharrenberg/kwetter/controllers/RestConfig.java similarity index 75% rename from src/main/java/controllers/RestConfig.java rename to src/main/java/com/nscharrenberg/kwetter/controllers/RestConfig.java index 6d99635..a3650c0 100644 --- a/src/main/java/controllers/RestConfig.java +++ b/src/main/java/com/nscharrenberg/kwetter/controllers/RestConfig.java @@ -1,4 +1,4 @@ -package controllers; +package com.nscharrenberg.kwetter.controllers; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.Application; diff --git a/src/main/java/controllers/TweetController.java b/src/main/java/com/nscharrenberg/kwetter/controllers/TweetController.java similarity index 94% rename from src/main/java/controllers/TweetController.java rename to src/main/java/com/nscharrenberg/kwetter/controllers/TweetController.java index 875659d..84a8541 100644 --- a/src/main/java/controllers/TweetController.java +++ b/src/main/java/com/nscharrenberg/kwetter/controllers/TweetController.java @@ -1,19 +1,19 @@ -package controllers; - -import authentication.AuthenticationProvider; -import authentication.PermissionEnum; -import domain.Tweet; -import domain.User; -import dtos.tweets.CreateTweetRequestObject; -import dtos.tweets.EditTweetRequestObject; -import dtos.tweets.LikeRequestObject; -import dtos.tweets.TweetDto; +package com.nscharrenberg.kwetter.controllers; + +import com.nscharrenberg.kwetter.authentication.AuthenticationProvider; +import com.nscharrenberg.kwetter.authentication.PermissionEnum; +import com.nscharrenberg.kwetter.domain.Tweet; +import com.nscharrenberg.kwetter.domain.User; +import com.nscharrenberg.kwetter.dtos.tweets.CreateTweetRequestObject; +import com.nscharrenberg.kwetter.dtos.tweets.EditTweetRequestObject; +import com.nscharrenberg.kwetter.dtos.tweets.LikeRequestObject; +import com.nscharrenberg.kwetter.dtos.tweets.TweetDto; import org.modelmapper.ModelMapper; -import responses.HttpStatusCodes; -import responses.JaxResponse; -import responses.ObjectResponse; -import service.TweetService; -import service.UserService; +import com.nscharrenberg.kwetter.responses.HttpStatusCodes; +import com.nscharrenberg.kwetter.responses.JaxResponse; +import com.nscharrenberg.kwetter.responses.ObjectResponse; +import com.nscharrenberg.kwetter.service.TweetService; +import com.nscharrenberg.kwetter.service.UserService; import javax.ejb.Stateless; import javax.inject.Inject; diff --git a/src/main/java/controllers/UserController.java b/src/main/java/com/nscharrenberg/kwetter/controllers/UserController.java similarity index 93% rename from src/main/java/controllers/UserController.java rename to src/main/java/com/nscharrenberg/kwetter/controllers/UserController.java index 2807526..19827d1 100644 --- a/src/main/java/controllers/UserController.java +++ b/src/main/java/com/nscharrenberg/kwetter/controllers/UserController.java @@ -1,22 +1,22 @@ -package controllers; +package com.nscharrenberg.kwetter.controllers; -import authentication.AuthenticationProvider; -import authentication.PermissionEnum; +import com.nscharrenberg.kwetter.authentication.AuthenticationProvider; +import com.nscharrenberg.kwetter.authentication.PermissionEnum; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import domain.Role; -import domain.User; -import dtos.users.EditUserRequestObject; -import dtos.users.FollowRequestObject; -import dtos.users.RoleRequestObject; -import dtos.users.UserDto; +import com.nscharrenberg.kwetter.domain.Role; +import com.nscharrenberg.kwetter.domain.User; +import com.nscharrenberg.kwetter.dtos.users.EditUserRequestObject; +import com.nscharrenberg.kwetter.dtos.users.FollowRequestObject; +import com.nscharrenberg.kwetter.dtos.users.RoleRequestObject; +import com.nscharrenberg.kwetter.dtos.users.UserDto; import org.checkerframework.checker.nullness.qual.Nullable; import org.modelmapper.ModelMapper; -import responses.HttpStatusCodes; -import responses.JaxResponse; -import responses.ObjectResponse; -import service.RoleService; -import service.UserService; +import com.nscharrenberg.kwetter.responses.HttpStatusCodes; +import com.nscharrenberg.kwetter.responses.JaxResponse; +import com.nscharrenberg.kwetter.responses.ObjectResponse; +import com.nscharrenberg.kwetter.service.RoleService; +import com.nscharrenberg.kwetter.service.UserService; import javax.ejb.Stateless; import javax.inject.Inject; diff --git a/src/main/java/domain/Permission.java b/src/main/java/com/nscharrenberg/kwetter/domain/Permission.java similarity index 98% rename from src/main/java/domain/Permission.java rename to src/main/java/com/nscharrenberg/kwetter/domain/Permission.java index be6cd1a..51f2722 100644 --- a/src/main/java/domain/Permission.java +++ b/src/main/java/com/nscharrenberg/kwetter/domain/Permission.java @@ -1,4 +1,4 @@ -package domain; +package com.nscharrenberg.kwetter.domain; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/domain/Role.java b/src/main/java/com/nscharrenberg/kwetter/domain/Role.java similarity index 98% rename from src/main/java/domain/Role.java rename to src/main/java/com/nscharrenberg/kwetter/domain/Role.java index e0b2999..aee28eb 100644 --- a/src/main/java/domain/Role.java +++ b/src/main/java/com/nscharrenberg/kwetter/domain/Role.java @@ -1,4 +1,4 @@ -package domain; +package com.nscharrenberg.kwetter.domain; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/domain/Tweet.java b/src/main/java/com/nscharrenberg/kwetter/domain/Tweet.java similarity index 98% rename from src/main/java/domain/Tweet.java rename to src/main/java/com/nscharrenberg/kwetter/domain/Tweet.java index 271b841..0fbf0d8 100644 --- a/src/main/java/domain/Tweet.java +++ b/src/main/java/com/nscharrenberg/kwetter/domain/Tweet.java @@ -1,4 +1,4 @@ -package domain; +package com.nscharrenberg.kwetter.domain; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/domain/User.java b/src/main/java/com/nscharrenberg/kwetter/domain/User.java similarity index 99% rename from src/main/java/domain/User.java rename to src/main/java/com/nscharrenberg/kwetter/domain/User.java index 7bd1789..5eeaab0 100644 --- a/src/main/java/domain/User.java +++ b/src/main/java/com/nscharrenberg/kwetter/domain/User.java @@ -1,4 +1,4 @@ -package domain; +package com.nscharrenberg.kwetter.domain; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/dtos/permissions/CreatePermissionRequestObject.java b/src/main/java/com/nscharrenberg/kwetter/dtos/permissions/CreatePermissionRequestObject.java similarity index 79% rename from src/main/java/dtos/permissions/CreatePermissionRequestObject.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/permissions/CreatePermissionRequestObject.java index 1ff5d9d..f215c2a 100644 --- a/src/main/java/dtos/permissions/CreatePermissionRequestObject.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/permissions/CreatePermissionRequestObject.java @@ -1,4 +1,4 @@ -package dtos.permissions; +package com.nscharrenberg.kwetter.dtos.permissions; public class CreatePermissionRequestObject { private String name; diff --git a/src/main/java/dtos/permissions/EditPermissionRequestObject.java b/src/main/java/com/nscharrenberg/kwetter/dtos/permissions/EditPermissionRequestObject.java similarity index 86% rename from src/main/java/dtos/permissions/EditPermissionRequestObject.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/permissions/EditPermissionRequestObject.java index edf3038..0751c89 100644 --- a/src/main/java/dtos/permissions/EditPermissionRequestObject.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/permissions/EditPermissionRequestObject.java @@ -1,4 +1,4 @@ -package dtos.permissions; +package com.nscharrenberg.kwetter.dtos.permissions; public class EditPermissionRequestObject { private Integer id; diff --git a/src/main/java/dtos/permissions/PermissionCleanDto.java b/src/main/java/com/nscharrenberg/kwetter/dtos/permissions/PermissionCleanDto.java similarity index 87% rename from src/main/java/dtos/permissions/PermissionCleanDto.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/permissions/PermissionCleanDto.java index d6104ff..83685fc 100644 --- a/src/main/java/dtos/permissions/PermissionCleanDto.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/permissions/PermissionCleanDto.java @@ -1,4 +1,4 @@ -package dtos.permissions; +package com.nscharrenberg.kwetter.dtos.permissions; import java.util.Set; diff --git a/src/main/java/dtos/permissions/PermissionDto.java b/src/main/java/com/nscharrenberg/kwetter/dtos/permissions/PermissionDto.java similarity index 77% rename from src/main/java/dtos/permissions/PermissionDto.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/permissions/PermissionDto.java index 0a693e8..7851125 100644 --- a/src/main/java/dtos/permissions/PermissionDto.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/permissions/PermissionDto.java @@ -1,7 +1,7 @@ -package dtos.permissions; +package com.nscharrenberg.kwetter.dtos.permissions; -import domain.Role; -import dtos.roles.RoleCleanDto; +import com.nscharrenberg.kwetter.domain.Role; +import com.nscharrenberg.kwetter.dtos.roles.RoleCleanDto; import java.util.Set; diff --git a/src/main/java/dtos/roles/CreateRoleRequestObject.java b/src/main/java/com/nscharrenberg/kwetter/dtos/roles/CreateRoleRequestObject.java similarity index 81% rename from src/main/java/dtos/roles/CreateRoleRequestObject.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/roles/CreateRoleRequestObject.java index a629f17..34fe434 100644 --- a/src/main/java/dtos/roles/CreateRoleRequestObject.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/roles/CreateRoleRequestObject.java @@ -1,4 +1,4 @@ -package dtos.roles; +package com.nscharrenberg.kwetter.dtos.roles; public class CreateRoleRequestObject { private String name; diff --git a/src/main/java/dtos/roles/EditRoleRequestObject.java b/src/main/java/com/nscharrenberg/kwetter/dtos/roles/EditRoleRequestObject.java similarity index 88% rename from src/main/java/dtos/roles/EditRoleRequestObject.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/roles/EditRoleRequestObject.java index 0a70d16..4317e0f 100644 --- a/src/main/java/dtos/roles/EditRoleRequestObject.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/roles/EditRoleRequestObject.java @@ -1,4 +1,4 @@ -package dtos.roles; +package com.nscharrenberg.kwetter.dtos.roles; public class EditRoleRequestObject { private Integer id; diff --git a/src/main/java/dtos/roles/RoleCleanDto.java b/src/main/java/com/nscharrenberg/kwetter/dtos/roles/RoleCleanDto.java similarity index 87% rename from src/main/java/dtos/roles/RoleCleanDto.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/roles/RoleCleanDto.java index 831a3c7..a545e1f 100644 --- a/src/main/java/dtos/roles/RoleCleanDto.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/roles/RoleCleanDto.java @@ -1,4 +1,4 @@ -package dtos.roles; +package com.nscharrenberg.kwetter.dtos.roles; public class RoleCleanDto { private Integer id; diff --git a/src/main/java/dtos/roles/RoleDto.java b/src/main/java/com/nscharrenberg/kwetter/dtos/roles/RoleDto.java similarity index 83% rename from src/main/java/dtos/roles/RoleDto.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/roles/RoleDto.java index 2131150..87c2918 100644 --- a/src/main/java/dtos/roles/RoleDto.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/roles/RoleDto.java @@ -1,6 +1,6 @@ -package dtos.roles; +package com.nscharrenberg.kwetter.dtos.roles; -import dtos.permissions.PermissionCleanDto; +import com.nscharrenberg.kwetter.dtos.permissions.PermissionCleanDto; import java.util.Set; diff --git a/src/main/java/dtos/tweets/CreateTweetRequestObject.java b/src/main/java/com/nscharrenberg/kwetter/dtos/tweets/CreateTweetRequestObject.java similarity index 89% rename from src/main/java/dtos/tweets/CreateTweetRequestObject.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/tweets/CreateTweetRequestObject.java index 50def16..af53a86 100644 --- a/src/main/java/dtos/tweets/CreateTweetRequestObject.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/tweets/CreateTweetRequestObject.java @@ -1,4 +1,4 @@ -package dtos.tweets; +package com.nscharrenberg.kwetter.dtos.tweets; public class CreateTweetRequestObject { private String message = ""; diff --git a/src/main/java/dtos/tweets/EditTweetRequestObject.java b/src/main/java/com/nscharrenberg/kwetter/dtos/tweets/EditTweetRequestObject.java similarity index 92% rename from src/main/java/dtos/tweets/EditTweetRequestObject.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/tweets/EditTweetRequestObject.java index 166c309..d4bb1f3 100644 --- a/src/main/java/dtos/tweets/EditTweetRequestObject.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/tweets/EditTweetRequestObject.java @@ -1,4 +1,4 @@ -package dtos.tweets; +package com.nscharrenberg.kwetter.dtos.tweets; public class EditTweetRequestObject { private Integer id = 0; diff --git a/src/main/java/dtos/tweets/LikeRequestObject.java b/src/main/java/com/nscharrenberg/kwetter/dtos/tweets/LikeRequestObject.java similarity index 89% rename from src/main/java/dtos/tweets/LikeRequestObject.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/tweets/LikeRequestObject.java index b04c7a9..f57320b 100644 --- a/src/main/java/dtos/tweets/LikeRequestObject.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/tweets/LikeRequestObject.java @@ -1,4 +1,4 @@ -package dtos.tweets; +package com.nscharrenberg.kwetter.dtos.tweets; public class LikeRequestObject { private Integer tweetId; diff --git a/src/main/java/dtos/tweets/TweetCleanDto.java b/src/main/java/com/nscharrenberg/kwetter/dtos/tweets/TweetCleanDto.java similarity index 61% rename from src/main/java/dtos/tweets/TweetCleanDto.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/tweets/TweetCleanDto.java index ff0f173..fec2999 100644 --- a/src/main/java/dtos/tweets/TweetCleanDto.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/tweets/TweetCleanDto.java @@ -1,6 +1,6 @@ -package dtos.tweets; +package com.nscharrenberg.kwetter.dtos.tweets; -import dtos.users.UserCleanDto; +import com.nscharrenberg.kwetter.dtos.users.UserCleanDto; import java.util.Date; diff --git a/src/main/java/dtos/tweets/TweetDto.java b/src/main/java/com/nscharrenberg/kwetter/dtos/tweets/TweetDto.java similarity index 91% rename from src/main/java/dtos/tweets/TweetDto.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/tweets/TweetDto.java index dc17b59..622cd96 100644 --- a/src/main/java/dtos/tweets/TweetDto.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/tweets/TweetDto.java @@ -1,6 +1,6 @@ -package dtos.tweets; +package com.nscharrenberg.kwetter.dtos.tweets; -import dtos.users.UserCleanDto; +import com.nscharrenberg.kwetter.dtos.users.UserCleanDto; import java.util.Date; import java.util.Set; diff --git a/src/main/java/dtos/users/CreateUserRequestObject.java b/src/main/java/com/nscharrenberg/kwetter/dtos/users/CreateUserRequestObject.java similarity index 97% rename from src/main/java/dtos/users/CreateUserRequestObject.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/users/CreateUserRequestObject.java index 1d70f7f..7026fc8 100644 --- a/src/main/java/dtos/users/CreateUserRequestObject.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/users/CreateUserRequestObject.java @@ -1,4 +1,4 @@ -package dtos.users; +package com.nscharrenberg.kwetter.dtos.users; public class CreateUserRequestObject { private String username = ""; diff --git a/src/main/java/dtos/users/EditUserRequestObject.java b/src/main/java/com/nscharrenberg/kwetter/dtos/users/EditUserRequestObject.java similarity index 97% rename from src/main/java/dtos/users/EditUserRequestObject.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/users/EditUserRequestObject.java index 636d4c7..325aac9 100644 --- a/src/main/java/dtos/users/EditUserRequestObject.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/users/EditUserRequestObject.java @@ -1,4 +1,4 @@ -package dtos.users; +package com.nscharrenberg.kwetter.dtos.users; public class EditUserRequestObject { private Integer id = 0; diff --git a/src/main/java/dtos/users/FollowRequestObject.java b/src/main/java/com/nscharrenberg/kwetter/dtos/users/FollowRequestObject.java similarity index 90% rename from src/main/java/dtos/users/FollowRequestObject.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/users/FollowRequestObject.java index acbb5ca..469e121 100644 --- a/src/main/java/dtos/users/FollowRequestObject.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/users/FollowRequestObject.java @@ -1,4 +1,4 @@ -package dtos.users; +package com.nscharrenberg.kwetter.dtos.users; public class FollowRequestObject { private Integer userId = 0; diff --git a/src/main/java/dtos/users/LoginRequestObject.java b/src/main/java/com/nscharrenberg/kwetter/dtos/users/LoginRequestObject.java similarity index 89% rename from src/main/java/dtos/users/LoginRequestObject.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/users/LoginRequestObject.java index 21ddd32..0bacddd 100644 --- a/src/main/java/dtos/users/LoginRequestObject.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/users/LoginRequestObject.java @@ -1,4 +1,4 @@ -package dtos.users; +package com.nscharrenberg.kwetter.dtos.users; public class LoginRequestObject { private String username; diff --git a/src/main/java/dtos/users/RoleRequestObject.java b/src/main/java/com/nscharrenberg/kwetter/dtos/users/RoleRequestObject.java similarity index 89% rename from src/main/java/dtos/users/RoleRequestObject.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/users/RoleRequestObject.java index ba93e72..d6f27a6 100644 --- a/src/main/java/dtos/users/RoleRequestObject.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/users/RoleRequestObject.java @@ -1,4 +1,4 @@ -package dtos.users; +package com.nscharrenberg.kwetter.dtos.users; public class RoleRequestObject { private Integer userId; diff --git a/src/main/java/dtos/users/TokenDto.java b/src/main/java/com/nscharrenberg/kwetter/dtos/users/TokenDto.java similarity index 79% rename from src/main/java/dtos/users/TokenDto.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/users/TokenDto.java index e618847..0af77c5 100644 --- a/src/main/java/dtos/users/TokenDto.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/users/TokenDto.java @@ -1,6 +1,6 @@ -package dtos.users; +package com.nscharrenberg.kwetter.dtos.users; -import domain.User; +import com.nscharrenberg.kwetter.domain.User; public class TokenDto { private String token; diff --git a/src/main/java/dtos/users/UserCleanDto.java b/src/main/java/com/nscharrenberg/kwetter/dtos/users/UserCleanDto.java similarity index 94% rename from src/main/java/dtos/users/UserCleanDto.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/users/UserCleanDto.java index a7a8cf6..2617740 100644 --- a/src/main/java/dtos/users/UserCleanDto.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/users/UserCleanDto.java @@ -1,6 +1,6 @@ -package dtos.users; +package com.nscharrenberg.kwetter.dtos.users; -import dtos.roles.RoleCleanDto; +import com.nscharrenberg.kwetter.dtos.roles.RoleCleanDto; public class UserCleanDto { private Integer id; diff --git a/src/main/java/dtos/users/UserDto.java b/src/main/java/com/nscharrenberg/kwetter/dtos/users/UserDto.java similarity index 94% rename from src/main/java/dtos/users/UserDto.java rename to src/main/java/com/nscharrenberg/kwetter/dtos/users/UserDto.java index 14155b6..aeb5173 100644 --- a/src/main/java/dtos/users/UserDto.java +++ b/src/main/java/com/nscharrenberg/kwetter/dtos/users/UserDto.java @@ -1,7 +1,7 @@ -package dtos.users; +package com.nscharrenberg.kwetter.dtos.users; -import dtos.roles.RoleCleanDto; -import dtos.tweets.TweetCleanDto; +import com.nscharrenberg.kwetter.dtos.roles.RoleCleanDto; +import com.nscharrenberg.kwetter.dtos.tweets.TweetCleanDto; import java.util.Set; diff --git a/src/main/java/exceptions/ActionForbiddenException.java b/src/main/java/com/nscharrenberg/kwetter/exceptions/ActionForbiddenException.java similarity index 91% rename from src/main/java/exceptions/ActionForbiddenException.java rename to src/main/java/com/nscharrenberg/kwetter/exceptions/ActionForbiddenException.java index a70482a..64e3d2e 100644 --- a/src/main/java/exceptions/ActionForbiddenException.java +++ b/src/main/java/com/nscharrenberg/kwetter/exceptions/ActionForbiddenException.java @@ -1,4 +1,4 @@ -package exceptions; +package com.nscharrenberg.kwetter.exceptions; public class ActionForbiddenException extends Exception { /** diff --git a/src/main/java/exceptions/CreationFailedException.java b/src/main/java/com/nscharrenberg/kwetter/exceptions/CreationFailedException.java similarity index 91% rename from src/main/java/exceptions/CreationFailedException.java rename to src/main/java/com/nscharrenberg/kwetter/exceptions/CreationFailedException.java index 31d174d..989ebca 100644 --- a/src/main/java/exceptions/CreationFailedException.java +++ b/src/main/java/com/nscharrenberg/kwetter/exceptions/CreationFailedException.java @@ -1,4 +1,4 @@ -package exceptions; +package com.nscharrenberg.kwetter.exceptions; public class CreationFailedException extends Exception { /** diff --git a/src/main/java/exceptions/InvalidContentException.java b/src/main/java/com/nscharrenberg/kwetter/exceptions/InvalidContentException.java similarity index 91% rename from src/main/java/exceptions/InvalidContentException.java rename to src/main/java/com/nscharrenberg/kwetter/exceptions/InvalidContentException.java index 56f1419..3835c76 100644 --- a/src/main/java/exceptions/InvalidContentException.java +++ b/src/main/java/com/nscharrenberg/kwetter/exceptions/InvalidContentException.java @@ -1,4 +1,4 @@ -package exceptions; +package com.nscharrenberg.kwetter.exceptions; public class InvalidContentException extends Exception { /** diff --git a/src/main/java/exceptions/NameNotUniqueException.java b/src/main/java/com/nscharrenberg/kwetter/exceptions/NameNotUniqueException.java similarity index 91% rename from src/main/java/exceptions/NameNotUniqueException.java rename to src/main/java/com/nscharrenberg/kwetter/exceptions/NameNotUniqueException.java index 854bf06..34c2b8f 100644 --- a/src/main/java/exceptions/NameNotUniqueException.java +++ b/src/main/java/com/nscharrenberg/kwetter/exceptions/NameNotUniqueException.java @@ -1,4 +1,4 @@ -package exceptions; +package com.nscharrenberg.kwetter.exceptions; public class NameNotUniqueException extends Exception { /** diff --git a/src/main/java/exceptions/NotFoundException.java b/src/main/java/com/nscharrenberg/kwetter/exceptions/NotFoundException.java similarity index 91% rename from src/main/java/exceptions/NotFoundException.java rename to src/main/java/com/nscharrenberg/kwetter/exceptions/NotFoundException.java index fa75f2d..2222625 100644 --- a/src/main/java/exceptions/NotFoundException.java +++ b/src/main/java/com/nscharrenberg/kwetter/exceptions/NotFoundException.java @@ -1,4 +1,4 @@ -package exceptions; +package com.nscharrenberg.kwetter.exceptions; public class NotFoundException extends Exception { /** diff --git a/src/main/java/repository/collection/PermissionServiceCollImpl.java b/src/main/java/com/nscharrenberg/kwetter/repository/collection/PermissionServiceCollImpl.java similarity index 84% rename from src/main/java/repository/collection/PermissionServiceCollImpl.java rename to src/main/java/com/nscharrenberg/kwetter/repository/collection/PermissionServiceCollImpl.java index 4f86199..c31e0f6 100644 --- a/src/main/java/repository/collection/PermissionServiceCollImpl.java +++ b/src/main/java/com/nscharrenberg/kwetter/repository/collection/PermissionServiceCollImpl.java @@ -1,9 +1,9 @@ -package repository.collection; +package com.nscharrenberg.kwetter.repository.collection; import com.google.common.collect.Iterables; -import domain.Permission; -import exceptions.NameNotUniqueException; -import repository.interfaces.PermissionRepository; +import com.nscharrenberg.kwetter.domain.Permission; +import com.nscharrenberg.kwetter.exceptions.NameNotUniqueException; +import com.nscharrenberg.kwetter.repository.interfaces.PermissionRepository; import javax.ejb.Stateful; import javax.ejb.Stateless; diff --git a/src/main/java/repository/collection/RoleServiceCollImpl.java b/src/main/java/com/nscharrenberg/kwetter/repository/collection/RoleServiceCollImpl.java similarity index 83% rename from src/main/java/repository/collection/RoleServiceCollImpl.java rename to src/main/java/com/nscharrenberg/kwetter/repository/collection/RoleServiceCollImpl.java index 5063c7f..4200e96 100644 --- a/src/main/java/repository/collection/RoleServiceCollImpl.java +++ b/src/main/java/com/nscharrenberg/kwetter/repository/collection/RoleServiceCollImpl.java @@ -1,10 +1,10 @@ -package repository.collection; +package com.nscharrenberg.kwetter.repository.collection; import com.google.common.collect.Iterables; -import domain.Permission; -import domain.Role; -import exceptions.NameNotUniqueException; -import repository.interfaces.RoleRepository; +import com.nscharrenberg.kwetter.domain.Permission; +import com.nscharrenberg.kwetter.domain.Role; +import com.nscharrenberg.kwetter.exceptions.NameNotUniqueException; +import com.nscharrenberg.kwetter.repository.interfaces.RoleRepository; import javax.ejb.Stateful; import javax.ejb.Stateless; diff --git a/src/main/java/repository/collection/TweetServiceCollImpl.java b/src/main/java/com/nscharrenberg/kwetter/repository/collection/TweetServiceCollImpl.java similarity index 87% rename from src/main/java/repository/collection/TweetServiceCollImpl.java rename to src/main/java/com/nscharrenberg/kwetter/repository/collection/TweetServiceCollImpl.java index 3e89852..bf09b98 100644 --- a/src/main/java/repository/collection/TweetServiceCollImpl.java +++ b/src/main/java/com/nscharrenberg/kwetter/repository/collection/TweetServiceCollImpl.java @@ -1,11 +1,11 @@ -package repository.collection; +package com.nscharrenberg.kwetter.repository.collection; import com.google.common.collect.Iterables; -import domain.Role; -import domain.Tweet; -import domain.User; -import exceptions.NameNotUniqueException; -import repository.interfaces.TweetRepository; +import com.nscharrenberg.kwetter.domain.Role; +import com.nscharrenberg.kwetter.domain.Tweet; +import com.nscharrenberg.kwetter.domain.User; +import com.nscharrenberg.kwetter.exceptions.NameNotUniqueException; +import com.nscharrenberg.kwetter.repository.interfaces.TweetRepository; import sun.reflect.generics.reflectiveObjects.NotImplementedException; import javax.ejb.Stateful; diff --git a/src/main/java/repository/collection/UserServiceCollImpl.java b/src/main/java/com/nscharrenberg/kwetter/repository/collection/UserServiceCollImpl.java similarity index 87% rename from src/main/java/repository/collection/UserServiceCollImpl.java rename to src/main/java/com/nscharrenberg/kwetter/repository/collection/UserServiceCollImpl.java index 783440d..9a3b8e0 100644 --- a/src/main/java/repository/collection/UserServiceCollImpl.java +++ b/src/main/java/com/nscharrenberg/kwetter/repository/collection/UserServiceCollImpl.java @@ -1,12 +1,12 @@ -package repository.collection; +package com.nscharrenberg.kwetter.repository.collection; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import domain.Role; -import domain.User; -import exceptions.NameNotUniqueException; +import com.nscharrenberg.kwetter.domain.Role; +import com.nscharrenberg.kwetter.domain.User; +import com.nscharrenberg.kwetter.exceptions.NameNotUniqueException; import org.checkerframework.checker.nullness.qual.Nullable; -import repository.interfaces.UserRepository; +import com.nscharrenberg.kwetter.repository.interfaces.UserRepository; import javax.ejb.Stateful; import javax.ejb.Stateless; diff --git a/src/main/java/repository/interfaces/JPA.java b/src/main/java/com/nscharrenberg/kwetter/repository/interfaces/JPA.java similarity index 84% rename from src/main/java/repository/interfaces/JPA.java rename to src/main/java/com/nscharrenberg/kwetter/repository/interfaces/JPA.java index 8fb3005..42adf5d 100644 --- a/src/main/java/repository/interfaces/JPA.java +++ b/src/main/java/com/nscharrenberg/kwetter/repository/interfaces/JPA.java @@ -1,4 +1,4 @@ -package repository.interfaces; +package com.nscharrenberg.kwetter.repository.interfaces; import javax.inject.Qualifier; import java.lang.annotation.Retention; diff --git a/src/main/java/repository/interfaces/PermissionRepository.java b/src/main/java/com/nscharrenberg/kwetter/repository/interfaces/PermissionRepository.java similarity index 63% rename from src/main/java/repository/interfaces/PermissionRepository.java rename to src/main/java/com/nscharrenberg/kwetter/repository/interfaces/PermissionRepository.java index 0628441..bd52b6c 100644 --- a/src/main/java/repository/interfaces/PermissionRepository.java +++ b/src/main/java/com/nscharrenberg/kwetter/repository/interfaces/PermissionRepository.java @@ -1,7 +1,7 @@ -package repository.interfaces; +package com.nscharrenberg.kwetter.repository.interfaces; -import domain.Permission; -import exceptions.NameNotUniqueException; +import com.nscharrenberg.kwetter.domain.Permission; +import com.nscharrenberg.kwetter.exceptions.NameNotUniqueException; import java.util.List; diff --git a/src/main/java/repository/interfaces/RoleRepository.java b/src/main/java/com/nscharrenberg/kwetter/repository/interfaces/RoleRepository.java similarity index 61% rename from src/main/java/repository/interfaces/RoleRepository.java rename to src/main/java/com/nscharrenberg/kwetter/repository/interfaces/RoleRepository.java index a411039..27bcdc4 100644 --- a/src/main/java/repository/interfaces/RoleRepository.java +++ b/src/main/java/com/nscharrenberg/kwetter/repository/interfaces/RoleRepository.java @@ -1,8 +1,8 @@ -package repository.interfaces; +package com.nscharrenberg.kwetter.repository.interfaces; -import domain.Permission; -import domain.Role; -import exceptions.NameNotUniqueException; +import com.nscharrenberg.kwetter.domain.Permission; +import com.nscharrenberg.kwetter.domain.Role; +import com.nscharrenberg.kwetter.exceptions.NameNotUniqueException; import java.util.List; diff --git a/src/main/java/repository/interfaces/TweetRepository.java b/src/main/java/com/nscharrenberg/kwetter/repository/interfaces/TweetRepository.java similarity index 83% rename from src/main/java/repository/interfaces/TweetRepository.java rename to src/main/java/com/nscharrenberg/kwetter/repository/interfaces/TweetRepository.java index d341943..1b7a093 100644 --- a/src/main/java/repository/interfaces/TweetRepository.java +++ b/src/main/java/com/nscharrenberg/kwetter/repository/interfaces/TweetRepository.java @@ -1,7 +1,7 @@ -package repository.interfaces; +package com.nscharrenberg.kwetter.repository.interfaces; -import domain.Tweet; -import domain.User; +import com.nscharrenberg.kwetter.domain.Tweet; +import com.nscharrenberg.kwetter.domain.User; import java.util.Date; import java.util.List; diff --git a/src/main/java/repository/interfaces/UserRepository.java b/src/main/java/com/nscharrenberg/kwetter/repository/interfaces/UserRepository.java similarity index 75% rename from src/main/java/repository/interfaces/UserRepository.java rename to src/main/java/com/nscharrenberg/kwetter/repository/interfaces/UserRepository.java index d650ded..83f0238 100644 --- a/src/main/java/repository/interfaces/UserRepository.java +++ b/src/main/java/com/nscharrenberg/kwetter/repository/interfaces/UserRepository.java @@ -1,7 +1,7 @@ -package repository.interfaces; +package com.nscharrenberg.kwetter.repository.interfaces; -import domain.Role; -import domain.User; +import com.nscharrenberg.kwetter.domain.Role; +import com.nscharrenberg.kwetter.domain.User; import java.util.List; diff --git a/src/main/java/repository/jpa/PermissionServiceJPAImpl.java b/src/main/java/com/nscharrenberg/kwetter/repository/jpa/PermissionServiceJPAImpl.java similarity index 87% rename from src/main/java/repository/jpa/PermissionServiceJPAImpl.java rename to src/main/java/com/nscharrenberg/kwetter/repository/jpa/PermissionServiceJPAImpl.java index b10284e..0544aa7 100644 --- a/src/main/java/repository/jpa/PermissionServiceJPAImpl.java +++ b/src/main/java/com/nscharrenberg/kwetter/repository/jpa/PermissionServiceJPAImpl.java @@ -1,9 +1,9 @@ -package repository.jpa; +package com.nscharrenberg.kwetter.repository.jpa; -import domain.Permission; -import exceptions.NameNotUniqueException; -import repository.interfaces.JPA; -import repository.interfaces.PermissionRepository; +import com.nscharrenberg.kwetter.domain.Permission; +import com.nscharrenberg.kwetter.exceptions.NameNotUniqueException; +import com.nscharrenberg.kwetter.repository.interfaces.JPA; +import com.nscharrenberg.kwetter.repository.interfaces.PermissionRepository; import javax.ejb.*; import javax.enterprise.inject.Produces; diff --git a/src/main/java/repository/jpa/RoleServiceJPAImpl.java b/src/main/java/com/nscharrenberg/kwetter/repository/jpa/RoleServiceJPAImpl.java similarity index 90% rename from src/main/java/repository/jpa/RoleServiceJPAImpl.java rename to src/main/java/com/nscharrenberg/kwetter/repository/jpa/RoleServiceJPAImpl.java index 5585156..661e4fd 100644 --- a/src/main/java/repository/jpa/RoleServiceJPAImpl.java +++ b/src/main/java/com/nscharrenberg/kwetter/repository/jpa/RoleServiceJPAImpl.java @@ -1,9 +1,9 @@ -package repository.jpa; +package com.nscharrenberg.kwetter.repository.jpa; -import domain.Permission; -import domain.Role; -import repository.interfaces.JPA; -import repository.interfaces.RoleRepository; +import com.nscharrenberg.kwetter.domain.Permission; +import com.nscharrenberg.kwetter.domain.Role; +import com.nscharrenberg.kwetter.repository.interfaces.JPA; +import com.nscharrenberg.kwetter.repository.interfaces.RoleRepository; import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; diff --git a/src/main/java/repository/jpa/TweetServiceJPAImpl.java b/src/main/java/com/nscharrenberg/kwetter/repository/jpa/TweetServiceJPAImpl.java similarity index 95% rename from src/main/java/repository/jpa/TweetServiceJPAImpl.java rename to src/main/java/com/nscharrenberg/kwetter/repository/jpa/TweetServiceJPAImpl.java index 2d79ea0..093ba82 100644 --- a/src/main/java/repository/jpa/TweetServiceJPAImpl.java +++ b/src/main/java/com/nscharrenberg/kwetter/repository/jpa/TweetServiceJPAImpl.java @@ -1,9 +1,9 @@ -package repository.jpa; +package com.nscharrenberg.kwetter.repository.jpa; -import domain.Tweet; -import domain.User; -import repository.interfaces.JPA; -import repository.interfaces.TweetRepository; +import com.nscharrenberg.kwetter.domain.Tweet; +import com.nscharrenberg.kwetter.domain.User; +import com.nscharrenberg.kwetter.repository.interfaces.JPA; +import com.nscharrenberg.kwetter.repository.interfaces.TweetRepository; import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; diff --git a/src/main/java/repository/jpa/UserServiceJPAImpl.java b/src/main/java/com/nscharrenberg/kwetter/repository/jpa/UserServiceJPAImpl.java similarity index 92% rename from src/main/java/repository/jpa/UserServiceJPAImpl.java rename to src/main/java/com/nscharrenberg/kwetter/repository/jpa/UserServiceJPAImpl.java index e581295..6e1be79 100644 --- a/src/main/java/repository/jpa/UserServiceJPAImpl.java +++ b/src/main/java/com/nscharrenberg/kwetter/repository/jpa/UserServiceJPAImpl.java @@ -1,9 +1,9 @@ -package repository.jpa; +package com.nscharrenberg.kwetter.repository.jpa; -import domain.Role; -import domain.User; -import repository.interfaces.JPA; -import repository.interfaces.UserRepository; +import com.nscharrenberg.kwetter.domain.Role; +import com.nscharrenberg.kwetter.domain.User; +import com.nscharrenberg.kwetter.repository.interfaces.JPA; +import com.nscharrenberg.kwetter.repository.interfaces.UserRepository; import javax.ejb.Stateless; import javax.persistence.EntityManager; diff --git a/src/main/java/responses/HttpStatusCodes.java b/src/main/java/com/nscharrenberg/kwetter/responses/HttpStatusCodes.java similarity index 97% rename from src/main/java/responses/HttpStatusCodes.java rename to src/main/java/com/nscharrenberg/kwetter/responses/HttpStatusCodes.java index 7567c08..2ec9ea1 100644 --- a/src/main/java/responses/HttpStatusCodes.java +++ b/src/main/java/com/nscharrenberg/kwetter/responses/HttpStatusCodes.java @@ -1,4 +1,4 @@ -package responses; +package com.nscharrenberg.kwetter.responses; public class HttpStatusCodes { public static final int CONTINUE = 100; diff --git a/src/main/java/responses/JaxResponse.java b/src/main/java/com/nscharrenberg/kwetter/responses/JaxResponse.java similarity index 92% rename from src/main/java/responses/JaxResponse.java rename to src/main/java/com/nscharrenberg/kwetter/responses/JaxResponse.java index 4851fd4..457b785 100644 --- a/src/main/java/responses/JaxResponse.java +++ b/src/main/java/com/nscharrenberg/kwetter/responses/JaxResponse.java @@ -1,4 +1,4 @@ -package responses; +package com.nscharrenberg.kwetter.responses; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/responses/ObjectResponse.java b/src/main/java/com/nscharrenberg/kwetter/responses/ObjectResponse.java similarity index 94% rename from src/main/java/responses/ObjectResponse.java rename to src/main/java/com/nscharrenberg/kwetter/responses/ObjectResponse.java index 2bc2855..8b5f157 100644 --- a/src/main/java/responses/ObjectResponse.java +++ b/src/main/java/com/nscharrenberg/kwetter/responses/ObjectResponse.java @@ -1,4 +1,4 @@ -package responses; +package com.nscharrenberg.kwetter.responses; public class ObjectResponse { private int code; diff --git a/src/main/java/service/PermissionService.java b/src/main/java/com/nscharrenberg/kwetter/service/PermissionService.java similarity index 93% rename from src/main/java/service/PermissionService.java rename to src/main/java/com/nscharrenberg/kwetter/service/PermissionService.java index bd94a74..1bf0409 100644 --- a/src/main/java/service/PermissionService.java +++ b/src/main/java/com/nscharrenberg/kwetter/service/PermissionService.java @@ -1,10 +1,10 @@ -package service; +package com.nscharrenberg.kwetter.service; -import domain.Permission; -import repository.interfaces.JPA; -import repository.interfaces.PermissionRepository; -import responses.HttpStatusCodes; -import responses.ObjectResponse; +import com.nscharrenberg.kwetter.domain.Permission; +import com.nscharrenberg.kwetter.repository.interfaces.JPA; +import com.nscharrenberg.kwetter.repository.interfaces.PermissionRepository; +import com.nscharrenberg.kwetter.responses.HttpStatusCodes; +import com.nscharrenberg.kwetter.responses.ObjectResponse; import javax.ejb.Stateless; import javax.inject.Inject; diff --git a/src/main/java/service/RoleService.java b/src/main/java/com/nscharrenberg/kwetter/service/RoleService.java similarity index 94% rename from src/main/java/service/RoleService.java rename to src/main/java/com/nscharrenberg/kwetter/service/RoleService.java index 353d015..12bb8f6 100644 --- a/src/main/java/service/RoleService.java +++ b/src/main/java/com/nscharrenberg/kwetter/service/RoleService.java @@ -1,12 +1,12 @@ -package service; - -import domain.Permission; -import domain.Role; -import exceptions.*; -import repository.interfaces.JPA; -import repository.interfaces.RoleRepository; -import responses.HttpStatusCodes; -import responses.ObjectResponse; +package com.nscharrenberg.kwetter.service; + +import com.nscharrenberg.kwetter.domain.Permission; +import com.nscharrenberg.kwetter.domain.Role; +import com.nscharrenberg.kwetter.exceptions.*; +import com.nscharrenberg.kwetter.repository.interfaces.JPA; +import com.nscharrenberg.kwetter.repository.interfaces.RoleRepository; +import com.nscharrenberg.kwetter.responses.HttpStatusCodes; +import com.nscharrenberg.kwetter.responses.ObjectResponse; import javax.ejb.Stateful; import javax.ejb.Stateless; diff --git a/src/main/java/service/TweetService.java b/src/main/java/com/nscharrenberg/kwetter/service/TweetService.java similarity index 97% rename from src/main/java/service/TweetService.java rename to src/main/java/com/nscharrenberg/kwetter/service/TweetService.java index 4f53d73..9e58cad 100644 --- a/src/main/java/service/TweetService.java +++ b/src/main/java/com/nscharrenberg/kwetter/service/TweetService.java @@ -1,12 +1,12 @@ -package service; - -import domain.Tweet; -import domain.User; -import exceptions.*; -import repository.interfaces.JPA; -import repository.interfaces.TweetRepository; -import responses.HttpStatusCodes; -import responses.ObjectResponse; +package com.nscharrenberg.kwetter.service; + +import com.nscharrenberg.kwetter.domain.Tweet; +import com.nscharrenberg.kwetter.domain.User; +import com.nscharrenberg.kwetter.exceptions.*; +import com.nscharrenberg.kwetter.repository.interfaces.JPA; +import com.nscharrenberg.kwetter.repository.interfaces.TweetRepository; +import com.nscharrenberg.kwetter.responses.HttpStatusCodes; +import com.nscharrenberg.kwetter.responses.ObjectResponse; import javax.annotation.Nullable; import javax.ejb.Stateless; diff --git a/src/main/java/service/UserService.java b/src/main/java/com/nscharrenberg/kwetter/service/UserService.java similarity index 96% rename from src/main/java/service/UserService.java rename to src/main/java/com/nscharrenberg/kwetter/service/UserService.java index 79e2765..1e5b807 100644 --- a/src/main/java/service/UserService.java +++ b/src/main/java/com/nscharrenberg/kwetter/service/UserService.java @@ -1,18 +1,18 @@ -package service; +package com.nscharrenberg.kwetter.service; -import authentication.PasswordAuthentication; +import com.nscharrenberg.kwetter.authentication.PasswordAuthentication; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.gson.Gson; -import domain.Permission; -import domain.Role; -import domain.User; -import exceptions.*; +import com.nscharrenberg.kwetter.domain.Permission; +import com.nscharrenberg.kwetter.domain.Role; +import com.nscharrenberg.kwetter.domain.User; +import com.nscharrenberg.kwetter.exceptions.*; import org.checkerframework.checker.nullness.qual.Nullable; -import repository.interfaces.JPA; -import repository.interfaces.UserRepository; -import responses.HttpStatusCodes; -import responses.ObjectResponse; +import com.nscharrenberg.kwetter.repository.interfaces.JPA; +import com.nscharrenberg.kwetter.repository.interfaces.UserRepository; +import com.nscharrenberg.kwetter.responses.HttpStatusCodes; +import com.nscharrenberg.kwetter.responses.ObjectResponse; import javax.ejb.Stateless; import javax.enterprise.inject.Default; diff --git a/src/main/java/utils/CorsFilter.java b/src/main/java/com/nscharrenberg/kwetter/utils/CorsFilter.java similarity index 97% rename from src/main/java/utils/CorsFilter.java rename to src/main/java/com/nscharrenberg/kwetter/utils/CorsFilter.java index 0e7d24a..387f98f 100644 --- a/src/main/java/utils/CorsFilter.java +++ b/src/main/java/com/nscharrenberg/kwetter/utils/CorsFilter.java @@ -1,4 +1,4 @@ -package utils; +package com.nscharrenberg.kwetter.utils; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerResponseContext; diff --git a/src/main/java/utils/DetailMessage.java b/src/main/java/com/nscharrenberg/kwetter/utils/DetailMessage.java similarity index 93% rename from src/main/java/utils/DetailMessage.java rename to src/main/java/com/nscharrenberg/kwetter/utils/DetailMessage.java index 05841fb..bf08b1a 100644 --- a/src/main/java/utils/DetailMessage.java +++ b/src/main/java/com/nscharrenberg/kwetter/utils/DetailMessage.java @@ -1,4 +1,4 @@ -package utils; +package com.nscharrenberg.kwetter.utils; import org.omnifaces.util.Messages; diff --git a/src/main/java/com/nscharrenberg/kwetter/utils/EmailUtil.java b/src/main/java/com/nscharrenberg/kwetter/utils/EmailUtil.java new file mode 100644 index 0000000..dd62989 --- /dev/null +++ b/src/main/java/com/nscharrenberg/kwetter/utils/EmailUtil.java @@ -0,0 +1,28 @@ +package com.nscharrenberg.kwetter.utils; + +import javax.annotation.Resource; +import javax.ejb.Stateless; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeMessage; +import java.io.Serializable; + +@Stateless + +public class EmailUtil implements Serializable { + @Resource(name = "java/mail/kwetter") + private Session mailSession; + + public void send() throws MessagingException { + Message message = new MimeMessage(mailSession); + + message.setSubject("Welcome"); + message.setRecipient(Message.RecipientType.TO, new InternetAddress("nscharrenberg@hotmail.com")); + message.setContent("

Hi You!

How are you doing?

", "text/html; charset=utf-8"); + + Transport.send(message); + } +} diff --git a/src/main/java/utils/Util.java b/src/main/java/com/nscharrenberg/kwetter/utils/Util.java similarity index 94% rename from src/main/java/utils/Util.java rename to src/main/java/com/nscharrenberg/kwetter/utils/Util.java index fcb4deb..d33a1c4 100644 --- a/src/main/java/utils/Util.java +++ b/src/main/java/com/nscharrenberg/kwetter/utils/Util.java @@ -1,4 +1,4 @@ -package utils; +package com.nscharrenberg.kwetter.utils; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/test/domain/TweetTest.java b/src/main/test/com/nscharrenberg/kwetter/domain/TweetTest.java similarity index 98% rename from src/main/test/domain/TweetTest.java rename to src/main/test/com/nscharrenberg/kwetter/domain/TweetTest.java index 5824e29..66f828a 100644 --- a/src/main/test/domain/TweetTest.java +++ b/src/main/test/com/nscharrenberg/kwetter/domain/TweetTest.java @@ -1,4 +1,4 @@ -package domain; +package com.nscharrenberg.kwetter.domain; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; diff --git a/src/main/test/domain/UserTest.java b/src/main/test/com/nscharrenberg/kwetter/domain/UserTest.java similarity index 98% rename from src/main/test/domain/UserTest.java rename to src/main/test/com/nscharrenberg/kwetter/domain/UserTest.java index 7894325..e25e2a3 100644 --- a/src/main/test/domain/UserTest.java +++ b/src/main/test/com/nscharrenberg/kwetter/domain/UserTest.java @@ -1,4 +1,4 @@ -package domain; +package com.nscharrenberg.kwetter.domain; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; diff --git a/src/main/test/com/nscharrenberg/kwetter/integration/PermissionTest.java b/src/main/test/com/nscharrenberg/kwetter/integration/PermissionTest.java new file mode 100644 index 0000000..451e550 --- /dev/null +++ b/src/main/test/com/nscharrenberg/kwetter/integration/PermissionTest.java @@ -0,0 +1,57 @@ +package com.nscharrenberg.kwetter.integration; + +import com.github.tomakehurst.wiremock.client.WireMock; +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.containing; +import static com.github.tomakehurst.wiremock.client.WireMock.post; +import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; +import com.jayway.restassured.RestAssured; +import static com.jayway.restassured.RestAssured.given; +import com.jayway.restassured.http.ContentType; +import com.jayway.restassured.parsing.Parser; +import java.io.File; +import java.net.URL; +import org.hamcrest.Matchers; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit.InSequence; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.resolver.api.maven.Maven; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(Arquillian.class) +public class PermissionTest { + private final WireMock wiremock = new WireMock(8888); + + @Deployment(testable = false) + public static WebArchive createDeployment() { + File[] files = Maven.resolver() + .loadPomFromFile("pom.xml") + .importRuntimeDependencies() + .resolve() + .withTransitivity() + .asFile(); + return ShrinkWrap.create(WebArchive.class) + .addPackages(true, "com.nscharrenberg.kwetter") + .addAsWebInfResource(new File("src/main/resources/META-INF/beans.xml")) + .addAsLibraries(files); + } + + @ArquillianResource + private URL contextPath; + + @Test + @InSequence(1) + public void testGetUsers() { + RestAssured.registerParser("text/plain", Parser.TEXT); + given() + .when() + .get(contextPath.toString() + "api/users") + .then() + .statusCode(200) + .contentType(ContentType.JSON); + } +} diff --git a/src/main/test/service/PermissionServiceTest.java b/src/main/test/com/nscharrenberg/kwetter/service/PermissionServiceTest.java similarity index 97% rename from src/main/test/service/PermissionServiceTest.java rename to src/main/test/com/nscharrenberg/kwetter/service/PermissionServiceTest.java index 98df69d..dfbdb8d 100644 --- a/src/main/test/service/PermissionServiceTest.java +++ b/src/main/test/com/nscharrenberg/kwetter/service/PermissionServiceTest.java @@ -1,15 +1,15 @@ -package service; +package com.nscharrenberg.kwetter.service; -import domain.Permission; +import com.nscharrenberg.kwetter.domain.Permission; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import repository.interfaces.PermissionRepository; -import responses.HttpStatusCodes; -import responses.ObjectResponse; +import com.nscharrenberg.kwetter.repository.interfaces.PermissionRepository; +import com.nscharrenberg.kwetter.responses.HttpStatusCodes; +import com.nscharrenberg.kwetter.responses.ObjectResponse; import java.util.ArrayList; import java.util.List; diff --git a/src/main/test/service/RoleServiceTest.java b/src/main/test/com/nscharrenberg/kwetter/service/RoleServiceTest.java similarity index 97% rename from src/main/test/service/RoleServiceTest.java rename to src/main/test/com/nscharrenberg/kwetter/service/RoleServiceTest.java index e840fca..9c5f951 100644 --- a/src/main/test/service/RoleServiceTest.java +++ b/src/main/test/com/nscharrenberg/kwetter/service/RoleServiceTest.java @@ -1,20 +1,20 @@ -package service; +package com.nscharrenberg.kwetter.service; -import domain.Permission; -import domain.Role; -import exceptions.*; +import com.nscharrenberg.kwetter.domain.Permission; +import com.nscharrenberg.kwetter.domain.Role; +import com.nscharrenberg.kwetter.exceptions.*; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import repository.collection.PermissionServiceCollImpl; -import repository.collection.RoleServiceCollImpl; -import repository.interfaces.RoleRepository; -import repository.jpa.RoleServiceJPAImpl; -import responses.HttpStatusCodes; -import responses.ObjectResponse; +import com.nscharrenberg.kwetter.repository.collection.PermissionServiceCollImpl; +import com.nscharrenberg.kwetter.repository.collection.RoleServiceCollImpl; +import com.nscharrenberg.kwetter.repository.interfaces.RoleRepository; +import com.nscharrenberg.kwetter.repository.jpa.RoleServiceJPAImpl; +import com.nscharrenberg.kwetter.responses.HttpStatusCodes; +import com.nscharrenberg.kwetter.responses.ObjectResponse; import java.util.ArrayList; import java.util.List; diff --git a/src/main/test/service/TweetServiceTest.java b/src/main/test/com/nscharrenberg/kwetter/service/TweetServiceTest.java similarity index 98% rename from src/main/test/service/TweetServiceTest.java rename to src/main/test/com/nscharrenberg/kwetter/service/TweetServiceTest.java index 495d5d0..b93df75 100644 --- a/src/main/test/service/TweetServiceTest.java +++ b/src/main/test/com/nscharrenberg/kwetter/service/TweetServiceTest.java @@ -1,18 +1,18 @@ -package service; +package com.nscharrenberg.kwetter.service; -import domain.Tweet; -import domain.User; -import exceptions.*; +import com.nscharrenberg.kwetter.domain.Tweet; +import com.nscharrenberg.kwetter.domain.User; +import com.nscharrenberg.kwetter.exceptions.*; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import repository.interfaces.TweetRepository; -import repository.interfaces.UserRepository; -import responses.HttpStatusCodes; -import responses.ObjectResponse; +import com.nscharrenberg.kwetter.repository.interfaces.TweetRepository; +import com.nscharrenberg.kwetter.repository.interfaces.UserRepository; +import com.nscharrenberg.kwetter.responses.HttpStatusCodes; +import com.nscharrenberg.kwetter.responses.ObjectResponse; import javax.swing.*; import java.security.NoSuchAlgorithmException; diff --git a/src/main/test/com/nscharrenberg/kwetter/service/UserServiceTest.java b/src/main/test/com/nscharrenberg/kwetter/service/UserServiceTest.java new file mode 100644 index 0000000..2a3dd86 --- /dev/null +++ b/src/main/test/com/nscharrenberg/kwetter/service/UserServiceTest.java @@ -0,0 +1,1499 @@ +//package com.nscharrenberg.kwetter.service; +// +//import com.nscharrenberg.kwetter.authentication.PasswordAuthentication; +//import com.nscharrenberg.kwetter.domain.Role; +//import com.nscharrenberg.kwetter.domain.User; +//import org.junit.Before; +//import org.junit.Test; +//import org.junit.runner.RunWith; +//import org.mockito.InjectMocks; +//import org.mockito.Mock; +//import org.mockito.junit.MockitoJUnitRunner; +//import com.nscharrenberg.kwetter.repository.interfaces.UserRepository; +//import com.nscharrenberg.kwetter.responses.HttpStatusCodes; +//import com.nscharrenberg.kwetter.responses.ObjectResponse; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import static org.junit.Assert.*; +//import static org.mockito.Mockito.*; +//import static org.mockito.MockitoAnnotations.initMocks; +// +//@RunWith(MockitoJUnitRunner.class) +//public class UserServiceTest { +// +// @InjectMocks +// private UserService userService; +// +// @Mock +// private UserRepository ur; +// +// @Mock +// private RoleService rr; +// +// @Before +// public void setUp() { +// initMocks(this); +// } +// +// @Test +// public void UserServiceTest() { +// assertNotNull(userService); +// } +// +// private List userList() { +// // Arrange +// List list = new ArrayList<>(); +// +// for(int i = 0; i < 5; i++) { +// User u = new User(); +// u.setId(i + 1); +// u.setUsername("user" + i); +// u.setEmail("user" + i + "@mail.com"); +// u.setPassword("password" + i); +// u.setLongitude(345.123); +// u.setLatitude(653.234); +// u.setWebsite("www.user" + i + ".com"); +// u.setBiography("This is the biography of user" + i); +// list.add(u); +// } +// +// return list; +// } +// +// /* +// * Get All Users Test +// */ +// @Test +// public void all_StatusCodeOk() { +// // Arrange +// List list = userList(); +// when(ur.all()).thenReturn(list); +// +// // Act +// ObjectResponse> response = userService.all(); +// +// // Assert +// verify(ur, atLeastOnce()).all(); +// assertEquals(HttpStatusCodes.OK, response.getCode()); +// assertEquals(list, response.getObject()); +// assertEquals(list.size(), response.getObject().size()); +// } +// +// /* +// * Get Permission By Id Tests +// */ +// @Test +// public void getById_ExistingId_StatusCodeOk() { +// // Arange +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// when(ur.getById(id)).thenReturn(user); +// +// // Act +// ObjectResponse response = userService.getById(id); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// assertEquals(HttpStatusCodes.OK, response.getCode()); +// assertEquals(user, response.getObject()); +// } +// +// @Test +// public void getById_IdNull_StatusCodeNotAcceptable() { +// // Arange +// int id = 0; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// +// // Act +// ObjectResponse response = userService.getById(id); +// +// // Assert +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void getById_IdDoesNotExist_StatusCodeNotFound() { +// // Arange +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// when(ur.getById(id)).thenReturn(null); +// +// // Act +// ObjectResponse response = userService.getById(id); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); +// assertNull(response.getObject()); +// } +// +// +// /* +// * Get Permission By Username Tests +// */ +// @Test +// public void getByUsername_ExistingUsername_StatusCodeOk() { +// // Arange +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// when(ur.getByUsername(username)).thenReturn(user); +// +// // Act +// ObjectResponse response = userService.getByUsername(username); +// +// // Assert +// verify(ur, atLeastOnce()).getByUsername(username); +// assertEquals(HttpStatusCodes.OK, response.getCode()); +// assertEquals(user, response.getObject()); +// } +// +// @Test +// public void getByUsername_UsernameNull_StatusCodeNotAcceptable() { +// // Arange +// int id = 15; +// String username = ""; +// String email = "testUser@mail.com"; +// String password = "password123"; +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// +// // Act +// ObjectResponse response = userService.getByUsername(username); +// +// // Assert +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void getByUsername_UsernameDoesNotExist_StatusCodeNotFound() { +// // Arange +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// when(ur.getByUsername(username)).thenReturn(null); +// +// // Act +// ObjectResponse response = userService.getByUsername(username); +// +// // Assert +// verify(ur, atLeastOnce()).getByUsername(username); +// assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); +// assertNull(response.getObject()); +// } +// +// /* +// * Get Permission By Username Tests +// */ +// @Test +// public void getByEmail_ExistingEmail_StatusCodeOk() { +// // Arange +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// when(ur.getByEmail(email)).thenReturn(user); +// +// // Act +// ObjectResponse response = userService.getByEmail(email); +// +// // Assert +// verify(ur, atLeastOnce()).getByEmail(email); +// assertEquals(HttpStatusCodes.OK, response.getCode()); +// assertEquals(user, response.getObject()); +// } +// +// @Test +// public void getByEmail_EmailNull_StatusCodeNotAcceptable() { +// // Arange +// int id = 866; +// String username = "testUser"; +// String email = ""; +// String password = "password123"; +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// +// // Act +// ObjectResponse response = userService.getByEmail(email); +// +// // Assert +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void getByEmail_EmailDoesNotExist_StatusCodeNotFound() { +// // Arange +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// when(ur.getByEmail(email)).thenReturn(null); +// +// // Act +// ObjectResponse response = userService.getByEmail(email); +// +// // Assert +// verify(ur, atLeastOnce()).getByEmail(email); +// assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); +// assertNull(response.getObject()); +// } +// +// /* +// * Create User Tests +// */ +// @Test +// public void create_newWithProperItems_StatusCodeOk() { +// // Arange +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// String roleName = "member"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// Role role = new Role(); +// role.setId(id); +// role.setName(roleName); +// +// when(ur.getByUsername(username)).thenReturn(null); +// when(ur.getByEmail(email)).thenReturn(null); +// when(rr.getByName(roleName)).thenReturn(new ObjectResponse<>(HttpStatusCodes.OK, "Role with name: " + role.getName() + " found", role)); +// when(ur.create(user)).thenReturn(user); +// +// // Act +// ObjectResponse response = userService.create(user); +// +// // Assert +// verify(ur, atLeastOnce()).getByUsername(username); +// verify(ur, atLeastOnce()).getByEmail(email); +// verify(rr, atLeastOnce()).getByName(roleName); +// verify(ur, atLeastOnce()).create(user); +// assertEquals(HttpStatusCodes.CREATED, response.getCode()); +// assertEquals(user, response.getObject()); +// } +// +// @Test +// public void create_EmptyUsername_StatusCodeNotAcceptable() { +// // Arange +// int id = 6; +// String username = ""; +// String email = "testUser@mail.com"; +// String password = "password123"; +// +// String roleName = "member"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// +// Role role = new Role(); +// role.setId(id); +// role.setName(roleName); +// +// // Act +// ObjectResponse response = userService.create(user); +// +// // Assert +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void create_EmptyEmail_StatusCodeNotAcceptable() { +// // Arange +// int id = 6; +// String username = "testUser"; +// String email = ""; +// String password = "password123"; +// +// String roleName = "member"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// +// Role role = new Role(); +// role.setId(id); +// role.setName(roleName); +// +// // Act +// ObjectResponse response = userService.create(user); +// +// // Assert +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void create_newWithExistingUsername_StatusCodeConflict() { +// // Arange +// int existingId = 6; +// String existingEmail = "testUser@mail.com"; +// String existingPassword = "password123"; +// +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// +// String roleName = "member"; +// +// User existing = new User(); +// existing.setId(existingId); +// existing.setUsername(username); +// existing.setEmail(existingEmail); +// existing.setPassword(existingPassword); +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// +// Role role = new Role(); +// role.setId(id); +// role.setName(roleName); +// +// when(ur.getByUsername(username)).thenReturn(existing); +// +// // Act +// ObjectResponse response = userService.create(user); +// +// // Assert +// verify(ur, atLeastOnce()).getByUsername(username); +// assertEquals(HttpStatusCodes.CONFLICT, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void create_newWithExistingEmail_StatusCodeConflict() { +// // Arange +// int existingId = 6; +// String existingUsername = "testUSer2"; +// String existingPassword = "password123"; +// +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// +// String roleName = "member"; +// +// User existing = new User(); +// existing.setId(existingId); +// existing.setUsername(existingUsername); +// existing.setEmail(email); +// existing.setPassword(existingPassword); +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// +// Role role = new Role(); +// role.setId(id); +// role.setName(roleName); +// +// when(ur.getByUsername(username)).thenReturn(null); +// when(ur.getByEmail(email)).thenReturn(existing); +// +// // Act +// ObjectResponse response = userService.create(user); +// +// // Assert +// verify(ur, atLeastOnce()).getByUsername(username); +// verify(ur, atLeastOnce()).getByEmail(email); +// assertEquals(HttpStatusCodes.CONFLICT, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void create_newWithBiographyToLong_StatusCodeNotAcceptable() { +// // Arange +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "DiMg5G7a0WtzAMM2lZGtRDUxGPEzSz8IiTp9kdEFIjQv4Ry0fWIj6g954aJH3nR1tA9vphw3BPjtBtJrBevfSdItG1PNQp2ZSkXJ0ANeLPS03l0aw4X70I2adMZQ5rhKo7FYqszRiUYUsoLU5rt4viJ2UUVak08RHsqa3WErgUaqojWdx7vb2L4XDvCUDhzR4b56"; +// +// String roleName = "member"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// Role role = new Role(); +// role.setId(id); +// role.setName(roleName); +// +// when(ur.getByUsername(username)).thenReturn(null); +// when(ur.getByEmail(email)).thenReturn(null); +// +// // Act +// ObjectResponse response = userService.create(user); +// +// // Assert +// verify(ur, atLeastOnce()).getByUsername(username); +// verify(ur, atLeastOnce()).getByEmail(email); +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void create_newWithRoleDoesNotExist_StatusCodeConflict() { +// // Arange +// int existingId = 6; +// String existingUsername = "testUSer2"; +// String existingPassword = "password123"; +// +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// +// String roleName = "member"; +// +// User existing = new User(); +// existing.setId(existingId); +// existing.setUsername(existingUsername); +// existing.setEmail(email); +// existing.setPassword(existingPassword); +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// +// when(ur.getByUsername(username)).thenReturn(null); +// when(ur.getByEmail(email)).thenReturn(null); +// when(rr.getByName(roleName)).thenReturn(new ObjectResponse<>(HttpStatusCodes.NOT_FOUND, "Role not found")); +// +// // Act +// ObjectResponse response = userService.create(user); +// +// // Assert +// verify(ur, atLeastOnce()).getByUsername(username); +// verify(ur, atLeastOnce()).getByEmail(email); +// verify(rr, atLeastOnce()).getByName(roleName); +// assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); +// assertNull(response.getObject()); +// } +// +// /* +// * Update User Tests +// */ +// @Test +// public void update_newWithProperItems_StatusCodeOk() { +// // Arange +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// String roleName = "member"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// Role role = new Role(); +// role.setId(id); +// role.setName(roleName); +// +// when(ur.getById(id)).thenReturn(user); +// when(ur.getByUsername(username)).thenReturn(null); +// when(ur.getByEmail(email)).thenReturn(null); +// when(ur.update(user)).thenReturn(user); +// +// // Act +// ObjectResponse response = userService.update(user); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// verify(ur, atLeastOnce()).getByUsername(username); +// verify(ur, atLeastOnce()).getByEmail(email); +// verify(ur, atLeastOnce()).update(user); +// assertEquals(HttpStatusCodes.OK, response.getCode()); +// assertEquals(user, response.getObject()); +// } +// +// @Test +// public void update_EmptyUsername_StatusCodeNotAcceptable() { +// // Arange +// int id = 6; +// String username = ""; +// String email = "testUser@mail.com"; +// String password = "password123"; +// +// String roleName = "member"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// +// Role role = new Role(); +// role.setId(id); +// role.setName(roleName); +// +// // Act +// ObjectResponse response = userService.update(user); +// +// // Assert +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void update_EmptyEmail_StatusCodeNotAcceptable() { +// // Arange +// int id = 6; +// String username = "testUser"; +// String email = ""; +// String password = "password123"; +// +// String roleName = "member"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// +// Role role = new Role(); +// role.setId(id); +// role.setName(roleName); +// +// // Act +// ObjectResponse response = userService.update(user); +// +// // Assert +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void update_newWithExistingUsername_StatusCodeConflict() { +// // Arange +// int existingId = 543; +// String existingEmail = "testUser@mail.com"; +// String existingPassword = "password123"; +// +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// +// String roleName = "member"; +// +// User existing = new User(); +// existing.setId(existingId); +// existing.setUsername(username); +// existing.setEmail(existingEmail); +// existing.setPassword(existingPassword); +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// +// Role role = new Role(); +// role.setId(id); +// role.setName(roleName); +// +// when(ur.getById(id)).thenReturn(user); +// when(ur.getByUsername(username)).thenReturn(existing); +// +// // Act +// ObjectResponse response = userService.update(user); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// verify(ur, atLeastOnce()).getByUsername(username); +// assertEquals(HttpStatusCodes.CONFLICT, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void update_newWithExistingEmail_StatusCodeConflict() { +// // Arange +// int existingId = 543; +// String existingUsername = "testUser2"; +// String existingPassword = "password123"; +// +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// +// String roleName = "member"; +// +// User existing = new User(); +// existing.setId(existingId); +// existing.setUsername(existingUsername); +// existing.setEmail(email); +// existing.setPassword(existingPassword); +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// +// Role role = new Role(); +// role.setId(id); +// role.setName(roleName); +// +// when(ur.getById(id)).thenReturn(user); +// when(ur.getByUsername(username)).thenReturn(null); +// when(ur.getByEmail(email)).thenReturn(existing); +// +// // Act +// ObjectResponse response = userService.update(user); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// verify(ur, atLeastOnce()).getByUsername(username); +// verify(ur, atLeastOnce()).getByEmail(email); +// assertEquals(HttpStatusCodes.CONFLICT, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void update_newWithBiographyToLong_StatusCodeNotAcceptable() { +// // Arange +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "DiMg5G7a0WtzAMM2lZGtRDUxGPEzSz8IiTp9kdEFIjQv4Ry0fWIj6g954aJH3nR1tA9vphw3BPjtBtJrBevfSdItG1PNQp2ZSkXJ0ANeLPS03l0aw4X70I2adMZQ5rhKo7FYqszRiUYUsoLU5rt4viJ2UUVak08RHsqa3WErgUaqojWdx7vb2L4XDvCUDhzR4b56"; +// +// String roleName = "member"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// Role role = new Role(); +// role.setId(id); +// role.setName(roleName); +// +// when(ur.getById(id)).thenReturn(user); +// +// // Act +// ObjectResponse response = userService.update(user); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +// +// /* +// * Delete User Tests +// */ +// @Test +// public void delete_ExistingId_StatusCodeOk() { +// // Arange +// int id = 6; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// when(ur.getById(id)).thenReturn(user); +// when(ur.delete(user)).thenReturn(true); +// +// // Act +// ObjectResponse response = userService.delete(user); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// verify(ur, atLeastOnce()).delete(user); +// assertEquals(HttpStatusCodes.OK, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void delete_IdNull_StatusCodeNotAcceptable() { +// // Arange +// int id = 0; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// // Act +// ObjectResponse response = userService.delete(user); +// +// // Assert +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void delete_IdDoesNotExist_StatusCodeNotFound() { +// // Arange +// int id = 562; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// when(ur.getById(id)).thenReturn(null); +// +// // Act +// ObjectResponse response = userService.delete(user); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); +// assertNull(response.getObject()); +// } +// +// /* +// * Follow User Tests +// */ +// @Test +// public void follow_withExistingUsers_StatusCodeOk() { +// // Arange +// int id = 562; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// // Arange +// int id2 = 987; +// String username2 = "testUser2"; +// String email2 = "testUser2@mail.com"; +// String password2 = "password1433"; +// String biography2 = "This is my biography2"; +// +// User toFollow = new User(); +// toFollow.setId(id2); +// toFollow.setUsername(username2); +// toFollow.setEmail(email2); +// toFollow.setPassword(password2); +// toFollow.setBiography(biography2); +// +// when(ur.getById(id)).thenReturn(user); +// when(ur.getById(id2)).thenReturn(toFollow); +// when(ur.follow(user, toFollow)).thenReturn(toFollow); +// +// // Act +// ObjectResponse response = userService.follow(user, toFollow); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// verify(ur, atLeastOnce()).getById(id2); +// verify(ur, atLeastOnce()).follow(user, toFollow); +// assertEquals(HttpStatusCodes.OK, response.getCode()); +// assertEquals(toFollow, response.getObject()); +// } +// +// @Test +// public void follow_UserIdNull_StatusCodeNotAcceptable() { +// // Arange +// int id = 0; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// // Arange +// int id2 = 987; +// String username2 = "testUser2"; +// String email2 = "testUser2@mail.com"; +// String password2 = "password1433"; +// String biography2 = "This is my biography2"; +// +// User toFollow = new User(); +// toFollow.setId(id2); +// toFollow.setUsername(username2); +// toFollow.setEmail(email2); +// toFollow.setPassword(password2); +// toFollow.setBiography(biography2); +// +// // Act +// ObjectResponse response = userService.follow(user, toFollow); +// +// // Assert +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void follow_toFollowIdNull_StatusCodeNotAcceptable() { +// // Arange +// int id = 789; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// // Arange +// int id2 = 0; +// String username2 = "testUser2"; +// String email2 = "testUser2@mail.com"; +// String password2 = "password1433"; +// String biography2 = "This is my biography2"; +// +// User toFollow = new User(); +// toFollow.setId(id2); +// toFollow.setUsername(username2); +// toFollow.setEmail(email2); +// toFollow.setPassword(password2); +// toFollow.setBiography(biography2); +// +// // Act +// ObjectResponse response = userService.follow(user, toFollow); +// +// // Assert +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void follow_UserDoesNotExist_StatusCodeOk() { +// // Arange +// int id = 562; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// // Arange +// int id2 = 987; +// String username2 = "testUser2"; +// String email2 = "testUser2@mail.com"; +// String password2 = "password1433"; +// String biography2 = "This is my biography2"; +// +// User toFollow = new User(); +// toFollow.setId(id2); +// toFollow.setUsername(username2); +// toFollow.setEmail(email2); +// toFollow.setPassword(password2); +// toFollow.setBiography(biography2); +// +// when(ur.getById(id)).thenReturn(null); +// +// // Act +// ObjectResponse response = userService.follow(user, toFollow); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void follow_toFollowDoesNotExist_StatusCodeOk() { +// // Arange +// int id = 562; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// // Arange +// int id2 = 987; +// String username2 = "testUser2"; +// String email2 = "testUser2@mail.com"; +// String password2 = "password1433"; +// String biography2 = "This is my biography2"; +// +// User toFollow = new User(); +// toFollow.setId(id2); +// toFollow.setUsername(username2); +// toFollow.setEmail(email2); +// toFollow.setPassword(password2); +// toFollow.setBiography(biography2); +// +// when(ur.getById(id)).thenReturn(user); +// when(ur.getById(id2)).thenReturn(null); +// +// // Act +// ObjectResponse response = userService.follow(user, toFollow); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// verify(ur, atLeastOnce()).getById(id2); +// assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void follow_UserAlreadyFollowingTheFollower_StatusCodeOk() { +// // Arange +// int id = 562; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// // Arange +// int id2 = 987; +// String username2 = "testUser2"; +// String email2 = "testUser2@mail.com"; +// String password2 = "password1433"; +// String biography2 = "This is my biography2"; +// +// User toFollow = new User(); +// toFollow.setId(id2); +// toFollow.setUsername(username2); +// toFollow.setEmail(email2); +// toFollow.setPassword(password2); +// toFollow.setBiography(biography2); +// +// user.addFollowing(toFollow); +// +// when(ur.getById(id)).thenReturn(user); +// when(ur.getById(id2)).thenReturn(toFollow); +// +// // Act +// ObjectResponse response = userService.follow(user, toFollow); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// verify(ur, atLeastOnce()).getById(id2); +// assertEquals(HttpStatusCodes.FORBIDDEN, response.getCode()); +// assertNull(response.getObject()); +// } +// +// /* +// * unFollow User Tests +// */ +// @Test +// public void unfollow_withExistingUsers_StatusCodeOk() { +// // Arange +// int id = 562; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// // Arange +// int id2 = 987; +// String username2 = "testUser2"; +// String email2 = "testUser2@mail.com"; +// String password2 = "password1433"; +// String biography2 = "This is my biography2"; +// +// User toFollow = new User(); +// toFollow.setId(id2); +// toFollow.setUsername(username2); +// toFollow.setEmail(email2); +// toFollow.setPassword(password2); +// toFollow.setBiography(biography2); +// +// user.addFollowing(toFollow); +// +// when(ur.getById(id)).thenReturn(user); +// when(ur.getById(id2)).thenReturn(toFollow); +// when(ur.unfollow(user, toFollow)).thenReturn(toFollow); +// +// // Act +// ObjectResponse response = userService.unfollow(user, toFollow); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// verify(ur, atLeastOnce()).getById(id2); +// verify(ur, atLeastOnce()).unfollow(user, toFollow); +// assertEquals(HttpStatusCodes.OK, response.getCode()); +// assertEquals(toFollow, response.getObject()); +// } +// +// @Test +// public void unfollow_UserIdNull_StatusCodeNotAcceptable() { +// // Arange +// int id = 0; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// // Arange +// int id2 = 987; +// String username2 = "testUser2"; +// String email2 = "testUser2@mail.com"; +// String password2 = "password1433"; +// String biography2 = "This is my biography2"; +// +// User toFollow = new User(); +// toFollow.setId(id2); +// toFollow.setUsername(username2); +// toFollow.setEmail(email2); +// toFollow.setPassword(password2); +// toFollow.setBiography(biography2); +// +// user.addFollowing(toFollow); +// +// // Act +// ObjectResponse response = userService.unfollow(user, toFollow); +// +// // Assert +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void unfollow_toFollowIdNull_StatusCodeNotAcceptable() { +// // Arange +// int id = 789; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// // Arange +// int id2 = 0; +// String username2 = "testUser2"; +// String email2 = "testUser2@mail.com"; +// String password2 = "password1433"; +// String biography2 = "This is my biography2"; +// +// User toFollow = new User(); +// toFollow.setId(id2); +// toFollow.setUsername(username2); +// toFollow.setEmail(email2); +// toFollow.setPassword(password2); +// toFollow.setBiography(biography2); +// +// user.addFollowing(toFollow); +// +// // Act +// ObjectResponse response = userService.unfollow(user, toFollow); +// +// // Assert +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void unfollow_UserDoesNotExist_StatusCodeOk() { +// // Arange +// int id = 562; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// // Arange +// int id2 = 987; +// String username2 = "testUser2"; +// String email2 = "testUser2@mail.com"; +// String password2 = "password1433"; +// String biography2 = "This is my biography2"; +// +// User toFollow = new User(); +// toFollow.setId(id2); +// toFollow.setUsername(username2); +// toFollow.setEmail(email2); +// toFollow.setPassword(password2); +// toFollow.setBiography(biography2); +// +// user.addFollowing(toFollow); +// +// when(ur.getById(id)).thenReturn(null); +// +// // Act +// ObjectResponse response = userService.unfollow(user, toFollow); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void unfollow_toFollowDoesNotExist_StatusCodeOk() { +// // Arange +// int id = 562; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// // Arange +// int id2 = 987; +// String username2 = "testUser2"; +// String email2 = "testUser2@mail.com"; +// String password2 = "password1433"; +// String biography2 = "This is my biography2"; +// +// User toFollow = new User(); +// toFollow.setId(id2); +// toFollow.setUsername(username2); +// toFollow.setEmail(email2); +// toFollow.setPassword(password2); +// toFollow.setBiography(biography2); +// +// user.addFollowing(toFollow); +// +// when(ur.getById(id)).thenReturn(user); +// when(ur.getById(id2)).thenReturn(null); +// +// // Act +// ObjectResponse response = userService.unfollow(user, toFollow); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// verify(ur, atLeastOnce()).getById(id2); +// assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void unfollow_UserNotFollowingTheFollower_StatusCodeOk() { +// // Arange +// int id = 562; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(password); +// user.setBiography(biography); +// +// // Arange +// int id2 = 987; +// String username2 = "testUser2"; +// String email2 = "testUser2@mail.com"; +// String password2 = "password1433"; +// String biography2 = "This is my biography2"; +// +// User toFollow = new User(); +// toFollow.setId(id2); +// toFollow.setUsername(username2); +// toFollow.setEmail(email2); +// toFollow.setPassword(password2); +// toFollow.setBiography(biography2); +// +// when(ur.getById(id)).thenReturn(user); +// when(ur.getById(id2)).thenReturn(toFollow); +// +// // Act +// ObjectResponse response = userService.unfollow(user, toFollow); +// +// // Assert +// verify(ur, atLeastOnce()).getById(id); +// verify(ur, atLeastOnce()).getById(id2); +// assertEquals(HttpStatusCodes.FORBIDDEN, response.getCode()); +// assertNull(response.getObject()); +// } +// +// /* +// * Login Tests +// */ +// @Test +// public void login_CorrectDetails_StatusCodeOk() { +// // Arange +// int id = 562; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(PasswordAuthentication.hash(password)); +// user.setBiography(biography); +// +// when(ur.getByUsername(username)).thenReturn(user); +// +// // Act +// ObjectResponse response = userService.login(username, password); +// +// // Assert +// verify(ur, atLeastOnce()).getByUsername(username); +// assertEquals(HttpStatusCodes.OK, response.getCode()); +// assertEquals(user, response.getObject()); +// } +// +// @Test +// public void login_IncorrectPassword_StatusCodeUnauthorized() { +// // Arange +// int id = 562; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(PasswordAuthentication.hash(password)); +// user.setBiography(biography); +// +// when(ur.getByUsername(username)).thenReturn(user); +// +// // Act +// ObjectResponse response = userService.login(username, "incorrectPassword"); +// +// // Assert +// verify(ur, atLeastOnce()).getByUsername(username); +// assertEquals(HttpStatusCodes.UNAUTHORIZED, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void login_IncorrectUsername_StatusCodeUnauthorized() { +// // Arange +// int id = 562; +// String username = "testUser"; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(PasswordAuthentication.hash(password)); +// user.setBiography(biography); +// +// when(ur.getByUsername(username)).thenReturn(null); +// +// // Act +// ObjectResponse response = userService.login(username, password); +// +// // Assert +// verify(ur, atLeastOnce()).getByUsername(username); +// assertEquals(HttpStatusCodes.UNAUTHORIZED, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void login_EmptyUsername_StatusCodeNotAcceptable() { +// // Arange +// int id = 562; +// String username = ""; +// String email = "testUser@mail.com"; +// String password = "password123"; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(PasswordAuthentication.hash(password)); +// user.setBiography(biography); +// +// +// // Act +// ObjectResponse response = userService.login(username, password); +// +// // Assert +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +// +// @Test +// public void login_EmptyPassword_StatusCodeNotAcceptable() { +// // Arange +// int id = 562; +// String username = "asdfasdf"; +// String email = "testUser@mail.com"; +// String password = ""; +// String biography = "This is my biography"; +// +// User user = new User(); +// user.setId(id); +// user.setUsername(username); +// user.setEmail(email); +// user.setPassword(PasswordAuthentication.hash(password)); +// user.setBiography(biography); +// +// // Act +// ObjectResponse response = userService.login(username, password); +// +// // Assert +// assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); +// assertNull(response.getObject()); +// } +//} diff --git a/src/main/test/integration/KwetterTest.java b/src/main/test/cucumber/KwetterTest.java similarity index 93% rename from src/main/test/integration/KwetterTest.java rename to src/main/test/cucumber/KwetterTest.java index 2f587e7..95f8659 100644 --- a/src/main/test/integration/KwetterTest.java +++ b/src/main/test/cucumber/KwetterTest.java @@ -1,4 +1,4 @@ -package integration; +package cucumber; import com.github.tomakehurst.wiremock.core.WireMockConfiguration; import com.github.tomakehurst.wiremock.junit.WireMockRule; diff --git a/src/main/test/integration/RestConnectionTest.java b/src/main/test/cucumber/RestConnectionTest.java similarity index 94% rename from src/main/test/integration/RestConnectionTest.java rename to src/main/test/cucumber/RestConnectionTest.java index 893c282..db2d81c 100644 --- a/src/main/test/integration/RestConnectionTest.java +++ b/src/main/test/cucumber/RestConnectionTest.java @@ -1,4 +1,4 @@ -package integration; +package cucumber; public class RestConnectionTest { public final static String BASE_URL = "http://localhost:8080/api/"; diff --git a/src/main/test/cucumber/RunCucumberTest.java b/src/main/test/cucumber/RunCucumberTest.java new file mode 100644 index 0000000..e8603cf --- /dev/null +++ b/src/main/test/cucumber/RunCucumberTest.java @@ -0,0 +1,13 @@ +//package cucumber; +// +//import cucumber.api.CucumberOptions; +//import cucumber.api.junit.Cucumber; +//import org.junit.runner.RunWith; +// +//@RunWith(Cucumber.class) +//@CucumberOptions( +// plugin = {"pretty"}, +// features = "src/main/test/cucumber/feature" +//) +//public class RunCucumberTest { +//} diff --git a/src/main/test/integration/container/WorldContainer.java b/src/main/test/cucumber/container/WorldContainer.java similarity index 91% rename from src/main/test/integration/container/WorldContainer.java rename to src/main/test/cucumber/container/WorldContainer.java index 304fead..7beda3e 100644 --- a/src/main/test/integration/container/WorldContainer.java +++ b/src/main/test/cucumber/container/WorldContainer.java @@ -1,4 +1,4 @@ -package integration.container; +package cucumber.container; import io.restassured.response.Response; import io.restassured.response.ValidatableResponse; diff --git a/src/main/test/integration/feature/GetPermission.feature b/src/main/test/cucumber/feature/GetPermission.feature similarity index 100% rename from src/main/test/integration/feature/GetPermission.feature rename to src/main/test/cucumber/feature/GetPermission.feature diff --git a/src/main/test/integration/feature/GetRole.feature b/src/main/test/cucumber/feature/GetRole.feature similarity index 100% rename from src/main/test/integration/feature/GetRole.feature rename to src/main/test/cucumber/feature/GetRole.feature diff --git a/src/main/test/integration/feature/GetTweet.feature b/src/main/test/cucumber/feature/GetTweet.feature similarity index 100% rename from src/main/test/integration/feature/GetTweet.feature rename to src/main/test/cucumber/feature/GetTweet.feature diff --git a/src/main/test/integration/feature/GetUser.feature b/src/main/test/cucumber/feature/GetUser.feature similarity index 100% rename from src/main/test/integration/feature/GetUser.feature rename to src/main/test/cucumber/feature/GetUser.feature diff --git a/src/main/test/integration/steps/GetPermissionStepDef.java b/src/main/test/cucumber/steps/GetPermissionStepDef.java similarity index 93% rename from src/main/test/integration/steps/GetPermissionStepDef.java rename to src/main/test/cucumber/steps/GetPermissionStepDef.java index 7402cf8..4cb39fe 100644 --- a/src/main/test/integration/steps/GetPermissionStepDef.java +++ b/src/main/test/cucumber/steps/GetPermissionStepDef.java @@ -1,10 +1,9 @@ -package integration.steps; +package cucumber.steps; -import cucumber.api.PendingException; import cucumber.api.java.Before; import cucumber.api.java.en.Then; import cucumber.api.java.en.When; -import integration.container.WorldContainer; +import cucumber.container.WorldContainer; import static org.hamcrest.Matchers.is; diff --git a/src/main/test/integration/steps/GetRoleStepDef.java b/src/main/test/cucumber/steps/GetRoleStepDef.java similarity index 95% rename from src/main/test/integration/steps/GetRoleStepDef.java rename to src/main/test/cucumber/steps/GetRoleStepDef.java index 04559c6..d6f3126 100644 --- a/src/main/test/integration/steps/GetRoleStepDef.java +++ b/src/main/test/cucumber/steps/GetRoleStepDef.java @@ -1,10 +1,10 @@ -package integration.steps; +package cucumber.steps; import cucumber.api.PendingException; import cucumber.api.java.Before; import cucumber.api.java.en.Then; import cucumber.api.java.en.When; -import integration.container.WorldContainer; +import cucumber.container.WorldContainer; import static org.hamcrest.Matchers.is; diff --git a/src/main/test/integration/steps/GetTweetStepDef.java b/src/main/test/cucumber/steps/GetTweetStepDef.java similarity index 96% rename from src/main/test/integration/steps/GetTweetStepDef.java rename to src/main/test/cucumber/steps/GetTweetStepDef.java index ff11aa1..6db76b6 100644 --- a/src/main/test/integration/steps/GetTweetStepDef.java +++ b/src/main/test/cucumber/steps/GetTweetStepDef.java @@ -1,10 +1,10 @@ -package integration.steps; +package cucumber.steps; import cucumber.api.PendingException; import cucumber.api.java.Before; import cucumber.api.java.en.Then; import cucumber.api.java.en.When; -import integration.container.WorldContainer; +import cucumber.container.WorldContainer; import static org.hamcrest.Matchers.*; diff --git a/src/main/test/integration/steps/GetUserStepDef.java b/src/main/test/cucumber/steps/GetUserStepDef.java similarity index 95% rename from src/main/test/integration/steps/GetUserStepDef.java rename to src/main/test/cucumber/steps/GetUserStepDef.java index e9cd3ec..a5f0f12 100644 --- a/src/main/test/integration/steps/GetUserStepDef.java +++ b/src/main/test/cucumber/steps/GetUserStepDef.java @@ -1,10 +1,10 @@ -package integration.steps; +package cucumber.steps; import cucumber.api.java.Before; import cucumber.api.java.en.And; import cucumber.api.java.en.Then; import cucumber.api.java.en.When; -import integration.container.WorldContainer; +import cucumber.container.WorldContainer; import static org.hamcrest.Matchers.is; diff --git a/src/main/test/integration/steps/OperationStepDef.java b/src/main/test/cucumber/steps/OperationStepDef.java similarity index 92% rename from src/main/test/integration/steps/OperationStepDef.java rename to src/main/test/cucumber/steps/OperationStepDef.java index 0bac4d8..a9f4f20 100644 --- a/src/main/test/integration/steps/OperationStepDef.java +++ b/src/main/test/cucumber/steps/OperationStepDef.java @@ -1,10 +1,10 @@ -package integration.steps; +package cucumber.steps; import cucumber.api.java.Before; import cucumber.api.java.en.And; import cucumber.api.java.en.Given; -import integration.KwetterTest; -import integration.container.WorldContainer; +import cucumber.KwetterTest; +import cucumber.container.WorldContainer; import io.restassured.RestAssured; import javax.ws.rs.core.MediaType; diff --git a/src/main/test/integration/RunCucumberTest.java b/src/main/test/integration/RunCucumberTest.java deleted file mode 100644 index 400c973..0000000 --- a/src/main/test/integration/RunCucumberTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package integration; - -import cucumber.api.CucumberOptions; -import cucumber.api.junit.Cucumber; -import org.junit.runner.RunWith; - -@RunWith(Cucumber.class) -@CucumberOptions( - plugin = {"pretty"}, - features = "src/main/test/integration/feature" -) -public class RunCucumberTest { -} diff --git a/src/main/test/service/UserServiceTest.java b/src/main/test/service/UserServiceTest.java deleted file mode 100644 index 09e49cf..0000000 --- a/src/main/test/service/UserServiceTest.java +++ /dev/null @@ -1,1499 +0,0 @@ -package service; - -import authentication.PasswordAuthentication; -import domain.Role; -import domain.User; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; -import repository.interfaces.UserRepository; -import responses.HttpStatusCodes; -import responses.ObjectResponse; - -import java.util.ArrayList; -import java.util.List; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; -import static org.mockito.MockitoAnnotations.initMocks; - -@RunWith(MockitoJUnitRunner.class) -public class UserServiceTest { - - @InjectMocks - private UserService userService; - - @Mock - private UserRepository ur; - - @Mock - private RoleService rr; - - @Before - public void setUp() { - initMocks(this); - } - - @Test - public void UserServiceTest() { - assertNotNull(userService); - } - - private List userList() { - // Arrange - List list = new ArrayList<>(); - - for(int i = 0; i < 5; i++) { - User u = new User(); - u.setId(i + 1); - u.setUsername("user" + i); - u.setEmail("user" + i + "@mail.com"); - u.setPassword("password" + i); - u.setLongitude(345.123); - u.setLatitude(653.234); - u.setWebsite("www.user" + i + ".com"); - u.setBiography("This is the biography of user" + i); - list.add(u); - } - - return list; - } - - /* - * Get All Users Test - */ - @Test - public void all_StatusCodeOk() { - // Arrange - List list = userList(); - when(ur.all()).thenReturn(list); - - // Act - ObjectResponse> response = userService.all(); - - // Assert - verify(ur, atLeastOnce()).all(); - assertEquals(HttpStatusCodes.OK, response.getCode()); - assertEquals(list, response.getObject()); - assertEquals(list.size(), response.getObject().size()); - } - - /* - * Get Permission By Id Tests - */ - @Test - public void getById_ExistingId_StatusCodeOk() { - // Arange - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - when(ur.getById(id)).thenReturn(user); - - // Act - ObjectResponse response = userService.getById(id); - - // Assert - verify(ur, atLeastOnce()).getById(id); - assertEquals(HttpStatusCodes.OK, response.getCode()); - assertEquals(user, response.getObject()); - } - - @Test - public void getById_IdNull_StatusCodeNotAcceptable() { - // Arange - int id = 0; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - - // Act - ObjectResponse response = userService.getById(id); - - // Assert - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void getById_IdDoesNotExist_StatusCodeNotFound() { - // Arange - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - when(ur.getById(id)).thenReturn(null); - - // Act - ObjectResponse response = userService.getById(id); - - // Assert - verify(ur, atLeastOnce()).getById(id); - assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); - assertNull(response.getObject()); - } - - - /* - * Get Permission By Username Tests - */ - @Test - public void getByUsername_ExistingUsername_StatusCodeOk() { - // Arange - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - when(ur.getByUsername(username)).thenReturn(user); - - // Act - ObjectResponse response = userService.getByUsername(username); - - // Assert - verify(ur, atLeastOnce()).getByUsername(username); - assertEquals(HttpStatusCodes.OK, response.getCode()); - assertEquals(user, response.getObject()); - } - - @Test - public void getByUsername_UsernameNull_StatusCodeNotAcceptable() { - // Arange - int id = 15; - String username = ""; - String email = "testUser@mail.com"; - String password = "password123"; - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - - // Act - ObjectResponse response = userService.getByUsername(username); - - // Assert - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void getByUsername_UsernameDoesNotExist_StatusCodeNotFound() { - // Arange - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - when(ur.getByUsername(username)).thenReturn(null); - - // Act - ObjectResponse response = userService.getByUsername(username); - - // Assert - verify(ur, atLeastOnce()).getByUsername(username); - assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); - assertNull(response.getObject()); - } - - /* - * Get Permission By Username Tests - */ - @Test - public void getByEmail_ExistingEmail_StatusCodeOk() { - // Arange - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - when(ur.getByEmail(email)).thenReturn(user); - - // Act - ObjectResponse response = userService.getByEmail(email); - - // Assert - verify(ur, atLeastOnce()).getByEmail(email); - assertEquals(HttpStatusCodes.OK, response.getCode()); - assertEquals(user, response.getObject()); - } - - @Test - public void getByEmail_EmailNull_StatusCodeNotAcceptable() { - // Arange - int id = 866; - String username = "testUser"; - String email = ""; - String password = "password123"; - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - - // Act - ObjectResponse response = userService.getByEmail(email); - - // Assert - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void getByEmail_EmailDoesNotExist_StatusCodeNotFound() { - // Arange - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - when(ur.getByEmail(email)).thenReturn(null); - - // Act - ObjectResponse response = userService.getByEmail(email); - - // Assert - verify(ur, atLeastOnce()).getByEmail(email); - assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); - assertNull(response.getObject()); - } - - /* - * Create User Tests - */ - @Test - public void create_newWithProperItems_StatusCodeOk() { - // Arange - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - String roleName = "member"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - Role role = new Role(); - role.setId(id); - role.setName(roleName); - - when(ur.getByUsername(username)).thenReturn(null); - when(ur.getByEmail(email)).thenReturn(null); - when(rr.getByName(roleName)).thenReturn(new ObjectResponse<>(HttpStatusCodes.OK, "Role with name: " + role.getName() + " found", role)); - when(ur.create(user)).thenReturn(user); - - // Act - ObjectResponse response = userService.create(user); - - // Assert - verify(ur, atLeastOnce()).getByUsername(username); - verify(ur, atLeastOnce()).getByEmail(email); - verify(rr, atLeastOnce()).getByName(roleName); - verify(ur, atLeastOnce()).create(user); - assertEquals(HttpStatusCodes.CREATED, response.getCode()); - assertEquals(user, response.getObject()); - } - - @Test - public void create_EmptyUsername_StatusCodeNotAcceptable() { - // Arange - int id = 6; - String username = ""; - String email = "testUser@mail.com"; - String password = "password123"; - - String roleName = "member"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - - Role role = new Role(); - role.setId(id); - role.setName(roleName); - - // Act - ObjectResponse response = userService.create(user); - - // Assert - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void create_EmptyEmail_StatusCodeNotAcceptable() { - // Arange - int id = 6; - String username = "testUser"; - String email = ""; - String password = "password123"; - - String roleName = "member"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - - Role role = new Role(); - role.setId(id); - role.setName(roleName); - - // Act - ObjectResponse response = userService.create(user); - - // Assert - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void create_newWithExistingUsername_StatusCodeConflict() { - // Arange - int existingId = 6; - String existingEmail = "testUser@mail.com"; - String existingPassword = "password123"; - - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - - String roleName = "member"; - - User existing = new User(); - existing.setId(existingId); - existing.setUsername(username); - existing.setEmail(existingEmail); - existing.setPassword(existingPassword); - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - - Role role = new Role(); - role.setId(id); - role.setName(roleName); - - when(ur.getByUsername(username)).thenReturn(existing); - - // Act - ObjectResponse response = userService.create(user); - - // Assert - verify(ur, atLeastOnce()).getByUsername(username); - assertEquals(HttpStatusCodes.CONFLICT, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void create_newWithExistingEmail_StatusCodeConflict() { - // Arange - int existingId = 6; - String existingUsername = "testUSer2"; - String existingPassword = "password123"; - - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - - String roleName = "member"; - - User existing = new User(); - existing.setId(existingId); - existing.setUsername(existingUsername); - existing.setEmail(email); - existing.setPassword(existingPassword); - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - - Role role = new Role(); - role.setId(id); - role.setName(roleName); - - when(ur.getByUsername(username)).thenReturn(null); - when(ur.getByEmail(email)).thenReturn(existing); - - // Act - ObjectResponse response = userService.create(user); - - // Assert - verify(ur, atLeastOnce()).getByUsername(username); - verify(ur, atLeastOnce()).getByEmail(email); - assertEquals(HttpStatusCodes.CONFLICT, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void create_newWithBiographyToLong_StatusCodeNotAcceptable() { - // Arange - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "DiMg5G7a0WtzAMM2lZGtRDUxGPEzSz8IiTp9kdEFIjQv4Ry0fWIj6g954aJH3nR1tA9vphw3BPjtBtJrBevfSdItG1PNQp2ZSkXJ0ANeLPS03l0aw4X70I2adMZQ5rhKo7FYqszRiUYUsoLU5rt4viJ2UUVak08RHsqa3WErgUaqojWdx7vb2L4XDvCUDhzR4b56"; - - String roleName = "member"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - Role role = new Role(); - role.setId(id); - role.setName(roleName); - - when(ur.getByUsername(username)).thenReturn(null); - when(ur.getByEmail(email)).thenReturn(null); - - // Act - ObjectResponse response = userService.create(user); - - // Assert - verify(ur, atLeastOnce()).getByUsername(username); - verify(ur, atLeastOnce()).getByEmail(email); - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void create_newWithRoleDoesNotExist_StatusCodeConflict() { - // Arange - int existingId = 6; - String existingUsername = "testUSer2"; - String existingPassword = "password123"; - - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - - String roleName = "member"; - - User existing = new User(); - existing.setId(existingId); - existing.setUsername(existingUsername); - existing.setEmail(email); - existing.setPassword(existingPassword); - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - - when(ur.getByUsername(username)).thenReturn(null); - when(ur.getByEmail(email)).thenReturn(null); - when(rr.getByName(roleName)).thenReturn(new ObjectResponse<>(HttpStatusCodes.NOT_FOUND, "Role not found")); - - // Act - ObjectResponse response = userService.create(user); - - // Assert - verify(ur, atLeastOnce()).getByUsername(username); - verify(ur, atLeastOnce()).getByEmail(email); - verify(rr, atLeastOnce()).getByName(roleName); - assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); - assertNull(response.getObject()); - } - - /* - * Update User Tests - */ - @Test - public void update_newWithProperItems_StatusCodeOk() { - // Arange - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - String roleName = "member"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - Role role = new Role(); - role.setId(id); - role.setName(roleName); - - when(ur.getById(id)).thenReturn(user); - when(ur.getByUsername(username)).thenReturn(null); - when(ur.getByEmail(email)).thenReturn(null); - when(ur.update(user)).thenReturn(user); - - // Act - ObjectResponse response = userService.update(user); - - // Assert - verify(ur, atLeastOnce()).getById(id); - verify(ur, atLeastOnce()).getByUsername(username); - verify(ur, atLeastOnce()).getByEmail(email); - verify(ur, atLeastOnce()).update(user); - assertEquals(HttpStatusCodes.OK, response.getCode()); - assertEquals(user, response.getObject()); - } - - @Test - public void update_EmptyUsername_StatusCodeNotAcceptable() { - // Arange - int id = 6; - String username = ""; - String email = "testUser@mail.com"; - String password = "password123"; - - String roleName = "member"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - - Role role = new Role(); - role.setId(id); - role.setName(roleName); - - // Act - ObjectResponse response = userService.update(user); - - // Assert - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void update_EmptyEmail_StatusCodeNotAcceptable() { - // Arange - int id = 6; - String username = "testUser"; - String email = ""; - String password = "password123"; - - String roleName = "member"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - - Role role = new Role(); - role.setId(id); - role.setName(roleName); - - // Act - ObjectResponse response = userService.update(user); - - // Assert - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void update_newWithExistingUsername_StatusCodeConflict() { - // Arange - int existingId = 543; - String existingEmail = "testUser@mail.com"; - String existingPassword = "password123"; - - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - - String roleName = "member"; - - User existing = new User(); - existing.setId(existingId); - existing.setUsername(username); - existing.setEmail(existingEmail); - existing.setPassword(existingPassword); - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - - Role role = new Role(); - role.setId(id); - role.setName(roleName); - - when(ur.getById(id)).thenReturn(user); - when(ur.getByUsername(username)).thenReturn(existing); - - // Act - ObjectResponse response = userService.update(user); - - // Assert - verify(ur, atLeastOnce()).getById(id); - verify(ur, atLeastOnce()).getByUsername(username); - assertEquals(HttpStatusCodes.CONFLICT, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void update_newWithExistingEmail_StatusCodeConflict() { - // Arange - int existingId = 543; - String existingUsername = "testUser2"; - String existingPassword = "password123"; - - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - - String roleName = "member"; - - User existing = new User(); - existing.setId(existingId); - existing.setUsername(existingUsername); - existing.setEmail(email); - existing.setPassword(existingPassword); - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - - Role role = new Role(); - role.setId(id); - role.setName(roleName); - - when(ur.getById(id)).thenReturn(user); - when(ur.getByUsername(username)).thenReturn(null); - when(ur.getByEmail(email)).thenReturn(existing); - - // Act - ObjectResponse response = userService.update(user); - - // Assert - verify(ur, atLeastOnce()).getById(id); - verify(ur, atLeastOnce()).getByUsername(username); - verify(ur, atLeastOnce()).getByEmail(email); - assertEquals(HttpStatusCodes.CONFLICT, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void update_newWithBiographyToLong_StatusCodeNotAcceptable() { - // Arange - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "DiMg5G7a0WtzAMM2lZGtRDUxGPEzSz8IiTp9kdEFIjQv4Ry0fWIj6g954aJH3nR1tA9vphw3BPjtBtJrBevfSdItG1PNQp2ZSkXJ0ANeLPS03l0aw4X70I2adMZQ5rhKo7FYqszRiUYUsoLU5rt4viJ2UUVak08RHsqa3WErgUaqojWdx7vb2L4XDvCUDhzR4b56"; - - String roleName = "member"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - Role role = new Role(); - role.setId(id); - role.setName(roleName); - - when(ur.getById(id)).thenReturn(user); - - // Act - ObjectResponse response = userService.update(user); - - // Assert - verify(ur, atLeastOnce()).getById(id); - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } - - /* - * Delete User Tests - */ - @Test - public void delete_ExistingId_StatusCodeOk() { - // Arange - int id = 6; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - when(ur.getById(id)).thenReturn(user); - when(ur.delete(user)).thenReturn(true); - - // Act - ObjectResponse response = userService.delete(user); - - // Assert - verify(ur, atLeastOnce()).getById(id); - verify(ur, atLeastOnce()).delete(user); - assertEquals(HttpStatusCodes.OK, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void delete_IdNull_StatusCodeNotAcceptable() { - // Arange - int id = 0; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - // Act - ObjectResponse response = userService.delete(user); - - // Assert - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void delete_IdDoesNotExist_StatusCodeNotFound() { - // Arange - int id = 562; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - when(ur.getById(id)).thenReturn(null); - - // Act - ObjectResponse response = userService.delete(user); - - // Assert - verify(ur, atLeastOnce()).getById(id); - assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); - assertNull(response.getObject()); - } - - /* - * Follow User Tests - */ - @Test - public void follow_withExistingUsers_StatusCodeOk() { - // Arange - int id = 562; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - // Arange - int id2 = 987; - String username2 = "testUser2"; - String email2 = "testUser2@mail.com"; - String password2 = "password1433"; - String biography2 = "This is my biography2"; - - User toFollow = new User(); - toFollow.setId(id2); - toFollow.setUsername(username2); - toFollow.setEmail(email2); - toFollow.setPassword(password2); - toFollow.setBiography(biography2); - - when(ur.getById(id)).thenReturn(user); - when(ur.getById(id2)).thenReturn(toFollow); - when(ur.follow(user, toFollow)).thenReturn(toFollow); - - // Act - ObjectResponse response = userService.follow(user, toFollow); - - // Assert - verify(ur, atLeastOnce()).getById(id); - verify(ur, atLeastOnce()).getById(id2); - verify(ur, atLeastOnce()).follow(user, toFollow); - assertEquals(HttpStatusCodes.OK, response.getCode()); - assertEquals(toFollow, response.getObject()); - } - - @Test - public void follow_UserIdNull_StatusCodeNotAcceptable() { - // Arange - int id = 0; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - // Arange - int id2 = 987; - String username2 = "testUser2"; - String email2 = "testUser2@mail.com"; - String password2 = "password1433"; - String biography2 = "This is my biography2"; - - User toFollow = new User(); - toFollow.setId(id2); - toFollow.setUsername(username2); - toFollow.setEmail(email2); - toFollow.setPassword(password2); - toFollow.setBiography(biography2); - - // Act - ObjectResponse response = userService.follow(user, toFollow); - - // Assert - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void follow_toFollowIdNull_StatusCodeNotAcceptable() { - // Arange - int id = 789; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - // Arange - int id2 = 0; - String username2 = "testUser2"; - String email2 = "testUser2@mail.com"; - String password2 = "password1433"; - String biography2 = "This is my biography2"; - - User toFollow = new User(); - toFollow.setId(id2); - toFollow.setUsername(username2); - toFollow.setEmail(email2); - toFollow.setPassword(password2); - toFollow.setBiography(biography2); - - // Act - ObjectResponse response = userService.follow(user, toFollow); - - // Assert - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void follow_UserDoesNotExist_StatusCodeOk() { - // Arange - int id = 562; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - // Arange - int id2 = 987; - String username2 = "testUser2"; - String email2 = "testUser2@mail.com"; - String password2 = "password1433"; - String biography2 = "This is my biography2"; - - User toFollow = new User(); - toFollow.setId(id2); - toFollow.setUsername(username2); - toFollow.setEmail(email2); - toFollow.setPassword(password2); - toFollow.setBiography(biography2); - - when(ur.getById(id)).thenReturn(null); - - // Act - ObjectResponse response = userService.follow(user, toFollow); - - // Assert - verify(ur, atLeastOnce()).getById(id); - assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void follow_toFollowDoesNotExist_StatusCodeOk() { - // Arange - int id = 562; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - // Arange - int id2 = 987; - String username2 = "testUser2"; - String email2 = "testUser2@mail.com"; - String password2 = "password1433"; - String biography2 = "This is my biography2"; - - User toFollow = new User(); - toFollow.setId(id2); - toFollow.setUsername(username2); - toFollow.setEmail(email2); - toFollow.setPassword(password2); - toFollow.setBiography(biography2); - - when(ur.getById(id)).thenReturn(user); - when(ur.getById(id2)).thenReturn(null); - - // Act - ObjectResponse response = userService.follow(user, toFollow); - - // Assert - verify(ur, atLeastOnce()).getById(id); - verify(ur, atLeastOnce()).getById(id2); - assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void follow_UserAlreadyFollowingTheFollower_StatusCodeOk() { - // Arange - int id = 562; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - // Arange - int id2 = 987; - String username2 = "testUser2"; - String email2 = "testUser2@mail.com"; - String password2 = "password1433"; - String biography2 = "This is my biography2"; - - User toFollow = new User(); - toFollow.setId(id2); - toFollow.setUsername(username2); - toFollow.setEmail(email2); - toFollow.setPassword(password2); - toFollow.setBiography(biography2); - - user.addFollowing(toFollow); - - when(ur.getById(id)).thenReturn(user); - when(ur.getById(id2)).thenReturn(toFollow); - - // Act - ObjectResponse response = userService.follow(user, toFollow); - - // Assert - verify(ur, atLeastOnce()).getById(id); - verify(ur, atLeastOnce()).getById(id2); - assertEquals(HttpStatusCodes.FORBIDDEN, response.getCode()); - assertNull(response.getObject()); - } - - /* - * unFollow User Tests - */ - @Test - public void unfollow_withExistingUsers_StatusCodeOk() { - // Arange - int id = 562; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - // Arange - int id2 = 987; - String username2 = "testUser2"; - String email2 = "testUser2@mail.com"; - String password2 = "password1433"; - String biography2 = "This is my biography2"; - - User toFollow = new User(); - toFollow.setId(id2); - toFollow.setUsername(username2); - toFollow.setEmail(email2); - toFollow.setPassword(password2); - toFollow.setBiography(biography2); - - user.addFollowing(toFollow); - - when(ur.getById(id)).thenReturn(user); - when(ur.getById(id2)).thenReturn(toFollow); - when(ur.unfollow(user, toFollow)).thenReturn(toFollow); - - // Act - ObjectResponse response = userService.unfollow(user, toFollow); - - // Assert - verify(ur, atLeastOnce()).getById(id); - verify(ur, atLeastOnce()).getById(id2); - verify(ur, atLeastOnce()).unfollow(user, toFollow); - assertEquals(HttpStatusCodes.OK, response.getCode()); - assertEquals(toFollow, response.getObject()); - } - - @Test - public void unfollow_UserIdNull_StatusCodeNotAcceptable() { - // Arange - int id = 0; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - // Arange - int id2 = 987; - String username2 = "testUser2"; - String email2 = "testUser2@mail.com"; - String password2 = "password1433"; - String biography2 = "This is my biography2"; - - User toFollow = new User(); - toFollow.setId(id2); - toFollow.setUsername(username2); - toFollow.setEmail(email2); - toFollow.setPassword(password2); - toFollow.setBiography(biography2); - - user.addFollowing(toFollow); - - // Act - ObjectResponse response = userService.unfollow(user, toFollow); - - // Assert - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void unfollow_toFollowIdNull_StatusCodeNotAcceptable() { - // Arange - int id = 789; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - // Arange - int id2 = 0; - String username2 = "testUser2"; - String email2 = "testUser2@mail.com"; - String password2 = "password1433"; - String biography2 = "This is my biography2"; - - User toFollow = new User(); - toFollow.setId(id2); - toFollow.setUsername(username2); - toFollow.setEmail(email2); - toFollow.setPassword(password2); - toFollow.setBiography(biography2); - - user.addFollowing(toFollow); - - // Act - ObjectResponse response = userService.unfollow(user, toFollow); - - // Assert - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void unfollow_UserDoesNotExist_StatusCodeOk() { - // Arange - int id = 562; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - // Arange - int id2 = 987; - String username2 = "testUser2"; - String email2 = "testUser2@mail.com"; - String password2 = "password1433"; - String biography2 = "This is my biography2"; - - User toFollow = new User(); - toFollow.setId(id2); - toFollow.setUsername(username2); - toFollow.setEmail(email2); - toFollow.setPassword(password2); - toFollow.setBiography(biography2); - - user.addFollowing(toFollow); - - when(ur.getById(id)).thenReturn(null); - - // Act - ObjectResponse response = userService.unfollow(user, toFollow); - - // Assert - verify(ur, atLeastOnce()).getById(id); - assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void unfollow_toFollowDoesNotExist_StatusCodeOk() { - // Arange - int id = 562; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - // Arange - int id2 = 987; - String username2 = "testUser2"; - String email2 = "testUser2@mail.com"; - String password2 = "password1433"; - String biography2 = "This is my biography2"; - - User toFollow = new User(); - toFollow.setId(id2); - toFollow.setUsername(username2); - toFollow.setEmail(email2); - toFollow.setPassword(password2); - toFollow.setBiography(biography2); - - user.addFollowing(toFollow); - - when(ur.getById(id)).thenReturn(user); - when(ur.getById(id2)).thenReturn(null); - - // Act - ObjectResponse response = userService.unfollow(user, toFollow); - - // Assert - verify(ur, atLeastOnce()).getById(id); - verify(ur, atLeastOnce()).getById(id2); - assertEquals(HttpStatusCodes.NOT_FOUND, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void unfollow_UserNotFollowingTheFollower_StatusCodeOk() { - // Arange - int id = 562; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(password); - user.setBiography(biography); - - // Arange - int id2 = 987; - String username2 = "testUser2"; - String email2 = "testUser2@mail.com"; - String password2 = "password1433"; - String biography2 = "This is my biography2"; - - User toFollow = new User(); - toFollow.setId(id2); - toFollow.setUsername(username2); - toFollow.setEmail(email2); - toFollow.setPassword(password2); - toFollow.setBiography(biography2); - - when(ur.getById(id)).thenReturn(user); - when(ur.getById(id2)).thenReturn(toFollow); - - // Act - ObjectResponse response = userService.unfollow(user, toFollow); - - // Assert - verify(ur, atLeastOnce()).getById(id); - verify(ur, atLeastOnce()).getById(id2); - assertEquals(HttpStatusCodes.FORBIDDEN, response.getCode()); - assertNull(response.getObject()); - } - - /* - * Login Tests - */ - @Test - public void login_CorrectDetails_StatusCodeOk() { - // Arange - int id = 562; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(PasswordAuthentication.hash(password)); - user.setBiography(biography); - - when(ur.getByUsername(username)).thenReturn(user); - - // Act - ObjectResponse response = userService.login(username, password); - - // Assert - verify(ur, atLeastOnce()).getByUsername(username); - assertEquals(HttpStatusCodes.OK, response.getCode()); - assertEquals(user, response.getObject()); - } - - @Test - public void login_IncorrectPassword_StatusCodeUnauthorized() { - // Arange - int id = 562; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(PasswordAuthentication.hash(password)); - user.setBiography(biography); - - when(ur.getByUsername(username)).thenReturn(user); - - // Act - ObjectResponse response = userService.login(username, "incorrectPassword"); - - // Assert - verify(ur, atLeastOnce()).getByUsername(username); - assertEquals(HttpStatusCodes.UNAUTHORIZED, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void login_IncorrectUsername_StatusCodeUnauthorized() { - // Arange - int id = 562; - String username = "testUser"; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(PasswordAuthentication.hash(password)); - user.setBiography(biography); - - when(ur.getByUsername(username)).thenReturn(null); - - // Act - ObjectResponse response = userService.login(username, password); - - // Assert - verify(ur, atLeastOnce()).getByUsername(username); - assertEquals(HttpStatusCodes.UNAUTHORIZED, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void login_EmptyUsername_StatusCodeNotAcceptable() { - // Arange - int id = 562; - String username = ""; - String email = "testUser@mail.com"; - String password = "password123"; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(PasswordAuthentication.hash(password)); - user.setBiography(biography); - - - // Act - ObjectResponse response = userService.login(username, password); - - // Assert - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } - - @Test - public void login_EmptyPassword_StatusCodeNotAcceptable() { - // Arange - int id = 562; - String username = "asdfasdf"; - String email = "testUser@mail.com"; - String password = ""; - String biography = "This is my biography"; - - User user = new User(); - user.setId(id); - user.setUsername(username); - user.setEmail(email); - user.setPassword(PasswordAuthentication.hash(password)); - user.setBiography(biography); - - // Act - ObjectResponse response = userService.login(username, password); - - // Assert - assertEquals(HttpStatusCodes.NOT_ACCEPTABLE, response.getCode()); - assertNull(response.getObject()); - } -} diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 5e2a871..e85d745 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -61,7 +61,6 @@ /admin/index.xhtml /admin/tweets.xhtml /admin/users.xhtml - /javax.faces.resource/* moderator diff --git a/target/kwetter/WEB-INF/web.xml b/target/kwetter/WEB-INF/web.xml new file mode 100644 index 0000000..5e2a871 --- /dev/null +++ b/target/kwetter/WEB-INF/web.xml @@ -0,0 +1,107 @@ + + + Kwetter + + Faces Servlet + javax.faces.webapp.FacesServlet + 1 + + + primefaces.FONT_AWESOME + true + + + primefaces.MOVE_SCRIPTS_TO_BOTTOM + true + + + org.omnifaces.VIEW_SCOPE_MANAGER_MAX_ACTIVE_VIEW_SCOPES + 6 + + + javax.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL + true + + + Faces Servlet + *.xhtml + + + + FORM + JDBCRealm + + /login.xhtml + /login.xhtml + + + + + /admin/index.xhtml + + + + Admin Pages + + Admin Pages + /admin/* + + + admin + + + + + Moderator Pages + + Moderator Pages + /admin/index.xhtml + /admin/tweets.xhtml + /admin/users.xhtml + /javax.faces.resource/* + + + moderator + admin + + + + + admin + + + moderator + + + + 403 + /403.xhtml + + + com.github.adminfaces.template.exception.AccessDeniedException + /403.xhtml + + + 404 + /404.xhtml + + + 500 + /500.xhtml + + + java.lang.Throwable + /500.xhtml + + + javax.faces.application.ViewExpiredException + /expired.xhtml + + + javax.persistence.OptimisticLockException + /optimistic.xhtml + + \ No newline at end of file diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..2b3eb4a --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,76 @@ +com\nscharrenberg\kwetter\dtos\users\RoleRequestObject.class +com\nscharrenberg\kwetter\dtos\roles\RoleCleanDto.class +com\nscharrenberg\kwetter\dtos\tweets\EditTweetRequestObject.class +com\nscharrenberg\kwetter\domain\Tweet.class +com\nscharrenberg\kwetter\dtos\users\UserCleanDto.class +com\nscharrenberg\kwetter\controllers\RestConfig.class +com\nscharrenberg\kwetter\dtos\roles\RoleDto.class +com\nscharrenberg\kwetter\dtos\users\FollowRequestObject.class +com\nscharrenberg\kwetter\repository\jpa\UserServiceJPAImpl.class +com\nscharrenberg\kwetter\dtos\users\UserDto.class +com\nscharrenberg\kwetter\repository\collection\PermissionServiceCollImpl.class +com\nscharrenberg\kwetter\StartUp.class +com\nscharrenberg\kwetter\beans\UserBean.class +com\nscharrenberg\kwetter\repository\interfaces\PermissionRepository.class +com\nscharrenberg\kwetter\authentication\TokenProvider.class +com\nscharrenberg\kwetter\dtos\users\LoginRequestObject.class +com\nscharrenberg\kwetter\beans\PermissionBean.class +com\nscharrenberg\kwetter\utils\DetailMessage.class +com\nscharrenberg\kwetter\controllers\UserController.class +com\nscharrenberg\kwetter\service\PermissionService.class +com\nscharrenberg\kwetter\beans\RoleBean.class +com\nscharrenberg\kwetter\beans\LogonBean.class +com\nscharrenberg\kwetter\utils\EmailUtil.class +com\nscharrenberg\kwetter\domain\User.class +com\nscharrenberg\kwetter\dtos\users\CreateUserRequestObject.class +com\nscharrenberg\kwetter\dtos\roles\CreateRoleRequestObject.class +com\nscharrenberg\kwetter\repository\collection\RoleServiceCollImpl.class +com\nscharrenberg\kwetter\exceptions\ActionForbiddenException.class +com\nscharrenberg\kwetter\dtos\users\TokenDto.class +com\nscharrenberg\kwetter\domain\Role.class +com\nscharrenberg\kwetter\utils\Util.class +com\nscharrenberg\kwetter\dtos\permissions\PermissionCleanDto.class +com\nscharrenberg\kwetter\exceptions\CreationFailedException.class +com\nscharrenberg\kwetter\authentication\PermissionEnum.class +com\nscharrenberg\kwetter\service\UserService.class +com\nscharrenberg\kwetter\exceptions\NameNotUniqueException.class +com\nscharrenberg\kwetter\repository\interfaces\JPA.class +com\nscharrenberg\kwetter\beans\PermissionAttachBean.class +com\nscharrenberg\kwetter\beans\TweetBean.class +com\nscharrenberg\kwetter\dtos\tweets\TweetCleanDto.class +com\nscharrenberg\kwetter\domain\Permission.class +com\nscharrenberg\kwetter\utils\CorsFilter.class +com\nscharrenberg\kwetter\repository\jpa\PermissionServiceJPAImpl.class +com\nscharrenberg\kwetter\dtos\tweets\TweetDto.class +com\nscharrenberg\kwetter\responses\JaxResponse.class +com\nscharrenberg\kwetter\beans\GeocodeView.class +com\nscharrenberg\kwetter\dtos\roles\EditRoleRequestObject.class +com\nscharrenberg\kwetter\dtos\tweets\LikeRequestObject.class +com\nscharrenberg\kwetter\service\RoleService.class +com\nscharrenberg\kwetter\beans\PermissionDetachBean.class +com\nscharrenberg\kwetter\exceptions\NotFoundException.class +com\nscharrenberg\kwetter\dtos\users\EditUserRequestObject.class +com\nscharrenberg\kwetter\repository\collection\UserServiceCollImpl.class +com\nscharrenberg\kwetter\beans\LanguageBean.class +com\nscharrenberg\kwetter\repository\interfaces\RoleRepository.class +com\nscharrenberg\kwetter\dtos\permissions\EditPermissionRequestObject.class +com\nscharrenberg\kwetter\authentication\PasswordAuthentication.class +com\nscharrenberg\kwetter\dtos\permissions\PermissionDto.class +com\nscharrenberg\kwetter\repository\jpa\TweetServiceJPAImpl.class +com\nscharrenberg\kwetter\dtos\permissions\CreatePermissionRequestObject.class +com\nscharrenberg\kwetter\responses\ObjectResponse.class +com\nscharrenberg\kwetter\repository\jpa\RoleServiceJPAImpl.class +com\nscharrenberg\kwetter\controllers\AuthenticationController.class +com\nscharrenberg\kwetter\repository\collection\TweetServiceCollImpl.class +com\nscharrenberg\kwetter\responses\HttpStatusCodes.class +com\nscharrenberg\kwetter\repository\interfaces\TweetRepository.class +com\nscharrenberg\kwetter\authentication\ServletIdentityStore.class +com\nscharrenberg\kwetter\exceptions\InvalidContentException.class +com\nscharrenberg\kwetter\service\TweetService.class +com\nscharrenberg\kwetter\dtos\tweets\CreateTweetRequestObject.class +com\nscharrenberg\kwetter\repository\interfaces\UserRepository.class +com\nscharrenberg\kwetter\controllers\TweetController.class +com\nscharrenberg\kwetter\service\UserService$1.class +com\nscharrenberg\kwetter\beans\ChangeRoleBean.class +com\nscharrenberg\kwetter\beans\LogonBean$1.class +com\nscharrenberg\kwetter\authentication\AuthenticationProvider.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..e28e088 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,74 @@ +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\authentication\AuthenticationProvider.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\repository\collection\UserServiceCollImpl.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\utils\CorsFilter.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\authentication\PasswordAuthentication.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\beans\GeocodeView.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\repository\jpa\UserServiceJPAImpl.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\service\TweetService.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\authentication\PermissionEnum.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\beans\ChangeRoleBean.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\controllers\RestConfig.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\permissions\EditPermissionRequestObject.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\users\FollowRequestObject.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\repository\interfaces\UserRepository.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\domain\User.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\exceptions\NotFoundException.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\users\TokenDto.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\repository\interfaces\RoleRepository.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\repository\interfaces\TweetRepository.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\domain\Tweet.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\users\UserDto.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\beans\PermissionBean.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\repository\collection\TweetServiceCollImpl.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\permissions\CreatePermissionRequestObject.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\exceptions\CreationFailedException.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\utils\EmailUtil.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\utils\DetailMessage.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\beans\UserBean.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\repository\interfaces\PermissionRepository.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\beans\LogonBean.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\beans\LanguageBean.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\tweets\TweetDto.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\controllers\AuthenticationController.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\responses\ObjectResponse.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\exceptions\ActionForbiddenException.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\domain\Permission.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\users\UserCleanDto.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\utils\Util.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\tweets\LikeRequestObject.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\permissions\PermissionCleanDto.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\repository\collection\PermissionServiceCollImpl.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\responses\HttpStatusCodes.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\users\RoleRequestObject.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\controllers\UserController.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\authentication\ServletIdentityStore.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\beans\TweetBean.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\tweets\TweetCleanDto.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\permissions\PermissionDto.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\authentication\TokenProvider.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\users\EditUserRequestObject.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\exceptions\InvalidContentException.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\beans\RoleBean.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\tweets\EditTweetRequestObject.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\repository\jpa\RoleServiceJPAImpl.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\controllers\TweetController.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\tweets\CreateTweetRequestObject.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\exceptions\NameNotUniqueException.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\StartUp.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\beans\PermissionDetachBean.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\domain\Role.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\users\CreateUserRequestObject.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\repository\interfaces\JPA.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\roles\RoleDto.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\repository\jpa\PermissionServiceJPAImpl.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\roles\CreateRoleRequestObject.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\service\RoleService.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\responses\JaxResponse.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\repository\jpa\TweetServiceJPAImpl.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\repository\collection\RoleServiceCollImpl.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\roles\EditRoleRequestObject.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\service\PermissionService.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\beans\PermissionAttachBean.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\service\UserService.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\roles\RoleCleanDto.java +D:\NScha\Synology Cloud\School\S6\JEA6\kwetter\src\main\java\com\nscharrenberg\kwetter\dtos\users\LoginRequestObject.java