From d08d4ca28c18c8f946ab3646d265e2ad58a3439f Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Tue, 5 May 2020 15:25:10 +0200 Subject: [PATCH 01/76] add use-cases, services, ports for managing teams --- .../projectadministration/domain/Project.java | 6 +++- .../project/get/ListProjectsUseCase.java | 2 ++ .../domain/ProjectRole.java | 30 +++++++++++++++++++ .../useradministration/domain/Team.java | 14 +++++++++ .../port/driven/AddUsersToTeamPort.java | 4 +++ .../port/driven/CreateTeamForProjectPort.java | 4 +++ .../driven/DeleteTeamFromProjectPort.java | 4 +++ .../driven/DeleteUserRoleForProjectPort.java | 4 +++ .../port/driven/DeleteUsersFromTeamPort.java | 4 +++ .../port/driven/GetTeamPort.java | 4 +++ .../port/driven/ListProjectsForTeamPort.java | 4 +++ .../port/driven/ListProjectsForUserPort.java | 4 +++ .../port/driven/ListTeamsForProjectPort.java | 4 +++ .../port/driven/ListTeamsForUserPort.java | 4 +++ .../port/driven/ListUsersPort.java | 4 +++ .../driven/SetUserRoleForProjectPort.java | 4 +++ .../driver/{load => get}/GetUserUseCase.java | 2 +- .../get/ListProjectsForUserUseCase.java | 14 +++++++++ .../port/driver/get/ListUsersUseCase.java | 13 ++++++++ .../DeleteUserRoleForProjectUseCase.java | 13 ++++++++ .../SetUserRoleForProjectUseCase.java | 15 ++++++++++ .../driver/teams/AddUsersToTeamUseCase.java | 13 ++++++++ .../teams/DeleteTeamFromProjectUseCase.java | 12 ++++++++ .../teams/DeleteUsersFromTeamUseCase.java | 15 ++++++++++ .../create/CreateTeamForProjectCommand.java | 22 ++++++++++++++ .../create/CreateTeamForProjectUseCase.java | 12 ++++++++ .../port/driver/teams/get/GetTeamUseCase.java | 12 ++++++++ .../teams/get/ListProjectsForTeamUseCase.java | 14 +++++++++ .../teams/get/ListTeamsForProjectUseCase.java | 14 +++++++++ .../teams/get/ListTeamsForUserUseCase.java | 14 +++++++++ .../service/{load => get}/GetUserService.java | 4 +-- .../get/ListProjectsForUserService.java | 13 ++++++++ .../service/get/ListUsersService.java | 15 ++++++++++ .../DeleteUserRoleForProjectService.java | 12 ++++++++ .../SetUserRoleForProjectService.java | 13 ++++++++ .../service/teams/AddUsersToTeamService.java | 15 ++++++++++ .../teams/DeleteTeamFromProjectService.java | 12 ++++++++ .../teams/DeleteUsersFromTeamService.java | 14 +++++++++ .../create/CreateTeamForProjectService.java | 13 ++++++++ .../service/teams/get/GetTeamService.java | 13 ++++++++ .../teams/get/ListProjectsForTeamService.java | 13 ++++++++ .../teams/get/ListTeamsForProjectService.java | 16 ++++++++++ .../teams/get/ListTeamsForUserService.java | 15 ++++++++++ .../user/GetUserServiceTest.java | 2 +- .../domain/ProjectEntity.java | 11 +++++-- .../useradministration/domain/TeamEntity.java | 23 ++++++++++++++ .../rest/user/GetUserController.java | 2 +- .../rest/unit/user/GetUserControllerTest.java | 2 +- 48 files changed, 483 insertions(+), 10 deletions(-) create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamForProjectPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamFromProjectPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java rename coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/{load => get}/GetUserUseCase.java (97%) create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/DeleteUserRoleForProjectUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamFromProjectUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteUsersFromTeamUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamForProjectCommand.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamForProjectUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/GetTeamUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java rename coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/{load => get}/GetUserService.java (88%) create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamFromProjectService.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamForProjectService.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java index 09d40a38a..6b81c49c7 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.projectadministration.domain; import java.util.Date; +import java.util.List; + +import io.reflectoring.coderadar.useradministration.domain.Team; import lombok.Data; -/** A coderadar project that defines the source of files that are to be analyzed. */ +/** A Coderadar project that defines the source of files that are to be analyzed. */ @Data public class Project { private long id; @@ -14,4 +17,5 @@ public class Project { private String vcsPassword; private boolean vcsOnline; private Date vcsStart; + private List teams; } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java index ad9f07e2e..733c6d89b 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java @@ -7,4 +7,6 @@ public interface ListProjectsUseCase { /** @return All project currently saved in the database. */ List listProjects(); + + List listProjectsForUser(long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java new file mode 100644 index 000000000..fb76f7a07 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java @@ -0,0 +1,30 @@ +package io.reflectoring.coderadar.useradministration.domain; + +import io.reflectoring.coderadar.projectadministration.domain.Project; + +/** + * ADMIN: + * - Can delete a project + * - Can remove users from a team + * - Can add users to a team + * - Can analyze an project + * - Can delete analysis results + * - Can configure file patterns, modules, analyzers, (merge contributors?) + * + * MEMBER: + * - Can analyze an project. + */ +public enum ProjectRole { + ADMIN("admin"), + MEMBER("member"); + + private final String value; + + ProjectRole(String value){ + this.value = value; + } + + public String getValue() { + return value; + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java new file mode 100644 index 000000000..10322d876 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java @@ -0,0 +1,14 @@ +package io.reflectoring.coderadar.useradministration.domain; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +public class Team { + private long id; + private String name; + private List members; +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java new file mode 100644 index 000000000..3086e113b --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +public interface AddUsersToTeamPort { +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamForProjectPort.java new file mode 100644 index 000000000..542651820 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamForProjectPort.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +public interface CreateTeamForProjectPort { +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamFromProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamFromProjectPort.java new file mode 100644 index 000000000..30f5a031f --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamFromProjectPort.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +public interface DeleteTeamFromProjectPort { +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java new file mode 100644 index 000000000..77d6e6946 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +public interface DeleteUserRoleForProjectPort { +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java new file mode 100644 index 000000000..9f517f8b8 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +public interface DeleteUsersFromTeamPort { +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java new file mode 100644 index 000000000..caec82939 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +public interface GetTeamPort { +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java new file mode 100644 index 000000000..3c59000c7 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +public interface ListProjectsForTeamPort { +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java new file mode 100644 index 000000000..e61e1b223 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +public interface ListProjectsForUserPort { +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java new file mode 100644 index 000000000..93de7f259 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +public interface ListTeamsForProjectPort { +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java new file mode 100644 index 000000000..41cec51b7 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +public interface ListTeamsForUserPort { +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java new file mode 100644 index 000000000..cfb5e9558 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +public interface ListUsersPort { +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java new file mode 100644 index 000000000..841565fae --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +public interface SetUserRoleForProjectPort { +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/load/GetUserUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/GetUserUseCase.java similarity index 97% rename from coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/load/GetUserUseCase.java rename to coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/GetUserUseCase.java index 5d0016706..8dbd66323 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/load/GetUserUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/GetUserUseCase.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.useradministration.port.driver.load; +package io.reflectoring.coderadar.useradministration.port.driver.get; import io.reflectoring.coderadar.useradministration.domain.User; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java new file mode 100644 index 000000000..5df201ef3 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java @@ -0,0 +1,14 @@ +package io.reflectoring.coderadar.useradministration.port.driver.get; + +import io.reflectoring.coderadar.projectadministration.domain.Project; + +import java.util.List; + +public interface ListProjectsForUserUseCase { + + /** + * @param userId The id of the user. + * @return All projects this user has access to. + */ + List listProjects(long userId); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java new file mode 100644 index 000000000..56c5e7aa9 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java @@ -0,0 +1,13 @@ +package io.reflectoring.coderadar.useradministration.port.driver.get; + +import io.reflectoring.coderadar.useradministration.domain.User; + +import java.util.List; + +public interface ListUsersUseCase { + + /** + * @return All users in the database. + */ + List listUsers(); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/DeleteUserRoleForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/DeleteUserRoleForProjectUseCase.java new file mode 100644 index 000000000..c462c2894 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/DeleteUserRoleForProjectUseCase.java @@ -0,0 +1,13 @@ +package io.reflectoring.coderadar.useradministration.port.driver.permissions; + +public interface DeleteUserRoleForProjectUseCase { + + /** + * Removes the role a given user has to a project. + * If the user is not in any team with access to the project, they + * will no longer have access to the project. + * @param projectId The id of the project. + * @param userId The id of the user. + */ + void deleteRole(long projectId, long userId); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java new file mode 100644 index 000000000..e8e7705db --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java @@ -0,0 +1,15 @@ +package io.reflectoring.coderadar.useradministration.port.driver.permissions; + +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; + +public interface SetUserRoleForProjectUseCase { + + /** + * Gives a user a role in the project. + * @param projectId The id of the project. + * @param userId The id of the user. + * @param role The role to set. + */ + void setRole(long projectId, long userId, ProjectRole role); +} + diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java new file mode 100644 index 000000000..e8ea38373 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java @@ -0,0 +1,13 @@ +package io.reflectoring.coderadar.useradministration.port.driver.teams; + +import java.util.List; + +public interface AddUsersToTeamUseCase { + + /** + * Adds users to a team. + * @param teamId The id of the team. + * @param userIds The ids of the users. + */ + void addUsersToTeam(long teamId, List userIds); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamFromProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamFromProjectUseCase.java new file mode 100644 index 000000000..c8d2b8458 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamFromProjectUseCase.java @@ -0,0 +1,12 @@ +package io.reflectoring.coderadar.useradministration.port.driver.teams; + +public interface DeleteTeamFromProjectUseCase { + + /** + * Deletes a team. + * Any permissions users had for a project because of the team + * will be lost after this operation. + * @param teamId The id of the team. + */ + void deleteTeam(long teamId); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteUsersFromTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteUsersFromTeamUseCase.java new file mode 100644 index 000000000..678e7ab72 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteUsersFromTeamUseCase.java @@ -0,0 +1,15 @@ +package io.reflectoring.coderadar.useradministration.port.driver.teams; + +import java.util.List; + +public interface DeleteUsersFromTeamUseCase { + + /** + * Deletes users from a team. + * Any permissions users had for a project because of the team + * will be lost after this operation. + * @param teamId The id of the team. + * @param userIds The ids of the users. + */ + void deleteUsersFromTeam(long teamId, List userIds); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamForProjectCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamForProjectCommand.java new file mode 100644 index 000000000..ec425a5ca --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamForProjectCommand.java @@ -0,0 +1,22 @@ +package io.reflectoring.coderadar.useradministration.port.driver.teams.create; + +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * DTO class for creating teams. + */ +@Data +@NoArgsConstructor +public class CreateTeamForProjectCommand { + @NotBlank private String name; + private List userIds; + + @NotNull + private ProjectRole role; +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamForProjectUseCase.java new file mode 100644 index 000000000..14a2a1427 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamForProjectUseCase.java @@ -0,0 +1,12 @@ +package io.reflectoring.coderadar.useradministration.port.driver.teams.create; + +public interface CreateTeamForProjectUseCase { + + /** + * Creates a team in the given project. + * @param projectId The id of the project. + * @param command The command containing the needed data. + * @return The id of the newly created team. + */ + Long createTeamForProject(long projectId, CreateTeamForProjectCommand command); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/GetTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/GetTeamUseCase.java new file mode 100644 index 000000000..35a3f2418 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/GetTeamUseCase.java @@ -0,0 +1,12 @@ +package io.reflectoring.coderadar.useradministration.port.driver.teams.get; + +import io.reflectoring.coderadar.useradministration.domain.Team; + +public interface GetTeamUseCase { + + /** + * @param teamId The team id. + * @return The team with the given id. + */ + Team get(long teamId); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java new file mode 100644 index 000000000..b35fda811 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java @@ -0,0 +1,14 @@ +package io.reflectoring.coderadar.useradministration.port.driver.teams.get; + +import io.reflectoring.coderadar.projectadministration.domain.Project; + +import java.util.List; + +public interface ListProjectsForTeamUseCase { + + /** + * @param teamId The id of the team. + * @return All projects the team has access to. + */ + List listProjects(long teamId); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java new file mode 100644 index 000000000..da0b8f6f8 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java @@ -0,0 +1,14 @@ +package io.reflectoring.coderadar.useradministration.port.driver.teams.get; + +import io.reflectoring.coderadar.useradministration.domain.Team; + +import java.util.List; + +public interface ListTeamsForProjectUseCase { + + /** + * @param projectId The id of the project. + * @return All teams with access to this project. + */ + List listTeamsForProject(long projectId); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java new file mode 100644 index 000000000..6710b87a5 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java @@ -0,0 +1,14 @@ +package io.reflectoring.coderadar.useradministration.port.driver.teams.get; + +import io.reflectoring.coderadar.useradministration.domain.Team; + +import java.util.List; + +public interface ListTeamsForUserUseCase { + + /** + * @param userId The id of the user. + * @return All teams the user is in. + */ + List listTeamsForUser(long userId); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/load/GetUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/GetUserService.java similarity index 88% rename from coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/load/GetUserService.java rename to coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/GetUserService.java index cc5bd30ba..4b3f8f06a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/load/GetUserService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/GetUserService.java @@ -1,9 +1,9 @@ -package io.reflectoring.coderadar.useradministration.service.load; +package io.reflectoring.coderadar.useradministration.service.get; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; -import io.reflectoring.coderadar.useradministration.port.driver.load.GetUserUseCase; +import io.reflectoring.coderadar.useradministration.port.driver.get.GetUserUseCase; import org.springframework.stereotype.Service; @Service diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java new file mode 100644 index 000000000..f932d5e23 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java @@ -0,0 +1,13 @@ +package io.reflectoring.coderadar.useradministration.service.get; + +import io.reflectoring.coderadar.projectadministration.domain.Project; +import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; + +import java.util.List; + +public class ListProjectsForUserService implements ListProjectsForUserUseCase { + @Override + public List listProjects(long userId) { + return null; + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java new file mode 100644 index 000000000..d45ffb78d --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java @@ -0,0 +1,15 @@ +package io.reflectoring.coderadar.useradministration.service.get; + +import io.reflectoring.coderadar.useradministration.domain.User; +import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ListUsersService implements ListUsersUseCase { + @Override + public List listUsers() { + return null; + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java new file mode 100644 index 000000000..1c60af896 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java @@ -0,0 +1,12 @@ +package io.reflectoring.coderadar.useradministration.service.permissions; + +import io.reflectoring.coderadar.useradministration.port.driver.permissions.DeleteUserRoleForProjectUseCase; +import org.springframework.stereotype.Service; + +@Service +public class DeleteUserRoleForProjectService implements DeleteUserRoleForProjectUseCase { + @Override + public void deleteRole(long projectId, long userId) { + + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java new file mode 100644 index 000000000..1853ab96c --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java @@ -0,0 +1,13 @@ +package io.reflectoring.coderadar.useradministration.service.permissions; + +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import io.reflectoring.coderadar.useradministration.port.driver.permissions.SetUserRoleForProjectUseCase; +import org.springframework.stereotype.Service; + +@Service +public class SetUserRoleForProjectService implements SetUserRoleForProjectUseCase { + @Override + public void setRole(long projectId, long userId, ProjectRole role) { + + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java new file mode 100644 index 000000000..47cdf2f82 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java @@ -0,0 +1,15 @@ +package io.reflectoring.coderadar.useradministration.service.teams; + +import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class AddUsersToTeamService implements AddUsersToTeamUseCase { + + @Override + public void addUsersToTeam(long teamId, List userIds) { + + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamFromProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamFromProjectService.java new file mode 100644 index 000000000..6687ae658 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamFromProjectService.java @@ -0,0 +1,12 @@ +package io.reflectoring.coderadar.useradministration.service.teams; + +import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteTeamFromProjectUseCase; +import org.springframework.stereotype.Service; + +@Service +public class DeleteTeamFromProjectService implements DeleteTeamFromProjectUseCase { + @Override + public void deleteTeam(long teamId) { + + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java new file mode 100644 index 000000000..626ae9a37 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java @@ -0,0 +1,14 @@ +package io.reflectoring.coderadar.useradministration.service.teams; + +import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteUsersFromTeamUseCase; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class DeleteUsersFromTeamService implements DeleteUsersFromTeamUseCase { + @Override + public void deleteUsersFromTeam(long teamId, List userIds) { + + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamForProjectService.java new file mode 100644 index 000000000..14e388df0 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamForProjectService.java @@ -0,0 +1,13 @@ +package io.reflectoring.coderadar.useradministration.service.teams.create; + +import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamForProjectCommand; +import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamForProjectUseCase; +import org.springframework.stereotype.Service; + +@Service +public class CreateTeamForProjectService implements CreateTeamForProjectUseCase { + @Override + public Long createTeamForProject(long projectId, CreateTeamForProjectCommand command) { + return null; + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java new file mode 100644 index 000000000..d4edfd427 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java @@ -0,0 +1,13 @@ +package io.reflectoring.coderadar.useradministration.service.teams.get; + +import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.GetTeamUseCase; +import org.springframework.stereotype.Service; + +@Service +public class GetTeamService implements GetTeamUseCase { + @Override + public Team get(long teamId) { + return null; + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java new file mode 100644 index 000000000..774f99987 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java @@ -0,0 +1,13 @@ +package io.reflectoring.coderadar.useradministration.service.teams.get; + +import io.reflectoring.coderadar.projectadministration.domain.Project; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; + +import java.util.List; + +public class ListProjectsForTeamService implements ListProjectsForTeamUseCase { + @Override + public List listProjects(long teamId) { + return null; + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java new file mode 100644 index 000000000..f7a38e799 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java @@ -0,0 +1,16 @@ +package io.reflectoring.coderadar.useradministration.service.teams.get; + +import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ListTeamsForProjectService implements ListTeamsForProjectUseCase { + + @Override + public List listTeamsForProject(long projectId) { + return null; + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java new file mode 100644 index 000000000..7895cf774 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java @@ -0,0 +1,15 @@ +package io.reflectoring.coderadar.useradministration.service.teams.get; + +import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ListTeamsForUserService implements ListTeamsForUserUseCase { + @Override + public List listTeamsForUser(long userId) { + return null; + } +} diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/GetUserServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/GetUserServiceTest.java index b30aa631c..48c6ac4c1 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/GetUserServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/GetUserServiceTest.java @@ -5,7 +5,7 @@ import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; -import io.reflectoring.coderadar.useradministration.service.load.GetUserService; +import io.reflectoring.coderadar.useradministration.service.get.GetUserService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java index 4367d7b68..84679642d 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java @@ -1,15 +1,17 @@ package io.reflectoring.coderadar.graph.projectadministration.domain; import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import org.neo4j.ogm.annotation.NodeEntity; import org.neo4j.ogm.annotation.Relationship; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + /** @see io.reflectoring.coderadar.projectadministration.domain.Project */ @NodeEntity @Data @@ -52,4 +54,7 @@ public class ProjectEntity { @Relationship(type = "HAS_BRANCH") private List branches = new ArrayList<>(); + + @Relationship(type = "HAS_TEAM") + private List teams; } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java new file mode 100644 index 000000000..bac669bf1 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java @@ -0,0 +1,23 @@ +package io.reflectoring.coderadar.graph.useradministration.domain; + +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.neo4j.ogm.annotation.NodeEntity; +import org.neo4j.ogm.annotation.Relationship; + +import java.util.List; + +@NodeEntity +@Data +@NoArgsConstructor +public class TeamEntity { + private Long id; + private String name; + + @Relationship(value = "IS_IN", direction = Relationship.INCOMING) + private List members; + + private ProjectRole role; + +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/GetUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/GetUserController.java index a0bb54b63..6b34a071a 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/GetUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/GetUserController.java @@ -2,7 +2,7 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; -import io.reflectoring.coderadar.useradministration.port.driver.load.GetUserUseCase; +import io.reflectoring.coderadar.useradministration.port.driver.get.GetUserUseCase; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java index 8f780e7f9..fcb9392b3 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java @@ -5,7 +5,7 @@ import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.rest.user.GetUserController; import io.reflectoring.coderadar.useradministration.domain.User; -import io.reflectoring.coderadar.useradministration.port.driver.load.GetUserUseCase; +import io.reflectoring.coderadar.useradministration.port.driver.get.GetUserUseCase; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; From 8bbff093a3790cf4467e180ff62e25cd2b8b105c Mon Sep 17 00:00:00 2001 From: Krause Date: Tue, 5 May 2020 16:01:45 +0200 Subject: [PATCH 02/76] create controllers for team configuration --- .../ChangePasswordController.java | 2 +- .../GetUserController.java | 2 +- .../ListProjectsForUserController.java | 16 +++++++++++ .../ListUsersController.java | 16 +++++++++++ .../LoginUserController.java | 2 +- .../RefreshTokenController.java | 2 +- .../RegisterUserController.java | 2 +- .../DeleteUserRoleForProjectController.java | 26 ++++++++++++++++++ .../SetUserRoleForProjectController.java | 27 +++++++++++++++++++ .../teams/AddUsersToTeamController.java | 16 +++++++++++ .../teams/CreateTeamForProjectController.java | 16 +++++++++++ .../DeleteTeamFromProjectController.java | 16 +++++++++++ .../teams/DeleteUsersFromTeamController.java | 16 +++++++++++ .../teams/GetTeamController.java | 16 +++++++++++ .../teams/ListProjectsForTeamController.java | 16 +++++++++++ .../teams/ListTeamsForProjectController.java | 16 +++++++++++ .../teams/ListTeamsForUserController.java | 16 +++++++++++ .../user/ChangePasswordControllerTest.java | 2 +- .../rest/unit/user/GetUserControllerTest.java | 2 +- .../unit/user/LoginUserControllerTest.java | 2 +- .../unit/user/RefreshTokenControllerTest.java | 2 +- .../unit/user/RegisterUserControllerTest.java | 2 +- ...angePasswordControllerIntegrationTest.java | 2 +- .../GetUserControllerIntegrationTest.java | 2 +- .../LoginUserControllerIntegrationTest.java | 2 +- ...RefreshTokenControllerIntegrationTest.java | 2 +- ...RegisterUserControllerIntegrationTest.java | 2 +- 27 files changed, 228 insertions(+), 15 deletions(-) rename coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/{user => useradministration}/ChangePasswordController.java (96%) rename coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/{user => useradministration}/GetUserController.java (95%) create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java rename coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/{user => useradministration}/LoginUserController.java (96%) rename coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/{user => useradministration}/RefreshTokenController.java (97%) rename coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/{user => useradministration}/RegisterUserController.java (96%) create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/DeleteUserRoleForProjectController.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java rename coderadar-test/src/test/java/io/reflectoring/coderadar/rest/{user => useradministration}/ChangePasswordControllerIntegrationTest.java (98%) rename coderadar-test/src/test/java/io/reflectoring/coderadar/rest/{user => useradministration}/GetUserControllerIntegrationTest.java (97%) rename coderadar-test/src/test/java/io/reflectoring/coderadar/rest/{user => useradministration}/LoginUserControllerIntegrationTest.java (98%) rename coderadar-test/src/test/java/io/reflectoring/coderadar/rest/{user => useradministration}/RefreshTokenControllerIntegrationTest.java (98%) rename coderadar-test/src/test/java/io/reflectoring/coderadar/rest/{user => useradministration}/RegisterUserControllerIntegrationTest.java (98%) diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/ChangePasswordController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordController.java similarity index 96% rename from coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/ChangePasswordController.java rename to coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordController.java index 81f0a358a..7f73cc7d4 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/ChangePasswordController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordController.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.user; +package io.reflectoring.coderadar.rest.useradministration; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/GetUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java similarity index 95% rename from coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/GetUserController.java rename to coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java index 6b34a071a..9dff555d8 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/GetUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.user; +package io.reflectoring.coderadar.rest.useradministration; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java new file mode 100644 index 000000000..59df0e290 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java @@ -0,0 +1,16 @@ +package io.reflectoring.coderadar.rest.useradministration; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class ListProjectsForUserController implements AbstractBaseController { + private final ListProjectsForUserUseCase listProjectsForUserUseCase; + + public ListProjectsForUserController(ListProjectsForUserUseCase listProjectsForUserUseCase) { + this.listProjectsForUserUseCase = listProjectsForUserUseCase; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java new file mode 100644 index 000000000..ee435c9ea --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java @@ -0,0 +1,16 @@ +package io.reflectoring.coderadar.rest.useradministration; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class ListUsersController implements AbstractBaseController { + private final ListUsersUseCase listUsersUseCase; + + public ListUsersController(ListUsersUseCase listUsersUseCase) { + this.listUsersUseCase = listUsersUseCase; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/LoginUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/LoginUserController.java similarity index 96% rename from coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/LoginUserController.java rename to coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/LoginUserController.java index bb349a207..d48225fcd 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/LoginUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/LoginUserController.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.user; +package io.reflectoring.coderadar.rest.useradministration; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/RefreshTokenController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenController.java similarity index 97% rename from coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/RefreshTokenController.java rename to coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenController.java index 29c44d5c3..210429971 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/RefreshTokenController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenController.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.user; +package io.reflectoring.coderadar.rest.useradministration; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/RegisterUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserController.java similarity index 96% rename from coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/RegisterUserController.java rename to coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserController.java index 777fe9880..78daf8ba3 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/user/RegisterUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserController.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.user; +package io.reflectoring.coderadar.rest.useradministration; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/DeleteUserRoleForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/DeleteUserRoleForProjectController.java new file mode 100644 index 000000000..ed0e5c35f --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/DeleteUserRoleForProjectController.java @@ -0,0 +1,26 @@ +package io.reflectoring.coderadar.rest.useradministration.permissions; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.port.driver.permissions.DeleteUserRoleForProjectUseCase; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class DeleteUserRoleForProjectController implements AbstractBaseController { + private final DeleteUserRoleForProjectUseCase deleteUserRoleForProjectUseCase; + + public DeleteUserRoleForProjectController(DeleteUserRoleForProjectUseCase deleteUserRoleForProjectUseCase) { + this.deleteUserRoleForProjectUseCase = deleteUserRoleForProjectUseCase; + } + + @DeleteMapping(path = "/projects/{projectId}/users/{userId}") + public ResponseEntity deleteUserRoleForProject(@PathVariable long projectId, @PathVariable long userId) { + deleteUserRoleForProjectUseCase.deleteRole(projectId, userId); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java new file mode 100644 index 000000000..f52f10043 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java @@ -0,0 +1,27 @@ +package io.reflectoring.coderadar.rest.useradministration.permissions; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import io.reflectoring.coderadar.useradministration.port.driver.permissions.SetUserRoleForProjectUseCase; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class SetUserRoleForProjectController implements AbstractBaseController { + private final SetUserRoleForProjectUseCase setUserRoleForProjectUseCase; + + public SetUserRoleForProjectController(SetUserRoleForProjectUseCase setUserRoleForProjectUseCase) { + this.setUserRoleForProjectUseCase = setUserRoleForProjectUseCase; + } + + @PostMapping(path = "/projects/{projectId}/users/{userId}") + public ResponseEntity setUserRoleForProject(@PathVariable long projectId, @PathVariable long userId) { + setUserRoleForProjectUseCase.setRole(projectId, userId, ProjectRole.ADMIN); // TODO: change last parameter + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java new file mode 100644 index 000000000..1772b75d6 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java @@ -0,0 +1,16 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class AddUsersToTeamController implements AbstractBaseController { + private final AddUsersToTeamUseCase addUsersToTeamUseCase; + + public AddUsersToTeamController(AddUsersToTeamUseCase addUsersToTeamUseCase) { + this.addUsersToTeamUseCase = addUsersToTeamUseCase; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java new file mode 100644 index 000000000..f80a10e75 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java @@ -0,0 +1,16 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamForProjectUseCase; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class CreateTeamForProjectController implements AbstractBaseController { + private final CreateTeamForProjectUseCase createTeamForProjectUseCase; + + public CreateTeamForProjectController(CreateTeamForProjectUseCase createTeamForProjectUseCase) { + this.createTeamForProjectUseCase = createTeamForProjectUseCase; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java new file mode 100644 index 000000000..371e7e182 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java @@ -0,0 +1,16 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteTeamFromProjectUseCase; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class DeleteTeamFromProjectController implements AbstractBaseController { + private final DeleteTeamFromProjectUseCase deleteTeamFromProjectUseCase; + + public DeleteTeamFromProjectController(DeleteTeamFromProjectUseCase deleteTeamFromProjectUseCase) { + this.deleteTeamFromProjectUseCase = deleteTeamFromProjectUseCase; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java new file mode 100644 index 000000000..d2e1979f3 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java @@ -0,0 +1,16 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteUsersFromTeamUseCase; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class DeleteUsersFromTeamController implements AbstractBaseController { + private final DeleteUsersFromTeamUseCase deleteUsersFromTeamUseCase; + + public DeleteUsersFromTeamController(DeleteUsersFromTeamUseCase deleteUsersFromTeamUseCase) { + this.deleteUsersFromTeamUseCase = deleteUsersFromTeamUseCase; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java new file mode 100644 index 000000000..351649731 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java @@ -0,0 +1,16 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.GetTeamUseCase; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class GetTeamController implements AbstractBaseController { + private final GetTeamUseCase getTeamUseCase; + + public GetTeamController(GetTeamUseCase getTeamUseCase) { + this.getTeamUseCase = getTeamUseCase; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java new file mode 100644 index 000000000..f007f8710 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java @@ -0,0 +1,16 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class ListProjectsForTeamController implements AbstractBaseController { + private final ListProjectsForTeamUseCase listProjectsForTeamUseCase; + + public ListProjectsForTeamController(ListProjectsForTeamUseCase listProjectsForTeamUseCase) { + this.listProjectsForTeamUseCase = listProjectsForTeamUseCase; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java new file mode 100644 index 000000000..1e9173968 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java @@ -0,0 +1,16 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class ListTeamsForProjectController implements AbstractBaseController { + private final ListTeamsForProjectUseCase listTeamsForProjectUseCase; + + public ListTeamsForProjectController(ListTeamsForProjectUseCase listTeamsForProjectUseCase) { + this.listTeamsForProjectUseCase = listTeamsForProjectUseCase; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java new file mode 100644 index 000000000..6e6f28c77 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java @@ -0,0 +1,16 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class ListTeamsForUserController implements AbstractBaseController { + private final ListTeamsForUserUseCase listTeamsForUserUseCase; + + public ListTeamsForUserController(ListTeamsForUserUseCase listTeamsForUserUseCase) { + this.listTeamsForUserUseCase = listTeamsForUserUseCase; + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java index d899f92bd..b9a6a4dd1 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java @@ -2,7 +2,7 @@ import static org.mockito.Mockito.mock; -import io.reflectoring.coderadar.rest.user.ChangePasswordController; +import io.reflectoring.coderadar.rest.useradministration.ChangePasswordController; import io.reflectoring.coderadar.useradministration.port.driver.password.ChangePasswordCommand; import io.reflectoring.coderadar.useradministration.port.driver.password.ChangePasswordUseCase; import org.junit.jupiter.api.Assertions; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java index fcb9392b3..340ddb165 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java @@ -3,7 +3,7 @@ import static org.mockito.Mockito.mock; import io.reflectoring.coderadar.rest.domain.GetUserResponse; -import io.reflectoring.coderadar.rest.user.GetUserController; +import io.reflectoring.coderadar.rest.useradministration.GetUserController; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.get.GetUserUseCase; import org.junit.jupiter.api.Assertions; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java index 6c032cbde..41014efa0 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java @@ -2,7 +2,7 @@ import static org.mockito.Mockito.mock; -import io.reflectoring.coderadar.rest.user.LoginUserController; +import io.reflectoring.coderadar.rest.useradministration.LoginUserController; import io.reflectoring.coderadar.useradministration.port.driver.login.LoginUserCommand; import io.reflectoring.coderadar.useradministration.port.driver.login.LoginUserResponse; import io.reflectoring.coderadar.useradministration.port.driver.login.LoginUserUseCase; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java index e2b6ea394..07dae9b3c 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java @@ -2,7 +2,7 @@ import static org.mockito.Mockito.mock; -import io.reflectoring.coderadar.rest.user.RefreshTokenController; +import io.reflectoring.coderadar.rest.useradministration.RefreshTokenController; import io.reflectoring.coderadar.useradministration.port.driver.refresh.RefreshTokenCommand; import io.reflectoring.coderadar.useradministration.port.driver.refresh.RefreshTokenResponse; import io.reflectoring.coderadar.useradministration.port.driver.refresh.RefreshTokenUseCase; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java index 5466709dd..d81587589 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java @@ -3,7 +3,7 @@ import static org.mockito.Mockito.mock; import io.reflectoring.coderadar.rest.domain.IdResponse; -import io.reflectoring.coderadar.rest.user.RegisterUserController; +import io.reflectoring.coderadar.rest.useradministration.RegisterUserController; import io.reflectoring.coderadar.useradministration.port.driver.register.RegisterUserCommand; import io.reflectoring.coderadar.useradministration.port.driver.register.RegisterUserUseCase; import org.junit.jupiter.api.Assertions; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/user/ChangePasswordControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordControllerIntegrationTest.java similarity index 98% rename from coderadar-test/src/test/java/io/reflectoring/coderadar/rest/user/ChangePasswordControllerIntegrationTest.java rename to coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordControllerIntegrationTest.java index 937556062..b4a77c99c 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/user/ChangePasswordControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordControllerIntegrationTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.user; +package io.reflectoring.coderadar.rest.useradministration; import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/user/GetUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java similarity index 97% rename from coderadar-test/src/test/java/io/reflectoring/coderadar/rest/user/GetUserControllerIntegrationTest.java rename to coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java index 842293ccf..66aff52c2 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/user/GetUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.user; +package io.reflectoring.coderadar.rest.useradministration; import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/user/LoginUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java similarity index 98% rename from coderadar-test/src/test/java/io/reflectoring/coderadar/rest/user/LoginUserControllerIntegrationTest.java rename to coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java index e4613baa4..b8a05b658 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/user/LoginUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.user; +package io.reflectoring.coderadar.rest.useradministration; import static org.hamcrest.Matchers.any; import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/user/RefreshTokenControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenControllerIntegrationTest.java similarity index 98% rename from coderadar-test/src/test/java/io/reflectoring/coderadar/rest/user/RefreshTokenControllerIntegrationTest.java rename to coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenControllerIntegrationTest.java index 99ae0f3ae..435715318 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/user/RefreshTokenControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenControllerIntegrationTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.user; +package io.reflectoring.coderadar.rest.useradministration; import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/user/RegisterUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserControllerIntegrationTest.java similarity index 98% rename from coderadar-test/src/test/java/io/reflectoring/coderadar/rest/user/RegisterUserControllerIntegrationTest.java rename to coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserControllerIntegrationTest.java index 36c60147d..9bf9a105a 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/user/RegisterUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserControllerIntegrationTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.user; +package io.reflectoring.coderadar.rest.useradministration; import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; From 528d0640a7326f878b83f968346254d599fbc048 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Tue, 5 May 2020 16:03:36 +0200 Subject: [PATCH 03/76] implemented services for team management --- .../TeamNotFoundException.java | 9 +++++++ .../port/driven/AddUsersToTeamPort.java | 9 +++++++ .../port/driven/CreateTeamForProjectPort.java | 10 ++++++++ .../driven/DeleteTeamFromProjectPort.java | 8 ++++++ .../driven/DeleteUserRoleForProjectPort.java | 9 +++++++ .../port/driven/DeleteUsersFromTeamPort.java | 11 ++++++++ .../port/driven/GetTeamPort.java | 21 ++++++++++++++++ .../port/driven/ListProjectsForTeamPort.java | 9 +++++++ .../port/driven/ListProjectsForUserPort.java | 10 ++++++++ .../port/driven/ListTeamsForProjectPort.java | 10 ++++++++ .../port/driven/ListTeamsForUserPort.java | 10 ++++++++ .../port/driven/ListUsersPort.java | 9 +++++++ .../driven/SetUserRoleForProjectPort.java | 10 ++++++++ .../get/ListProjectsForUserUseCase.java | 1 + .../get/ListProjectsForUserService.java | 18 ++++++++++++- .../service/get/ListUsersService.java | 9 ++++++- .../DeleteUserRoleForProjectService.java | 24 +++++++++++++++++- .../SetUserRoleForProjectService.java | 24 +++++++++++++++++- .../service/teams/AddUsersToTeamService.java | 25 ++++++++++++++++++- .../teams/DeleteTeamFromProjectService.java | 18 ++++++++++++- .../teams/DeleteUsersFromTeamService.java | 25 ++++++++++++++++++- .../create/CreateTeamForProjectService.java | 17 ++++++++++++- .../service/teams/get/GetTeamService.java | 15 ++++++++++- .../teams/get/ListProjectsForTeamService.java | 18 ++++++++++++- .../teams/get/ListTeamsForProjectService.java | 17 ++++++++++++- .../teams/get/ListTeamsForUserService.java | 18 ++++++++++++- 26 files changed, 352 insertions(+), 12 deletions(-) create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotFoundException.java diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotFoundException.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotFoundException.java new file mode 100644 index 000000000..e31b95687 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotFoundException.java @@ -0,0 +1,9 @@ +package io.reflectoring.coderadar.useradministration; + +import io.reflectoring.coderadar.EntityNotFoundException; + +public class TeamNotFoundException extends EntityNotFoundException { + public TeamNotFoundException(Long teamId) { + super("Team with id " + teamId + " not found."); + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java index 3086e113b..dc498771e 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java @@ -1,4 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driven; +import java.util.List; + public interface AddUsersToTeamPort { + + /** + * Adds users to a team. + * @param teamId The id of the team. + * @param userIds The ids of the users. + */ + void addUsersToTeam(long teamId, List userIds); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamForProjectPort.java index 542651820..3cb1413c6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamForProjectPort.java @@ -1,4 +1,14 @@ package io.reflectoring.coderadar.useradministration.port.driven; +import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamForProjectCommand; + public interface CreateTeamForProjectPort { + + /** + * Creates a team in the given project. + * @param projectId The id of the project. + * @param command The command containing the needed data. + * @return The id of the newly created team. + */ + Long createTeamForProject(long projectId, CreateTeamForProjectCommand command); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamFromProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamFromProjectPort.java index 30f5a031f..98085bdee 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamFromProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamFromProjectPort.java @@ -1,4 +1,12 @@ package io.reflectoring.coderadar.useradministration.port.driven; public interface DeleteTeamFromProjectPort { + + /** + * Deletes a team. + * Any permissions users had for a project because of the team + * will be lost after this operation. + * @param teamId The id of the team. + */ + void deleteTeam(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java index 77d6e6946..1c9a5fc39 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java @@ -1,4 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driven; public interface DeleteUserRoleForProjectPort { + + /** + * Removes the role a given user has to a project. + * If the user is not in any team with access to the project, they + * will no longer have access to the project. + * @param projectId The id of the project. + * @param userId The id of the user. + */ + void deleteRole(long projectId, long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java index 9f517f8b8..24f473541 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java @@ -1,4 +1,15 @@ package io.reflectoring.coderadar.useradministration.port.driven; +import java.util.List; + public interface DeleteUsersFromTeamPort { + + /** + * Deletes users from a team. + * Any permissions users had for a project because of the team + * will be lost after this operation. + * @param teamId The id of the team. + * @param userIds The ids of the users. + */ + void deleteUsersFromTeam(long teamId, List userIds); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java index caec82939..900272e86 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java @@ -1,4 +1,25 @@ package io.reflectoring.coderadar.useradministration.port.driven; +import io.reflectoring.coderadar.useradministration.domain.Team; + public interface GetTeamPort { + /** + * @param teamId The team id. + * @return The team with the given id. + */ + Team get(long teamId); + + /** + * + * @param teamId The id of the team. + * @return True if a team with the given id exists. + */ + boolean existsById(long teamId); + + /** + * + * @param name The name of the team. + * @return True if a team with the given name exists. + */ + boolean existsByName(String name); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java index 3c59000c7..8023219dc 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java @@ -1,4 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driven; +import io.reflectoring.coderadar.projectadministration.domain.Project; + +import java.util.List; + public interface ListProjectsForTeamPort { + /** + * @param teamId The id of the team. + * @return All projects the team has access to. + */ + List listProjects(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java index e61e1b223..1a157df90 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java @@ -1,4 +1,14 @@ package io.reflectoring.coderadar.useradministration.port.driven; +import io.reflectoring.coderadar.projectadministration.domain.Project; + +import java.util.List; + public interface ListProjectsForUserPort { + + /** + * @param userId The id of the user. + * @return All projects this user has access to. + */ + List listProjects(long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java index 93de7f259..196b9f9ae 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java @@ -1,4 +1,14 @@ package io.reflectoring.coderadar.useradministration.port.driven; +import io.reflectoring.coderadar.useradministration.domain.Team; + +import java.util.List; + public interface ListTeamsForProjectPort { + + /** + * @param projectId The id of the project. + * @return All teams with access to this project. + */ + List listTeamsForProject(long projectId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java index 41cec51b7..7697bf60d 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java @@ -1,4 +1,14 @@ package io.reflectoring.coderadar.useradministration.port.driven; +import io.reflectoring.coderadar.useradministration.domain.Team; + +import java.util.List; + public interface ListTeamsForUserPort { + + /** + * @param userId The id of the user. + * @return All teams the user is in. + */ + List listTeamsForUser(long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java index cfb5e9558..86ffdaaa9 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java @@ -1,4 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driven; +import io.reflectoring.coderadar.useradministration.domain.User; + +import java.util.List; + public interface ListUsersPort { + + /** + * @return All users in the database. + */ + List listUsers(); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java index 841565fae..5d39452ac 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java @@ -1,4 +1,14 @@ package io.reflectoring.coderadar.useradministration.port.driven; +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; + public interface SetUserRoleForProjectPort { + + /** + * Gives a user a role in the project. + * @param projectId The id of the project. + * @param userId The id of the user. + * @param role The role to set. + */ + void setRole(long projectId, long userId, ProjectRole role); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java index 5df201ef3..891b558ad 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.port.driver.get; import io.reflectoring.coderadar.projectadministration.domain.Project; +import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForUserPort; import java.util.List; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java index f932d5e23..d9676b81f 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java @@ -1,13 +1,29 @@ package io.reflectoring.coderadar.useradministration.service.get; import io.reflectoring.coderadar.projectadministration.domain.Project; +import io.reflectoring.coderadar.useradministration.UserNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; +import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForUserPort; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; import java.util.List; public class ListProjectsForUserService implements ListProjectsForUserUseCase { + + private final ListProjectsForUserPort listProjectsForUserPort; + private final GetUserPort getUserPort; + + public ListProjectsForUserService(ListProjectsForUserPort listProjectsForUserPort, GetUserPort getUserPort) { + this.listProjectsForUserPort = listProjectsForUserPort; + this.getUserPort = getUserPort; + } + @Override public List listProjects(long userId) { - return null; + if(this.getUserPort.existsById(userId)){ + return listProjectsForUserPort.listProjects(userId); + } else { + throw new UserNotFoundException(userId); + } } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java index d45ffb78d..86d84495b 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java @@ -8,8 +8,15 @@ @Service public class ListUsersService implements ListUsersUseCase { + + private final ListUsersService listUsersService; + + public ListUsersService(ListUsersService listUsersService) { + this.listUsersService = listUsersService; + } + @Override public List listUsers() { - return null; + return listUsersService.listUsers(); } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java index 1c60af896..a990365e4 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java @@ -1,12 +1,34 @@ package io.reflectoring.coderadar.useradministration.service.permissions; +import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; +import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; +import io.reflectoring.coderadar.useradministration.UserNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driven.DeleteUserRoleForProjectPort; +import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driver.permissions.DeleteUserRoleForProjectUseCase; import org.springframework.stereotype.Service; @Service public class DeleteUserRoleForProjectService implements DeleteUserRoleForProjectUseCase { + + private final GetProjectPort getProjectPort; + private final GetUserPort getUserPort; + private final DeleteUserRoleForProjectPort deleteUserRoleForProjectPort; + + public DeleteUserRoleForProjectService(GetProjectPort getProjectPort, GetUserPort getUserPort, DeleteUserRoleForProjectPort deleteUserRoleForProjectPort) { + this.getProjectPort = getProjectPort; + this.getUserPort = getUserPort; + this.deleteUserRoleForProjectPort = deleteUserRoleForProjectPort; + } + @Override public void deleteRole(long projectId, long userId) { - + if(!getProjectPort.existsById(projectId)){ + throw new ProjectNotFoundException(projectId); + } + if(!getUserPort.existsById(userId)) { + throw new UserNotFoundException(userId); + } + deleteUserRoleForProjectPort.deleteRole(projectId, userId); } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java index 1853ab96c..bd60dc880 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java @@ -1,13 +1,35 @@ package io.reflectoring.coderadar.useradministration.service.permissions; +import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; +import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; +import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; +import io.reflectoring.coderadar.useradministration.port.driven.SetUserRoleForProjectPort; import io.reflectoring.coderadar.useradministration.port.driver.permissions.SetUserRoleForProjectUseCase; import org.springframework.stereotype.Service; @Service public class SetUserRoleForProjectService implements SetUserRoleForProjectUseCase { + + private final GetProjectPort getProjectPort; + private final GetUserPort getUserPort; + private final SetUserRoleForProjectPort setUserRoleForProjectPort; + + public SetUserRoleForProjectService(GetProjectPort getProjectPort, GetUserPort getUserPort, SetUserRoleForProjectPort setUserRoleForProjectPort) { + this.getProjectPort = getProjectPort; + this.getUserPort = getUserPort; + this.setUserRoleForProjectPort = setUserRoleForProjectPort; + } + @Override public void setRole(long projectId, long userId, ProjectRole role) { - + if(!getProjectPort.existsById(projectId)){ + throw new ProjectNotFoundException(projectId); + } + if(!getUserPort.existsById(userId)) { + throw new UserNotFoundException(userId); + } + setUserRoleForProjectPort.setRole(projectId, userId, role); } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java index 47cdf2f82..9e457c789 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java @@ -1,5 +1,10 @@ package io.reflectoring.coderadar.useradministration.service.teams; +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; +import io.reflectoring.coderadar.useradministration.UserNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driven.AddUsersToTeamPort; +import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; +import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; import org.springframework.stereotype.Service; @@ -8,8 +13,26 @@ @Service public class AddUsersToTeamService implements AddUsersToTeamUseCase { + private final GetTeamPort getTeamPort; + private final GetUserPort getUserPort; + private final AddUsersToTeamPort addUsersToTeamPort; + + public AddUsersToTeamService(GetTeamPort getTeamPort, GetUserPort getUserPort, AddUsersToTeamPort addUsersToTeamPort) { + this.getTeamPort = getTeamPort; + this.getUserPort = getUserPort; + this.addUsersToTeamPort = addUsersToTeamPort; + } + @Override public void addUsersToTeam(long teamId, List userIds) { - + if(!getTeamPort.existsById(teamId)){ + throw new TeamNotFoundException(teamId); + } + for(Long userId : userIds){ + if(!getUserPort.existsById(userId)) { + throw new UserNotFoundException(userId); + } + } + addUsersToTeamPort.addUsersToTeam(teamId, userIds); } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamFromProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamFromProjectService.java index 6687ae658..b1c865a75 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamFromProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamFromProjectService.java @@ -1,12 +1,28 @@ package io.reflectoring.coderadar.useradministration.service.teams; +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driven.DeleteTeamFromProjectPort; +import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteTeamFromProjectUseCase; import org.springframework.stereotype.Service; @Service public class DeleteTeamFromProjectService implements DeleteTeamFromProjectUseCase { + + private final GetTeamPort getTeamPort; + private final DeleteTeamFromProjectPort deleteTeamFromProjectPort; + + public DeleteTeamFromProjectService(GetTeamPort getTeamPort, DeleteTeamFromProjectPort deleteTeamFromProjectPort) { + this.getTeamPort = getTeamPort; + this.deleteTeamFromProjectPort = deleteTeamFromProjectPort; + } + @Override public void deleteTeam(long teamId) { - + if(getTeamPort.existsById(teamId)){ + deleteTeamFromProjectPort.deleteTeam(teamId); + } else { + throw new TeamNotFoundException(teamId); + } } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java index 626ae9a37..4a58f2647 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.useradministration.service.teams; +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; +import io.reflectoring.coderadar.useradministration.UserNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; +import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteUsersFromTeamUseCase; import org.springframework.stereotype.Service; @@ -7,8 +11,27 @@ @Service public class DeleteUsersFromTeamService implements DeleteUsersFromTeamUseCase { + + private final GetTeamPort getTeamPort; + private final GetUserPort getUserPort; + private final DeleteUsersFromTeamService deleteUsersFromTeamService; + + public DeleteUsersFromTeamService(GetTeamPort getTeamPort, GetUserPort getUserPort, DeleteUsersFromTeamService deleteUsersFromTeamService) { + this.getTeamPort = getTeamPort; + this.getUserPort = getUserPort; + this.deleteUsersFromTeamService = deleteUsersFromTeamService; + } + @Override public void deleteUsersFromTeam(long teamId, List userIds) { - + if(!getTeamPort.existsById(teamId)){ + throw new TeamNotFoundException(teamId); + } + for(Long userId : userIds){ + if(!getUserPort.existsById(userId)) { + throw new UserNotFoundException(userId); + } + } + deleteUsersFromTeamService.deleteUsersFromTeam(teamId, userIds); } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamForProjectService.java index 14e388df0..d861190f4 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamForProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamForProjectService.java @@ -1,13 +1,28 @@ package io.reflectoring.coderadar.useradministration.service.teams.create; +import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; +import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; +import io.reflectoring.coderadar.useradministration.port.driven.CreateTeamForProjectPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamForProjectCommand; import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamForProjectUseCase; import org.springframework.stereotype.Service; @Service public class CreateTeamForProjectService implements CreateTeamForProjectUseCase { + + private final GetProjectPort getProjectPort; + private final CreateTeamForProjectPort createTeamForProjectPort; + + public CreateTeamForProjectService(GetProjectPort getProjectPort, CreateTeamForProjectPort createTeamForProjectPort) { + this.getProjectPort = getProjectPort; + this.createTeamForProjectPort = createTeamForProjectPort; + } + @Override public Long createTeamForProject(long projectId, CreateTeamForProjectCommand command) { - return null; + if(!getProjectPort.existsById(projectId)){ + throw new ProjectNotFoundException(projectId); + } + return createTeamForProjectPort.createTeamForProject(projectId, command); } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java index d4edfd427..ed391fba5 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java @@ -1,13 +1,26 @@ package io.reflectoring.coderadar.useradministration.service.teams.get; import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.GetTeamUseCase; import org.springframework.stereotype.Service; @Service public class GetTeamService implements GetTeamUseCase { + + private final GetTeamPort getTeamPort; + + public GetTeamService(GetTeamPort getTeamPort) { + this.getTeamPort = getTeamPort; + } + @Override public Team get(long teamId) { - return null; + if(getTeamPort.existsById(teamId)){ + return getTeamPort.get(teamId); + } else { + throw new TeamNotFoundException(teamId); + } } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java index 774f99987..4497ec234 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java @@ -1,13 +1,29 @@ package io.reflectoring.coderadar.useradministration.service.teams.get; import io.reflectoring.coderadar.projectadministration.domain.Project; +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; +import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForTeamPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; import java.util.List; public class ListProjectsForTeamService implements ListProjectsForTeamUseCase { + + private final GetTeamPort getTeamPort; + private final ListProjectsForTeamPort listProjectsForTeamPort; + + public ListProjectsForTeamService(GetTeamPort getTeamPort, ListProjectsForTeamPort listProjectsForTeamPort) { + this.getTeamPort = getTeamPort; + this.listProjectsForTeamPort = listProjectsForTeamPort; + } + @Override public List listProjects(long teamId) { - return null; + if(getTeamPort.existsById(teamId)){ + return listProjectsForTeamPort.listProjects(teamId); + } else { + throw new TeamNotFoundException(teamId); + } } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java index f7a38e799..5c886f715 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java @@ -1,6 +1,9 @@ package io.reflectoring.coderadar.useradministration.service.teams.get; +import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; +import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsForProjectPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; import org.springframework.stereotype.Service; @@ -9,8 +12,20 @@ @Service public class ListTeamsForProjectService implements ListTeamsForProjectUseCase { + private final ListTeamsForProjectPort listTeamsForProjectPort; + private final GetProjectPort getProjectPort; + + public ListTeamsForProjectService(ListTeamsForProjectPort listTeamsForProjectPort, GetProjectPort getProjectPort) { + this.listTeamsForProjectPort = listTeamsForProjectPort; + this.getProjectPort = getProjectPort; + } + @Override public List listTeamsForProject(long projectId) { - return null; + if(getProjectPort.existsById(projectId)){ + return listTeamsForProjectPort.listTeamsForProject(projectId); + } else { + throw new ProjectNotFoundException(projectId); + } } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java index 7895cf774..5e07a39d0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java @@ -1,6 +1,9 @@ package io.reflectoring.coderadar.useradministration.service.teams.get; +import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; +import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsForUserPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; import org.springframework.stereotype.Service; @@ -8,8 +11,21 @@ @Service public class ListTeamsForUserService implements ListTeamsForUserUseCase { + + private final GetUserPort getUserPort; + private final ListTeamsForUserPort listTeamsForUserPort; + + public ListTeamsForUserService(GetUserPort getUserPort, ListTeamsForUserPort listTeamsForUserPort) { + this.getUserPort = getUserPort; + this.listTeamsForUserPort = listTeamsForUserPort; + } + @Override public List listTeamsForUser(long userId) { - return null; + if(getUserPort.existsById(userId)){ + listTeamsForUserPort.listTeamsForUser(userId); + } else { + throw new UserNotFoundException(userId); + } } } From 2bd9cf584d081205e3af149b62c9424e1e9f175f Mon Sep 17 00:00:00 2001 From: Krause Date: Tue, 5 May 2020 16:14:24 +0200 Subject: [PATCH 04/76] implement AddUsersToTeamController --- .../teams/AddUsersToTeamController.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java index 1772b75d6..9951b53f6 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java @@ -2,9 +2,17 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @Transactional public class AddUsersToTeamController implements AbstractBaseController { @@ -13,4 +21,10 @@ public class AddUsersToTeamController implements AbstractBaseController { public AddUsersToTeamController(AddUsersToTeamUseCase addUsersToTeamUseCase) { this.addUsersToTeamUseCase = addUsersToTeamUseCase; } + + @PostMapping(path = "/teams/{teamId}/users", consumes = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity addUsersToTeam(@PathVariable long teamId, @RequestBody List userIds) { + addUsersToTeamUseCase.addUsersToTeam(teamId, userIds); + return new ResponseEntity<>(HttpStatus.OK); + } } From 5a34eedef1153777d5fa496a7ab7ad2589584cc1 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Tue, 5 May 2020 16:20:52 +0200 Subject: [PATCH 05/76] add create and delete team use-cases/ports/service --- .../port/driven/AddTeamToProjectPort.java | 11 ++++++++ .../port/driven/CreateTeamForProjectPort.java | 14 ---------- .../port/driven/CreateTeamPort.java | 12 ++++++++ .../port/driven/DeleteTeamPort.java | 9 ++++++ ...rt.java => RemoveTeamFromProjectPort.java} | 2 +- .../driver/teams/AddTeamToProjectUseCase.java | 11 ++++++++ .../port/driver/teams/DeleteTeamUseCase.java | 10 +++++++ ...java => RemoveTeamFromProjectUseCase.java} | 6 ++-- ...ectCommand.java => CreateTeamCommand.java} | 5 +--- .../create/CreateTeamForProjectUseCase.java | 12 -------- .../teams/create/CreateTeamUseCase.java | 11 ++++++++ .../teams/AddTeamToProjectService.java | 27 ++++++++++++++++++ ...ectService.java => DeleteTeamService.java} | 14 +++++----- .../teams/RemoveTeamFromProjectService.java | 28 +++++++++++++++++++ .../create/CreateTeamForProjectService.java | 28 ------------------- .../teams/create/CreateTeamService.java | 19 +++++++++++++ .../teams/get/ListTeamsForUserService.java | 2 +- .../teams/CreateTeamForProjectController.java | 8 +++--- .../DeleteTeamFromProjectController.java | 8 +++--- 19 files changed, 159 insertions(+), 78 deletions(-) create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java delete mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamForProjectPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamPort.java rename coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/{DeleteTeamFromProjectPort.java => RemoveTeamFromProjectPort.java} (86%) create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamUseCase.java rename coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/{DeleteTeamFromProjectUseCase.java => RemoveTeamFromProjectUseCase.java} (66%) rename coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/{CreateTeamForProjectCommand.java => CreateTeamCommand.java} (83%) delete mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamForProjectUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java rename coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/{DeleteTeamFromProjectService.java => DeleteTeamService.java} (59%) create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java delete mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamForProjectService.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java new file mode 100644 index 000000000..4c9784afd --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java @@ -0,0 +1,11 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +public interface AddTeamToProjectPort { + + /** + * Creates a team in the given project. + * @param projectId The id of the project. + * @param teamId The team id. + */ + void addTeamToProject(long projectId, long teamId); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamForProjectPort.java deleted file mode 100644 index 3cb1413c6..000000000 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamForProjectPort.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.reflectoring.coderadar.useradministration.port.driven; - -import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamForProjectCommand; - -public interface CreateTeamForProjectPort { - - /** - * Creates a team in the given project. - * @param projectId The id of the project. - * @param command The command containing the needed data. - * @return The id of the newly created team. - */ - Long createTeamForProject(long projectId, CreateTeamForProjectCommand command); -} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamPort.java new file mode 100644 index 000000000..8031abf07 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamPort.java @@ -0,0 +1,12 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; + +public interface CreateTeamPort { + /** + * Creates a new team. + * @param createTeamCommand The command containing the required data. + * @return The id of the new team. + */ + Long createTeam(CreateTeamCommand createTeamCommand); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamPort.java new file mode 100644 index 000000000..ccdf82b03 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamPort.java @@ -0,0 +1,9 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +public interface DeleteTeamPort { + /** + * Deletes a team. + * @param teamId The id of the team. + */ + void deleteTeam(long teamId); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamFromProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveTeamFromProjectPort.java similarity index 86% rename from coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamFromProjectPort.java rename to coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveTeamFromProjectPort.java index 98085bdee..ceea3914f 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamFromProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveTeamFromProjectPort.java @@ -1,6 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driven; -public interface DeleteTeamFromProjectPort { +public interface RemoveTeamFromProjectPort { /** * Deletes a team. diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java new file mode 100644 index 000000000..f2e9706d5 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java @@ -0,0 +1,11 @@ +package io.reflectoring.coderadar.useradministration.port.driver.teams; + +public interface AddTeamToProjectUseCase { + + /** + * Creates a team in the given project. + * @param projectId The id of the project. + * @param teamId The id of the team. + */ + void addTeamToProject(long projectId, long teamId); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamUseCase.java new file mode 100644 index 000000000..c7203e947 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamUseCase.java @@ -0,0 +1,10 @@ +package io.reflectoring.coderadar.useradministration.port.driver.teams; + +public interface DeleteTeamUseCase { + + /** + * Deletes a team. + * @param teamId The id of the team. + */ + void deleteTeam(long teamId); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamFromProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveTeamFromProjectUseCase.java similarity index 66% rename from coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamFromProjectUseCase.java rename to coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveTeamFromProjectUseCase.java index c8d2b8458..b09028254 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamFromProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveTeamFromProjectUseCase.java @@ -1,12 +1,12 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams; -public interface DeleteTeamFromProjectUseCase { +public interface RemoveTeamFromProjectUseCase { /** - * Deletes a team. + * Removes a team from a project. * Any permissions users had for a project because of the team * will be lost after this operation. * @param teamId The id of the team. */ - void deleteTeam(long teamId); + void removeTeam(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamForProjectCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java similarity index 83% rename from coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamForProjectCommand.java rename to coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java index ec425a5ca..e5bf4e032 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamForProjectCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java @@ -13,10 +13,7 @@ */ @Data @NoArgsConstructor -public class CreateTeamForProjectCommand { +public class CreateTeamCommand { @NotBlank private String name; private List userIds; - - @NotNull - private ProjectRole role; } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamForProjectUseCase.java deleted file mode 100644 index 14a2a1427..000000000 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamForProjectUseCase.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.reflectoring.coderadar.useradministration.port.driver.teams.create; - -public interface CreateTeamForProjectUseCase { - - /** - * Creates a team in the given project. - * @param projectId The id of the project. - * @param command The command containing the needed data. - * @return The id of the newly created team. - */ - Long createTeamForProject(long projectId, CreateTeamForProjectCommand command); -} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamUseCase.java new file mode 100644 index 000000000..bac7da580 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamUseCase.java @@ -0,0 +1,11 @@ +package io.reflectoring.coderadar.useradministration.port.driver.teams.create; + +public interface CreateTeamUseCase { + + /** + * Creates a new team. + * @param createTeamCommand The command containing the required data. + * @return The id of the new team. + */ + Long createTeam(CreateTeamCommand createTeamCommand); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java new file mode 100644 index 000000000..7fd99394f --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java @@ -0,0 +1,27 @@ +package io.reflectoring.coderadar.useradministration.service.teams; + +import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; +import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; +import io.reflectoring.coderadar.useradministration.port.driven.AddTeamToProjectPort; +import io.reflectoring.coderadar.useradministration.port.driver.teams.AddTeamToProjectUseCase; +import org.springframework.stereotype.Service; + +@Service +public class AddTeamToProjectService implements AddTeamToProjectUseCase { + + private final GetProjectPort getProjectPort; + private final AddTeamToProjectPort addTeamToProjectPort; + + public AddTeamToProjectService(GetProjectPort getProjectPort, AddTeamToProjectPort addTeamToProjectPort) { + this.getProjectPort = getProjectPort; + this.addTeamToProjectPort = addTeamToProjectPort; + } + + @Override + public void addTeamToProject(long projectId, long teamId) { + if(!getProjectPort.existsById(projectId)){ + throw new ProjectNotFoundException(projectId); + } + addTeamToProjectPort.addTeamToProject(projectId, teamId); + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamFromProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamService.java similarity index 59% rename from coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamFromProjectService.java rename to coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamService.java index b1c865a75..8878c20e5 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamFromProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamService.java @@ -1,26 +1,26 @@ package io.reflectoring.coderadar.useradministration.service.teams; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; -import io.reflectoring.coderadar.useradministration.port.driven.DeleteTeamFromProjectPort; +import io.reflectoring.coderadar.useradministration.port.driven.DeleteTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; -import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteTeamFromProjectUseCase; +import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteTeamUseCase; import org.springframework.stereotype.Service; @Service -public class DeleteTeamFromProjectService implements DeleteTeamFromProjectUseCase { +public class DeleteTeamService implements DeleteTeamUseCase { private final GetTeamPort getTeamPort; - private final DeleteTeamFromProjectPort deleteTeamFromProjectPort; + private final DeleteTeamPort deleteTeamPort; - public DeleteTeamFromProjectService(GetTeamPort getTeamPort, DeleteTeamFromProjectPort deleteTeamFromProjectPort) { + public DeleteTeamService(GetTeamPort getTeamPort, DeleteTeamPort deleteTeamPort) { this.getTeamPort = getTeamPort; - this.deleteTeamFromProjectPort = deleteTeamFromProjectPort; + this.deleteTeamPort = deleteTeamPort; } @Override public void deleteTeam(long teamId) { if(getTeamPort.existsById(teamId)){ - deleteTeamFromProjectPort.deleteTeam(teamId); + deleteTeamPort.deleteTeam(teamId); } else { throw new TeamNotFoundException(teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java new file mode 100644 index 000000000..747a7a4b7 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java @@ -0,0 +1,28 @@ +package io.reflectoring.coderadar.useradministration.service.teams; + +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driven.RemoveTeamFromProjectPort; +import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; +import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveTeamFromProjectUseCase; +import org.springframework.stereotype.Service; + +@Service +public class RemoveTeamFromProjectService implements RemoveTeamFromProjectUseCase { + + private final GetTeamPort getTeamPort; + private final RemoveTeamFromProjectPort removeTeamFromProjectPort; + + public RemoveTeamFromProjectService(GetTeamPort getTeamPort, RemoveTeamFromProjectPort removeTeamFromProjectPort) { + this.getTeamPort = getTeamPort; + this.removeTeamFromProjectPort = removeTeamFromProjectPort; + } + + @Override + public void removeTeam(long teamId) { + if(getTeamPort.existsById(teamId)){ + removeTeamFromProjectPort.deleteTeam(teamId); + } else { + throw new TeamNotFoundException(teamId); + } + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamForProjectService.java deleted file mode 100644 index d861190f4..000000000 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamForProjectService.java +++ /dev/null @@ -1,28 +0,0 @@ -package io.reflectoring.coderadar.useradministration.service.teams.create; - -import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; -import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; -import io.reflectoring.coderadar.useradministration.port.driven.CreateTeamForProjectPort; -import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamForProjectCommand; -import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamForProjectUseCase; -import org.springframework.stereotype.Service; - -@Service -public class CreateTeamForProjectService implements CreateTeamForProjectUseCase { - - private final GetProjectPort getProjectPort; - private final CreateTeamForProjectPort createTeamForProjectPort; - - public CreateTeamForProjectService(GetProjectPort getProjectPort, CreateTeamForProjectPort createTeamForProjectPort) { - this.getProjectPort = getProjectPort; - this.createTeamForProjectPort = createTeamForProjectPort; - } - - @Override - public Long createTeamForProject(long projectId, CreateTeamForProjectCommand command) { - if(!getProjectPort.existsById(projectId)){ - throw new ProjectNotFoundException(projectId); - } - return createTeamForProjectPort.createTeamForProject(projectId, command); - } -} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java new file mode 100644 index 000000000..121eea5bd --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java @@ -0,0 +1,19 @@ +package io.reflectoring.coderadar.useradministration.service.teams.create; + +import io.reflectoring.coderadar.useradministration.port.driven.CreateTeamPort; +import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; +import org.springframework.stereotype.Service; + +@Service +public class CreateTeamService implements CreateTeamPort { + private final CreateTeamPort createTeamPort; + + public CreateTeamService(CreateTeamPort createTeamPort) { + this.createTeamPort = createTeamPort; + } + + @Override + public Long createTeam(CreateTeamCommand createTeamCommand) { + return createTeamPort.createTeam(createTeamCommand); + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java index 5e07a39d0..4de2043c5 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java @@ -23,7 +23,7 @@ public ListTeamsForUserService(GetUserPort getUserPort, ListTeamsForUserPort lis @Override public List listTeamsForUser(long userId) { if(getUserPort.existsById(userId)){ - listTeamsForUserPort.listTeamsForUser(userId); + return listTeamsForUserPort.listTeamsForUser(userId); } else { throw new UserNotFoundException(userId); } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java index f80a10e75..5fb284b63 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java @@ -1,16 +1,16 @@ package io.reflectoring.coderadar.rest.useradministration.teams; import io.reflectoring.coderadar.rest.AbstractBaseController; -import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamForProjectUseCase; +import io.reflectoring.coderadar.useradministration.port.driver.teams.AddTeamToProjectUseCase; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RestController; @RestController @Transactional public class CreateTeamForProjectController implements AbstractBaseController { - private final CreateTeamForProjectUseCase createTeamForProjectUseCase; + private final AddTeamToProjectUseCase addTeamToProjectUseCase; - public CreateTeamForProjectController(CreateTeamForProjectUseCase createTeamForProjectUseCase) { - this.createTeamForProjectUseCase = createTeamForProjectUseCase; + public CreateTeamForProjectController(AddTeamToProjectUseCase addTeamToProjectUseCase) { + this.addTeamToProjectUseCase = addTeamToProjectUseCase; } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java index 371e7e182..24ac43021 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java @@ -1,16 +1,16 @@ package io.reflectoring.coderadar.rest.useradministration.teams; import io.reflectoring.coderadar.rest.AbstractBaseController; -import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteTeamFromProjectUseCase; +import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveTeamFromProjectUseCase; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RestController; @RestController @Transactional public class DeleteTeamFromProjectController implements AbstractBaseController { - private final DeleteTeamFromProjectUseCase deleteTeamFromProjectUseCase; + private final RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase; - public DeleteTeamFromProjectController(DeleteTeamFromProjectUseCase deleteTeamFromProjectUseCase) { - this.deleteTeamFromProjectUseCase = deleteTeamFromProjectUseCase; + public DeleteTeamFromProjectController(RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase) { + this.removeTeamFromProjectUseCase = removeTeamFromProjectUseCase; } } From f44bb3877e164101537cf495a4eaa8dc86c36771 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Tue, 5 May 2020 16:54:27 +0200 Subject: [PATCH 06/76] Implemented: AddTeamToProjectAdapter CreateTeamAdapter DeleteTeamAdapter ListProjectsForTeamAdapter ListTeamsForUserAdapter ListUsersAdapter TeamMapper and applied spotless. --- .../projectadministration/domain/Project.java | 3 +- .../TeamAlreadyExistsException.java | 9 ++++ .../TeamNotFoundException.java | 6 +-- .../domain/ProjectRole.java | 33 ++++++-------- .../useradministration/domain/Team.java | 9 ++-- .../port/driven/AddTeamToProjectPort.java | 16 ++++--- .../port/driven/AddUsersToTeamPort.java | 13 +++--- .../port/driven/CreateTeamPort.java | 13 +++--- .../port/driven/DeleteTeamPort.java | 11 ++--- .../driven/DeleteUserRoleForProjectPort.java | 16 +++---- .../port/driven/DeleteUsersFromTeamPort.java | 16 +++---- .../port/driven/GetTeamPort.java | 32 +++++++------- .../port/driven/ListProjectsForTeamPort.java | 11 +++-- .../port/driven/ListProjectsForUserPort.java | 11 +++-- .../port/driven/ListTeamsForProjectPort.java | 11 +++-- .../port/driven/ListTeamsForUserPort.java | 11 +++-- .../port/driven/ListUsersPort.java | 7 +-- .../driven/RemoveTeamFromProjectPort.java | 14 +++--- .../driven/SetUserRoleForProjectPort.java | 15 ++++--- .../get/ListProjectsForUserUseCase.java | 12 +++-- .../port/driver/get/ListUsersUseCase.java | 7 +-- .../DeleteUserRoleForProjectUseCase.java | 16 +++---- .../SetUserRoleForProjectUseCase.java | 16 +++---- .../driver/teams/AddTeamToProjectUseCase.java | 16 ++++--- .../driver/teams/AddUsersToTeamUseCase.java | 13 +++--- .../port/driver/teams/DeleteTeamUseCase.java | 11 ++--- .../teams/DeleteUsersFromTeamUseCase.java | 16 +++---- .../teams/RemoveTeamFromProjectUseCase.java | 14 +++--- .../teams/create/CreateTeamCommand.java | 15 +++---- .../teams/create/CreateTeamUseCase.java | 13 +++--- .../port/driver/teams/get/GetTeamUseCase.java | 10 ++--- .../teams/get/ListProjectsForTeamUseCase.java | 11 +++-- .../teams/get/ListTeamsForProjectUseCase.java | 11 +++-- .../teams/get/ListTeamsForUserUseCase.java | 11 +++-- .../get/ListProjectsForUserService.java | 28 ++++++------ .../service/get/ListUsersService.java | 19 ++++---- .../DeleteUserRoleForProjectService.java | 37 +++++++++------- .../SetUserRoleForProjectService.java | 37 +++++++++------- .../teams/AddTeamToProjectService.java | 25 ++++++----- .../service/teams/AddUsersToTeamService.java | 42 +++++++++--------- .../service/teams/DeleteTeamService.java | 26 +++++------ .../teams/DeleteUsersFromTeamService.java | 44 ++++++++++--------- .../teams/RemoveTeamFromProjectService.java | 29 ++++++------ .../teams/create/CreateTeamService.java | 22 +++++++--- .../service/teams/get/GetTeamService.java | 24 +++++----- .../teams/get/ListProjectsForTeamService.java | 28 ++++++------ .../teams/get/ListTeamsForProjectService.java | 30 ++++++------- .../teams/get/ListTeamsForUserService.java | 30 ++++++------- .../domain/ProjectEntity.java | 7 ++- .../graph/useradministration/TeamMapper.java | 29 ++++++++++++ .../adapter/ListUsersAdapter.java | 28 ++++++++++++ .../teams/AddTeamToProjectAdapter.java | 21 +++++++++ .../adapter/teams/CreateTeamAdapter.java | 28 ++++++++++++ .../adapter/teams/DeleteTeamAdapter.java | 18 ++++++++ .../teams/ListProjectsForTeamAdapter.java | 24 ++++++++++ .../teams/ListTeamsForUserAdapter.java | 24 ++++++++++ .../useradministration/domain/TeamEntity.java | 15 +++---- .../repository/TeamRepository.java | 37 ++++++++++++++++ .../repository/UserRepository.java | 8 ++++ .../ListProjectsForUserController.java | 8 ++-- .../ListUsersController.java | 8 ++-- .../DeleteUserRoleForProjectController.java | 20 +++++---- .../SetUserRoleForProjectController.java | 21 +++++---- .../teams/AddUsersToTeamController.java | 8 ++-- .../teams/CreateTeamForProjectController.java | 8 ++-- .../DeleteTeamFromProjectController.java | 9 ++-- .../teams/DeleteUsersFromTeamController.java | 10 ++--- .../teams/GetTeamController.java | 8 ++-- .../teams/ListProjectsForTeamController.java | 8 ++-- .../teams/ListTeamsForProjectController.java | 8 ++-- .../teams/ListTeamsForUserController.java | 8 ++-- 71 files changed, 730 insertions(+), 503 deletions(-) create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamAlreadyExistsException.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/TeamMapper.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListUsersAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddTeamToProjectAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/CreateTeamAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteTeamAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForUserAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java index 6b81c49c7..0b46dc9a5 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java @@ -1,9 +1,8 @@ package io.reflectoring.coderadar.projectadministration.domain; +import io.reflectoring.coderadar.useradministration.domain.Team; import java.util.Date; import java.util.List; - -import io.reflectoring.coderadar.useradministration.domain.Team; import lombok.Data; /** A Coderadar project that defines the source of files that are to be analyzed. */ diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamAlreadyExistsException.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamAlreadyExistsException.java new file mode 100644 index 000000000..5409b9fcf --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamAlreadyExistsException.java @@ -0,0 +1,9 @@ +package io.reflectoring.coderadar.useradministration; + +import io.reflectoring.coderadar.EntityAlreadyExistsException; + +public class TeamAlreadyExistsException extends EntityAlreadyExistsException { + public TeamAlreadyExistsException(String name) { + super("Team with name " + name + " already exists!"); + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotFoundException.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotFoundException.java index e31b95687..a9b2d8ddb 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotFoundException.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotFoundException.java @@ -3,7 +3,7 @@ import io.reflectoring.coderadar.EntityNotFoundException; public class TeamNotFoundException extends EntityNotFoundException { - public TeamNotFoundException(Long teamId) { - super("Team with id " + teamId + " not found."); - } + public TeamNotFoundException(Long teamId) { + super("Team with id " + teamId + " not found."); + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java index fb76f7a07..56daa1860 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java @@ -1,30 +1,23 @@ package io.reflectoring.coderadar.useradministration.domain; -import io.reflectoring.coderadar.projectadministration.domain.Project; - /** - * ADMIN: - * - Can delete a project - * - Can remove users from a team - * - Can add users to a team - * - Can analyze an project - * - Can delete analysis results - * - Can configure file patterns, modules, analyzers, (merge contributors?) + * ADMIN: - Can delete a project - Can remove users from a team - Can add users to a team - Can + * analyze an project - Can delete analysis results - Can configure file patterns, modules, + * analyzers, (merge contributors?) * - * MEMBER: - * - Can analyze an project. + *

MEMBER: - Can analyze an project. */ public enum ProjectRole { - ADMIN("admin"), - MEMBER("member"); + ADMIN("admin"), + MEMBER("member"); - private final String value; + private final String value; - ProjectRole(String value){ - this.value = value; - } + ProjectRole(String value) { + this.value = value; + } - public String getValue() { - return value; - } + public String getValue() { + return value; + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java index 10322d876..f53caa593 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.useradministration.domain; +import java.util.List; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data @NoArgsConstructor public class Team { - private long id; - private String name; - private List members; + private long id; + private String name; + private List members; } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java index 4c9784afd..980144861 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java @@ -1,11 +1,15 @@ package io.reflectoring.coderadar.useradministration.port.driven; +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; + public interface AddTeamToProjectPort { - /** - * Creates a team in the given project. - * @param projectId The id of the project. - * @param teamId The team id. - */ - void addTeamToProject(long projectId, long teamId); + /** + * Creates a team in the given project. + * + * @param projectId The id of the project. + * @param teamId The team id. + * @param role The role to add the team with. + */ + void addTeamToProject(long projectId, long teamId, ProjectRole role); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java index dc498771e..3657d5114 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java @@ -4,10 +4,11 @@ public interface AddUsersToTeamPort { - /** - * Adds users to a team. - * @param teamId The id of the team. - * @param userIds The ids of the users. - */ - void addUsersToTeam(long teamId, List userIds); + /** + * Adds users to a team. + * + * @param teamId The id of the team. + * @param userIds The ids of the users. + */ + void addUsersToTeam(long teamId, List userIds); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamPort.java index 8031abf07..0c3d5b79b 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamPort.java @@ -3,10 +3,11 @@ import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; public interface CreateTeamPort { - /** - * Creates a new team. - * @param createTeamCommand The command containing the required data. - * @return The id of the new team. - */ - Long createTeam(CreateTeamCommand createTeamCommand); + /** + * Creates a new team. + * + * @param createTeamCommand The command containing the required data. + * @return The id of the new team. + */ + Long createTeam(CreateTeamCommand createTeamCommand); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamPort.java index ccdf82b03..f0a8f1d89 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamPort.java @@ -1,9 +1,10 @@ package io.reflectoring.coderadar.useradministration.port.driven; public interface DeleteTeamPort { - /** - * Deletes a team. - * @param teamId The id of the team. - */ - void deleteTeam(long teamId); + /** + * Deletes a team. + * + * @param teamId The id of the team. + */ + void deleteTeam(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java index 1c9a5fc39..59745885c 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java @@ -2,12 +2,12 @@ public interface DeleteUserRoleForProjectPort { - /** - * Removes the role a given user has to a project. - * If the user is not in any team with access to the project, they - * will no longer have access to the project. - * @param projectId The id of the project. - * @param userId The id of the user. - */ - void deleteRole(long projectId, long userId); + /** + * Removes the role a given user has to a project. If the user is not in any team with access to + * the project, they will no longer have access to the project. + * + * @param projectId The id of the project. + * @param userId The id of the user. + */ + void deleteRole(long projectId, long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java index 24f473541..1c36887c5 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java @@ -4,12 +4,12 @@ public interface DeleteUsersFromTeamPort { - /** - * Deletes users from a team. - * Any permissions users had for a project because of the team - * will be lost after this operation. - * @param teamId The id of the team. - * @param userIds The ids of the users. - */ - void deleteUsersFromTeam(long teamId, List userIds); + /** + * Deletes users from a team. Any permissions users had for a project because of the team will be + * lost after this operation. + * + * @param teamId The id of the team. + * @param userIds The ids of the users. + */ + void deleteUsersFromTeam(long teamId, List userIds); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java index 900272e86..039eb392b 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java @@ -3,23 +3,21 @@ import io.reflectoring.coderadar.useradministration.domain.Team; public interface GetTeamPort { - /** - * @param teamId The team id. - * @return The team with the given id. - */ - Team get(long teamId); + /** + * @param teamId The team id. + * @return The team with the given id. + */ + Team get(long teamId); - /** - * - * @param teamId The id of the team. - * @return True if a team with the given id exists. - */ - boolean existsById(long teamId); + /** + * @param teamId The id of the team. + * @return True if a team with the given id exists. + */ + boolean existsById(long teamId); - /** - * - * @param name The name of the team. - * @return True if a team with the given name exists. - */ - boolean existsByName(String name); + /** + * @param name The name of the team. + * @return True if a team with the given name exists. + */ + boolean existsByName(String name); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java index 8023219dc..91980ca17 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java @@ -1,13 +1,12 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.projectadministration.domain.Project; - import java.util.List; public interface ListProjectsForTeamPort { - /** - * @param teamId The id of the team. - * @return All projects the team has access to. - */ - List listProjects(long teamId); + /** + * @param teamId The id of the team. + * @return All projects the team has access to. + */ + List listProjects(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java index 1a157df90..a3e4edee1 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.projectadministration.domain.Project; - import java.util.List; public interface ListProjectsForUserPort { - /** - * @param userId The id of the user. - * @return All projects this user has access to. - */ - List listProjects(long userId); + /** + * @param userId The id of the user. + * @return All projects this user has access to. + */ + List listProjects(long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java index 196b9f9ae..beedfb323 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsForProjectPort { - /** - * @param projectId The id of the project. - * @return All teams with access to this project. - */ - List listTeamsForProject(long projectId); + /** + * @param projectId The id of the project. + * @return All teams with access to this project. + */ + List listTeamsForProject(long projectId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java index 7697bf60d..7ecb1ccdf 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsForUserPort { - /** - * @param userId The id of the user. - * @return All teams the user is in. - */ - List listTeamsForUser(long userId); + /** + * @param userId The id of the user. + * @return All teams the user is in. + */ + List listTeamsForUser(long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java index 86ffdaaa9..039cf273c 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java @@ -1,13 +1,10 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.User; - import java.util.List; public interface ListUsersPort { - /** - * @return All users in the database. - */ - List listUsers(); + /** @return All users in the database. */ + List listUsers(); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveTeamFromProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveTeamFromProjectPort.java index ceea3914f..4f511ef96 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveTeamFromProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveTeamFromProjectPort.java @@ -2,11 +2,11 @@ public interface RemoveTeamFromProjectPort { - /** - * Deletes a team. - * Any permissions users had for a project because of the team - * will be lost after this operation. - * @param teamId The id of the team. - */ - void deleteTeam(long teamId); + /** + * Deletes a team. Any permissions users had for a project because of the team will be lost after + * this operation. + * + * @param teamId The id of the team. + */ + void deleteTeam(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java index 5d39452ac..ba0fa7140 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java @@ -4,11 +4,12 @@ public interface SetUserRoleForProjectPort { - /** - * Gives a user a role in the project. - * @param projectId The id of the project. - * @param userId The id of the user. - * @param role The role to set. - */ - void setRole(long projectId, long userId, ProjectRole role); + /** + * Gives a user a role in the project. + * + * @param projectId The id of the project. + * @param userId The id of the user. + * @param role The role to set. + */ + void setRole(long projectId, long userId, ProjectRole role); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java index 891b558ad..7e5ef22b2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java @@ -1,15 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driver.get; import io.reflectoring.coderadar.projectadministration.domain.Project; -import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForUserPort; - import java.util.List; public interface ListProjectsForUserUseCase { - /** - * @param userId The id of the user. - * @return All projects this user has access to. - */ - List listProjects(long userId); + /** + * @param userId The id of the user. + * @return All projects this user has access to. + */ + List listProjects(long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java index 56c5e7aa9..33efbdf78 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java @@ -1,13 +1,10 @@ package io.reflectoring.coderadar.useradministration.port.driver.get; import io.reflectoring.coderadar.useradministration.domain.User; - import java.util.List; public interface ListUsersUseCase { - /** - * @return All users in the database. - */ - List listUsers(); + /** @return All users in the database. */ + List listUsers(); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/DeleteUserRoleForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/DeleteUserRoleForProjectUseCase.java index c462c2894..042911ce7 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/DeleteUserRoleForProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/DeleteUserRoleForProjectUseCase.java @@ -2,12 +2,12 @@ public interface DeleteUserRoleForProjectUseCase { - /** - * Removes the role a given user has to a project. - * If the user is not in any team with access to the project, they - * will no longer have access to the project. - * @param projectId The id of the project. - * @param userId The id of the user. - */ - void deleteRole(long projectId, long userId); + /** + * Removes the role a given user has to a project. If the user is not in any team with access to + * the project, they will no longer have access to the project. + * + * @param projectId The id of the project. + * @param userId The id of the user. + */ + void deleteRole(long projectId, long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java index e8e7705db..aa0a27b77 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java @@ -4,12 +4,12 @@ public interface SetUserRoleForProjectUseCase { - /** - * Gives a user a role in the project. - * @param projectId The id of the project. - * @param userId The id of the user. - * @param role The role to set. - */ - void setRole(long projectId, long userId, ProjectRole role); + /** + * Gives a user a role in the project. + * + * @param projectId The id of the project. + * @param userId The id of the user. + * @param role The role to set. + */ + void setRole(long projectId, long userId, ProjectRole role); } - diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java index f2e9706d5..27357c8e3 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java @@ -1,11 +1,15 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams; +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; + public interface AddTeamToProjectUseCase { - /** - * Creates a team in the given project. - * @param projectId The id of the project. - * @param teamId The id of the team. - */ - void addTeamToProject(long projectId, long teamId); + /** + * Creates a team in the given project. + * + * @param projectId The id of the project. + * @param teamId The id of the team. + * @param role The role to add the team with. + */ + void addTeamToProject(long projectId, long teamId, ProjectRole role); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java index e8ea38373..009ea374e 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java @@ -4,10 +4,11 @@ public interface AddUsersToTeamUseCase { - /** - * Adds users to a team. - * @param teamId The id of the team. - * @param userIds The ids of the users. - */ - void addUsersToTeam(long teamId, List userIds); + /** + * Adds users to a team. + * + * @param teamId The id of the team. + * @param userIds The ids of the users. + */ + void addUsersToTeam(long teamId, List userIds); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamUseCase.java index c7203e947..de3e258cc 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamUseCase.java @@ -2,9 +2,10 @@ public interface DeleteTeamUseCase { - /** - * Deletes a team. - * @param teamId The id of the team. - */ - void deleteTeam(long teamId); + /** + * Deletes a team. + * + * @param teamId The id of the team. + */ + void deleteTeam(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteUsersFromTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteUsersFromTeamUseCase.java index 678e7ab72..c07b7ef43 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteUsersFromTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteUsersFromTeamUseCase.java @@ -4,12 +4,12 @@ public interface DeleteUsersFromTeamUseCase { - /** - * Deletes users from a team. - * Any permissions users had for a project because of the team - * will be lost after this operation. - * @param teamId The id of the team. - * @param userIds The ids of the users. - */ - void deleteUsersFromTeam(long teamId, List userIds); + /** + * Deletes users from a team. Any permissions users had for a project because of the team will be + * lost after this operation. + * + * @param teamId The id of the team. + * @param userIds The ids of the users. + */ + void deleteUsersFromTeam(long teamId, List userIds); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveTeamFromProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveTeamFromProjectUseCase.java index b09028254..5cb8a8601 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveTeamFromProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveTeamFromProjectUseCase.java @@ -2,11 +2,11 @@ public interface RemoveTeamFromProjectUseCase { - /** - * Removes a team from a project. - * Any permissions users had for a project because of the team - * will be lost after this operation. - * @param teamId The id of the team. - */ - void removeTeam(long teamId); + /** + * Removes a team from a project. Any permissions users had for a project because of the team will + * be lost after this operation. + * + * @param teamId The id of the team. + */ + void removeTeam(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java index e5bf4e032..8edff6bf2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java @@ -1,19 +1,14 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.create; -import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import java.util.List; +import javax.validation.constraints.NotBlank; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.List; - -/** - * DTO class for creating teams. - */ +/** DTO class for creating teams. */ @Data @NoArgsConstructor public class CreateTeamCommand { - @NotBlank private String name; - private List userIds; + @NotBlank private String name; + private List userIds; } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamUseCase.java index bac7da580..7d3119437 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamUseCase.java @@ -2,10 +2,11 @@ public interface CreateTeamUseCase { - /** - * Creates a new team. - * @param createTeamCommand The command containing the required data. - * @return The id of the new team. - */ - Long createTeam(CreateTeamCommand createTeamCommand); + /** + * Creates a new team. + * + * @param createTeamCommand The command containing the required data. + * @return The id of the new team. + */ + Long createTeam(CreateTeamCommand createTeamCommand); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/GetTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/GetTeamUseCase.java index 35a3f2418..8161b2115 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/GetTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/GetTeamUseCase.java @@ -4,9 +4,9 @@ public interface GetTeamUseCase { - /** - * @param teamId The team id. - * @return The team with the given id. - */ - Team get(long teamId); + /** + * @param teamId The team id. + * @return The team with the given id. + */ + Team get(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java index b35fda811..b592245a6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.projectadministration.domain.Project; - import java.util.List; public interface ListProjectsForTeamUseCase { - /** - * @param teamId The id of the team. - * @return All projects the team has access to. - */ - List listProjects(long teamId); + /** + * @param teamId The id of the team. + * @return All projects the team has access to. + */ + List listProjects(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java index da0b8f6f8..50bc267b6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsForProjectUseCase { - /** - * @param projectId The id of the project. - * @return All teams with access to this project. - */ - List listTeamsForProject(long projectId); + /** + * @param projectId The id of the project. + * @return All teams with access to this project. + */ + List listTeamsForProject(long projectId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java index 6710b87a5..93d0ad43a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsForUserUseCase { - /** - * @param userId The id of the user. - * @return All teams the user is in. - */ - List listTeamsForUser(long userId); + /** + * @param userId The id of the user. + * @return All teams the user is in. + */ + List listTeamsForUser(long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java index d9676b81f..52053d383 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java @@ -5,25 +5,25 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForUserPort; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; - import java.util.List; public class ListProjectsForUserService implements ListProjectsForUserUseCase { - private final ListProjectsForUserPort listProjectsForUserPort; - private final GetUserPort getUserPort; + private final ListProjectsForUserPort listProjectsForUserPort; + private final GetUserPort getUserPort; - public ListProjectsForUserService(ListProjectsForUserPort listProjectsForUserPort, GetUserPort getUserPort) { - this.listProjectsForUserPort = listProjectsForUserPort; - this.getUserPort = getUserPort; - } + public ListProjectsForUserService( + ListProjectsForUserPort listProjectsForUserPort, GetUserPort getUserPort) { + this.listProjectsForUserPort = listProjectsForUserPort; + this.getUserPort = getUserPort; + } - @Override - public List listProjects(long userId) { - if(this.getUserPort.existsById(userId)){ - return listProjectsForUserPort.listProjects(userId); - } else { - throw new UserNotFoundException(userId); - } + @Override + public List listProjects(long userId) { + if (this.getUserPort.existsById(userId)) { + return listProjectsForUserPort.listProjects(userId); + } else { + throw new UserNotFoundException(userId); } + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java index 86d84495b..074e094b0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java @@ -2,21 +2,20 @@ import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListUsersService implements ListUsersUseCase { - private final ListUsersService listUsersService; + private final ListUsersService listUsersService; - public ListUsersService(ListUsersService listUsersService) { - this.listUsersService = listUsersService; - } + public ListUsersService(ListUsersService listUsersService) { + this.listUsersService = listUsersService; + } - @Override - public List listUsers() { - return listUsersService.listUsers(); - } + @Override + public List listUsers() { + return listUsersService.listUsers(); + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java index a990365e4..18bd6a8b2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java @@ -11,24 +11,27 @@ @Service public class DeleteUserRoleForProjectService implements DeleteUserRoleForProjectUseCase { - private final GetProjectPort getProjectPort; - private final GetUserPort getUserPort; - private final DeleteUserRoleForProjectPort deleteUserRoleForProjectPort; + private final GetProjectPort getProjectPort; + private final GetUserPort getUserPort; + private final DeleteUserRoleForProjectPort deleteUserRoleForProjectPort; - public DeleteUserRoleForProjectService(GetProjectPort getProjectPort, GetUserPort getUserPort, DeleteUserRoleForProjectPort deleteUserRoleForProjectPort) { - this.getProjectPort = getProjectPort; - this.getUserPort = getUserPort; - this.deleteUserRoleForProjectPort = deleteUserRoleForProjectPort; - } + public DeleteUserRoleForProjectService( + GetProjectPort getProjectPort, + GetUserPort getUserPort, + DeleteUserRoleForProjectPort deleteUserRoleForProjectPort) { + this.getProjectPort = getProjectPort; + this.getUserPort = getUserPort; + this.deleteUserRoleForProjectPort = deleteUserRoleForProjectPort; + } - @Override - public void deleteRole(long projectId, long userId) { - if(!getProjectPort.existsById(projectId)){ - throw new ProjectNotFoundException(projectId); - } - if(!getUserPort.existsById(userId)) { - throw new UserNotFoundException(userId); - } - deleteUserRoleForProjectPort.deleteRole(projectId, userId); + @Override + public void deleteRole(long projectId, long userId) { + if (!getProjectPort.existsById(projectId)) { + throw new ProjectNotFoundException(projectId); + } + if (!getUserPort.existsById(userId)) { + throw new UserNotFoundException(userId); } + deleteUserRoleForProjectPort.deleteRole(projectId, userId); + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java index bd60dc880..23a6b1b07 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java @@ -12,24 +12,27 @@ @Service public class SetUserRoleForProjectService implements SetUserRoleForProjectUseCase { - private final GetProjectPort getProjectPort; - private final GetUserPort getUserPort; - private final SetUserRoleForProjectPort setUserRoleForProjectPort; + private final GetProjectPort getProjectPort; + private final GetUserPort getUserPort; + private final SetUserRoleForProjectPort setUserRoleForProjectPort; - public SetUserRoleForProjectService(GetProjectPort getProjectPort, GetUserPort getUserPort, SetUserRoleForProjectPort setUserRoleForProjectPort) { - this.getProjectPort = getProjectPort; - this.getUserPort = getUserPort; - this.setUserRoleForProjectPort = setUserRoleForProjectPort; - } + public SetUserRoleForProjectService( + GetProjectPort getProjectPort, + GetUserPort getUserPort, + SetUserRoleForProjectPort setUserRoleForProjectPort) { + this.getProjectPort = getProjectPort; + this.getUserPort = getUserPort; + this.setUserRoleForProjectPort = setUserRoleForProjectPort; + } - @Override - public void setRole(long projectId, long userId, ProjectRole role) { - if(!getProjectPort.existsById(projectId)){ - throw new ProjectNotFoundException(projectId); - } - if(!getUserPort.existsById(userId)) { - throw new UserNotFoundException(userId); - } - setUserRoleForProjectPort.setRole(projectId, userId, role); + @Override + public void setRole(long projectId, long userId, ProjectRole role) { + if (!getProjectPort.existsById(projectId)) { + throw new ProjectNotFoundException(projectId); + } + if (!getUserPort.existsById(userId)) { + throw new UserNotFoundException(userId); } + setUserRoleForProjectPort.setRole(projectId, userId, role); + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java index 7fd99394f..c7f95145a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java @@ -9,19 +9,20 @@ @Service public class AddTeamToProjectService implements AddTeamToProjectUseCase { - private final GetProjectPort getProjectPort; - private final AddTeamToProjectPort addTeamToProjectPort; + private final GetProjectPort getProjectPort; + private final AddTeamToProjectPort addTeamToProjectPort; - public AddTeamToProjectService(GetProjectPort getProjectPort, AddTeamToProjectPort addTeamToProjectPort) { - this.getProjectPort = getProjectPort; - this.addTeamToProjectPort = addTeamToProjectPort; - } + public AddTeamToProjectService( + GetProjectPort getProjectPort, AddTeamToProjectPort addTeamToProjectPort) { + this.getProjectPort = getProjectPort; + this.addTeamToProjectPort = addTeamToProjectPort; + } - @Override - public void addTeamToProject(long projectId, long teamId) { - if(!getProjectPort.existsById(projectId)){ - throw new ProjectNotFoundException(projectId); - } - addTeamToProjectPort.addTeamToProject(projectId, teamId); + @Override + public void addTeamToProject(long projectId, long teamId) { + if (!getProjectPort.existsById(projectId)) { + throw new ProjectNotFoundException(projectId); } + addTeamToProjectPort.addTeamToProject(projectId, teamId); + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java index 9e457c789..8f3409924 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java @@ -6,33 +6,33 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class AddUsersToTeamService implements AddUsersToTeamUseCase { - private final GetTeamPort getTeamPort; - private final GetUserPort getUserPort; - private final AddUsersToTeamPort addUsersToTeamPort; + private final GetTeamPort getTeamPort; + private final GetUserPort getUserPort; + private final AddUsersToTeamPort addUsersToTeamPort; - public AddUsersToTeamService(GetTeamPort getTeamPort, GetUserPort getUserPort, AddUsersToTeamPort addUsersToTeamPort) { - this.getTeamPort = getTeamPort; - this.getUserPort = getUserPort; - this.addUsersToTeamPort = addUsersToTeamPort; - } + public AddUsersToTeamService( + GetTeamPort getTeamPort, GetUserPort getUserPort, AddUsersToTeamPort addUsersToTeamPort) { + this.getTeamPort = getTeamPort; + this.getUserPort = getUserPort; + this.addUsersToTeamPort = addUsersToTeamPort; + } - @Override - public void addUsersToTeam(long teamId, List userIds) { - if(!getTeamPort.existsById(teamId)){ - throw new TeamNotFoundException(teamId); - } - for(Long userId : userIds){ - if(!getUserPort.existsById(userId)) { - throw new UserNotFoundException(userId); - } - } - addUsersToTeamPort.addUsersToTeam(teamId, userIds); + @Override + public void addUsersToTeam(long teamId, List userIds) { + if (!getTeamPort.existsById(teamId)) { + throw new TeamNotFoundException(teamId); + } + for (Long userId : userIds) { + if (!getUserPort.existsById(userId)) { + throw new UserNotFoundException(userId); + } } + addUsersToTeamPort.addUsersToTeam(teamId, userIds); + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamService.java index 8878c20e5..cbb6c07c0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamService.java @@ -9,20 +9,20 @@ @Service public class DeleteTeamService implements DeleteTeamUseCase { - private final GetTeamPort getTeamPort; - private final DeleteTeamPort deleteTeamPort; + private final GetTeamPort getTeamPort; + private final DeleteTeamPort deleteTeamPort; - public DeleteTeamService(GetTeamPort getTeamPort, DeleteTeamPort deleteTeamPort) { - this.getTeamPort = getTeamPort; - this.deleteTeamPort = deleteTeamPort; - } + public DeleteTeamService(GetTeamPort getTeamPort, DeleteTeamPort deleteTeamPort) { + this.getTeamPort = getTeamPort; + this.deleteTeamPort = deleteTeamPort; + } - @Override - public void deleteTeam(long teamId) { - if(getTeamPort.existsById(teamId)){ - deleteTeamPort.deleteTeam(teamId); - } else { - throw new TeamNotFoundException(teamId); - } + @Override + public void deleteTeam(long teamId) { + if (getTeamPort.existsById(teamId)) { + deleteTeamPort.deleteTeam(teamId); + } else { + throw new TeamNotFoundException(teamId); } + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java index 4a58f2647..e4aa81f06 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java @@ -5,33 +5,35 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteUsersFromTeamUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class DeleteUsersFromTeamService implements DeleteUsersFromTeamUseCase { - private final GetTeamPort getTeamPort; - private final GetUserPort getUserPort; - private final DeleteUsersFromTeamService deleteUsersFromTeamService; + private final GetTeamPort getTeamPort; + private final GetUserPort getUserPort; + private final DeleteUsersFromTeamService deleteUsersFromTeamService; - public DeleteUsersFromTeamService(GetTeamPort getTeamPort, GetUserPort getUserPort, DeleteUsersFromTeamService deleteUsersFromTeamService) { - this.getTeamPort = getTeamPort; - this.getUserPort = getUserPort; - this.deleteUsersFromTeamService = deleteUsersFromTeamService; - } + public DeleteUsersFromTeamService( + GetTeamPort getTeamPort, + GetUserPort getUserPort, + DeleteUsersFromTeamService deleteUsersFromTeamService) { + this.getTeamPort = getTeamPort; + this.getUserPort = getUserPort; + this.deleteUsersFromTeamService = deleteUsersFromTeamService; + } - @Override - public void deleteUsersFromTeam(long teamId, List userIds) { - if(!getTeamPort.existsById(teamId)){ - throw new TeamNotFoundException(teamId); - } - for(Long userId : userIds){ - if(!getUserPort.existsById(userId)) { - throw new UserNotFoundException(userId); - } - } - deleteUsersFromTeamService.deleteUsersFromTeam(teamId, userIds); + @Override + public void deleteUsersFromTeam(long teamId, List userIds) { + if (!getTeamPort.existsById(teamId)) { + throw new TeamNotFoundException(teamId); + } + for (Long userId : userIds) { + if (!getUserPort.existsById(userId)) { + throw new UserNotFoundException(userId); + } } + deleteUsersFromTeamService.deleteUsersFromTeam(teamId, userIds); + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java index 747a7a4b7..40653b170 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java @@ -1,28 +1,29 @@ package io.reflectoring.coderadar.useradministration.service.teams; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; -import io.reflectoring.coderadar.useradministration.port.driven.RemoveTeamFromProjectPort; import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; +import io.reflectoring.coderadar.useradministration.port.driven.RemoveTeamFromProjectPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveTeamFromProjectUseCase; import org.springframework.stereotype.Service; @Service public class RemoveTeamFromProjectService implements RemoveTeamFromProjectUseCase { - private final GetTeamPort getTeamPort; - private final RemoveTeamFromProjectPort removeTeamFromProjectPort; + private final GetTeamPort getTeamPort; + private final RemoveTeamFromProjectPort removeTeamFromProjectPort; - public RemoveTeamFromProjectService(GetTeamPort getTeamPort, RemoveTeamFromProjectPort removeTeamFromProjectPort) { - this.getTeamPort = getTeamPort; - this.removeTeamFromProjectPort = removeTeamFromProjectPort; - } + public RemoveTeamFromProjectService( + GetTeamPort getTeamPort, RemoveTeamFromProjectPort removeTeamFromProjectPort) { + this.getTeamPort = getTeamPort; + this.removeTeamFromProjectPort = removeTeamFromProjectPort; + } - @Override - public void removeTeam(long teamId) { - if(getTeamPort.existsById(teamId)){ - removeTeamFromProjectPort.deleteTeam(teamId); - } else { - throw new TeamNotFoundException(teamId); - } + @Override + public void removeTeam(long teamId) { + if (getTeamPort.existsById(teamId)) { + removeTeamFromProjectPort.deleteTeam(teamId); + } else { + throw new TeamNotFoundException(teamId); } + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java index 121eea5bd..1a6abddc7 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java @@ -1,19 +1,27 @@ package io.reflectoring.coderadar.useradministration.service.teams.create; +import io.reflectoring.coderadar.useradministration.TeamAlreadyExistsException; import io.reflectoring.coderadar.useradministration.port.driven.CreateTeamPort; +import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; import org.springframework.stereotype.Service; @Service public class CreateTeamService implements CreateTeamPort { - private final CreateTeamPort createTeamPort; + private final CreateTeamPort createTeamPort; + private final GetTeamPort getTeamPort; - public CreateTeamService(CreateTeamPort createTeamPort) { - this.createTeamPort = createTeamPort; - } + public CreateTeamService(CreateTeamPort createTeamPort, GetTeamPort getTeamPort) { + this.createTeamPort = createTeamPort; + this.getTeamPort = getTeamPort; + } - @Override - public Long createTeam(CreateTeamCommand createTeamCommand) { - return createTeamPort.createTeam(createTeamCommand); + @Override + public Long createTeam(CreateTeamCommand createTeamCommand) { + if (getTeamPort.existsByName(createTeamCommand.getName())) { + throw new TeamAlreadyExistsException(createTeamCommand.getName()); + } else { + return createTeamPort.createTeam(createTeamCommand); } + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java index ed391fba5..641acf880 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java @@ -1,26 +1,26 @@ package io.reflectoring.coderadar.useradministration.service.teams.get; +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; -import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.GetTeamUseCase; import org.springframework.stereotype.Service; @Service public class GetTeamService implements GetTeamUseCase { - private final GetTeamPort getTeamPort; + private final GetTeamPort getTeamPort; - public GetTeamService(GetTeamPort getTeamPort) { - this.getTeamPort = getTeamPort; - } + public GetTeamService(GetTeamPort getTeamPort) { + this.getTeamPort = getTeamPort; + } - @Override - public Team get(long teamId) { - if(getTeamPort.existsById(teamId)){ - return getTeamPort.get(teamId); - } else { - throw new TeamNotFoundException(teamId); - } + @Override + public Team get(long teamId) { + if (getTeamPort.existsById(teamId)) { + return getTeamPort.get(teamId); + } else { + throw new TeamNotFoundException(teamId); } + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java index 4497ec234..269e8ba93 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java @@ -5,25 +5,25 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForTeamPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; - import java.util.List; public class ListProjectsForTeamService implements ListProjectsForTeamUseCase { - private final GetTeamPort getTeamPort; - private final ListProjectsForTeamPort listProjectsForTeamPort; + private final GetTeamPort getTeamPort; + private final ListProjectsForTeamPort listProjectsForTeamPort; - public ListProjectsForTeamService(GetTeamPort getTeamPort, ListProjectsForTeamPort listProjectsForTeamPort) { - this.getTeamPort = getTeamPort; - this.listProjectsForTeamPort = listProjectsForTeamPort; - } + public ListProjectsForTeamService( + GetTeamPort getTeamPort, ListProjectsForTeamPort listProjectsForTeamPort) { + this.getTeamPort = getTeamPort; + this.listProjectsForTeamPort = listProjectsForTeamPort; + } - @Override - public List listProjects(long teamId) { - if(getTeamPort.existsById(teamId)){ - return listProjectsForTeamPort.listProjects(teamId); - } else { - throw new TeamNotFoundException(teamId); - } + @Override + public List listProjects(long teamId) { + if (getTeamPort.existsById(teamId)) { + return listProjectsForTeamPort.listProjects(teamId); + } else { + throw new TeamNotFoundException(teamId); } + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java index 5c886f715..171b6d26e 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java @@ -5,27 +5,27 @@ import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsForProjectPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListTeamsForProjectService implements ListTeamsForProjectUseCase { - private final ListTeamsForProjectPort listTeamsForProjectPort; - private final GetProjectPort getProjectPort; + private final ListTeamsForProjectPort listTeamsForProjectPort; + private final GetProjectPort getProjectPort; - public ListTeamsForProjectService(ListTeamsForProjectPort listTeamsForProjectPort, GetProjectPort getProjectPort) { - this.listTeamsForProjectPort = listTeamsForProjectPort; - this.getProjectPort = getProjectPort; - } + public ListTeamsForProjectService( + ListTeamsForProjectPort listTeamsForProjectPort, GetProjectPort getProjectPort) { + this.listTeamsForProjectPort = listTeamsForProjectPort; + this.getProjectPort = getProjectPort; + } - @Override - public List listTeamsForProject(long projectId) { - if(getProjectPort.existsById(projectId)){ - return listTeamsForProjectPort.listTeamsForProject(projectId); - } else { - throw new ProjectNotFoundException(projectId); - } + @Override + public List listTeamsForProject(long projectId) { + if (getProjectPort.existsById(projectId)) { + return listTeamsForProjectPort.listTeamsForProject(projectId); + } else { + throw new ProjectNotFoundException(projectId); } + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java index 4de2043c5..c40a82ee2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java @@ -5,27 +5,27 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsForUserPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListTeamsForUserService implements ListTeamsForUserUseCase { - private final GetUserPort getUserPort; - private final ListTeamsForUserPort listTeamsForUserPort; + private final GetUserPort getUserPort; + private final ListTeamsForUserPort listTeamsForUserPort; - public ListTeamsForUserService(GetUserPort getUserPort, ListTeamsForUserPort listTeamsForUserPort) { - this.getUserPort = getUserPort; - this.listTeamsForUserPort = listTeamsForUserPort; - } + public ListTeamsForUserService( + GetUserPort getUserPort, ListTeamsForUserPort listTeamsForUserPort) { + this.getUserPort = getUserPort; + this.listTeamsForUserPort = listTeamsForUserPort; + } - @Override - public List listTeamsForUser(long userId) { - if(getUserPort.existsById(userId)){ - return listTeamsForUserPort.listTeamsForUser(userId); - } else { - throw new UserNotFoundException(userId); - } + @Override + public List listTeamsForUser(long userId) { + if (getUserPort.existsById(userId)) { + return listTeamsForUserPort.listTeamsForUser(userId); + } else { + throw new UserNotFoundException(userId); } + } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java index 84679642d..20f8ee84f 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java @@ -2,16 +2,15 @@ import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import org.neo4j.ogm.annotation.NodeEntity; import org.neo4j.ogm.annotation.Relationship; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - /** @see io.reflectoring.coderadar.projectadministration.domain.Project */ @NodeEntity @Data diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/TeamMapper.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/TeamMapper.java new file mode 100644 index 000000000..7a5245c28 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/TeamMapper.java @@ -0,0 +1,29 @@ +package io.reflectoring.coderadar.graph.useradministration; + +import io.reflectoring.coderadar.graph.Mapper; +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.useradministration.domain.Team; + +public class TeamMapper implements Mapper { + + private final UserMapper userMapper = new UserMapper(); + + @Override + public Team mapGraphObject(TeamEntity nodeEntity) { + Team team = new Team(); + team.setName(nodeEntity.getName()); + team.setMembers(userMapper.mapNodeEntities(nodeEntity.getMembers())); + team.setId(nodeEntity.getId()); + return team; + } + + @Override + public TeamEntity mapDomainObject(Team domainObject) { + TeamEntity teamEntity = new TeamEntity(); + teamEntity.setName(domainObject.getName()); + teamEntity.setMembers( + userMapper.mapDomainObjects( + domainObject.getMembers())); // TODO: I don't think we should be doing this. + return teamEntity; + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListUsersAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListUsersAdapter.java new file mode 100644 index 000000000..38792c5c7 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListUsersAdapter.java @@ -0,0 +1,28 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter; + +import io.reflectoring.coderadar.graph.useradministration.UserMapper; +import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import io.reflectoring.coderadar.useradministration.domain.User; +import io.reflectoring.coderadar.useradministration.port.driven.ListUsersPort; +import java.util.ArrayList; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public class ListUsersAdapter implements ListUsersPort { + + private final UserRepository userRepository; + private final UserMapper userMapper = new UserMapper(); + + public ListUsersAdapter(UserRepository userRepository) { + this.userRepository = userRepository; + } + + @Override + public List listUsers() { + List userEntities = new ArrayList<>(); + userRepository.findAll(0).iterator().forEachRemaining(userEntities::add); + return userMapper.mapNodeEntities(userEntities); + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddTeamToProjectAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddTeamToProjectAdapter.java new file mode 100644 index 000000000..46e7ebb58 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddTeamToProjectAdapter.java @@ -0,0 +1,21 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import io.reflectoring.coderadar.useradministration.port.driven.AddTeamToProjectPort; +import org.springframework.stereotype.Service; + +@Service +public class AddTeamToProjectAdapter implements AddTeamToProjectPort { + + private final TeamRepository teamRepository; + + public AddTeamToProjectAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } + + @Override + public void addTeamToProject(long projectId, long teamId, ProjectRole role) { + teamRepository.addTeamToProject(projectId, teamId, role.getValue()); + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/CreateTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/CreateTeamAdapter.java new file mode 100644 index 000000000..4bdec5d05 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/CreateTeamAdapter.java @@ -0,0 +1,28 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import io.reflectoring.coderadar.useradministration.port.driven.CreateTeamPort; +import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; +import org.springframework.stereotype.Service; + +@Service +public class CreateTeamAdapter implements CreateTeamPort { + + private final TeamRepository teamRepository; + private final UserRepository userRepository; + + public CreateTeamAdapter(TeamRepository teamRepository, UserRepository userRepository) { + this.teamRepository = teamRepository; + this.userRepository = userRepository; + } + + @Override + public Long createTeam(CreateTeamCommand createTeamCommand) { + TeamEntity teamEntity = new TeamEntity(); + teamEntity.setMembers(userRepository.findAllByIds(createTeamCommand.getUserIds())); + teamEntity.setName(createTeamCommand.getName()); + return teamRepository.save(teamEntity, 1).getId(); + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteTeamAdapter.java new file mode 100644 index 000000000..05c6c2525 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteTeamAdapter.java @@ -0,0 +1,18 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.useradministration.port.driven.DeleteTeamPort; + +public class DeleteTeamAdapter implements DeleteTeamPort { + + private final TeamRepository teamRepository; + + public DeleteTeamAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } + + @Override + public void deleteTeam(long teamId) { + teamRepository.deleteById(teamId); + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java new file mode 100644 index 000000000..8b1c09363 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java @@ -0,0 +1,24 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.graph.projectadministration.project.ProjectMapper; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.projectadministration.domain.Project; +import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForTeamPort; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public class ListProjectsForTeamAdapter implements ListProjectsForTeamPort { + + private final ProjectMapper projectMapper = new ProjectMapper(); + private final TeamRepository teamRepository; + + public ListProjectsForTeamAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } + + @Override + public List listProjects(long teamId) { + return projectMapper.mapNodeEntities(teamRepository.listProjectByTeamId(teamId)); + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForUserAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForUserAdapter.java new file mode 100644 index 000000000..77bd1bc63 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForUserAdapter.java @@ -0,0 +1,24 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.graph.useradministration.TeamMapper; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsForUserPort; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public class ListTeamsForUserAdapter implements ListTeamsForUserPort { + + private final TeamRepository teamRepository; + private final TeamMapper teamMapper = new TeamMapper(); + + public ListTeamsForUserAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } + + @Override + public List listTeamsForUser(long userId) { + return teamMapper.mapNodeEntities(teamRepository.listTeamsByUserId(userId)); + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java index bac669bf1..7ba8edf58 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java @@ -1,23 +1,18 @@ package io.reflectoring.coderadar.graph.useradministration.domain; -import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import java.util.List; import lombok.Data; import lombok.NoArgsConstructor; import org.neo4j.ogm.annotation.NodeEntity; import org.neo4j.ogm.annotation.Relationship; -import java.util.List; - @NodeEntity @Data @NoArgsConstructor public class TeamEntity { - private Long id; - private String name; - - @Relationship(value = "IS_IN", direction = Relationship.INCOMING) - private List members; - - private ProjectRole role; + private Long id; + private String name; + @Relationship(value = "IS_IN", direction = Relationship.INCOMING) + private List members; } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java new file mode 100644 index 000000000..745282290 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java @@ -0,0 +1,37 @@ +package io.reflectoring.coderadar.graph.useradministration.repository; + +import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import java.util.List; +import org.springframework.data.neo4j.annotation.Query; +import org.springframework.data.neo4j.repository.Neo4jRepository; + +public interface TeamRepository extends Neo4jRepository { + + /** + * @param userId The user id. + * @return All teams the user is in. + */ + @Query("MATCH (u)-[:IS_IN]->(t) WHERE ID(u) = {0} RETURN t") + List listTeamsByUserId(long userId); + + /** + * Creates a [:HAS_TEAM] relationship between a project and a team. + * + * @param projectId The id of the project. + * @param teamId The id of the team. + * @param role The role of the team in the project. + */ + @Query( + "MATCH (p) WHERE ID(p) = {0} " + + "MATCH (t) WHERE ID(t) = {1} WITH p, t " + + "CREATE (p)-[r:HAS_TEAM {role: {2}}]->(t)") + void addTeamToProject(long projectId, long teamId, String role); + + /** + * @param teamId The team id. + * @return All the project a team is assigned to. + */ + @Query("MATCH (t)<-[:HAS_TEAM]-(p) WHERE ID(t) = {0} RETURN p") + List listProjectByTeamId(long teamId); +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java index 41287fea2..4c5ff3df0 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.graph.useradministration.repository; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; +import java.util.List; import org.springframework.data.neo4j.annotation.Query; import org.springframework.data.neo4j.repository.Neo4jRepository; import org.springframework.lang.NonNull; @@ -36,4 +37,11 @@ public interface UserRepository extends Neo4jRepository { */ @Query("MATCH (u) WHERE ID(u) = {0} RETURN COUNT(u) > 0") boolean existsById(long id); + + /** + * @param userIds The user ids. + * @return All users matching the given ids. + */ + @Query("MATCH (u) WHERE ID(u) IN {0} RETURN DISTINCT u") + List findAllByIds(List userIds); } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java index 59df0e290..a09023c91 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java @@ -8,9 +8,9 @@ @RestController @Transactional public class ListProjectsForUserController implements AbstractBaseController { - private final ListProjectsForUserUseCase listProjectsForUserUseCase; + private final ListProjectsForUserUseCase listProjectsForUserUseCase; - public ListProjectsForUserController(ListProjectsForUserUseCase listProjectsForUserUseCase) { - this.listProjectsForUserUseCase = listProjectsForUserUseCase; - } + public ListProjectsForUserController(ListProjectsForUserUseCase listProjectsForUserUseCase) { + this.listProjectsForUserUseCase = listProjectsForUserUseCase; + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java index ee435c9ea..0d3e121ab 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java @@ -8,9 +8,9 @@ @RestController @Transactional public class ListUsersController implements AbstractBaseController { - private final ListUsersUseCase listUsersUseCase; + private final ListUsersUseCase listUsersUseCase; - public ListUsersController(ListUsersUseCase listUsersUseCase) { - this.listUsersUseCase = listUsersUseCase; - } + public ListUsersController(ListUsersUseCase listUsersUseCase) { + this.listUsersUseCase = listUsersUseCase; + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/DeleteUserRoleForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/DeleteUserRoleForProjectController.java index ed0e5c35f..1c0dc15a0 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/DeleteUserRoleForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/DeleteUserRoleForProjectController.java @@ -12,15 +12,17 @@ @RestController @Transactional public class DeleteUserRoleForProjectController implements AbstractBaseController { - private final DeleteUserRoleForProjectUseCase deleteUserRoleForProjectUseCase; + private final DeleteUserRoleForProjectUseCase deleteUserRoleForProjectUseCase; - public DeleteUserRoleForProjectController(DeleteUserRoleForProjectUseCase deleteUserRoleForProjectUseCase) { - this.deleteUserRoleForProjectUseCase = deleteUserRoleForProjectUseCase; - } + public DeleteUserRoleForProjectController( + DeleteUserRoleForProjectUseCase deleteUserRoleForProjectUseCase) { + this.deleteUserRoleForProjectUseCase = deleteUserRoleForProjectUseCase; + } - @DeleteMapping(path = "/projects/{projectId}/users/{userId}") - public ResponseEntity deleteUserRoleForProject(@PathVariable long projectId, @PathVariable long userId) { - deleteUserRoleForProjectUseCase.deleteRole(projectId, userId); - return new ResponseEntity<>(HttpStatus.OK); - } + @DeleteMapping(path = "/projects/{projectId}/users/{userId}") + public ResponseEntity deleteUserRoleForProject( + @PathVariable long projectId, @PathVariable long userId) { + deleteUserRoleForProjectUseCase.deleteRole(projectId, userId); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java index f52f10043..0a2ea794c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java @@ -13,15 +13,18 @@ @RestController @Transactional public class SetUserRoleForProjectController implements AbstractBaseController { - private final SetUserRoleForProjectUseCase setUserRoleForProjectUseCase; + private final SetUserRoleForProjectUseCase setUserRoleForProjectUseCase; - public SetUserRoleForProjectController(SetUserRoleForProjectUseCase setUserRoleForProjectUseCase) { - this.setUserRoleForProjectUseCase = setUserRoleForProjectUseCase; - } + public SetUserRoleForProjectController( + SetUserRoleForProjectUseCase setUserRoleForProjectUseCase) { + this.setUserRoleForProjectUseCase = setUserRoleForProjectUseCase; + } - @PostMapping(path = "/projects/{projectId}/users/{userId}") - public ResponseEntity setUserRoleForProject(@PathVariable long projectId, @PathVariable long userId) { - setUserRoleForProjectUseCase.setRole(projectId, userId, ProjectRole.ADMIN); // TODO: change last parameter - return new ResponseEntity<>(HttpStatus.OK); - } + @PostMapping(path = "/projects/{projectId}/users/{userId}") + public ResponseEntity setUserRoleForProject( + @PathVariable long projectId, @PathVariable long userId) { + setUserRoleForProjectUseCase.setRole( + projectId, userId, ProjectRole.ADMIN); // TODO: change last parameter + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java index 1772b75d6..7f35e5fb7 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java @@ -8,9 +8,9 @@ @RestController @Transactional public class AddUsersToTeamController implements AbstractBaseController { - private final AddUsersToTeamUseCase addUsersToTeamUseCase; + private final AddUsersToTeamUseCase addUsersToTeamUseCase; - public AddUsersToTeamController(AddUsersToTeamUseCase addUsersToTeamUseCase) { - this.addUsersToTeamUseCase = addUsersToTeamUseCase; - } + public AddUsersToTeamController(AddUsersToTeamUseCase addUsersToTeamUseCase) { + this.addUsersToTeamUseCase = addUsersToTeamUseCase; + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java index 5fb284b63..a2e380196 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java @@ -8,9 +8,9 @@ @RestController @Transactional public class CreateTeamForProjectController implements AbstractBaseController { - private final AddTeamToProjectUseCase addTeamToProjectUseCase; + private final AddTeamToProjectUseCase addTeamToProjectUseCase; - public CreateTeamForProjectController(AddTeamToProjectUseCase addTeamToProjectUseCase) { - this.addTeamToProjectUseCase = addTeamToProjectUseCase; - } + public CreateTeamForProjectController(AddTeamToProjectUseCase addTeamToProjectUseCase) { + this.addTeamToProjectUseCase = addTeamToProjectUseCase; + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java index 24ac43021..2b195f5e6 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java @@ -8,9 +8,10 @@ @RestController @Transactional public class DeleteTeamFromProjectController implements AbstractBaseController { - private final RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase; + private final RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase; - public DeleteTeamFromProjectController(RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase) { - this.removeTeamFromProjectUseCase = removeTeamFromProjectUseCase; - } + public DeleteTeamFromProjectController( + RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase) { + this.removeTeamFromProjectUseCase = removeTeamFromProjectUseCase; + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java index d2e1979f3..868a83b4e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java @@ -7,10 +7,10 @@ @RestController @Transactional -public class DeleteUsersFromTeamController implements AbstractBaseController { - private final DeleteUsersFromTeamUseCase deleteUsersFromTeamUseCase; +public class DeleteUsersFromTeamController implements AbstractBaseController { + private final DeleteUsersFromTeamUseCase deleteUsersFromTeamUseCase; - public DeleteUsersFromTeamController(DeleteUsersFromTeamUseCase deleteUsersFromTeamUseCase) { - this.deleteUsersFromTeamUseCase = deleteUsersFromTeamUseCase; - } + public DeleteUsersFromTeamController(DeleteUsersFromTeamUseCase deleteUsersFromTeamUseCase) { + this.deleteUsersFromTeamUseCase = deleteUsersFromTeamUseCase; + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java index 351649731..5c9b37e10 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java @@ -8,9 +8,9 @@ @RestController @Transactional public class GetTeamController implements AbstractBaseController { - private final GetTeamUseCase getTeamUseCase; + private final GetTeamUseCase getTeamUseCase; - public GetTeamController(GetTeamUseCase getTeamUseCase) { - this.getTeamUseCase = getTeamUseCase; - } + public GetTeamController(GetTeamUseCase getTeamUseCase) { + this.getTeamUseCase = getTeamUseCase; + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java index f007f8710..18f3eaed3 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java @@ -8,9 +8,9 @@ @RestController @Transactional public class ListProjectsForTeamController implements AbstractBaseController { - private final ListProjectsForTeamUseCase listProjectsForTeamUseCase; + private final ListProjectsForTeamUseCase listProjectsForTeamUseCase; - public ListProjectsForTeamController(ListProjectsForTeamUseCase listProjectsForTeamUseCase) { - this.listProjectsForTeamUseCase = listProjectsForTeamUseCase; - } + public ListProjectsForTeamController(ListProjectsForTeamUseCase listProjectsForTeamUseCase) { + this.listProjectsForTeamUseCase = listProjectsForTeamUseCase; + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java index 1e9173968..f1eca082c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java @@ -8,9 +8,9 @@ @RestController @Transactional public class ListTeamsForProjectController implements AbstractBaseController { - private final ListTeamsForProjectUseCase listTeamsForProjectUseCase; + private final ListTeamsForProjectUseCase listTeamsForProjectUseCase; - public ListTeamsForProjectController(ListTeamsForProjectUseCase listTeamsForProjectUseCase) { - this.listTeamsForProjectUseCase = listTeamsForProjectUseCase; - } + public ListTeamsForProjectController(ListTeamsForProjectUseCase listTeamsForProjectUseCase) { + this.listTeamsForProjectUseCase = listTeamsForProjectUseCase; + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java index 6e6f28c77..b0169c364 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java @@ -8,9 +8,9 @@ @RestController @Transactional public class ListTeamsForUserController implements AbstractBaseController { - private final ListTeamsForUserUseCase listTeamsForUserUseCase; + private final ListTeamsForUserUseCase listTeamsForUserUseCase; - public ListTeamsForUserController(ListTeamsForUserUseCase listTeamsForUserUseCase) { - this.listTeamsForUserUseCase = listTeamsForUserUseCase; - } + public ListTeamsForUserController(ListTeamsForUserUseCase listTeamsForUserUseCase) { + this.listTeamsForUserUseCase = listTeamsForUserUseCase; + } } From f9cb58961a0bd8fcb5c94b2de58ea2926dc23687 Mon Sep 17 00:00:00 2001 From: Krause Date: Tue, 5 May 2020 17:21:50 +0200 Subject: [PATCH 07/76] implement controllers for teams/users configuration --- .../rest/GetProjectResponseMapper.java | 36 +++++++++++++++++++ .../coderadar/rest/GetTeamResponseMapper.java | 25 +++++++++++++ .../coderadar/rest/GetUserResponseMapper.java | 23 ++++++++++++ .../rest/domain/GetTeamResponse.java | 16 +++++++++ .../rest/project/GetProjectController.java | 10 ++---- .../rest/project/ListProjectsController.java | 15 ++------ .../useradministration/GetUserController.java | 9 +++-- .../ListProjectsForUserController.java | 16 +++++++++ .../ListUsersController.java | 16 +++++++++ .../teams/AddTeamToProjectController.java | 26 ++++++++++++++ .../teams/CreateTeamForProjectController.java | 16 --------- .../teams/DeleteTeamController.java | 26 ++++++++++++++ .../DeleteTeamFromProjectController.java | 16 --------- .../teams/DeleteUsersFromTeamController.java | 14 ++++++++ .../teams/GetTeamController.java | 15 ++++++++ .../teams/ListProjectsForTeamController.java | 17 +++++++++ .../teams/ListTeamsForProjectController.java | 16 +++++++++ .../teams/ListTeamsForUserController.java | 16 +++++++++ .../RemoveTeamFromProjectController.java | 27 ++++++++++++++ .../rest/unit/user/GetUserControllerTest.java | 2 +- 20 files changed, 302 insertions(+), 55 deletions(-) create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java delete mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamController.java delete mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java new file mode 100644 index 000000000..da49f75a5 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java @@ -0,0 +1,36 @@ +package io.reflectoring.coderadar.rest; + +import io.reflectoring.coderadar.projectadministration.domain.Project; +import io.reflectoring.coderadar.rest.domain.GetProjectResponse; + +import java.util.ArrayList; +import java.util.List; + +public class GetProjectResponseMapper { + private GetProjectResponseMapper() {} + + public static GetProjectResponse mapProject(Project project) { + return new GetProjectResponse() + .setName(project.getName()) + .setId(project.getId()) + .setStartDate(project.getVcsStart()) + .setVcsOnline(project.isVcsOnline()) + .setVcsUrl(project.getVcsUrl()) + .setVcsUsername(project.getVcsUsername()); + } + + public static List mapProjects(List projects) { + List responses = new ArrayList<>(projects.size()); + for (Project project : projects) { + responses.add( + new GetProjectResponse() + .setName(project.getName()) + .setId(project.getId()) + .setStartDate(project.getVcsStart()) + .setVcsOnline(project.isVcsOnline()) + .setVcsUrl(project.getVcsUrl()) + .setVcsUsername(project.getVcsUsername())); + } + return responses; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java new file mode 100644 index 000000000..4b9de13b6 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java @@ -0,0 +1,25 @@ +package io.reflectoring.coderadar.rest; + +import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import io.reflectoring.coderadar.useradministration.domain.Team; + +import java.util.ArrayList; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + +public class GetTeamResponseMapper { + private GetTeamResponseMapper() {} + + public static GetTeamResponse mapTeam(Team team) { + return new GetTeamResponse(team.getId(), team.getName(), mapUsers(team.getMembers())); + } + + public static List mapTeams(List teams) { + List result = new ArrayList<>(teams.size()); + for (Team team : teams) { + result.add(new GetTeamResponse(team.getId(), team.getName(), mapUsers(team.getMembers()))); + } + return result; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java new file mode 100644 index 000000000..18c3645d3 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java @@ -0,0 +1,23 @@ +package io.reflectoring.coderadar.rest; + +import io.reflectoring.coderadar.rest.domain.GetUserResponse; +import io.reflectoring.coderadar.useradministration.domain.User; + +import java.util.ArrayList; +import java.util.List; + +public class GetUserResponseMapper { + private GetUserResponseMapper() {} + + public static GetUserResponse mapUser(User user) { + return new GetUserResponse(user.getId(), user.getUsername()); + } + + public static List mapUsers(List users) { + List result = new ArrayList<>(users.size()); + for (User user : users) { + result.add(new GetUserResponse(user.getId(), user.getUsername())); + } + return result; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java new file mode 100644 index 000000000..1400aa848 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java @@ -0,0 +1,16 @@ +package io.reflectoring.coderadar.rest.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class GetTeamResponse { + private long id; + private String name; + private List members; +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java index 70543ef5f..a6e2b145e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java @@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProject; + @Transactional @RestController public class GetProjectController implements AbstractBaseController { @@ -24,13 +26,7 @@ public GetProjectController(GetProjectUseCase getProjectUseCase) { @GetMapping(path = "/projects/{projectId}", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getProject(@PathVariable long projectId) { Project project = getProjectUseCase.get(projectId); - GetProjectResponse getProjectResponse = new GetProjectResponse(); - getProjectResponse.setName(project.getName()); - getProjectResponse.setId(project.getId()); - getProjectResponse.setVcsUsername(project.getVcsUsername()); - getProjectResponse.setStartDate(project.getVcsStart()); - getProjectResponse.setVcsUrl(project.getVcsUrl()); - getProjectResponse.setVcsOnline(project.isVcsOnline()); + GetProjectResponse getProjectResponse = mapProject(project); return new ResponseEntity<>(getProjectResponse, HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java index 0a1aec974..24e267835 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java @@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + @Transactional @RestController public class ListProjectsController implements AbstractBaseController { @@ -25,17 +27,6 @@ public ListProjectsController(ListProjectsUseCase listProjectsUseCase) { @GetMapping(path = "/projects", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> listProjects() { List projects = listProjectsUseCase.listProjects(); - List responses = new ArrayList<>(projects.size()); - for (Project project : projects) { - responses.add( - new GetProjectResponse() - .setName(project.getName()) - .setId(project.getId()) - .setStartDate(project.getVcsStart()) - .setVcsOnline(project.isVcsOnline()) - .setVcsUrl(project.getVcsUrl()) - .setVcsUsername(project.getVcsUsername())); - } - return new ResponseEntity<>(responses, HttpStatus.OK); + return new ResponseEntity<>(mapProjects(projects), HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java index 9dff555d8..925722465 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; +import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.get.GetUserUseCase; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUser; + @RestController @Transactional public class GetUserController implements AbstractBaseController { @@ -21,8 +24,8 @@ public GetUserController(GetUserUseCase getUserUseCase) { } @GetMapping(path = "/user/{userId}", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity loadUser(@PathVariable long userId) { - return new ResponseEntity<>( - new GetUserResponse(userId, getUserUseCase.getUser(userId).getUsername()), HttpStatus.OK); + public ResponseEntity getUser(@PathVariable long userId) { + User user = getUserUseCase.getUser(userId); + return new ResponseEntity<>(mapUser(user), HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java index 59df0e290..b1bf85650 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java @@ -1,10 +1,20 @@ package io.reflectoring.coderadar.rest.useradministration; +import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + @RestController @Transactional public class ListProjectsForUserController implements AbstractBaseController { @@ -13,4 +23,10 @@ public class ListProjectsForUserController implements AbstractBaseController { public ListProjectsForUserController(ListProjectsForUserUseCase listProjectsForUserUseCase) { this.listProjectsForUserUseCase = listProjectsForUserUseCase; } + + @GetMapping(path = "/users/{userId}/projects") + public ResponseEntity> listProjectsForUser(@PathVariable long userId) { + List projects = listProjectsForUserUseCase.listProjects(userId); + return new ResponseEntity<>(mapProjects(projects), HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java index ee435c9ea..61e6cdf35 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java @@ -1,10 +1,20 @@ package io.reflectoring.coderadar.rest.useradministration; import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.rest.domain.GetUserResponse; +import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + @RestController @Transactional public class ListUsersController implements AbstractBaseController { @@ -13,4 +23,10 @@ public class ListUsersController implements AbstractBaseController { public ListUsersController(ListUsersUseCase listUsersUseCase) { this.listUsersUseCase = listUsersUseCase; } + + @GetMapping(path = "/users", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity> listUsers() { + List users = listUsersUseCase.listUsers(); + return new ResponseEntity<>(mapUsers(users), HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java new file mode 100644 index 000000000..498ad70ae --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java @@ -0,0 +1,26 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.port.driver.teams.AddTeamToProjectUseCase; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class AddTeamToProjectController implements AbstractBaseController { + private final AddTeamToProjectUseCase addTeamToProjectUseCase; + + public AddTeamToProjectController(AddTeamToProjectUseCase addTeamToProjectUseCase) { + this.addTeamToProjectUseCase = addTeamToProjectUseCase; + } + + @PostMapping(path = "/projects/{projectId}/teams/{teamId}") + public ResponseEntity addTeamToProject(@PathVariable long projectId, @PathVariable long teamId) { + addTeamToProjectUseCase.addTeamToProject(projectId, teamId); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java deleted file mode 100644 index 5fb284b63..000000000 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamForProjectController.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.reflectoring.coderadar.rest.useradministration.teams; - -import io.reflectoring.coderadar.rest.AbstractBaseController; -import io.reflectoring.coderadar.useradministration.port.driver.teams.AddTeamToProjectUseCase; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@Transactional -public class CreateTeamForProjectController implements AbstractBaseController { - private final AddTeamToProjectUseCase addTeamToProjectUseCase; - - public CreateTeamForProjectController(AddTeamToProjectUseCase addTeamToProjectUseCase) { - this.addTeamToProjectUseCase = addTeamToProjectUseCase; - } -} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamController.java new file mode 100644 index 000000000..bc79ff865 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamController.java @@ -0,0 +1,26 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteTeamUseCase; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class DeleteTeamController implements AbstractBaseController { + private final DeleteTeamUseCase deleteTeamUseCase; + + public DeleteTeamController(DeleteTeamUseCase deleteTeamUseCase) { + this.deleteTeamUseCase = deleteTeamUseCase; + } + + @DeleteMapping(path = "/teams/{teamId}") + public ResponseEntity deleteTeam(@PathVariable long teamId) { + deleteTeamUseCase.deleteTeam(teamId); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java deleted file mode 100644 index 24ac43021..000000000 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamFromProjectController.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.reflectoring.coderadar.rest.useradministration.teams; - -import io.reflectoring.coderadar.rest.AbstractBaseController; -import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveTeamFromProjectUseCase; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@Transactional -public class DeleteTeamFromProjectController implements AbstractBaseController { - private final RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase; - - public DeleteTeamFromProjectController(RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase) { - this.removeTeamFromProjectUseCase = removeTeamFromProjectUseCase; - } -} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java index d2e1979f3..50302b20e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java @@ -2,9 +2,17 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteUsersFromTeamUseCase; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @Transactional public class DeleteUsersFromTeamController implements AbstractBaseController { @@ -13,4 +21,10 @@ public class DeleteUsersFromTeamController implements AbstractBaseController { public DeleteUsersFromTeamController(DeleteUsersFromTeamUseCase deleteUsersFromTeamUseCase) { this.deleteUsersFromTeamUseCase = deleteUsersFromTeamUseCase; } + + @DeleteMapping(path = "/teams/{teamId}/users", consumes = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity deleteUsersFromTeam(@PathVariable long teamId, @RequestBody List userIds) { + deleteUsersFromTeamUseCase.deleteUsersFromTeam(teamId, userIds); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java index 351649731..145885331 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java @@ -1,10 +1,19 @@ package io.reflectoring.coderadar.rest.useradministration.teams; import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.GetTeamUseCase; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeam; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + @RestController @Transactional public class GetTeamController implements AbstractBaseController { @@ -13,4 +22,10 @@ public class GetTeamController implements AbstractBaseController { public GetTeamController(GetTeamUseCase getTeamUseCase) { this.getTeamUseCase = getTeamUseCase; } + + @GetMapping(path = "/teams/{teamId}") + public ResponseEntity getTeam(@PathVariable long teamId) { + Team team = getTeamUseCase.get(teamId); + return new ResponseEntity<>(mapTeam(team), HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java index f007f8710..8e3953ef9 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java @@ -1,10 +1,21 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.rest.GetProjectResponseMapper; +import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + @RestController @Transactional public class ListProjectsForTeamController implements AbstractBaseController { @@ -13,4 +24,10 @@ public class ListProjectsForTeamController implements AbstractBaseController { public ListProjectsForTeamController(ListProjectsForTeamUseCase listProjectsForTeamUseCase) { this.listProjectsForTeamUseCase = listProjectsForTeamUseCase; } + + @GetMapping(path = "/teams/{teamId}/projects") + public ResponseEntity> listProjectsForTeam(@PathVariable long teamId) { + List projects = listProjectsForTeamUseCase.listProjects(teamId); + return new ResponseEntity<>(mapProjects(projects), HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java index 1e9173968..f50ea7b33 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java @@ -1,10 +1,20 @@ package io.reflectoring.coderadar.rest.useradministration.teams; import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + @RestController @Transactional public class ListTeamsForProjectController implements AbstractBaseController { @@ -13,4 +23,10 @@ public class ListTeamsForProjectController implements AbstractBaseController { public ListTeamsForProjectController(ListTeamsForProjectUseCase listTeamsForProjectUseCase) { this.listTeamsForProjectUseCase = listTeamsForProjectUseCase; } + + @GetMapping(path = "/projects/{projectId/teams") + public ResponseEntity> listTeamsForProject(@PathVariable long projectId) { + List teams = listTeamsForProjectUseCase.listTeamsForProject(projectId); + return new ResponseEntity<>(mapTeams(teams), HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java index 6e6f28c77..66c15c732 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java @@ -1,10 +1,20 @@ package io.reflectoring.coderadar.rest.useradministration.teams; import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + @RestController @Transactional public class ListTeamsForUserController implements AbstractBaseController { @@ -13,4 +23,10 @@ public class ListTeamsForUserController implements AbstractBaseController { public ListTeamsForUserController(ListTeamsForUserUseCase listTeamsForUserUseCase) { this.listTeamsForUserUseCase = listTeamsForUserUseCase; } + + @GetMapping(path = "/users/{userId}/teams") + public ResponseEntity> listTeamsForUser(@PathVariable long userId) { + List teams = listTeamsForUserUseCase.listTeamsForUser(userId); + return new ResponseEntity<>(mapTeams(teams), HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java new file mode 100644 index 000000000..c1a2d78a7 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java @@ -0,0 +1,27 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveTeamFromProjectUseCase; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class RemoveTeamFromProjectController implements AbstractBaseController { + private final RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase; + + public RemoveTeamFromProjectController(RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase) { + this.removeTeamFromProjectUseCase = removeTeamFromProjectUseCase; + } + + // TODO: which http method should be used here? + @PostMapping(path = "/project/{projectId}/teams/{teamId}") + public ResponseEntity removeTeamFromProject(@PathVariable long projectId, @PathVariable long teamId) { + removeTeamFromProjectUseCase.removeTeam(teamId); // TODO: change signature of this method + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java index 340ddb165..cd2645264 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java @@ -23,7 +23,7 @@ void loadUserWithIdOne() { Mockito.when(getUserUseCase.getUser(1L)) .thenReturn(new User().setUsername("username").setId(1L)); - ResponseEntity responseEntity = testSubject.loadUser(1L); + ResponseEntity responseEntity = testSubject.getUser(1L); Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); Assertions.assertEquals("username", responseEntity.getBody().getUsername()); From 877268ae7c99acc98482005964e590677f507aaa Mon Sep 17 00:00:00 2001 From: Krause Date: Tue, 5 May 2020 17:52:12 +0200 Subject: [PATCH 08/76] apply spotless --- .../projectadministration/domain/Project.java | 3 +- .../TeamAlreadyExistsException.java | 9 ++++ .../TeamNotFoundException.java | 6 +-- .../domain/ProjectRole.java | 33 +++++-------- .../useradministration/domain/Team.java | 9 ++-- .../port/driven/AddTeamToProjectPort.java | 13 ++--- .../port/driven/AddUsersToTeamPort.java | 13 ++--- .../port/driven/CreateTeamPort.java | 13 ++--- .../port/driven/DeleteTeamPort.java | 11 +++-- .../driven/DeleteUserRoleForProjectPort.java | 16 +++---- .../port/driven/DeleteUsersFromTeamPort.java | 16 +++---- .../port/driven/GetTeamPort.java | 32 ++++++------- .../port/driven/ListProjectsForTeamPort.java | 11 ++--- .../port/driven/ListProjectsForUserPort.java | 11 ++--- .../port/driven/ListTeamsForProjectPort.java | 11 ++--- .../port/driven/ListTeamsForUserPort.java | 11 ++--- .../port/driven/ListUsersPort.java | 7 +-- .../driven/RemoveTeamFromProjectPort.java | 14 +++--- .../driven/SetUserRoleForProjectPort.java | 15 +++--- .../get/ListProjectsForUserUseCase.java | 12 ++--- .../port/driver/get/ListUsersUseCase.java | 7 +-- .../DeleteUserRoleForProjectUseCase.java | 16 +++---- .../SetUserRoleForProjectUseCase.java | 16 +++---- .../driver/teams/AddTeamToProjectUseCase.java | 13 ++--- .../driver/teams/AddUsersToTeamUseCase.java | 13 ++--- .../port/driver/teams/DeleteTeamUseCase.java | 11 +++-- .../teams/DeleteUsersFromTeamUseCase.java | 16 +++---- .../teams/RemoveTeamFromProjectUseCase.java | 14 +++--- .../teams/create/CreateTeamCommand.java | 15 ++---- .../teams/create/CreateTeamUseCase.java | 13 ++--- .../port/driver/teams/get/GetTeamUseCase.java | 10 ++-- .../teams/get/ListProjectsForTeamUseCase.java | 11 ++--- .../teams/get/ListTeamsForProjectUseCase.java | 11 ++--- .../teams/get/ListTeamsForUserUseCase.java | 11 ++--- .../get/ListProjectsForUserService.java | 28 +++++------ .../service/get/ListUsersService.java | 19 ++++---- .../DeleteUserRoleForProjectService.java | 37 ++++++++------- .../SetUserRoleForProjectService.java | 37 ++++++++------- .../teams/AddTeamToProjectService.java | 25 +++++----- .../service/teams/AddUsersToTeamService.java | 42 ++++++++--------- .../service/teams/DeleteTeamService.java | 26 +++++----- .../teams/DeleteUsersFromTeamService.java | 44 ++++++++--------- .../teams/RemoveTeamFromProjectService.java | 29 ++++++------ .../teams/create/CreateTeamService.java | 16 +++---- .../service/teams/get/GetTeamService.java | 24 +++++----- .../teams/get/ListProjectsForTeamService.java | 28 +++++------ .../teams/get/ListTeamsForProjectService.java | 30 ++++++------ .../teams/get/ListTeamsForUserService.java | 30 ++++++------ .../domain/ProjectEntity.java | 7 ++- .../graph/useradministration/TeamMapper.java | 29 ++++++++++++ .../adapter/ListProjectsForUserAdapter.java | 14 ++++++ .../adapter/ListUsersAdapter.java | 28 +++++++++++ .../teams/AddTeamToProjectAdapter.java | 21 +++++++++ .../adapter/teams/CreateTeamAdapter.java | 28 +++++++++++ .../adapter/teams/DeleteTeamAdapter.java | 20 ++++++++ .../teams/ListProjectsForTeamAdapter.java | 24 ++++++++++ .../teams/ListTeamsForUserAdapter.java | 24 ++++++++++ .../useradministration/domain/TeamEntity.java | 14 +++--- .../repository/TeamRepository.java | 39 +++++++++++++++ .../rest/GetProjectResponseMapper.java | 47 +++++++++---------- .../coderadar/rest/GetTeamResponseMapper.java | 25 +++++----- .../coderadar/rest/GetUserResponseMapper.java | 21 ++++----- .../rest/domain/GetTeamResponse.java | 9 ++-- .../rest/project/GetProjectController.java | 4 +- .../rest/project/ListProjectsController.java | 5 +- .../useradministration/GetUserController.java | 4 +- .../ListProjectsForUserController.java | 25 +++++----- .../ListUsersController.java | 25 +++++----- .../DeleteUserRoleForProjectController.java | 20 ++++---- .../SetUserRoleForProjectController.java | 21 +++++---- .../teams/AddTeamToProjectController.java | 19 ++++---- .../teams/AddUsersToTeamController.java | 22 ++++----- .../teams/DeleteTeamController.java | 18 +++---- .../teams/DeleteUsersFromTeamController.java | 24 +++++----- .../teams/GetTeamController.java | 23 +++++---- .../teams/ListProjectsForTeamController.java | 26 +++++----- .../teams/ListTeamsForProjectController.java | 25 +++++----- .../teams/ListTeamsForUserController.java | 25 +++++----- .../RemoveTeamFromProjectController.java | 22 +++++---- 79 files changed, 866 insertions(+), 650 deletions(-) create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamAlreadyExistsException.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/TeamMapper.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListUsersAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddTeamToProjectAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/CreateTeamAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteTeamAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForUserAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java index 6b81c49c7..0b46dc9a5 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java @@ -1,9 +1,8 @@ package io.reflectoring.coderadar.projectadministration.domain; +import io.reflectoring.coderadar.useradministration.domain.Team; import java.util.Date; import java.util.List; - -import io.reflectoring.coderadar.useradministration.domain.Team; import lombok.Data; /** A Coderadar project that defines the source of files that are to be analyzed. */ diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamAlreadyExistsException.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamAlreadyExistsException.java new file mode 100644 index 000000000..5409b9fcf --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamAlreadyExistsException.java @@ -0,0 +1,9 @@ +package io.reflectoring.coderadar.useradministration; + +import io.reflectoring.coderadar.EntityAlreadyExistsException; + +public class TeamAlreadyExistsException extends EntityAlreadyExistsException { + public TeamAlreadyExistsException(String name) { + super("Team with name " + name + " already exists!"); + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotFoundException.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotFoundException.java index e31b95687..a9b2d8ddb 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotFoundException.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotFoundException.java @@ -3,7 +3,7 @@ import io.reflectoring.coderadar.EntityNotFoundException; public class TeamNotFoundException extends EntityNotFoundException { - public TeamNotFoundException(Long teamId) { - super("Team with id " + teamId + " not found."); - } + public TeamNotFoundException(Long teamId) { + super("Team with id " + teamId + " not found."); + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java index fb76f7a07..56daa1860 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java @@ -1,30 +1,23 @@ package io.reflectoring.coderadar.useradministration.domain; -import io.reflectoring.coderadar.projectadministration.domain.Project; - /** - * ADMIN: - * - Can delete a project - * - Can remove users from a team - * - Can add users to a team - * - Can analyze an project - * - Can delete analysis results - * - Can configure file patterns, modules, analyzers, (merge contributors?) + * ADMIN: - Can delete a project - Can remove users from a team - Can add users to a team - Can + * analyze an project - Can delete analysis results - Can configure file patterns, modules, + * analyzers, (merge contributors?) * - * MEMBER: - * - Can analyze an project. + *

MEMBER: - Can analyze an project. */ public enum ProjectRole { - ADMIN("admin"), - MEMBER("member"); + ADMIN("admin"), + MEMBER("member"); - private final String value; + private final String value; - ProjectRole(String value){ - this.value = value; - } + ProjectRole(String value) { + this.value = value; + } - public String getValue() { - return value; - } + public String getValue() { + return value; + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java index 10322d876..f53caa593 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.useradministration.domain; +import java.util.List; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data @NoArgsConstructor public class Team { - private long id; - private String name; - private List members; + private long id; + private String name; + private List members; } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java index 4c9784afd..05c2f1744 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java @@ -2,10 +2,11 @@ public interface AddTeamToProjectPort { - /** - * Creates a team in the given project. - * @param projectId The id of the project. - * @param teamId The team id. - */ - void addTeamToProject(long projectId, long teamId); + /** + * Creates a team in the given project. + * + * @param projectId The id of the project. + * @param teamId The team id. + */ + void addTeamToProject(long projectId, long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java index dc498771e..3657d5114 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java @@ -4,10 +4,11 @@ public interface AddUsersToTeamPort { - /** - * Adds users to a team. - * @param teamId The id of the team. - * @param userIds The ids of the users. - */ - void addUsersToTeam(long teamId, List userIds); + /** + * Adds users to a team. + * + * @param teamId The id of the team. + * @param userIds The ids of the users. + */ + void addUsersToTeam(long teamId, List userIds); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamPort.java index 8031abf07..0c3d5b79b 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/CreateTeamPort.java @@ -3,10 +3,11 @@ import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; public interface CreateTeamPort { - /** - * Creates a new team. - * @param createTeamCommand The command containing the required data. - * @return The id of the new team. - */ - Long createTeam(CreateTeamCommand createTeamCommand); + /** + * Creates a new team. + * + * @param createTeamCommand The command containing the required data. + * @return The id of the new team. + */ + Long createTeam(CreateTeamCommand createTeamCommand); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamPort.java index ccdf82b03..f0a8f1d89 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteTeamPort.java @@ -1,9 +1,10 @@ package io.reflectoring.coderadar.useradministration.port.driven; public interface DeleteTeamPort { - /** - * Deletes a team. - * @param teamId The id of the team. - */ - void deleteTeam(long teamId); + /** + * Deletes a team. + * + * @param teamId The id of the team. + */ + void deleteTeam(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java index 1c9a5fc39..59745885c 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java @@ -2,12 +2,12 @@ public interface DeleteUserRoleForProjectPort { - /** - * Removes the role a given user has to a project. - * If the user is not in any team with access to the project, they - * will no longer have access to the project. - * @param projectId The id of the project. - * @param userId The id of the user. - */ - void deleteRole(long projectId, long userId); + /** + * Removes the role a given user has to a project. If the user is not in any team with access to + * the project, they will no longer have access to the project. + * + * @param projectId The id of the project. + * @param userId The id of the user. + */ + void deleteRole(long projectId, long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java index 24f473541..1c36887c5 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java @@ -4,12 +4,12 @@ public interface DeleteUsersFromTeamPort { - /** - * Deletes users from a team. - * Any permissions users had for a project because of the team - * will be lost after this operation. - * @param teamId The id of the team. - * @param userIds The ids of the users. - */ - void deleteUsersFromTeam(long teamId, List userIds); + /** + * Deletes users from a team. Any permissions users had for a project because of the team will be + * lost after this operation. + * + * @param teamId The id of the team. + * @param userIds The ids of the users. + */ + void deleteUsersFromTeam(long teamId, List userIds); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java index 900272e86..039eb392b 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetTeamPort.java @@ -3,23 +3,21 @@ import io.reflectoring.coderadar.useradministration.domain.Team; public interface GetTeamPort { - /** - * @param teamId The team id. - * @return The team with the given id. - */ - Team get(long teamId); + /** + * @param teamId The team id. + * @return The team with the given id. + */ + Team get(long teamId); - /** - * - * @param teamId The id of the team. - * @return True if a team with the given id exists. - */ - boolean existsById(long teamId); + /** + * @param teamId The id of the team. + * @return True if a team with the given id exists. + */ + boolean existsById(long teamId); - /** - * - * @param name The name of the team. - * @return True if a team with the given name exists. - */ - boolean existsByName(String name); + /** + * @param name The name of the team. + * @return True if a team with the given name exists. + */ + boolean existsByName(String name); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java index 8023219dc..91980ca17 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java @@ -1,13 +1,12 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.projectadministration.domain.Project; - import java.util.List; public interface ListProjectsForTeamPort { - /** - * @param teamId The id of the team. - * @return All projects the team has access to. - */ - List listProjects(long teamId); + /** + * @param teamId The id of the team. + * @return All projects the team has access to. + */ + List listProjects(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java index 1a157df90..a3e4edee1 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.projectadministration.domain.Project; - import java.util.List; public interface ListProjectsForUserPort { - /** - * @param userId The id of the user. - * @return All projects this user has access to. - */ - List listProjects(long userId); + /** + * @param userId The id of the user. + * @return All projects this user has access to. + */ + List listProjects(long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java index 196b9f9ae..beedfb323 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsForProjectPort { - /** - * @param projectId The id of the project. - * @return All teams with access to this project. - */ - List listTeamsForProject(long projectId); + /** + * @param projectId The id of the project. + * @return All teams with access to this project. + */ + List listTeamsForProject(long projectId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java index 7697bf60d..7ecb1ccdf 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsForUserPort { - /** - * @param userId The id of the user. - * @return All teams the user is in. - */ - List listTeamsForUser(long userId); + /** + * @param userId The id of the user. + * @return All teams the user is in. + */ + List listTeamsForUser(long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java index 86ffdaaa9..039cf273c 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java @@ -1,13 +1,10 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.User; - import java.util.List; public interface ListUsersPort { - /** - * @return All users in the database. - */ - List listUsers(); + /** @return All users in the database. */ + List listUsers(); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveTeamFromProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveTeamFromProjectPort.java index ceea3914f..4f511ef96 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveTeamFromProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveTeamFromProjectPort.java @@ -2,11 +2,11 @@ public interface RemoveTeamFromProjectPort { - /** - * Deletes a team. - * Any permissions users had for a project because of the team - * will be lost after this operation. - * @param teamId The id of the team. - */ - void deleteTeam(long teamId); + /** + * Deletes a team. Any permissions users had for a project because of the team will be lost after + * this operation. + * + * @param teamId The id of the team. + */ + void deleteTeam(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java index 5d39452ac..ba0fa7140 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java @@ -4,11 +4,12 @@ public interface SetUserRoleForProjectPort { - /** - * Gives a user a role in the project. - * @param projectId The id of the project. - * @param userId The id of the user. - * @param role The role to set. - */ - void setRole(long projectId, long userId, ProjectRole role); + /** + * Gives a user a role in the project. + * + * @param projectId The id of the project. + * @param userId The id of the user. + * @param role The role to set. + */ + void setRole(long projectId, long userId, ProjectRole role); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java index 891b558ad..7e5ef22b2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java @@ -1,15 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driver.get; import io.reflectoring.coderadar.projectadministration.domain.Project; -import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForUserPort; - import java.util.List; public interface ListProjectsForUserUseCase { - /** - * @param userId The id of the user. - * @return All projects this user has access to. - */ - List listProjects(long userId); + /** + * @param userId The id of the user. + * @return All projects this user has access to. + */ + List listProjects(long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java index 56c5e7aa9..33efbdf78 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java @@ -1,13 +1,10 @@ package io.reflectoring.coderadar.useradministration.port.driver.get; import io.reflectoring.coderadar.useradministration.domain.User; - import java.util.List; public interface ListUsersUseCase { - /** - * @return All users in the database. - */ - List listUsers(); + /** @return All users in the database. */ + List listUsers(); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/DeleteUserRoleForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/DeleteUserRoleForProjectUseCase.java index c462c2894..042911ce7 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/DeleteUserRoleForProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/DeleteUserRoleForProjectUseCase.java @@ -2,12 +2,12 @@ public interface DeleteUserRoleForProjectUseCase { - /** - * Removes the role a given user has to a project. - * If the user is not in any team with access to the project, they - * will no longer have access to the project. - * @param projectId The id of the project. - * @param userId The id of the user. - */ - void deleteRole(long projectId, long userId); + /** + * Removes the role a given user has to a project. If the user is not in any team with access to + * the project, they will no longer have access to the project. + * + * @param projectId The id of the project. + * @param userId The id of the user. + */ + void deleteRole(long projectId, long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java index e8e7705db..aa0a27b77 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java @@ -4,12 +4,12 @@ public interface SetUserRoleForProjectUseCase { - /** - * Gives a user a role in the project. - * @param projectId The id of the project. - * @param userId The id of the user. - * @param role The role to set. - */ - void setRole(long projectId, long userId, ProjectRole role); + /** + * Gives a user a role in the project. + * + * @param projectId The id of the project. + * @param userId The id of the user. + * @param role The role to set. + */ + void setRole(long projectId, long userId, ProjectRole role); } - diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java index f2e9706d5..b45a4d629 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java @@ -2,10 +2,11 @@ public interface AddTeamToProjectUseCase { - /** - * Creates a team in the given project. - * @param projectId The id of the project. - * @param teamId The id of the team. - */ - void addTeamToProject(long projectId, long teamId); + /** + * Creates a team in the given project. + * + * @param projectId The id of the project. + * @param teamId The id of the team. + */ + void addTeamToProject(long projectId, long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java index e8ea38373..009ea374e 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java @@ -4,10 +4,11 @@ public interface AddUsersToTeamUseCase { - /** - * Adds users to a team. - * @param teamId The id of the team. - * @param userIds The ids of the users. - */ - void addUsersToTeam(long teamId, List userIds); + /** + * Adds users to a team. + * + * @param teamId The id of the team. + * @param userIds The ids of the users. + */ + void addUsersToTeam(long teamId, List userIds); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamUseCase.java index c7203e947..de3e258cc 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteTeamUseCase.java @@ -2,9 +2,10 @@ public interface DeleteTeamUseCase { - /** - * Deletes a team. - * @param teamId The id of the team. - */ - void deleteTeam(long teamId); + /** + * Deletes a team. + * + * @param teamId The id of the team. + */ + void deleteTeam(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteUsersFromTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteUsersFromTeamUseCase.java index 678e7ab72..c07b7ef43 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteUsersFromTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteUsersFromTeamUseCase.java @@ -4,12 +4,12 @@ public interface DeleteUsersFromTeamUseCase { - /** - * Deletes users from a team. - * Any permissions users had for a project because of the team - * will be lost after this operation. - * @param teamId The id of the team. - * @param userIds The ids of the users. - */ - void deleteUsersFromTeam(long teamId, List userIds); + /** + * Deletes users from a team. Any permissions users had for a project because of the team will be + * lost after this operation. + * + * @param teamId The id of the team. + * @param userIds The ids of the users. + */ + void deleteUsersFromTeam(long teamId, List userIds); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveTeamFromProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveTeamFromProjectUseCase.java index b09028254..5cb8a8601 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveTeamFromProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveTeamFromProjectUseCase.java @@ -2,11 +2,11 @@ public interface RemoveTeamFromProjectUseCase { - /** - * Removes a team from a project. - * Any permissions users had for a project because of the team - * will be lost after this operation. - * @param teamId The id of the team. - */ - void removeTeam(long teamId); + /** + * Removes a team from a project. Any permissions users had for a project because of the team will + * be lost after this operation. + * + * @param teamId The id of the team. + */ + void removeTeam(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java index e5bf4e032..8edff6bf2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java @@ -1,19 +1,14 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.create; -import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import java.util.List; +import javax.validation.constraints.NotBlank; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.List; - -/** - * DTO class for creating teams. - */ +/** DTO class for creating teams. */ @Data @NoArgsConstructor public class CreateTeamCommand { - @NotBlank private String name; - private List userIds; + @NotBlank private String name; + private List userIds; } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamUseCase.java index bac7da580..7d3119437 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamUseCase.java @@ -2,10 +2,11 @@ public interface CreateTeamUseCase { - /** - * Creates a new team. - * @param createTeamCommand The command containing the required data. - * @return The id of the new team. - */ - Long createTeam(CreateTeamCommand createTeamCommand); + /** + * Creates a new team. + * + * @param createTeamCommand The command containing the required data. + * @return The id of the new team. + */ + Long createTeam(CreateTeamCommand createTeamCommand); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/GetTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/GetTeamUseCase.java index 35a3f2418..8161b2115 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/GetTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/GetTeamUseCase.java @@ -4,9 +4,9 @@ public interface GetTeamUseCase { - /** - * @param teamId The team id. - * @return The team with the given id. - */ - Team get(long teamId); + /** + * @param teamId The team id. + * @return The team with the given id. + */ + Team get(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java index b35fda811..b592245a6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.projectadministration.domain.Project; - import java.util.List; public interface ListProjectsForTeamUseCase { - /** - * @param teamId The id of the team. - * @return All projects the team has access to. - */ - List listProjects(long teamId); + /** + * @param teamId The id of the team. + * @return All projects the team has access to. + */ + List listProjects(long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java index da0b8f6f8..50bc267b6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsForProjectUseCase { - /** - * @param projectId The id of the project. - * @return All teams with access to this project. - */ - List listTeamsForProject(long projectId); + /** + * @param projectId The id of the project. + * @return All teams with access to this project. + */ + List listTeamsForProject(long projectId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java index 6710b87a5..93d0ad43a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsForUserUseCase { - /** - * @param userId The id of the user. - * @return All teams the user is in. - */ - List listTeamsForUser(long userId); + /** + * @param userId The id of the user. + * @return All teams the user is in. + */ + List listTeamsForUser(long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java index d9676b81f..52053d383 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java @@ -5,25 +5,25 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForUserPort; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; - import java.util.List; public class ListProjectsForUserService implements ListProjectsForUserUseCase { - private final ListProjectsForUserPort listProjectsForUserPort; - private final GetUserPort getUserPort; + private final ListProjectsForUserPort listProjectsForUserPort; + private final GetUserPort getUserPort; - public ListProjectsForUserService(ListProjectsForUserPort listProjectsForUserPort, GetUserPort getUserPort) { - this.listProjectsForUserPort = listProjectsForUserPort; - this.getUserPort = getUserPort; - } + public ListProjectsForUserService( + ListProjectsForUserPort listProjectsForUserPort, GetUserPort getUserPort) { + this.listProjectsForUserPort = listProjectsForUserPort; + this.getUserPort = getUserPort; + } - @Override - public List listProjects(long userId) { - if(this.getUserPort.existsById(userId)){ - return listProjectsForUserPort.listProjects(userId); - } else { - throw new UserNotFoundException(userId); - } + @Override + public List listProjects(long userId) { + if (this.getUserPort.existsById(userId)) { + return listProjectsForUserPort.listProjects(userId); + } else { + throw new UserNotFoundException(userId); } + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java index 86d84495b..074e094b0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java @@ -2,21 +2,20 @@ import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListUsersService implements ListUsersUseCase { - private final ListUsersService listUsersService; + private final ListUsersService listUsersService; - public ListUsersService(ListUsersService listUsersService) { - this.listUsersService = listUsersService; - } + public ListUsersService(ListUsersService listUsersService) { + this.listUsersService = listUsersService; + } - @Override - public List listUsers() { - return listUsersService.listUsers(); - } + @Override + public List listUsers() { + return listUsersService.listUsers(); + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java index a990365e4..18bd6a8b2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java @@ -11,24 +11,27 @@ @Service public class DeleteUserRoleForProjectService implements DeleteUserRoleForProjectUseCase { - private final GetProjectPort getProjectPort; - private final GetUserPort getUserPort; - private final DeleteUserRoleForProjectPort deleteUserRoleForProjectPort; + private final GetProjectPort getProjectPort; + private final GetUserPort getUserPort; + private final DeleteUserRoleForProjectPort deleteUserRoleForProjectPort; - public DeleteUserRoleForProjectService(GetProjectPort getProjectPort, GetUserPort getUserPort, DeleteUserRoleForProjectPort deleteUserRoleForProjectPort) { - this.getProjectPort = getProjectPort; - this.getUserPort = getUserPort; - this.deleteUserRoleForProjectPort = deleteUserRoleForProjectPort; - } + public DeleteUserRoleForProjectService( + GetProjectPort getProjectPort, + GetUserPort getUserPort, + DeleteUserRoleForProjectPort deleteUserRoleForProjectPort) { + this.getProjectPort = getProjectPort; + this.getUserPort = getUserPort; + this.deleteUserRoleForProjectPort = deleteUserRoleForProjectPort; + } - @Override - public void deleteRole(long projectId, long userId) { - if(!getProjectPort.existsById(projectId)){ - throw new ProjectNotFoundException(projectId); - } - if(!getUserPort.existsById(userId)) { - throw new UserNotFoundException(userId); - } - deleteUserRoleForProjectPort.deleteRole(projectId, userId); + @Override + public void deleteRole(long projectId, long userId) { + if (!getProjectPort.existsById(projectId)) { + throw new ProjectNotFoundException(projectId); + } + if (!getUserPort.existsById(userId)) { + throw new UserNotFoundException(userId); } + deleteUserRoleForProjectPort.deleteRole(projectId, userId); + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java index bd60dc880..23a6b1b07 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/SetUserRoleForProjectService.java @@ -12,24 +12,27 @@ @Service public class SetUserRoleForProjectService implements SetUserRoleForProjectUseCase { - private final GetProjectPort getProjectPort; - private final GetUserPort getUserPort; - private final SetUserRoleForProjectPort setUserRoleForProjectPort; + private final GetProjectPort getProjectPort; + private final GetUserPort getUserPort; + private final SetUserRoleForProjectPort setUserRoleForProjectPort; - public SetUserRoleForProjectService(GetProjectPort getProjectPort, GetUserPort getUserPort, SetUserRoleForProjectPort setUserRoleForProjectPort) { - this.getProjectPort = getProjectPort; - this.getUserPort = getUserPort; - this.setUserRoleForProjectPort = setUserRoleForProjectPort; - } + public SetUserRoleForProjectService( + GetProjectPort getProjectPort, + GetUserPort getUserPort, + SetUserRoleForProjectPort setUserRoleForProjectPort) { + this.getProjectPort = getProjectPort; + this.getUserPort = getUserPort; + this.setUserRoleForProjectPort = setUserRoleForProjectPort; + } - @Override - public void setRole(long projectId, long userId, ProjectRole role) { - if(!getProjectPort.existsById(projectId)){ - throw new ProjectNotFoundException(projectId); - } - if(!getUserPort.existsById(userId)) { - throw new UserNotFoundException(userId); - } - setUserRoleForProjectPort.setRole(projectId, userId, role); + @Override + public void setRole(long projectId, long userId, ProjectRole role) { + if (!getProjectPort.existsById(projectId)) { + throw new ProjectNotFoundException(projectId); + } + if (!getUserPort.existsById(userId)) { + throw new UserNotFoundException(userId); } + setUserRoleForProjectPort.setRole(projectId, userId, role); + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java index 7fd99394f..c7f95145a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java @@ -9,19 +9,20 @@ @Service public class AddTeamToProjectService implements AddTeamToProjectUseCase { - private final GetProjectPort getProjectPort; - private final AddTeamToProjectPort addTeamToProjectPort; + private final GetProjectPort getProjectPort; + private final AddTeamToProjectPort addTeamToProjectPort; - public AddTeamToProjectService(GetProjectPort getProjectPort, AddTeamToProjectPort addTeamToProjectPort) { - this.getProjectPort = getProjectPort; - this.addTeamToProjectPort = addTeamToProjectPort; - } + public AddTeamToProjectService( + GetProjectPort getProjectPort, AddTeamToProjectPort addTeamToProjectPort) { + this.getProjectPort = getProjectPort; + this.addTeamToProjectPort = addTeamToProjectPort; + } - @Override - public void addTeamToProject(long projectId, long teamId) { - if(!getProjectPort.existsById(projectId)){ - throw new ProjectNotFoundException(projectId); - } - addTeamToProjectPort.addTeamToProject(projectId, teamId); + @Override + public void addTeamToProject(long projectId, long teamId) { + if (!getProjectPort.existsById(projectId)) { + throw new ProjectNotFoundException(projectId); } + addTeamToProjectPort.addTeamToProject(projectId, teamId); + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java index 9e457c789..8f3409924 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java @@ -6,33 +6,33 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class AddUsersToTeamService implements AddUsersToTeamUseCase { - private final GetTeamPort getTeamPort; - private final GetUserPort getUserPort; - private final AddUsersToTeamPort addUsersToTeamPort; + private final GetTeamPort getTeamPort; + private final GetUserPort getUserPort; + private final AddUsersToTeamPort addUsersToTeamPort; - public AddUsersToTeamService(GetTeamPort getTeamPort, GetUserPort getUserPort, AddUsersToTeamPort addUsersToTeamPort) { - this.getTeamPort = getTeamPort; - this.getUserPort = getUserPort; - this.addUsersToTeamPort = addUsersToTeamPort; - } + public AddUsersToTeamService( + GetTeamPort getTeamPort, GetUserPort getUserPort, AddUsersToTeamPort addUsersToTeamPort) { + this.getTeamPort = getTeamPort; + this.getUserPort = getUserPort; + this.addUsersToTeamPort = addUsersToTeamPort; + } - @Override - public void addUsersToTeam(long teamId, List userIds) { - if(!getTeamPort.existsById(teamId)){ - throw new TeamNotFoundException(teamId); - } - for(Long userId : userIds){ - if(!getUserPort.existsById(userId)) { - throw new UserNotFoundException(userId); - } - } - addUsersToTeamPort.addUsersToTeam(teamId, userIds); + @Override + public void addUsersToTeam(long teamId, List userIds) { + if (!getTeamPort.existsById(teamId)) { + throw new TeamNotFoundException(teamId); + } + for (Long userId : userIds) { + if (!getUserPort.existsById(userId)) { + throw new UserNotFoundException(userId); + } } + addUsersToTeamPort.addUsersToTeam(teamId, userIds); + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamService.java index 8878c20e5..cbb6c07c0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteTeamService.java @@ -9,20 +9,20 @@ @Service public class DeleteTeamService implements DeleteTeamUseCase { - private final GetTeamPort getTeamPort; - private final DeleteTeamPort deleteTeamPort; + private final GetTeamPort getTeamPort; + private final DeleteTeamPort deleteTeamPort; - public DeleteTeamService(GetTeamPort getTeamPort, DeleteTeamPort deleteTeamPort) { - this.getTeamPort = getTeamPort; - this.deleteTeamPort = deleteTeamPort; - } + public DeleteTeamService(GetTeamPort getTeamPort, DeleteTeamPort deleteTeamPort) { + this.getTeamPort = getTeamPort; + this.deleteTeamPort = deleteTeamPort; + } - @Override - public void deleteTeam(long teamId) { - if(getTeamPort.existsById(teamId)){ - deleteTeamPort.deleteTeam(teamId); - } else { - throw new TeamNotFoundException(teamId); - } + @Override + public void deleteTeam(long teamId) { + if (getTeamPort.existsById(teamId)) { + deleteTeamPort.deleteTeam(teamId); + } else { + throw new TeamNotFoundException(teamId); } + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java index 4a58f2647..e4aa81f06 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java @@ -5,33 +5,35 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteUsersFromTeamUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class DeleteUsersFromTeamService implements DeleteUsersFromTeamUseCase { - private final GetTeamPort getTeamPort; - private final GetUserPort getUserPort; - private final DeleteUsersFromTeamService deleteUsersFromTeamService; + private final GetTeamPort getTeamPort; + private final GetUserPort getUserPort; + private final DeleteUsersFromTeamService deleteUsersFromTeamService; - public DeleteUsersFromTeamService(GetTeamPort getTeamPort, GetUserPort getUserPort, DeleteUsersFromTeamService deleteUsersFromTeamService) { - this.getTeamPort = getTeamPort; - this.getUserPort = getUserPort; - this.deleteUsersFromTeamService = deleteUsersFromTeamService; - } + public DeleteUsersFromTeamService( + GetTeamPort getTeamPort, + GetUserPort getUserPort, + DeleteUsersFromTeamService deleteUsersFromTeamService) { + this.getTeamPort = getTeamPort; + this.getUserPort = getUserPort; + this.deleteUsersFromTeamService = deleteUsersFromTeamService; + } - @Override - public void deleteUsersFromTeam(long teamId, List userIds) { - if(!getTeamPort.existsById(teamId)){ - throw new TeamNotFoundException(teamId); - } - for(Long userId : userIds){ - if(!getUserPort.existsById(userId)) { - throw new UserNotFoundException(userId); - } - } - deleteUsersFromTeamService.deleteUsersFromTeam(teamId, userIds); + @Override + public void deleteUsersFromTeam(long teamId, List userIds) { + if (!getTeamPort.existsById(teamId)) { + throw new TeamNotFoundException(teamId); + } + for (Long userId : userIds) { + if (!getUserPort.existsById(userId)) { + throw new UserNotFoundException(userId); + } } + deleteUsersFromTeamService.deleteUsersFromTeam(teamId, userIds); + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java index 747a7a4b7..40653b170 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java @@ -1,28 +1,29 @@ package io.reflectoring.coderadar.useradministration.service.teams; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; -import io.reflectoring.coderadar.useradministration.port.driven.RemoveTeamFromProjectPort; import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; +import io.reflectoring.coderadar.useradministration.port.driven.RemoveTeamFromProjectPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveTeamFromProjectUseCase; import org.springframework.stereotype.Service; @Service public class RemoveTeamFromProjectService implements RemoveTeamFromProjectUseCase { - private final GetTeamPort getTeamPort; - private final RemoveTeamFromProjectPort removeTeamFromProjectPort; + private final GetTeamPort getTeamPort; + private final RemoveTeamFromProjectPort removeTeamFromProjectPort; - public RemoveTeamFromProjectService(GetTeamPort getTeamPort, RemoveTeamFromProjectPort removeTeamFromProjectPort) { - this.getTeamPort = getTeamPort; - this.removeTeamFromProjectPort = removeTeamFromProjectPort; - } + public RemoveTeamFromProjectService( + GetTeamPort getTeamPort, RemoveTeamFromProjectPort removeTeamFromProjectPort) { + this.getTeamPort = getTeamPort; + this.removeTeamFromProjectPort = removeTeamFromProjectPort; + } - @Override - public void removeTeam(long teamId) { - if(getTeamPort.existsById(teamId)){ - removeTeamFromProjectPort.deleteTeam(teamId); - } else { - throw new TeamNotFoundException(teamId); - } + @Override + public void removeTeam(long teamId) { + if (getTeamPort.existsById(teamId)) { + removeTeamFromProjectPort.deleteTeam(teamId); + } else { + throw new TeamNotFoundException(teamId); } + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java index 121eea5bd..404032835 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java @@ -6,14 +6,14 @@ @Service public class CreateTeamService implements CreateTeamPort { - private final CreateTeamPort createTeamPort; + private final CreateTeamPort createTeamPort; - public CreateTeamService(CreateTeamPort createTeamPort) { - this.createTeamPort = createTeamPort; - } + public CreateTeamService(CreateTeamPort createTeamPort) { + this.createTeamPort = createTeamPort; + } - @Override - public Long createTeam(CreateTeamCommand createTeamCommand) { - return createTeamPort.createTeam(createTeamCommand); - } + @Override + public Long createTeam(CreateTeamCommand createTeamCommand) { + return createTeamPort.createTeam(createTeamCommand); + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java index ed391fba5..641acf880 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/GetTeamService.java @@ -1,26 +1,26 @@ package io.reflectoring.coderadar.useradministration.service.teams.get; +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; -import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.GetTeamUseCase; import org.springframework.stereotype.Service; @Service public class GetTeamService implements GetTeamUseCase { - private final GetTeamPort getTeamPort; + private final GetTeamPort getTeamPort; - public GetTeamService(GetTeamPort getTeamPort) { - this.getTeamPort = getTeamPort; - } + public GetTeamService(GetTeamPort getTeamPort) { + this.getTeamPort = getTeamPort; + } - @Override - public Team get(long teamId) { - if(getTeamPort.existsById(teamId)){ - return getTeamPort.get(teamId); - } else { - throw new TeamNotFoundException(teamId); - } + @Override + public Team get(long teamId) { + if (getTeamPort.existsById(teamId)) { + return getTeamPort.get(teamId); + } else { + throw new TeamNotFoundException(teamId); } + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java index 4497ec234..269e8ba93 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java @@ -5,25 +5,25 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForTeamPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; - import java.util.List; public class ListProjectsForTeamService implements ListProjectsForTeamUseCase { - private final GetTeamPort getTeamPort; - private final ListProjectsForTeamPort listProjectsForTeamPort; + private final GetTeamPort getTeamPort; + private final ListProjectsForTeamPort listProjectsForTeamPort; - public ListProjectsForTeamService(GetTeamPort getTeamPort, ListProjectsForTeamPort listProjectsForTeamPort) { - this.getTeamPort = getTeamPort; - this.listProjectsForTeamPort = listProjectsForTeamPort; - } + public ListProjectsForTeamService( + GetTeamPort getTeamPort, ListProjectsForTeamPort listProjectsForTeamPort) { + this.getTeamPort = getTeamPort; + this.listProjectsForTeamPort = listProjectsForTeamPort; + } - @Override - public List listProjects(long teamId) { - if(getTeamPort.existsById(teamId)){ - return listProjectsForTeamPort.listProjects(teamId); - } else { - throw new TeamNotFoundException(teamId); - } + @Override + public List listProjects(long teamId) { + if (getTeamPort.existsById(teamId)) { + return listProjectsForTeamPort.listProjects(teamId); + } else { + throw new TeamNotFoundException(teamId); } + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java index 5c886f715..171b6d26e 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java @@ -5,27 +5,27 @@ import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsForProjectPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListTeamsForProjectService implements ListTeamsForProjectUseCase { - private final ListTeamsForProjectPort listTeamsForProjectPort; - private final GetProjectPort getProjectPort; + private final ListTeamsForProjectPort listTeamsForProjectPort; + private final GetProjectPort getProjectPort; - public ListTeamsForProjectService(ListTeamsForProjectPort listTeamsForProjectPort, GetProjectPort getProjectPort) { - this.listTeamsForProjectPort = listTeamsForProjectPort; - this.getProjectPort = getProjectPort; - } + public ListTeamsForProjectService( + ListTeamsForProjectPort listTeamsForProjectPort, GetProjectPort getProjectPort) { + this.listTeamsForProjectPort = listTeamsForProjectPort; + this.getProjectPort = getProjectPort; + } - @Override - public List listTeamsForProject(long projectId) { - if(getProjectPort.existsById(projectId)){ - return listTeamsForProjectPort.listTeamsForProject(projectId); - } else { - throw new ProjectNotFoundException(projectId); - } + @Override + public List listTeamsForProject(long projectId) { + if (getProjectPort.existsById(projectId)) { + return listTeamsForProjectPort.listTeamsForProject(projectId); + } else { + throw new ProjectNotFoundException(projectId); } + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java index 4de2043c5..c40a82ee2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java @@ -5,27 +5,27 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsForUserPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListTeamsForUserService implements ListTeamsForUserUseCase { - private final GetUserPort getUserPort; - private final ListTeamsForUserPort listTeamsForUserPort; + private final GetUserPort getUserPort; + private final ListTeamsForUserPort listTeamsForUserPort; - public ListTeamsForUserService(GetUserPort getUserPort, ListTeamsForUserPort listTeamsForUserPort) { - this.getUserPort = getUserPort; - this.listTeamsForUserPort = listTeamsForUserPort; - } + public ListTeamsForUserService( + GetUserPort getUserPort, ListTeamsForUserPort listTeamsForUserPort) { + this.getUserPort = getUserPort; + this.listTeamsForUserPort = listTeamsForUserPort; + } - @Override - public List listTeamsForUser(long userId) { - if(getUserPort.existsById(userId)){ - return listTeamsForUserPort.listTeamsForUser(userId); - } else { - throw new UserNotFoundException(userId); - } + @Override + public List listTeamsForUser(long userId) { + if (getUserPort.existsById(userId)) { + return listTeamsForUserPort.listTeamsForUser(userId); + } else { + throw new UserNotFoundException(userId); } + } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java index 84679642d..20f8ee84f 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java @@ -2,16 +2,15 @@ import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import org.neo4j.ogm.annotation.NodeEntity; import org.neo4j.ogm.annotation.Relationship; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - /** @see io.reflectoring.coderadar.projectadministration.domain.Project */ @NodeEntity @Data diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/TeamMapper.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/TeamMapper.java new file mode 100644 index 000000000..7a5245c28 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/TeamMapper.java @@ -0,0 +1,29 @@ +package io.reflectoring.coderadar.graph.useradministration; + +import io.reflectoring.coderadar.graph.Mapper; +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.useradministration.domain.Team; + +public class TeamMapper implements Mapper { + + private final UserMapper userMapper = new UserMapper(); + + @Override + public Team mapGraphObject(TeamEntity nodeEntity) { + Team team = new Team(); + team.setName(nodeEntity.getName()); + team.setMembers(userMapper.mapNodeEntities(nodeEntity.getMembers())); + team.setId(nodeEntity.getId()); + return team; + } + + @Override + public TeamEntity mapDomainObject(Team domainObject) { + TeamEntity teamEntity = new TeamEntity(); + teamEntity.setName(domainObject.getName()); + teamEntity.setMembers( + userMapper.mapDomainObjects( + domainObject.getMembers())); // TODO: I don't think we should be doing this. + return teamEntity; + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java new file mode 100644 index 000000000..2bf01d5c6 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java @@ -0,0 +1,14 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter; + +import io.reflectoring.coderadar.projectadministration.domain.Project; +import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForUserPort; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public class ListProjectsForUserAdapter implements ListProjectsForUserPort { + @Override + public List listProjects(long userId) { + return null; + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListUsersAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListUsersAdapter.java new file mode 100644 index 000000000..38792c5c7 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListUsersAdapter.java @@ -0,0 +1,28 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter; + +import io.reflectoring.coderadar.graph.useradministration.UserMapper; +import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import io.reflectoring.coderadar.useradministration.domain.User; +import io.reflectoring.coderadar.useradministration.port.driven.ListUsersPort; +import java.util.ArrayList; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public class ListUsersAdapter implements ListUsersPort { + + private final UserRepository userRepository; + private final UserMapper userMapper = new UserMapper(); + + public ListUsersAdapter(UserRepository userRepository) { + this.userRepository = userRepository; + } + + @Override + public List listUsers() { + List userEntities = new ArrayList<>(); + userRepository.findAll(0).iterator().forEachRemaining(userEntities::add); + return userMapper.mapNodeEntities(userEntities); + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddTeamToProjectAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddTeamToProjectAdapter.java new file mode 100644 index 000000000..46e7ebb58 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddTeamToProjectAdapter.java @@ -0,0 +1,21 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import io.reflectoring.coderadar.useradministration.port.driven.AddTeamToProjectPort; +import org.springframework.stereotype.Service; + +@Service +public class AddTeamToProjectAdapter implements AddTeamToProjectPort { + + private final TeamRepository teamRepository; + + public AddTeamToProjectAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } + + @Override + public void addTeamToProject(long projectId, long teamId, ProjectRole role) { + teamRepository.addTeamToProject(projectId, teamId, role.getValue()); + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/CreateTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/CreateTeamAdapter.java new file mode 100644 index 000000000..4bdec5d05 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/CreateTeamAdapter.java @@ -0,0 +1,28 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import io.reflectoring.coderadar.useradministration.port.driven.CreateTeamPort; +import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; +import org.springframework.stereotype.Service; + +@Service +public class CreateTeamAdapter implements CreateTeamPort { + + private final TeamRepository teamRepository; + private final UserRepository userRepository; + + public CreateTeamAdapter(TeamRepository teamRepository, UserRepository userRepository) { + this.teamRepository = teamRepository; + this.userRepository = userRepository; + } + + @Override + public Long createTeam(CreateTeamCommand createTeamCommand) { + TeamEntity teamEntity = new TeamEntity(); + teamEntity.setMembers(userRepository.findAllByIds(createTeamCommand.getUserIds())); + teamEntity.setName(createTeamCommand.getName()); + return teamRepository.save(teamEntity, 1).getId(); + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteTeamAdapter.java new file mode 100644 index 000000000..149d9d02c --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteTeamAdapter.java @@ -0,0 +1,20 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.useradministration.port.driven.DeleteTeamPort; +import org.springframework.stereotype.Service; + +@Service +public class DeleteTeamAdapter implements DeleteTeamPort { + + private final TeamRepository teamRepository; + + public DeleteTeamAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } + + @Override + public void deleteTeam(long teamId) { + teamRepository.deleteById(teamId); + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java new file mode 100644 index 000000000..8b1c09363 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java @@ -0,0 +1,24 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.graph.projectadministration.project.ProjectMapper; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.projectadministration.domain.Project; +import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForTeamPort; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public class ListProjectsForTeamAdapter implements ListProjectsForTeamPort { + + private final ProjectMapper projectMapper = new ProjectMapper(); + private final TeamRepository teamRepository; + + public ListProjectsForTeamAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } + + @Override + public List listProjects(long teamId) { + return projectMapper.mapNodeEntities(teamRepository.listProjectByTeamId(teamId)); + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForUserAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForUserAdapter.java new file mode 100644 index 000000000..77bd1bc63 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForUserAdapter.java @@ -0,0 +1,24 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.graph.useradministration.TeamMapper; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsForUserPort; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public class ListTeamsForUserAdapter implements ListTeamsForUserPort { + + private final TeamRepository teamRepository; + private final TeamMapper teamMapper = new TeamMapper(); + + public ListTeamsForUserAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } + + @Override + public List listTeamsForUser(long userId) { + return teamMapper.mapNodeEntities(teamRepository.listTeamsByUserId(userId)); + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java index bac669bf1..7b1214dd1 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java @@ -1,23 +1,21 @@ package io.reflectoring.coderadar.graph.useradministration.domain; import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import java.util.List; import lombok.Data; import lombok.NoArgsConstructor; import org.neo4j.ogm.annotation.NodeEntity; import org.neo4j.ogm.annotation.Relationship; -import java.util.List; - @NodeEntity @Data @NoArgsConstructor public class TeamEntity { - private Long id; - private String name; - - @Relationship(value = "IS_IN", direction = Relationship.INCOMING) - private List members; + private Long id; + private String name; - private ProjectRole role; + @Relationship(value = "IS_IN", direction = Relationship.INCOMING) + private List members; + private ProjectRole role; } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java new file mode 100644 index 000000000..b26fffbda --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java @@ -0,0 +1,39 @@ +package io.reflectoring.coderadar.graph.useradministration.repository; + +import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import java.util.List; +import org.springframework.data.neo4j.annotation.Query; +import org.springframework.data.neo4j.repository.Neo4jRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface TeamRepository extends Neo4jRepository { + + /** + * @param userId The user id. + * @return All teams the user is in. + */ + @Query("MATCH (u)-[:IS_IN]->(t) WHERE ID(u) = {0} RETURN t") + List listTeamsByUserId(long userId); + + /** + * Creates a [:HAS_TEAM] relationship between a project and a team. + * + * @param projectId The id of the project. + * @param teamId The id of the team. + * @param role The role of the team in the project. + */ + @Query( + "MATCH (p) WHERE ID(p) = {0} " + + "MATCH (t) WHERE ID(t) = {1} WITH p, t " + + "CREATE (p)-[r:HAS_TEAM {role: {2}}]->(t)") + void addTeamToProject(long projectId, long teamId, String role); + + /** + * @param teamId The team id. + * @return All the project a team is assigned to. + */ + @Query("MATCH (t)<-[:HAS_TEAM]-(p) WHERE ID(t) = {0} RETURN p") + List listProjectByTeamId(long teamId); +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java index da49f75a5..09718d5a1 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java @@ -2,35 +2,34 @@ import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; - import java.util.ArrayList; import java.util.List; public class GetProjectResponseMapper { - private GetProjectResponseMapper() {} + private GetProjectResponseMapper() {} - public static GetProjectResponse mapProject(Project project) { - return new GetProjectResponse() - .setName(project.getName()) - .setId(project.getId()) - .setStartDate(project.getVcsStart()) - .setVcsOnline(project.isVcsOnline()) - .setVcsUrl(project.getVcsUrl()) - .setVcsUsername(project.getVcsUsername()); - } + public static GetProjectResponse mapProject(Project project) { + return new GetProjectResponse() + .setName(project.getName()) + .setId(project.getId()) + .setStartDate(project.getVcsStart()) + .setVcsOnline(project.isVcsOnline()) + .setVcsUrl(project.getVcsUrl()) + .setVcsUsername(project.getVcsUsername()); + } - public static List mapProjects(List projects) { - List responses = new ArrayList<>(projects.size()); - for (Project project : projects) { - responses.add( - new GetProjectResponse() - .setName(project.getName()) - .setId(project.getId()) - .setStartDate(project.getVcsStart()) - .setVcsOnline(project.isVcsOnline()) - .setVcsUrl(project.getVcsUrl()) - .setVcsUsername(project.getVcsUsername())); - } - return responses; + public static List mapProjects(List projects) { + List responses = new ArrayList<>(projects.size()); + for (Project project : projects) { + responses.add( + new GetProjectResponse() + .setName(project.getName()) + .setId(project.getId()) + .setStartDate(project.getVcsStart()) + .setVcsOnline(project.isVcsOnline()) + .setVcsUrl(project.getVcsUrl()) + .setVcsUsername(project.getVcsUsername())); } + return responses; + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java index 4b9de13b6..b6bc666a9 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java @@ -1,25 +1,24 @@ package io.reflectoring.coderadar.rest; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.ArrayList; import java.util.List; -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; - public class GetTeamResponseMapper { - private GetTeamResponseMapper() {} + private GetTeamResponseMapper() {} - public static GetTeamResponse mapTeam(Team team) { - return new GetTeamResponse(team.getId(), team.getName(), mapUsers(team.getMembers())); - } + public static GetTeamResponse mapTeam(Team team) { + return new GetTeamResponse(team.getId(), team.getName(), mapUsers(team.getMembers())); + } - public static List mapTeams(List teams) { - List result = new ArrayList<>(teams.size()); - for (Team team : teams) { - result.add(new GetTeamResponse(team.getId(), team.getName(), mapUsers(team.getMembers()))); - } - return result; + public static List mapTeams(List teams) { + List result = new ArrayList<>(teams.size()); + for (Team team : teams) { + result.add(new GetTeamResponse(team.getId(), team.getName(), mapUsers(team.getMembers()))); } + return result; + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java index 18c3645d3..00a583bac 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java @@ -2,22 +2,21 @@ import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; - import java.util.ArrayList; import java.util.List; public class GetUserResponseMapper { - private GetUserResponseMapper() {} + private GetUserResponseMapper() {} - public static GetUserResponse mapUser(User user) { - return new GetUserResponse(user.getId(), user.getUsername()); - } + public static GetUserResponse mapUser(User user) { + return new GetUserResponse(user.getId(), user.getUsername()); + } - public static List mapUsers(List users) { - List result = new ArrayList<>(users.size()); - for (User user : users) { - result.add(new GetUserResponse(user.getId(), user.getUsername())); - } - return result; + public static List mapUsers(List users) { + List result = new ArrayList<>(users.size()); + for (User user : users) { + result.add(new GetUserResponse(user.getId(), user.getUsername())); } + return result; + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java index 1400aa848..d08e0a915 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java @@ -1,16 +1,15 @@ package io.reflectoring.coderadar.rest.domain; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data @NoArgsConstructor @AllArgsConstructor public class GetTeamResponse { - private long id; - private String name; - private List members; + private long id; + private String name; + private List members; } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java index a6e2b145e..edbdbc9a2 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.project; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProject; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.GetProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; @@ -12,8 +14,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProject; - @Transactional @RestController public class GetProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java index 24e267835..cc7c13811 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.rest.project; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.ListProjectsUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; -import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -13,8 +14,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; - @Transactional @RestController public class ListProjectsController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java index 925722465..8861264f2 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.useradministration; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUser; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; @@ -12,8 +14,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUser; - @RestController @Transactional public class GetUserController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java index b1bf85650..b554d7687 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; @@ -11,22 +14,18 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; - @RestController @Transactional public class ListProjectsForUserController implements AbstractBaseController { - private final ListProjectsForUserUseCase listProjectsForUserUseCase; + private final ListProjectsForUserUseCase listProjectsForUserUseCase; - public ListProjectsForUserController(ListProjectsForUserUseCase listProjectsForUserUseCase) { - this.listProjectsForUserUseCase = listProjectsForUserUseCase; - } + public ListProjectsForUserController(ListProjectsForUserUseCase listProjectsForUserUseCase) { + this.listProjectsForUserUseCase = listProjectsForUserUseCase; + } - @GetMapping(path = "/users/{userId}/projects") - public ResponseEntity> listProjectsForUser(@PathVariable long userId) { - List projects = listProjectsForUserUseCase.listProjects(userId); - return new ResponseEntity<>(mapProjects(projects), HttpStatus.OK); - } + @GetMapping(path = "/users/{userId}/projects") + public ResponseEntity> listProjectsForUser(@PathVariable long userId) { + List projects = listProjectsForUserUseCase.listProjects(userId); + return new ResponseEntity<>(mapProjects(projects), HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java index 61e6cdf35..152a5c8f5 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,22 +14,18 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; - @RestController @Transactional public class ListUsersController implements AbstractBaseController { - private final ListUsersUseCase listUsersUseCase; + private final ListUsersUseCase listUsersUseCase; - public ListUsersController(ListUsersUseCase listUsersUseCase) { - this.listUsersUseCase = listUsersUseCase; - } + public ListUsersController(ListUsersUseCase listUsersUseCase) { + this.listUsersUseCase = listUsersUseCase; + } - @GetMapping(path = "/users", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> listUsers() { - List users = listUsersUseCase.listUsers(); - return new ResponseEntity<>(mapUsers(users), HttpStatus.OK); - } + @GetMapping(path = "/users", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity> listUsers() { + List users = listUsersUseCase.listUsers(); + return new ResponseEntity<>(mapUsers(users), HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/DeleteUserRoleForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/DeleteUserRoleForProjectController.java index ed0e5c35f..1c0dc15a0 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/DeleteUserRoleForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/DeleteUserRoleForProjectController.java @@ -12,15 +12,17 @@ @RestController @Transactional public class DeleteUserRoleForProjectController implements AbstractBaseController { - private final DeleteUserRoleForProjectUseCase deleteUserRoleForProjectUseCase; + private final DeleteUserRoleForProjectUseCase deleteUserRoleForProjectUseCase; - public DeleteUserRoleForProjectController(DeleteUserRoleForProjectUseCase deleteUserRoleForProjectUseCase) { - this.deleteUserRoleForProjectUseCase = deleteUserRoleForProjectUseCase; - } + public DeleteUserRoleForProjectController( + DeleteUserRoleForProjectUseCase deleteUserRoleForProjectUseCase) { + this.deleteUserRoleForProjectUseCase = deleteUserRoleForProjectUseCase; + } - @DeleteMapping(path = "/projects/{projectId}/users/{userId}") - public ResponseEntity deleteUserRoleForProject(@PathVariable long projectId, @PathVariable long userId) { - deleteUserRoleForProjectUseCase.deleteRole(projectId, userId); - return new ResponseEntity<>(HttpStatus.OK); - } + @DeleteMapping(path = "/projects/{projectId}/users/{userId}") + public ResponseEntity deleteUserRoleForProject( + @PathVariable long projectId, @PathVariable long userId) { + deleteUserRoleForProjectUseCase.deleteRole(projectId, userId); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java index f52f10043..0a2ea794c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java @@ -13,15 +13,18 @@ @RestController @Transactional public class SetUserRoleForProjectController implements AbstractBaseController { - private final SetUserRoleForProjectUseCase setUserRoleForProjectUseCase; + private final SetUserRoleForProjectUseCase setUserRoleForProjectUseCase; - public SetUserRoleForProjectController(SetUserRoleForProjectUseCase setUserRoleForProjectUseCase) { - this.setUserRoleForProjectUseCase = setUserRoleForProjectUseCase; - } + public SetUserRoleForProjectController( + SetUserRoleForProjectUseCase setUserRoleForProjectUseCase) { + this.setUserRoleForProjectUseCase = setUserRoleForProjectUseCase; + } - @PostMapping(path = "/projects/{projectId}/users/{userId}") - public ResponseEntity setUserRoleForProject(@PathVariable long projectId, @PathVariable long userId) { - setUserRoleForProjectUseCase.setRole(projectId, userId, ProjectRole.ADMIN); // TODO: change last parameter - return new ResponseEntity<>(HttpStatus.OK); - } + @PostMapping(path = "/projects/{projectId}/users/{userId}") + public ResponseEntity setUserRoleForProject( + @PathVariable long projectId, @PathVariable long userId) { + setUserRoleForProjectUseCase.setRole( + projectId, userId, ProjectRole.ADMIN); // TODO: change last parameter + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java index 498ad70ae..1a6f8b708 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java @@ -12,15 +12,16 @@ @RestController @Transactional public class AddTeamToProjectController implements AbstractBaseController { - private final AddTeamToProjectUseCase addTeamToProjectUseCase; + private final AddTeamToProjectUseCase addTeamToProjectUseCase; - public AddTeamToProjectController(AddTeamToProjectUseCase addTeamToProjectUseCase) { - this.addTeamToProjectUseCase = addTeamToProjectUseCase; - } + public AddTeamToProjectController(AddTeamToProjectUseCase addTeamToProjectUseCase) { + this.addTeamToProjectUseCase = addTeamToProjectUseCase; + } - @PostMapping(path = "/projects/{projectId}/teams/{teamId}") - public ResponseEntity addTeamToProject(@PathVariable long projectId, @PathVariable long teamId) { - addTeamToProjectUseCase.addTeamToProject(projectId, teamId); - return new ResponseEntity<>(HttpStatus.OK); - } + @PostMapping(path = "/projects/{projectId}/teams/{teamId}") + public ResponseEntity addTeamToProject( + @PathVariable long projectId, @PathVariable long teamId) { + addTeamToProjectUseCase.addTeamToProject(projectId, teamId); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java index 9951b53f6..ff6dcb099 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,20 +12,19 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @RestController @Transactional public class AddUsersToTeamController implements AbstractBaseController { - private final AddUsersToTeamUseCase addUsersToTeamUseCase; + private final AddUsersToTeamUseCase addUsersToTeamUseCase; - public AddUsersToTeamController(AddUsersToTeamUseCase addUsersToTeamUseCase) { - this.addUsersToTeamUseCase = addUsersToTeamUseCase; - } + public AddUsersToTeamController(AddUsersToTeamUseCase addUsersToTeamUseCase) { + this.addUsersToTeamUseCase = addUsersToTeamUseCase; + } - @PostMapping(path = "/teams/{teamId}/users", consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity addUsersToTeam(@PathVariable long teamId, @RequestBody List userIds) { - addUsersToTeamUseCase.addUsersToTeam(teamId, userIds); - return new ResponseEntity<>(HttpStatus.OK); - } + @PostMapping(path = "/teams/{teamId}/users", consumes = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity addUsersToTeam( + @PathVariable long teamId, @RequestBody List userIds) { + addUsersToTeamUseCase.addUsersToTeam(teamId, userIds); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamController.java index bc79ff865..fb18c36bd 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamController.java @@ -12,15 +12,15 @@ @RestController @Transactional public class DeleteTeamController implements AbstractBaseController { - private final DeleteTeamUseCase deleteTeamUseCase; + private final DeleteTeamUseCase deleteTeamUseCase; - public DeleteTeamController(DeleteTeamUseCase deleteTeamUseCase) { - this.deleteTeamUseCase = deleteTeamUseCase; - } + public DeleteTeamController(DeleteTeamUseCase deleteTeamUseCase) { + this.deleteTeamUseCase = deleteTeamUseCase; + } - @DeleteMapping(path = "/teams/{teamId}") - public ResponseEntity deleteTeam(@PathVariable long teamId) { - deleteTeamUseCase.deleteTeam(teamId); - return new ResponseEntity<>(HttpStatus.OK); - } + @DeleteMapping(path = "/teams/{teamId}") + public ResponseEntity deleteTeam(@PathVariable long teamId) { + deleteTeamUseCase.deleteTeam(teamId); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java index 50302b20e..2b561638f 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteUsersFromTeamUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,20 +12,19 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @RestController @Transactional -public class DeleteUsersFromTeamController implements AbstractBaseController { - private final DeleteUsersFromTeamUseCase deleteUsersFromTeamUseCase; +public class DeleteUsersFromTeamController implements AbstractBaseController { + private final DeleteUsersFromTeamUseCase deleteUsersFromTeamUseCase; - public DeleteUsersFromTeamController(DeleteUsersFromTeamUseCase deleteUsersFromTeamUseCase) { - this.deleteUsersFromTeamUseCase = deleteUsersFromTeamUseCase; - } + public DeleteUsersFromTeamController(DeleteUsersFromTeamUseCase deleteUsersFromTeamUseCase) { + this.deleteUsersFromTeamUseCase = deleteUsersFromTeamUseCase; + } - @DeleteMapping(path = "/teams/{teamId}/users", consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity deleteUsersFromTeam(@PathVariable long teamId, @RequestBody List userIds) { - deleteUsersFromTeamUseCase.deleteUsersFromTeam(teamId, userIds); - return new ResponseEntity<>(HttpStatus.OK); - } + @DeleteMapping(path = "/teams/{teamId}/users", consumes = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity deleteUsersFromTeam( + @PathVariable long teamId, @RequestBody List userIds) { + deleteUsersFromTeamUseCase.deleteUsersFromTeam(teamId, userIds); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java index 145885331..42612384a 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeam; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; @@ -11,21 +13,18 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeam; -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; - @RestController @Transactional public class GetTeamController implements AbstractBaseController { - private final GetTeamUseCase getTeamUseCase; + private final GetTeamUseCase getTeamUseCase; - public GetTeamController(GetTeamUseCase getTeamUseCase) { - this.getTeamUseCase = getTeamUseCase; - } + public GetTeamController(GetTeamUseCase getTeamUseCase) { + this.getTeamUseCase = getTeamUseCase; + } - @GetMapping(path = "/teams/{teamId}") - public ResponseEntity getTeam(@PathVariable long teamId) { - Team team = getTeamUseCase.get(teamId); - return new ResponseEntity<>(mapTeam(team), HttpStatus.OK); - } + @GetMapping(path = "/teams/{teamId}") + public ResponseEntity getTeam(@PathVariable long teamId) { + Team team = getTeamUseCase.get(teamId); + return new ResponseEntity<>(mapTeam(team), HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java index 8e3953ef9..9c21f09e4 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java @@ -1,10 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.AbstractBaseController; -import io.reflectoring.coderadar.rest.GetProjectResponseMapper; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; @@ -12,22 +14,18 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; - @RestController @Transactional public class ListProjectsForTeamController implements AbstractBaseController { - private final ListProjectsForTeamUseCase listProjectsForTeamUseCase; + private final ListProjectsForTeamUseCase listProjectsForTeamUseCase; - public ListProjectsForTeamController(ListProjectsForTeamUseCase listProjectsForTeamUseCase) { - this.listProjectsForTeamUseCase = listProjectsForTeamUseCase; - } + public ListProjectsForTeamController(ListProjectsForTeamUseCase listProjectsForTeamUseCase) { + this.listProjectsForTeamUseCase = listProjectsForTeamUseCase; + } - @GetMapping(path = "/teams/{teamId}/projects") - public ResponseEntity> listProjectsForTeam(@PathVariable long teamId) { - List projects = listProjectsForTeamUseCase.listProjects(teamId); - return new ResponseEntity<>(mapProjects(projects), HttpStatus.OK); - } + @GetMapping(path = "/teams/{teamId}/projects") + public ResponseEntity> listProjectsForTeam(@PathVariable long teamId) { + List projects = listProjectsForTeamUseCase.listProjects(teamId); + return new ResponseEntity<>(mapProjects(projects), HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java index f50ea7b33..30fa2d5f6 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; @@ -11,22 +14,18 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - @RestController @Transactional public class ListTeamsForProjectController implements AbstractBaseController { - private final ListTeamsForProjectUseCase listTeamsForProjectUseCase; + private final ListTeamsForProjectUseCase listTeamsForProjectUseCase; - public ListTeamsForProjectController(ListTeamsForProjectUseCase listTeamsForProjectUseCase) { - this.listTeamsForProjectUseCase = listTeamsForProjectUseCase; - } + public ListTeamsForProjectController(ListTeamsForProjectUseCase listTeamsForProjectUseCase) { + this.listTeamsForProjectUseCase = listTeamsForProjectUseCase; + } - @GetMapping(path = "/projects/{projectId/teams") - public ResponseEntity> listTeamsForProject(@PathVariable long projectId) { - List teams = listTeamsForProjectUseCase.listTeamsForProject(projectId); - return new ResponseEntity<>(mapTeams(teams), HttpStatus.OK); - } + @GetMapping(path = "/projects/{projectId/teams") + public ResponseEntity> listTeamsForProject(@PathVariable long projectId) { + List teams = listTeamsForProjectUseCase.listTeamsForProject(projectId); + return new ResponseEntity<>(mapTeams(teams), HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java index 66c15c732..ff83c9a52 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; @@ -11,22 +14,18 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - @RestController @Transactional public class ListTeamsForUserController implements AbstractBaseController { - private final ListTeamsForUserUseCase listTeamsForUserUseCase; + private final ListTeamsForUserUseCase listTeamsForUserUseCase; - public ListTeamsForUserController(ListTeamsForUserUseCase listTeamsForUserUseCase) { - this.listTeamsForUserUseCase = listTeamsForUserUseCase; - } + public ListTeamsForUserController(ListTeamsForUserUseCase listTeamsForUserUseCase) { + this.listTeamsForUserUseCase = listTeamsForUserUseCase; + } - @GetMapping(path = "/users/{userId}/teams") - public ResponseEntity> listTeamsForUser(@PathVariable long userId) { - List teams = listTeamsForUserUseCase.listTeamsForUser(userId); - return new ResponseEntity<>(mapTeams(teams), HttpStatus.OK); - } + @GetMapping(path = "/users/{userId}/teams") + public ResponseEntity> listTeamsForUser(@PathVariable long userId) { + List teams = listTeamsForUserUseCase.listTeamsForUser(userId); + return new ResponseEntity<>(mapTeams(teams), HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java index c1a2d78a7..3826751eb 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java @@ -12,16 +12,18 @@ @RestController @Transactional public class RemoveTeamFromProjectController implements AbstractBaseController { - private final RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase; + private final RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase; - public RemoveTeamFromProjectController(RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase) { - this.removeTeamFromProjectUseCase = removeTeamFromProjectUseCase; - } + public RemoveTeamFromProjectController( + RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase) { + this.removeTeamFromProjectUseCase = removeTeamFromProjectUseCase; + } - // TODO: which http method should be used here? - @PostMapping(path = "/project/{projectId}/teams/{teamId}") - public ResponseEntity removeTeamFromProject(@PathVariable long projectId, @PathVariable long teamId) { - removeTeamFromProjectUseCase.removeTeam(teamId); // TODO: change signature of this method - return new ResponseEntity<>(HttpStatus.OK); - } + // TODO: which http method should be used here? + @PostMapping(path = "/project/{projectId}/teams/{teamId}") + public ResponseEntity removeTeamFromProject( + @PathVariable long projectId, @PathVariable long teamId) { + removeTeamFromProjectUseCase.removeTeam(teamId); // TODO: change signature of this method + return new ResponseEntity<>(HttpStatus.OK); + } } From a52b8ad0c74caae0d8de95656ed220d1f1d73a84 Mon Sep 17 00:00:00 2001 From: Kilian Krause Date: Wed, 6 May 2020 08:37:03 +0200 Subject: [PATCH 09/76] create adapters --- .../service/project/ListProjectsService.java | 5 ++++ .../get/ListProjectsForUserService.java | 2 ++ .../service/get/ListUsersService.java | 9 ++++---- .../teams/AddTeamToProjectService.java | 5 ++-- .../teams/DeleteUsersFromTeamService.java | 9 ++++---- .../teams/get/ListProjectsForTeamService.java | 2 ++ .../DeleteUserRoleForProjectAdapter.java | 12 ++++++++++ .../SetUserRoleForProjectAdapter.java | 13 +++++++++++ .../adapter/teams/AddUsersToTeamAdapter.java | 13 +++++++++++ .../adapter/teams/DeleteTeamAdapter.java | 2 ++ .../teams/DeleteUsersFromTeamAdapter.java | 13 +++++++++++ .../adapter/teams/GetTeamAdapter.java | 23 +++++++++++++++++++ .../teams/ListTeamsForProjectAdapter.java | 14 +++++++++++ .../teams/RemoveTeamFromProjectAdapter.java | 12 ++++++++++ .../teams/AddTeamToProjectController.java | 3 ++- coderadar-ui/package-lock.json | 12 +++++----- 16 files changed, 132 insertions(+), 17 deletions(-) create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/DeleteUserRoleForProjectAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/SetUserRoleForProjectAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddUsersToTeamAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteUsersFromTeamAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/GetTeamAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForProjectAdapter.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/RemoveTeamFromProjectAdapter.java diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java index aa9fb10d8..a577e39e1 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java @@ -19,4 +19,9 @@ public ListProjectsService(ListProjectsPort listProjectsPort) { public List listProjects() { return listProjectsPort.getProjects(); } + + @Override + public List listProjectsForUser(long userId) { + return null; // TODO: implement + } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java index 52053d383..ece517eab 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java @@ -6,7 +6,9 @@ import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForUserPort; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; import java.util.List; +import org.springframework.stereotype.Service; +@Service public class ListProjectsForUserService implements ListProjectsForUserUseCase { private final ListProjectsForUserPort listProjectsForUserPort; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java index 074e094b0..850467661 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.service.get; import io.reflectoring.coderadar.useradministration.domain.User; +import io.reflectoring.coderadar.useradministration.port.driven.ListUsersPort; import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; import java.util.List; import org.springframework.stereotype.Service; @@ -8,14 +9,14 @@ @Service public class ListUsersService implements ListUsersUseCase { - private final ListUsersService listUsersService; + private final ListUsersPort listUsersPort; - public ListUsersService(ListUsersService listUsersService) { - this.listUsersService = listUsersService; + public ListUsersService(ListUsersPort listUsersPort) { + this.listUsersPort = listUsersPort; } @Override public List listUsers() { - return listUsersService.listUsers(); + return listUsersPort.listUsers(); } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java index c7f95145a..c8a6af03e 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; import io.reflectoring.coderadar.useradministration.port.driven.AddTeamToProjectPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddTeamToProjectUseCase; import org.springframework.stereotype.Service; @@ -19,10 +20,10 @@ public AddTeamToProjectService( } @Override - public void addTeamToProject(long projectId, long teamId) { + public void addTeamToProject(long projectId, long teamId, ProjectRole role) { if (!getProjectPort.existsById(projectId)) { throw new ProjectNotFoundException(projectId); } - addTeamToProjectPort.addTeamToProject(projectId, teamId); + addTeamToProjectPort.addTeamToProject(projectId, teamId, role); } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java index e4aa81f06..4f40dc3b5 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.UserNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driven.DeleteUsersFromTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteUsersFromTeamUseCase; @@ -13,15 +14,15 @@ public class DeleteUsersFromTeamService implements DeleteUsersFromTeamUseCase { private final GetTeamPort getTeamPort; private final GetUserPort getUserPort; - private final DeleteUsersFromTeamService deleteUsersFromTeamService; + private final DeleteUsersFromTeamPort deleteUsersFromTeamPort; public DeleteUsersFromTeamService( GetTeamPort getTeamPort, GetUserPort getUserPort, - DeleteUsersFromTeamService deleteUsersFromTeamService) { + DeleteUsersFromTeamPort deleteUsersFromTeamPort) { this.getTeamPort = getTeamPort; this.getUserPort = getUserPort; - this.deleteUsersFromTeamService = deleteUsersFromTeamService; + this.deleteUsersFromTeamPort = deleteUsersFromTeamPort; } @Override @@ -34,6 +35,6 @@ public void deleteUsersFromTeam(long teamId, List userIds) { throw new UserNotFoundException(userId); } } - deleteUsersFromTeamService.deleteUsersFromTeam(teamId, userIds); + deleteUsersFromTeamPort.deleteUsersFromTeam(teamId, userIds); } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java index 269e8ba93..b170b8cdd 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java @@ -6,7 +6,9 @@ import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForTeamPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; import java.util.List; +import org.springframework.stereotype.Service; +@Service public class ListProjectsForTeamService implements ListProjectsForTeamUseCase { private final GetTeamPort getTeamPort; diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/DeleteUserRoleForProjectAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/DeleteUserRoleForProjectAdapter.java new file mode 100644 index 000000000..75fb69040 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/DeleteUserRoleForProjectAdapter.java @@ -0,0 +1,12 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.permissions; + +import io.reflectoring.coderadar.useradministration.port.driven.DeleteUserRoleForProjectPort; +import org.springframework.stereotype.Service; + +@Service +public class DeleteUserRoleForProjectAdapter implements DeleteUserRoleForProjectPort { + @Override + public void deleteRole(long projectId, long userId) { + // TODO: implement + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/SetUserRoleForProjectAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/SetUserRoleForProjectAdapter.java new file mode 100644 index 000000000..4c5ec5d63 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/SetUserRoleForProjectAdapter.java @@ -0,0 +1,13 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.permissions; + +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import io.reflectoring.coderadar.useradministration.port.driven.SetUserRoleForProjectPort; +import org.springframework.stereotype.Service; + +@Service +public class SetUserRoleForProjectAdapter implements SetUserRoleForProjectPort { + @Override + public void setRole(long projectId, long userId, ProjectRole role) { + // TODO: implement + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddUsersToTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddUsersToTeamAdapter.java new file mode 100644 index 000000000..aa33c7889 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddUsersToTeamAdapter.java @@ -0,0 +1,13 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.useradministration.port.driven.AddUsersToTeamPort; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public class AddUsersToTeamAdapter implements AddUsersToTeamPort { + @Override + public void addUsersToTeam(long teamId, List userIds) { + // TODO: implement + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteTeamAdapter.java index 05c6c2525..149d9d02c 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteTeamAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteTeamAdapter.java @@ -2,7 +2,9 @@ import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.useradministration.port.driven.DeleteTeamPort; +import org.springframework.stereotype.Service; +@Service public class DeleteTeamAdapter implements DeleteTeamPort { private final TeamRepository teamRepository; diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteUsersFromTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteUsersFromTeamAdapter.java new file mode 100644 index 000000000..dd28915cb --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteUsersFromTeamAdapter.java @@ -0,0 +1,13 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.useradministration.port.driven.DeleteUsersFromTeamPort; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public class DeleteUsersFromTeamAdapter implements DeleteUsersFromTeamPort { + @Override + public void deleteUsersFromTeam(long teamId, List userIds) { + // TODO: implement + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/GetTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/GetTeamAdapter.java new file mode 100644 index 000000000..468f12f70 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/GetTeamAdapter.java @@ -0,0 +1,23 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; +import org.springframework.stereotype.Service; + +@Service +public class GetTeamAdapter implements GetTeamPort { + @Override + public Team get(long teamId) { + return null; // TODO: implement + } + + @Override + public boolean existsById(long teamId) { + return false; // TODO: implement + } + + @Override + public boolean existsByName(String name) { + return false; // TODO: implement + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForProjectAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForProjectAdapter.java new file mode 100644 index 000000000..f3bd307be --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForProjectAdapter.java @@ -0,0 +1,14 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsForProjectPort; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public class ListTeamsForProjectAdapter implements ListTeamsForProjectPort { + @Override + public List listTeamsForProject(long projectId) { + return null; // TODO: implement + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/RemoveTeamFromProjectAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/RemoveTeamFromProjectAdapter.java new file mode 100644 index 000000000..b5f021f9f --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/RemoveTeamFromProjectAdapter.java @@ -0,0 +1,12 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.useradministration.port.driven.RemoveTeamFromProjectPort; +import org.springframework.stereotype.Service; + +@Service +public class RemoveTeamFromProjectAdapter implements RemoveTeamFromProjectPort { + @Override + public void deleteTeam(long teamId) { + // TODO: implement + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java index 1a6f8b708..ae4a27258 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.rest.useradministration.teams; import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddTeamToProjectUseCase; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -21,7 +22,7 @@ public AddTeamToProjectController(AddTeamToProjectUseCase addTeamToProjectUseCas @PostMapping(path = "/projects/{projectId}/teams/{teamId}") public ResponseEntity addTeamToProject( @PathVariable long projectId, @PathVariable long teamId) { - addTeamToProjectUseCase.addTeamToProject(projectId, teamId); + addTeamToProjectUseCase.addTeamToProject(projectId, teamId, ProjectRole.ADMIN); // TODO return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/coderadar-ui/package-lock.json b/coderadar-ui/package-lock.json index d8e96dc26..2dcb2333b 100644 --- a/coderadar-ui/package-lock.json +++ b/coderadar-ui/package-lock.json @@ -485,9 +485,9 @@ } }, "@angular/elements": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-9.1.3.tgz", - "integrity": "sha512-67mIR+3Gpsu/E5wV2+jcW8YDfWLuID5piEgey9UnwDkp4YCNfs/+22yhmDi0JxwD+SPSSe1JJodJObxnNnQCxg==" + "version": "9.1.4", + "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-9.1.4.tgz", + "integrity": "sha512-VXb+/eZv2x8CsDESnk8ICysDE3C2Htuj76WiG6NO4X1aX26XLTvnT5YLnOJ+8l8L88eh6s80Rphw6Gr6amUXHA==" }, "@angular/flex-layout": { "version": "7.0.0-beta.24", @@ -7070,9 +7070,9 @@ } }, "moment": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + "version": "2.25.3", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz", + "integrity": "sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg==" }, "move-concurrently": { "version": "1.0.1", From 3336421b888ae661b85bc2a23e5abf5dd559b36e Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 6 May 2020 09:13:51 +0200 Subject: [PATCH 10/76] work on useradministration adapters --- .../domain/ProjectEntity.java | 3 --- .../project/repository/ProjectRepository.java | 18 ++++++++++++++++++ .../adapter/ListProjectsForUserAdapter.java | 15 +++++++++++++-- .../teams/ListProjectsForTeamAdapter.java | 13 +++++++------ .../useradministration/domain/TeamEntity.java | 5 +++++ .../useradministration/domain/UserEntity.java | 5 +++++ .../repository/TeamRepository.java | 9 +-------- .../repository/UserRepository.java | 1 + 8 files changed, 50 insertions(+), 19 deletions(-) diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java index 20f8ee84f..125d26c52 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java @@ -53,7 +53,4 @@ public class ProjectEntity { @Relationship(type = "HAS_BRANCH") private List branches = new ArrayList<>(); - - @Relationship(type = "HAS_TEAM") - private List teams; } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java index fcfb1577a..2de22be2c 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java @@ -159,6 +159,24 @@ public interface ProjectRepository extends Neo4jRepository + "CREATE (p)-[r:CONTAINS_COMMIT]->(c)") void attachCommitsWithIds(long projectId, @NonNull List commitIds); + /** + * + * @param projectId + */ @Query("MATCH (p)<-[r:WORKS_ON]-() WHERE ID(p) = {0} DELETE r") void deleteContributorRelationships(long projectId); + + /** + * @param userId The user id. + * @return All the project a user is assigned to. + */ + @Query("MATCH (u)-[:ASSIGNED_TO]->(p) WHERE ID(u) = {0} RETURN p") + List findProjectsByUsedId(long userId); + + /** + * @param teamId The team id. + * @return All the project a team is assigned to. + */ + @Query("MATCH (t)-[:ASSIGNED_TO]->(p) WHERE ID(t) = {0} RETURN p") + List listProjectByTeamId(long teamId); } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java index 2bf01d5c6..43ffb6a0e 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java @@ -1,14 +1,25 @@ package io.reflectoring.coderadar.graph.useradministration.adapter; +import io.reflectoring.coderadar.graph.projectadministration.project.ProjectMapper; +import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForUserPort; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListProjectsForUserAdapter implements ListProjectsForUserPort { + + private final ProjectRepository projectRepository; + private final ProjectMapper projectMapper = new ProjectMapper(); + + public ListProjectsForUserAdapter(ProjectRepository projectRepository) { + this.projectRepository = projectRepository; + } + @Override public List listProjects(long userId) { - return null; + return projectMapper.mapNodeEntities(projectRepository.findProjectsByUsedId(userId)); } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java index 8b1c09363..71511dd8e 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java @@ -1,24 +1,25 @@ package io.reflectoring.coderadar.graph.useradministration.adapter.teams; import io.reflectoring.coderadar.graph.projectadministration.project.ProjectMapper; -import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForTeamPort; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListProjectsForTeamAdapter implements ListProjectsForTeamPort { private final ProjectMapper projectMapper = new ProjectMapper(); - private final TeamRepository teamRepository; + private final ProjectRepository projectRepository; - public ListProjectsForTeamAdapter(TeamRepository teamRepository) { - this.teamRepository = teamRepository; + public ListProjectsForTeamAdapter(ProjectRepository projectRepository) { + this.projectRepository = projectRepository; } @Override public List listProjects(long teamId) { - return projectMapper.mapNodeEntities(teamRepository.listProjectByTeamId(teamId)); + return projectMapper.mapNodeEntities(projectRepository.listProjectByTeamId(teamId)); } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java index 7ba8edf58..e67d67982 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java @@ -1,6 +1,8 @@ package io.reflectoring.coderadar.graph.useradministration.domain; import java.util.List; + +import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import lombok.Data; import lombok.NoArgsConstructor; import org.neo4j.ogm.annotation.NodeEntity; @@ -15,4 +17,7 @@ public class TeamEntity { @Relationship(value = "IS_IN", direction = Relationship.INCOMING) private List members; + + @Relationship(type = "ASSIGNED_TO") + private List projects; } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/UserEntity.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/UserEntity.java index fa8ebac09..7b6216aea 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/UserEntity.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/UserEntity.java @@ -1,6 +1,8 @@ package io.reflectoring.coderadar.graph.useradministration.domain; import java.util.List; + +import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import lombok.Data; import org.neo4j.ogm.annotation.NodeEntity; import org.neo4j.ogm.annotation.Relationship; @@ -15,4 +17,7 @@ public class UserEntity { @Relationship(value = "HAS") private List refreshTokens; + + @Relationship(type = "ASSIGNED_TO") + private List projects; } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java index 745282290..342696037 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java @@ -25,13 +25,6 @@ public interface TeamRepository extends Neo4jRepository { @Query( "MATCH (p) WHERE ID(p) = {0} " + "MATCH (t) WHERE ID(t) = {1} WITH p, t " - + "CREATE (p)-[r:HAS_TEAM {role: {2}}]->(t)") + + "CREATE (t)-[r:ASSIGNED_TO {role: {2}}]->(p)") void addTeamToProject(long projectId, long teamId, String role); - - /** - * @param teamId The team id. - * @return All the project a team is assigned to. - */ - @Query("MATCH (t)<-[:HAS_TEAM]-(p) WHERE ID(t) = {0} RETURN p") - List listProjectByTeamId(long teamId); } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java index 4c5ff3df0..cafa0b5ac 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java @@ -1,5 +1,6 @@ package io.reflectoring.coderadar.graph.useradministration.repository; +import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import java.util.List; import org.springframework.data.neo4j.annotation.Query; From 08905eae58b1d6ebd3e5eab8187a4da9db1c074f Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 6 May 2020 10:57:25 +0200 Subject: [PATCH 11/76] implement useradministration adapters --- .../driven/RemoveTeamFromProjectPort.java | 7 +-- .../teams/RemoveTeamFromProjectUseCase.java | 3 +- .../teams/RemoveTeamFromProjectService.java | 4 +- .../domain/ProjectEntity.java | 1 - .../project/repository/ProjectRepository.java | 5 +-- .../adapter/ListProjectsForUserAdapter.java | 3 +- .../DeleteUserRoleForProjectAdapter.java | 10 ++++- .../SetUserRoleForProjectAdapter.java | 10 ++++- .../adapter/teams/AddUsersToTeamAdapter.java | 10 ++++- .../teams/DeleteUsersFromTeamAdapter.java | 10 ++++- .../adapter/teams/GetTeamAdapter.java | 16 +++++-- .../teams/ListProjectsForTeamAdapter.java | 3 +- .../teams/ListTeamsForProjectAdapter.java | 12 ++++- .../teams/RemoveTeamFromProjectAdapter.java | 12 ++++- .../useradministration/domain/TeamEntity.java | 3 +- .../useradministration/domain/UserEntity.java | 3 +- .../repository/TeamRepository.java | 44 ++++++++++++++++++- .../repository/UserRepository.java | 24 +++++++++- .../RemoveTeamFromProjectController.java | 2 +- 19 files changed, 150 insertions(+), 32 deletions(-) diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveTeamFromProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveTeamFromProjectPort.java index 4f511ef96..6dd85f281 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveTeamFromProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveTeamFromProjectPort.java @@ -3,10 +3,11 @@ public interface RemoveTeamFromProjectPort { /** - * Deletes a team. Any permissions users had for a project because of the team will be lost after - * this operation. + * Removes a team from a project. Any permissions users had for a project because of the team will + * be lost after this operation. * + * @param projectId The id of the project. * @param teamId The id of the team. */ - void deleteTeam(long teamId); + void removeTeam(long projectId, long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveTeamFromProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveTeamFromProjectUseCase.java index 5cb8a8601..4cec067bf 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveTeamFromProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveTeamFromProjectUseCase.java @@ -6,7 +6,8 @@ public interface RemoveTeamFromProjectUseCase { * Removes a team from a project. Any permissions users had for a project because of the team will * be lost after this operation. * + * @param projectId The id of the project. * @param teamId The id of the team. */ - void removeTeam(long teamId); + void removeTeam(long projectId, long teamId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java index 40653b170..027ed925a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java @@ -19,9 +19,9 @@ public RemoveTeamFromProjectService( } @Override - public void removeTeam(long teamId) { + public void removeTeam(long projectId, long teamId) { if (getTeamPort.existsById(teamId)) { - removeTeamFromProjectPort.deleteTeam(teamId); + removeTeamFromProjectPort.removeTeam(projectId, teamId); } else { throw new TeamNotFoundException(teamId); } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java index 125d26c52..4367d7b68 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/domain/ProjectEntity.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.graph.projectadministration.domain; import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; -import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java index 2de22be2c..e287e781d 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java @@ -159,10 +159,7 @@ public interface ProjectRepository extends Neo4jRepository + "CREATE (p)-[r:CONTAINS_COMMIT]->(c)") void attachCommitsWithIds(long projectId, @NonNull List commitIds); - /** - * - * @param projectId - */ + /** @param projectId */ @Query("MATCH (p)<-[r:WORKS_ON]-() WHERE ID(p) = {0} DELETE r") void deleteContributorRelationships(long projectId); diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java index 43ffb6a0e..06bdea9f7 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java @@ -4,9 +4,8 @@ import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForUserPort; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListProjectsForUserAdapter implements ListProjectsForUserPort { diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/DeleteUserRoleForProjectAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/DeleteUserRoleForProjectAdapter.java index 75fb69040..ad70cf20f 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/DeleteUserRoleForProjectAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/DeleteUserRoleForProjectAdapter.java @@ -1,12 +1,20 @@ package io.reflectoring.coderadar.graph.useradministration.adapter.permissions; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.useradministration.port.driven.DeleteUserRoleForProjectPort; import org.springframework.stereotype.Service; @Service public class DeleteUserRoleForProjectAdapter implements DeleteUserRoleForProjectPort { + + private final UserRepository userRepository; + + public DeleteUserRoleForProjectAdapter(UserRepository userRepository) { + this.userRepository = userRepository; + } + @Override public void deleteRole(long projectId, long userId) { - // TODO: implement + userRepository.removeUserRoleFromProject(projectId, userId); } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/SetUserRoleForProjectAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/SetUserRoleForProjectAdapter.java index 4c5ec5d63..d8a8138bb 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/SetUserRoleForProjectAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/SetUserRoleForProjectAdapter.java @@ -1,13 +1,21 @@ package io.reflectoring.coderadar.graph.useradministration.adapter.permissions; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.useradministration.domain.ProjectRole; import io.reflectoring.coderadar.useradministration.port.driven.SetUserRoleForProjectPort; import org.springframework.stereotype.Service; @Service public class SetUserRoleForProjectAdapter implements SetUserRoleForProjectPort { + + private final UserRepository userRepository; + + public SetUserRoleForProjectAdapter(UserRepository userRepository) { + this.userRepository = userRepository; + } + @Override public void setRole(long projectId, long userId, ProjectRole role) { - // TODO: implement + userRepository.setUserRoleForProject(projectId, userId, role.getValue()); } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddUsersToTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddUsersToTeamAdapter.java index aa33c7889..c4ca54ec9 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddUsersToTeamAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/AddUsersToTeamAdapter.java @@ -1,13 +1,21 @@ package io.reflectoring.coderadar.graph.useradministration.adapter.teams; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.useradministration.port.driven.AddUsersToTeamPort; import java.util.List; import org.springframework.stereotype.Service; @Service public class AddUsersToTeamAdapter implements AddUsersToTeamPort { + + private final TeamRepository teamRepository; + + public AddUsersToTeamAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } + @Override public void addUsersToTeam(long teamId, List userIds) { - // TODO: implement + teamRepository.addUsersToTeam(teamId, userIds); } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteUsersFromTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteUsersFromTeamAdapter.java index dd28915cb..811b20ca1 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteUsersFromTeamAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteUsersFromTeamAdapter.java @@ -1,13 +1,21 @@ package io.reflectoring.coderadar.graph.useradministration.adapter.teams; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.useradministration.port.driven.DeleteUsersFromTeamPort; import java.util.List; import org.springframework.stereotype.Service; @Service public class DeleteUsersFromTeamAdapter implements DeleteUsersFromTeamPort { + + private final TeamRepository teamRepository; + + public DeleteUsersFromTeamAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } + @Override public void deleteUsersFromTeam(long teamId, List userIds) { - // TODO: implement + teamRepository.deleteUsersFromTeam(teamId, userIds); } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/GetTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/GetTeamAdapter.java index 468f12f70..1de1e6ff3 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/GetTeamAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/GetTeamAdapter.java @@ -1,23 +1,33 @@ package io.reflectoring.coderadar.graph.useradministration.adapter.teams; +import io.reflectoring.coderadar.graph.useradministration.TeamMapper; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import org.springframework.stereotype.Service; @Service public class GetTeamAdapter implements GetTeamPort { + + private final TeamRepository teamRepository; + private final TeamMapper teamMapper = new TeamMapper(); + + public GetTeamAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } + @Override public Team get(long teamId) { - return null; // TODO: implement + return teamMapper.mapGraphObject(teamRepository.findByIdWithMembers(teamId)); } @Override public boolean existsById(long teamId) { - return false; // TODO: implement + return teamRepository.existsById(teamId); } @Override public boolean existsByName(String name) { - return false; // TODO: implement + return teamRepository.existsByName(name); } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java index 71511dd8e..c57c75c2d 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java @@ -4,9 +4,8 @@ import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForTeamPort; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListProjectsForTeamAdapter implements ListProjectsForTeamPort { diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForProjectAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForProjectAdapter.java index f3bd307be..5a3e8669f 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForProjectAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsForProjectAdapter.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.graph.useradministration.adapter.teams; +import io.reflectoring.coderadar.graph.useradministration.TeamMapper; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsForProjectPort; import java.util.List; @@ -7,8 +9,16 @@ @Service public class ListTeamsForProjectAdapter implements ListTeamsForProjectPort { + + private final TeamRepository teamRepository; + private final TeamMapper teamMapper = new TeamMapper(); + + public ListTeamsForProjectAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } + @Override public List listTeamsForProject(long projectId) { - return null; // TODO: implement + return teamMapper.mapNodeEntities(teamRepository.listTeamsByProjectIdWithMembers(projectId)); } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/RemoveTeamFromProjectAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/RemoveTeamFromProjectAdapter.java index b5f021f9f..f74207f37 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/RemoveTeamFromProjectAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/RemoveTeamFromProjectAdapter.java @@ -1,12 +1,20 @@ package io.reflectoring.coderadar.graph.useradministration.adapter.teams; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.useradministration.port.driven.RemoveTeamFromProjectPort; import org.springframework.stereotype.Service; @Service public class RemoveTeamFromProjectAdapter implements RemoveTeamFromProjectPort { + + private final TeamRepository teamRepository; + + public RemoveTeamFromProjectAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } + @Override - public void deleteTeam(long teamId) { - // TODO: implement + public void removeTeam(long projectId, long teamId) { + teamRepository.removeTeamFromProject(projectId, teamId); } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java index e67d67982..6b3d81683 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java @@ -1,8 +1,7 @@ package io.reflectoring.coderadar.graph.useradministration.domain; -import java.util.List; - import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; +import java.util.List; import lombok.Data; import lombok.NoArgsConstructor; import org.neo4j.ogm.annotation.NodeEntity; diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/UserEntity.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/UserEntity.java index 7b6216aea..daacc6736 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/UserEntity.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/UserEntity.java @@ -1,8 +1,7 @@ package io.reflectoring.coderadar.graph.useradministration.domain; -import java.util.List; - import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; +import java.util.List; import lombok.Data; import org.neo4j.ogm.annotation.NodeEntity; import org.neo4j.ogm.annotation.Relationship; diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java index 342696037..27b0b7b09 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java @@ -1,6 +1,5 @@ package io.reflectoring.coderadar.graph.useradministration.repository; -import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import java.util.List; import org.springframework.data.neo4j.annotation.Query; @@ -27,4 +26,47 @@ public interface TeamRepository extends Neo4jRepository { + "MATCH (t) WHERE ID(t) = {1} WITH p, t " + "CREATE (t)-[r:ASSIGNED_TO {role: {2}}]->(p)") void addTeamToProject(long projectId, long teamId, String role); + + @Query( + "MATCH (t) WHERE ID(t) = {0} WITH t" + + "UNWIND {1} as x " + + "MATCH (u) WHERE ID(u) = x " + + "CREATE (u)-[r:IS_IN]->(t)") + void addUsersToTeam(long teamId, List userIds); + + @Query( + "MATCH (t) WHERE ID(t) = {0} WITH t" + + "UNWIND {1} as x " + + "MATCH (u)-[r:IS_IN]->(t) WHERE ID(u) = x " + + "DELETE r") + void deleteUsersFromTeam(long teamId, List userIds); + + /** + * @param teamId The team id. + * @return The team along with all of its members; + */ + @Query("MATCH (u)-[r:IS_IN]->(t) WHERE ID(t) = {0} RETURN t, r, u") + TeamEntity findByIdWithMembers(long teamId); + + @Query("MATCH (t) WHERE ID(t) = {0} RETURN COUNT(t) > 0") + boolean existsById(long teamId); + + @Query("MATCH (t:TeamEntity) WHERE t.name = {0} RETURN COUNT(t) > 0") + boolean existsByName(String name); + + /** + * @param projectId The project id. + * @return All teams assigned to the project along with their members. + */ + @Query("MATCH (p)<-[:ASSIGNED_TO]-(t)<-[r:IS_IN]-(u) WHERE ID(p) = {0} RETURN t, r, u") + List listTeamsByProjectIdWithMembers(long projectId); + + /** + * Deletes the [:ASSIGNED_TO] relationship between the team and the project. + * + * @param projectId The id of the project. + * @param teamId The id of the team. + */ + @Query("MATCH (p)<-[r:ASSIGNED_TO]-(t) WHERE ID(p) = {0} AND ID(t) = {1} DELETE r") + void removeTeamFromProject(long projectId, long teamId); } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java index cafa0b5ac..fb47f23e4 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java @@ -1,6 +1,5 @@ package io.reflectoring.coderadar.graph.useradministration.repository; -import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import java.util.List; import org.springframework.data.neo4j.annotation.Query; @@ -45,4 +44,27 @@ public interface UserRepository extends Neo4jRepository { */ @Query("MATCH (u) WHERE ID(u) IN {0} RETURN DISTINCT u") List findAllByIds(List userIds); + + /** + * Sets the role of a user for a given project. If the user already has a role in the project, it + * is deleted and a new one is created in its place. + * + * @param projectId The of the project. + * @param userId The id of the user. + * @param role The role to set. + */ + @Query( + "MATCH (p), (u) WHERE ID(p) = {0} AND ID(u) = {1} WITH p, u " + + "OPTIONAL MATCH (p)<-[r:ASSIGNED_TO]-(u) DELETE r " + + "CREATE (p)<-[r:ASSIGNED_TO {role: {2}}]-(u)") + void setUserRoleForProject(long projectId, long userId, String role); + + /** + * Deletes the [:ASSIGNED_TO] relationship between a user and a project. + * + * @param projectId The project id. + * @param userId The user id. + */ + @Query("MATCH (p)<-[r:ASSIGNED_TO]-(u) WHERE ID(p) = {0} AND ID(u) = {1} DELETE r") + void removeUserRoleFromProject(long projectId, long userId); } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java index 3826751eb..123376b9f 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java @@ -23,7 +23,7 @@ public RemoveTeamFromProjectController( @PostMapping(path = "/project/{projectId}/teams/{teamId}") public ResponseEntity removeTeamFromProject( @PathVariable long projectId, @PathVariable long teamId) { - removeTeamFromProjectUseCase.removeTeam(teamId); // TODO: change signature of this method + removeTeamFromProjectUseCase.removeTeam(projectId, teamId); return new ResponseEntity<>(HttpStatus.OK); } } From cc322c152554757eff0fba2029902f6e13b5afac Mon Sep 17 00:00:00 2001 From: Krause Date: Wed, 6 May 2020 11:39:17 +0200 Subject: [PATCH 12/76] adjust controllers --- .../src/main/resources/application.properties | 2 +- .../teams/create/CreateTeamService.java | 3 +- .../ListProjectsForUserController.java | 3 +- .../SetUserRoleForProjectController.java | 11 ++++--- .../teams/CreateTeamController.java | 32 +++++++++++++++++++ .../teams/GetTeamController.java | 3 +- .../teams/ListProjectsForTeamController.java | 3 +- .../teams/ListTeamsForProjectController.java | 3 +- .../teams/ListTeamsForUserController.java | 3 +- 9 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamController.java diff --git a/coderadar-app/src/main/resources/application.properties b/coderadar-app/src/main/resources/application.properties index 4a161ea99..f5cf01808 100644 --- a/coderadar-app/src/main/resources/application.properties +++ b/coderadar-app/src/main/resources/application.properties @@ -6,7 +6,7 @@ coderadar.workdir=coderadar-workdir coderadar.dateLocale=de_DE coderadar.authentication.accessToken.durationInMinutes=15 coderadar.authentication.refreshToken.durationInMinutes=86400 -coderadar.authentication.enabled=true +coderadar.authentication.enabled=false coderadar.cors.enabled=true logging.level.io.reflectoring.coderadar=DEBUG diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java index 1a6abddc7..e51796612 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java @@ -4,10 +4,11 @@ import io.reflectoring.coderadar.useradministration.port.driven.CreateTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; +import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamUseCase; import org.springframework.stereotype.Service; @Service -public class CreateTeamService implements CreateTeamPort { +public class CreateTeamService implements CreateTeamUseCase { private final CreateTeamPort createTeamPort; private final GetTeamPort getTeamPort; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java index b554d7687..c2ec50395 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java @@ -8,6 +8,7 @@ import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; import java.util.List; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; @@ -23,7 +24,7 @@ public ListProjectsForUserController(ListProjectsForUserUseCase listProjectsForU this.listProjectsForUserUseCase = listProjectsForUserUseCase; } - @GetMapping(path = "/users/{userId}/projects") + @GetMapping(path = "/users/{userId}/projects", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> listProjectsForUser(@PathVariable long userId) { List projects = listProjectsForUserUseCase.listProjects(userId); return new ResponseEntity<>(mapProjects(projects), HttpStatus.OK); diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java index 0a2ea794c..e8baf97a9 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java @@ -4,10 +4,12 @@ import io.reflectoring.coderadar.useradministration.domain.ProjectRole; import io.reflectoring.coderadar.useradministration.port.driver.permissions.SetUserRoleForProjectUseCase; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @RestController @@ -20,11 +22,12 @@ public SetUserRoleForProjectController( this.setUserRoleForProjectUseCase = setUserRoleForProjectUseCase; } - @PostMapping(path = "/projects/{projectId}/users/{userId}") + @PostMapping( + path = "/projects/{projectId}/users/{userId}", + consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity setUserRoleForProject( - @PathVariable long projectId, @PathVariable long userId) { - setUserRoleForProjectUseCase.setRole( - projectId, userId, ProjectRole.ADMIN); // TODO: change last parameter + @PathVariable long projectId, @PathVariable long userId, @RequestBody ProjectRole role) { + setUserRoleForProjectUseCase.setRole(projectId, userId, role); return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamController.java new file mode 100644 index 000000000..8b41d07ae --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamController.java @@ -0,0 +1,32 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.rest.domain.IdResponse; +import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; +import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamUseCase; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class CreateTeamController implements AbstractBaseController { + private final CreateTeamUseCase createTeamUseCase; + + public CreateTeamController(CreateTeamUseCase createTeamUseCase) { + this.createTeamUseCase = createTeamUseCase; + } + + @PostMapping( + path = "/teams", + consumes = MediaType.APPLICATION_JSON_VALUE, + produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity createTeam(@RequestBody CreateTeamCommand command) { + Long teamId = createTeamUseCase.createTeam(command); + return new ResponseEntity<>(new IdResponse(teamId), HttpStatus.OK); + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java index 42612384a..9f1a75db7 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java @@ -7,6 +7,7 @@ import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.GetTeamUseCase; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; @@ -22,7 +23,7 @@ public GetTeamController(GetTeamUseCase getTeamUseCase) { this.getTeamUseCase = getTeamUseCase; } - @GetMapping(path = "/teams/{teamId}") + @GetMapping(path = "/teams/{teamId}", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getTeam(@PathVariable long teamId) { Team team = getTeamUseCase.get(teamId); return new ResponseEntity<>(mapTeam(team), HttpStatus.OK); diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java index 9c21f09e4..c2cb83147 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java @@ -8,6 +8,7 @@ import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; import java.util.List; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; @@ -23,7 +24,7 @@ public ListProjectsForTeamController(ListProjectsForTeamUseCase listProjectsForT this.listProjectsForTeamUseCase = listProjectsForTeamUseCase; } - @GetMapping(path = "/teams/{teamId}/projects") + @GetMapping(path = "/teams/{teamId}/projects", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> listProjectsForTeam(@PathVariable long teamId) { List projects = listProjectsForTeamUseCase.listProjects(teamId); return new ResponseEntity<>(mapProjects(projects), HttpStatus.OK); diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java index 30fa2d5f6..e30b81297 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java @@ -8,6 +8,7 @@ import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; import java.util.List; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; @@ -23,7 +24,7 @@ public ListTeamsForProjectController(ListTeamsForProjectUseCase listTeamsForProj this.listTeamsForProjectUseCase = listTeamsForProjectUseCase; } - @GetMapping(path = "/projects/{projectId/teams") + @GetMapping(path = "/projects/{projectId}/teams", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> listTeamsForProject(@PathVariable long projectId) { List teams = listTeamsForProjectUseCase.listTeamsForProject(projectId); return new ResponseEntity<>(mapTeams(teams), HttpStatus.OK); diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java index ff83c9a52..7c172c950 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java @@ -8,6 +8,7 @@ import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; import java.util.List; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; @@ -23,7 +24,7 @@ public ListTeamsForUserController(ListTeamsForUserUseCase listTeamsForUserUseCas this.listTeamsForUserUseCase = listTeamsForUserUseCase; } - @GetMapping(path = "/users/{userId}/teams") + @GetMapping(path = "/users/{userId}/teams", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> listTeamsForUser(@PathVariable long userId) { List teams = listTeamsForUserUseCase.listTeamsForUser(userId); return new ResponseEntity<>(mapTeams(teams), HttpStatus.OK); From 9e5bcb1eba751d5d851d02393fd303bcf65f22a0 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 6 May 2020 11:39:46 +0200 Subject: [PATCH 13/76] fix CreateTeamService --- .../service/teams/create/CreateTeamService.java | 14 ++++++++++++-- .../teams/ListTeamsForProjectController.java | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java index 1a6abddc7..0fa2c2ccb 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java @@ -1,19 +1,24 @@ package io.reflectoring.coderadar.useradministration.service.teams.create; import io.reflectoring.coderadar.useradministration.TeamAlreadyExistsException; +import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driven.CreateTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; +import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; +import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamUseCase; import org.springframework.stereotype.Service; @Service -public class CreateTeamService implements CreateTeamPort { +public class CreateTeamService implements CreateTeamUseCase { private final CreateTeamPort createTeamPort; private final GetTeamPort getTeamPort; + private final GetUserPort getUserPort; - public CreateTeamService(CreateTeamPort createTeamPort, GetTeamPort getTeamPort) { + public CreateTeamService(CreateTeamPort createTeamPort, GetTeamPort getTeamPort, GetUserPort getUserPort) { this.createTeamPort = createTeamPort; this.getTeamPort = getTeamPort; + this.getUserPort = getUserPort; } @Override @@ -21,6 +26,11 @@ public Long createTeam(CreateTeamCommand createTeamCommand) { if (getTeamPort.existsByName(createTeamCommand.getName())) { throw new TeamAlreadyExistsException(createTeamCommand.getName()); } else { + for (Long userId : createTeamCommand.getUserIds()) { + if (!getUserPort.existsById(userId)) { + throw new UserNotFoundException(userId); + } + } return createTeamPort.createTeam(createTeamCommand); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java index 30fa2d5f6..8b5ece8a1 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java @@ -23,7 +23,7 @@ public ListTeamsForProjectController(ListTeamsForProjectUseCase listTeamsForProj this.listTeamsForProjectUseCase = listTeamsForProjectUseCase; } - @GetMapping(path = "/projects/{projectId/teams") + @GetMapping(path = "/projects/{projectId}/teams") public ResponseEntity> listTeamsForProject(@PathVariable long projectId) { List teams = listTeamsForProjectUseCase.listTeamsForProject(projectId); return new ResponseEntity<>(mapTeams(teams), HttpStatus.OK); From 672d95e9a6656bb883e5547b18a1861c28e06e6e Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 6 May 2020 11:47:36 +0200 Subject: [PATCH 14/76] fix queries --- .../service/teams/create/CreateTeamService.java | 3 ++- .../project/repository/ProjectRepository.java | 2 +- .../graph/useradministration/repository/TeamRepository.java | 4 ++-- .../graph/useradministration/repository/UserRepository.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java index 0fa2c2ccb..9cf10329d 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java @@ -15,7 +15,8 @@ public class CreateTeamService implements CreateTeamUseCase { private final GetTeamPort getTeamPort; private final GetUserPort getUserPort; - public CreateTeamService(CreateTeamPort createTeamPort, GetTeamPort getTeamPort, GetUserPort getUserPort) { + public CreateTeamService( + CreateTeamPort createTeamPort, GetTeamPort getTeamPort, GetUserPort getUserPort) { this.createTeamPort = createTeamPort; this.getTeamPort = getTeamPort; this.getUserPort = getUserPort; diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java index e287e781d..0661291c2 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java @@ -113,7 +113,7 @@ public interface ProjectRepository extends Neo4jRepository * @param id The project id. * @return True if a project with the given id exists, false otherwise. */ - @Query("MATCH (p) WHERE ID(p) = {0} RETURN COUNT(*) > 0") + @Query("MATCH (p:ProjectRepository) WHERE ID(p) = {0} RETURN COUNT(*) > 0") boolean existsById(long id); /** diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java index 27b0b7b09..09ede8d2f 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java @@ -45,10 +45,10 @@ public interface TeamRepository extends Neo4jRepository { * @param teamId The team id. * @return The team along with all of its members; */ - @Query("MATCH (u)-[r:IS_IN]->(t) WHERE ID(t) = {0} RETURN t, r, u") + @Query("MATCH (u)-[r:IS_IN*0..1]->(t) WHERE ID(t) = {0} RETURN t, r, u") TeamEntity findByIdWithMembers(long teamId); - @Query("MATCH (t) WHERE ID(t) = {0} RETURN COUNT(t) > 0") + @Query("MATCH (t:TeamEntity) WHERE ID(t) = {0} RETURN COUNT(t) > 0") boolean existsById(long teamId); @Query("MATCH (t:TeamEntity) WHERE t.name = {0} RETURN COUNT(t) > 0") diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java index fb47f23e4..229f37b4e 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java @@ -35,7 +35,7 @@ public interface UserRepository extends Neo4jRepository { * @param id The user id. * @return True if a user with the given id exists. */ - @Query("MATCH (u) WHERE ID(u) = {0} RETURN COUNT(u) > 0") + @Query("MATCH (u:UserEntity) WHERE ID(u) = {0} RETURN COUNT(u) > 0") boolean existsById(long id); /** From e7511b093dc54898683e52675ba4f0e4f4e16126 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 6 May 2020 12:26:55 +0200 Subject: [PATCH 15/76] fix typo in ProjectRepository --- .../project/repository/ProjectRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java index 0661291c2..d6c9f6d19 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java @@ -113,7 +113,7 @@ public interface ProjectRepository extends Neo4jRepository * @param id The project id. * @return True if a project with the given id exists, false otherwise. */ - @Query("MATCH (p:ProjectRepository) WHERE ID(p) = {0} RETURN COUNT(*) > 0") + @Query("MATCH (p:ProjectEntity) WHERE ID(p) = {0} RETURN COUNT(*) > 0") boolean existsById(long id); /** From 162b37dfa4f53cb6795a115c0a1e2828591ebc66 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 6 May 2020 13:08:01 +0200 Subject: [PATCH 16/76] added ListTeams use-case/port/controller/adapter --- .../port/driven/ListTeamsPort.java | 12 ++++++++ .../driver/teams/get/ListTeamsUseCase.java | 13 +++++++++ .../service/teams/get/ListTeamsService.java | 18 ++++++++++++ .../adapter/teams/ListTeamsAdapter.java | 23 +++++++++++++++ .../repository/TeamRepository.java | 8 ++++++ .../teams/AddTeamToProjectController.java | 8 ++++-- .../teams/ListTeamsController.java | 28 +++++++++++++++++++ 7 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java new file mode 100644 index 000000000..300ee7c0e --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java @@ -0,0 +1,12 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +import io.reflectoring.coderadar.useradministration.domain.Team; + +import java.util.List; + +public interface ListTeamsPort { + /** + * @return All teams in the database. + */ + List listTeams(); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java new file mode 100644 index 000000000..b52affe23 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java @@ -0,0 +1,13 @@ +package io.reflectoring.coderadar.useradministration.port.driver.teams.get; + +import io.reflectoring.coderadar.useradministration.domain.Team; + +import java.util.List; + +public interface ListTeamsUseCase { + + /** + * @return All teams in the database. + */ + List listTeams(); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java new file mode 100644 index 000000000..2626aa980 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java @@ -0,0 +1,18 @@ +package io.reflectoring.coderadar.useradministration.service.teams.get; + +import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ListTeamsService implements ListTeamsUseCase { + + + + @Override + public List listTeams() { + return null; + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java new file mode 100644 index 000000000..6389e5ddd --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java @@ -0,0 +1,23 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsPort; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ListTeamsAdapter implements ListTeamsPort { + + private final TeamRepository teamRepository; + + public ListTeamsAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } + + @Override + public List listTeams() { + return teamRepository.findAllWithMembers(); + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java index 09ede8d2f..41634b97c 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java @@ -2,6 +2,8 @@ import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import java.util.List; + +import io.reflectoring.coderadar.useradministration.domain.Team; import org.springframework.data.neo4j.annotation.Query; import org.springframework.data.neo4j.repository.Neo4jRepository; @@ -69,4 +71,10 @@ public interface TeamRepository extends Neo4jRepository { */ @Query("MATCH (p)<-[r:ASSIGNED_TO]-(t) WHERE ID(p) = {0} AND ID(t) = {1} DELETE r") void removeTeamFromProject(long projectId, long teamId); + + /** + * @return All teams in the database along with their members. + */ + @Query("MATCH (t:TeamEntity)<-[r:IS_IN]-(u) RETURN t, r, u") + List findAllWithMembers(); } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java index ae4a27258..acda62841 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java @@ -4,10 +4,12 @@ import io.reflectoring.coderadar.useradministration.domain.ProjectRole; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddTeamToProjectUseCase; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @RestController @@ -19,10 +21,10 @@ public AddTeamToProjectController(AddTeamToProjectUseCase addTeamToProjectUseCas this.addTeamToProjectUseCase = addTeamToProjectUseCase; } - @PostMapping(path = "/projects/{projectId}/teams/{teamId}") + @PostMapping(path = "/projects/{projectId}/teams/{teamId}", consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity addTeamToProject( - @PathVariable long projectId, @PathVariable long teamId) { - addTeamToProjectUseCase.addTeamToProject(projectId, teamId, ProjectRole.ADMIN); // TODO + @PathVariable long projectId, @PathVariable long teamId, @RequestBody ProjectRole role) { + addTeamToProjectUseCase.addTeamToProject(projectId, teamId, role); return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java new file mode 100644 index 000000000..c9c36b3a4 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java @@ -0,0 +1,28 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + +public class ListTeamsController implements AbstractBaseController { + private final ListTeamsUseCase listTeamsUseCase; + + public ListTeamsController(ListTeamsUseCase listTeamsUseCase) { + this.listTeamsUseCase = listTeamsUseCase; + } + + @GetMapping(path = "/teams", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity> listTeams() { + List teams = listTeamsUseCase.listTeams(); + return new ResponseEntity<>(mapTeams(teams), HttpStatus.OK); + } +} From 3dc9487cce08b4aaf869825bc8bb004b47eed001 Mon Sep 17 00:00:00 2001 From: Krause Date: Wed, 6 May 2020 13:28:55 +0200 Subject: [PATCH 17/76] create json wrapper for ProjectRole --- .../port/driven/ListTeamsPort.java | 7 ++---- .../driver/teams/get/ListTeamsUseCase.java | 7 ++---- .../service/teams/get/ListTeamsService.java | 13 ++++------ .../adapter/teams/ListTeamsAdapter.java | 19 +++++++------- .../repository/TeamRepository.java | 7 ++---- .../rest/ProjectRoleJsonWrapper.java | 13 ++++++++++ .../SetUserRoleForProjectController.java | 8 +++--- .../teams/AddTeamToProjectController.java | 12 ++++++--- .../teams/ListTeamsController.java | 25 +++++++++---------- .../RemoveTeamFromProjectController.java | 3 +-- 10 files changed, 59 insertions(+), 55 deletions(-) create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java index 300ee7c0e..ba093a6de 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsPort { - /** - * @return All teams in the database. - */ - List listTeams(); + /** @return All teams in the database. */ + List listTeams(); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java index b52affe23..d5db61391 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java @@ -1,13 +1,10 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsUseCase { - /** - * @return All teams in the database. - */ - List listTeams(); + /** @return All teams in the database. */ + List listTeams(); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java index 2626aa980..764b47424 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java @@ -2,17 +2,14 @@ import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListTeamsService implements ListTeamsUseCase { - - - @Override - public List listTeams() { - return null; - } + @Override + public List listTeams() { + return null; + } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java index 6389e5ddd..5cc18b8ee 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java @@ -3,21 +3,20 @@ import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsPort; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListTeamsAdapter implements ListTeamsPort { - private final TeamRepository teamRepository; + private final TeamRepository teamRepository; - public ListTeamsAdapter(TeamRepository teamRepository) { - this.teamRepository = teamRepository; - } + public ListTeamsAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } - @Override - public List listTeams() { - return teamRepository.findAllWithMembers(); - } + @Override + public List listTeams() { + return teamRepository.findAllWithMembers(); + } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java index 41634b97c..fa55971e7 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java @@ -1,9 +1,8 @@ package io.reflectoring.coderadar.graph.useradministration.repository; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; -import java.util.List; - import io.reflectoring.coderadar.useradministration.domain.Team; +import java.util.List; import org.springframework.data.neo4j.annotation.Query; import org.springframework.data.neo4j.repository.Neo4jRepository; @@ -72,9 +71,7 @@ public interface TeamRepository extends Neo4jRepository { @Query("MATCH (p)<-[r:ASSIGNED_TO]-(t) WHERE ID(p) = {0} AND ID(t) = {1} DELETE r") void removeTeamFromProject(long projectId, long teamId); - /** - * @return All teams in the database along with their members. - */ + /** @return All teams in the database along with their members. */ @Query("MATCH (t:TeamEntity)<-[r:IS_IN]-(u) RETURN t, r, u") List findAllWithMembers(); } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java new file mode 100644 index 000000000..e3b0c7e13 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java @@ -0,0 +1,13 @@ +package io.reflectoring.coderadar.rest; + +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ProjectRoleJsonWrapper { + private ProjectRole role; +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java index e8baf97a9..3bdf5479a 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectController.java @@ -1,7 +1,7 @@ package io.reflectoring.coderadar.rest.useradministration.permissions; import io.reflectoring.coderadar.rest.AbstractBaseController; -import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; import io.reflectoring.coderadar.useradministration.port.driver.permissions.SetUserRoleForProjectUseCase; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -26,8 +26,10 @@ public SetUserRoleForProjectController( path = "/projects/{projectId}/users/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity setUserRoleForProject( - @PathVariable long projectId, @PathVariable long userId, @RequestBody ProjectRole role) { - setUserRoleForProjectUseCase.setRole(projectId, userId, role); + @PathVariable long projectId, + @PathVariable long userId, + @RequestBody ProjectRoleJsonWrapper role) { + setUserRoleForProjectUseCase.setRole(projectId, userId, role.getRole()); return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java index acda62841..abf7f5931 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java @@ -1,7 +1,7 @@ package io.reflectoring.coderadar.rest.useradministration.teams; import io.reflectoring.coderadar.rest.AbstractBaseController; -import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddTeamToProjectUseCase; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -21,10 +21,14 @@ public AddTeamToProjectController(AddTeamToProjectUseCase addTeamToProjectUseCas this.addTeamToProjectUseCase = addTeamToProjectUseCase; } - @PostMapping(path = "/projects/{projectId}/teams/{teamId}", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping( + path = "/projects/{projectId}/teams/{teamId}", + consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity addTeamToProject( - @PathVariable long projectId, @PathVariable long teamId, @RequestBody ProjectRole role) { - addTeamToProjectUseCase.addTeamToProject(projectId, teamId, role); + @PathVariable long projectId, + @PathVariable long teamId, + @RequestBody ProjectRoleJsonWrapper role) { + addTeamToProjectUseCase.addTeamToProject(projectId, teamId, role.getRole()); return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java index c9c36b3a4..22db03325 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java @@ -1,28 +1,27 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - public class ListTeamsController implements AbstractBaseController { - private final ListTeamsUseCase listTeamsUseCase; + private final ListTeamsUseCase listTeamsUseCase; - public ListTeamsController(ListTeamsUseCase listTeamsUseCase) { - this.listTeamsUseCase = listTeamsUseCase; - } + public ListTeamsController(ListTeamsUseCase listTeamsUseCase) { + this.listTeamsUseCase = listTeamsUseCase; + } - @GetMapping(path = "/teams", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> listTeams() { - List teams = listTeamsUseCase.listTeams(); - return new ResponseEntity<>(mapTeams(teams), HttpStatus.OK); - } + @GetMapping(path = "/teams", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity> listTeams() { + List teams = listTeamsUseCase.listTeams(); + return new ResponseEntity<>(mapTeams(teams), HttpStatus.OK); + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java index 123376b9f..6231591fa 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java @@ -19,8 +19,7 @@ public RemoveTeamFromProjectController( this.removeTeamFromProjectUseCase = removeTeamFromProjectUseCase; } - // TODO: which http method should be used here? - @PostMapping(path = "/project/{projectId}/teams/{teamId}") + @PostMapping(path = "/projects/{projectId}/teams/{teamId}") public ResponseEntity removeTeamFromProject( @PathVariable long projectId, @PathVariable long teamId) { removeTeamFromProjectUseCase.removeTeam(projectId, teamId); From dbcb0b19b519f104d49c8437aded48e96b0b1dab Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 6 May 2020 13:29:13 +0200 Subject: [PATCH 18/76] do not create multiple relationships between teams and projects --- .../port/driven/ListTeamsPort.java | 7 ++---- .../driver/teams/get/ListTeamsUseCase.java | 7 ++---- .../service/teams/get/ListTeamsService.java | 13 ++++------ .../adapter/teams/ListTeamsAdapter.java | 19 +++++++------- .../repository/TeamRepository.java | 8 +++--- .../teams/AddTeamToProjectController.java | 6 +++-- .../teams/ListTeamsController.java | 25 +++++++++---------- 7 files changed, 37 insertions(+), 48 deletions(-) diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java index 300ee7c0e..ba093a6de 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsPort { - /** - * @return All teams in the database. - */ - List listTeams(); + /** @return All teams in the database. */ + List listTeams(); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java index b52affe23..d5db61391 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java @@ -1,13 +1,10 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsUseCase { - /** - * @return All teams in the database. - */ - List listTeams(); + /** @return All teams in the database. */ + List listTeams(); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java index 2626aa980..764b47424 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java @@ -2,17 +2,14 @@ import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListTeamsService implements ListTeamsUseCase { - - - @Override - public List listTeams() { - return null; - } + @Override + public List listTeams() { + return null; + } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java index 6389e5ddd..5cc18b8ee 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java @@ -3,21 +3,20 @@ import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsPort; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListTeamsAdapter implements ListTeamsPort { - private final TeamRepository teamRepository; + private final TeamRepository teamRepository; - public ListTeamsAdapter(TeamRepository teamRepository) { - this.teamRepository = teamRepository; - } + public ListTeamsAdapter(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } - @Override - public List listTeams() { - return teamRepository.findAllWithMembers(); - } + @Override + public List listTeams() { + return teamRepository.findAllWithMembers(); + } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java index 41634b97c..30a98af2e 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java @@ -1,9 +1,8 @@ package io.reflectoring.coderadar.graph.useradministration.repository; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; -import java.util.List; - import io.reflectoring.coderadar.useradministration.domain.Team; +import java.util.List; import org.springframework.data.neo4j.annotation.Query; import org.springframework.data.neo4j.repository.Neo4jRepository; @@ -26,6 +25,7 @@ public interface TeamRepository extends Neo4jRepository { @Query( "MATCH (p) WHERE ID(p) = {0} " + "MATCH (t) WHERE ID(t) = {1} WITH p, t " + + "OPTIONAL MATCH (t)-[r:ASSIGNED_TO]->(p) DELETE r " + "CREATE (t)-[r:ASSIGNED_TO {role: {2}}]->(p)") void addTeamToProject(long projectId, long teamId, String role); @@ -72,9 +72,7 @@ public interface TeamRepository extends Neo4jRepository { @Query("MATCH (p)<-[r:ASSIGNED_TO]-(t) WHERE ID(p) = {0} AND ID(t) = {1} DELETE r") void removeTeamFromProject(long projectId, long teamId); - /** - * @return All teams in the database along with their members. - */ + /** @return All teams in the database along with their members. */ @Query("MATCH (t:TeamEntity)<-[r:IS_IN]-(u) RETURN t, r, u") List findAllWithMembers(); } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java index acda62841..b69a59fa4 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java @@ -21,9 +21,11 @@ public AddTeamToProjectController(AddTeamToProjectUseCase addTeamToProjectUseCas this.addTeamToProjectUseCase = addTeamToProjectUseCase; } - @PostMapping(path = "/projects/{projectId}/teams/{teamId}", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping( + path = "/projects/{projectId}/teams/{teamId}", + consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity addTeamToProject( - @PathVariable long projectId, @PathVariable long teamId, @RequestBody ProjectRole role) { + @PathVariable long projectId, @PathVariable long teamId, @RequestBody ProjectRole role) { addTeamToProjectUseCase.addTeamToProject(projectId, teamId, role); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java index c9c36b3a4..22db03325 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java @@ -1,28 +1,27 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - public class ListTeamsController implements AbstractBaseController { - private final ListTeamsUseCase listTeamsUseCase; + private final ListTeamsUseCase listTeamsUseCase; - public ListTeamsController(ListTeamsUseCase listTeamsUseCase) { - this.listTeamsUseCase = listTeamsUseCase; - } + public ListTeamsController(ListTeamsUseCase listTeamsUseCase) { + this.listTeamsUseCase = listTeamsUseCase; + } - @GetMapping(path = "/teams", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> listTeams() { - List teams = listTeamsUseCase.listTeams(); - return new ResponseEntity<>(mapTeams(teams), HttpStatus.OK); - } + @GetMapping(path = "/teams", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity> listTeams() { + List teams = listTeamsUseCase.listTeams(); + return new ResponseEntity<>(mapTeams(teams), HttpStatus.OK); + } } From e7dc5de48bed3fd1277df885785d63a531f2d97e Mon Sep 17 00:00:00 2001 From: Krause Date: Wed, 6 May 2020 14:16:41 +0200 Subject: [PATCH 19/76] minor fixes --- .../repository/TeamRepository.java | 2 +- .../repository/UserRepository.java | 2 +- .../coderadar/rest/JsonListWrapper.java | 14 ++++++++++++++ .../coderadar/rest/ProjectRoleJsonWrapper.java | 2 +- .../rest/useradministration/GetUserController.java | 2 +- .../teams/AddTeamToProjectController.java | 3 ++- .../teams/AddUsersToTeamController.java | 5 +++-- 7 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java index 30a98af2e..b90d76ce4 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java @@ -26,7 +26,7 @@ public interface TeamRepository extends Neo4jRepository { "MATCH (p) WHERE ID(p) = {0} " + "MATCH (t) WHERE ID(t) = {1} WITH p, t " + "OPTIONAL MATCH (t)-[r:ASSIGNED_TO]->(p) DELETE r " - + "CREATE (t)-[r:ASSIGNED_TO {role: {2}}]->(p)") + + "CREATE (t)-[r1:ASSIGNED_TO {role: {2}}]->(p)") void addTeamToProject(long projectId, long teamId, String role); @Query( diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java index 229f37b4e..e2c534f4c 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java @@ -56,7 +56,7 @@ public interface UserRepository extends Neo4jRepository { @Query( "MATCH (p), (u) WHERE ID(p) = {0} AND ID(u) = {1} WITH p, u " + "OPTIONAL MATCH (p)<-[r:ASSIGNED_TO]-(u) DELETE r " - + "CREATE (p)<-[r:ASSIGNED_TO {role: {2}}]-(u)") + + "CREATE (p)<-[r1:ASSIGNED_TO {role: {2}}]-(u)") void setUserRoleForProject(long projectId, long userId, String role); /** diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java new file mode 100644 index 000000000..06a3a3fc4 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java @@ -0,0 +1,14 @@ +package io.reflectoring.coderadar.rest; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class JsonListWrapper { + private List elements; +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java index e3b0c7e13..5571fadf4 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java @@ -8,6 +8,6 @@ @Data @NoArgsConstructor @AllArgsConstructor -public class ProjectRoleJsonWrapper { +public class ProjectRoleJsonWrapper { // TODO: create validator for input validation in controllers private ProjectRole role; } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java index 8861264f2..02cc410cc 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java @@ -23,7 +23,7 @@ public GetUserController(GetUserUseCase getUserUseCase) { this.getUserUseCase = getUserUseCase; } - @GetMapping(path = "/user/{userId}", produces = MediaType.APPLICATION_JSON_VALUE) + @GetMapping(path = "/users/{userId}", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getUser(@PathVariable long userId) { User user = getUserUseCase.getUser(userId); return new ResponseEntity<>(mapUser(user), HttpStatus.OK); diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java index abf7f5931..eb8ac83e8 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectController.java @@ -7,6 +7,7 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -27,7 +28,7 @@ public AddTeamToProjectController(AddTeamToProjectUseCase addTeamToProjectUseCas public ResponseEntity addTeamToProject( @PathVariable long projectId, @PathVariable long teamId, - @RequestBody ProjectRoleJsonWrapper role) { + @Validated @RequestBody ProjectRoleJsonWrapper role) { addTeamToProjectUseCase.addTeamToProject(projectId, teamId, role.getRole()); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java index ff6dcb099..c644bbb60 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.rest.useradministration.teams; import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.rest.JsonListWrapper; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; import java.util.List; import org.springframework.http.HttpStatus; @@ -23,8 +24,8 @@ public AddUsersToTeamController(AddUsersToTeamUseCase addUsersToTeamUseCase) { @PostMapping(path = "/teams/{teamId}/users", consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity addUsersToTeam( - @PathVariable long teamId, @RequestBody List userIds) { - addUsersToTeamUseCase.addUsersToTeam(teamId, userIds); + @PathVariable long teamId, @RequestBody JsonListWrapper userIds) { + addUsersToTeamUseCase.addUsersToTeam(teamId, userIds.getElements()); return new ResponseEntity<>(HttpStatus.OK); } } From b8a35a49d95566b82b50ca38dbb38dbc63dfb72b Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 6 May 2020 14:22:46 +0200 Subject: [PATCH 20/76] add ListUsersForProject use-case/port/adapter/service/controller and fix minor issues --- .../TeamNotAssignedException.java | 8 +++++ .../port/driven/ListUsersForProjectPort.java | 13 ++++++++ .../teams/get/ListUsersForProjectUseCase.java | 13 ++++++++ .../teams/AddTeamToProjectService.java | 11 ++++++- .../teams/RemoveTeamFromProjectService.java | 24 ++++++++++++-- .../teams/get/ListUsersForProjectService.java | 31 ++++++++++++++++++ .../teams/ListUsersForProjectAdapter.java | 24 ++++++++++++++ .../repository/TeamRepository.java | 2 +- .../repository/UserRepository.java | 7 +++- .../teams/ListTeamsController.java | 4 +++ .../teams/ListUsersForProjectController.java | 32 +++++++++++++++++++ .../RemoveTeamFromProjectController.java | 12 +++++-- 12 files changed, 172 insertions(+), 9 deletions(-) create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotAssignedException.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersForProjectPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListUsersForProjectUseCase.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListUsersForProjectService.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListUsersForProjectAdapter.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListUsersForProjectController.java diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotAssignedException.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotAssignedException.java new file mode 100644 index 000000000..0db8381fb --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/TeamNotAssignedException.java @@ -0,0 +1,8 @@ +package io.reflectoring.coderadar.useradministration; + +public class TeamNotAssignedException extends RuntimeException { + public TeamNotAssignedException(Long projectId, Long teamId) { + super( + String.format("Team with id %d is not assigned to project with id %d", teamId, projectId)); + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersForProjectPort.java new file mode 100644 index 000000000..b302708a6 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersForProjectPort.java @@ -0,0 +1,13 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +import io.reflectoring.coderadar.useradministration.domain.User; +import java.util.List; + +public interface ListUsersForProjectPort { + + /** + * @param projectId The project id. + * @return All users that have access to this project. + */ + List listUsers(long projectId); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListUsersForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListUsersForProjectUseCase.java new file mode 100644 index 000000000..a1e492bc4 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListUsersForProjectUseCase.java @@ -0,0 +1,13 @@ +package io.reflectoring.coderadar.useradministration.port.driver.teams.get; + +import io.reflectoring.coderadar.useradministration.domain.User; +import java.util.List; + +public interface ListUsersForProjectUseCase { + + /** + * @param projectId The project id. + * @return All users that have access to this project. + */ + List listUsers(long projectId); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java index c8a6af03e..b13ae4a8f 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddTeamToProjectService.java @@ -2,8 +2,10 @@ import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.domain.ProjectRole; import io.reflectoring.coderadar.useradministration.port.driven.AddTeamToProjectPort; +import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddTeamToProjectUseCase; import org.springframework.stereotype.Service; @@ -12,11 +14,15 @@ public class AddTeamToProjectService implements AddTeamToProjectUseCase { private final GetProjectPort getProjectPort; private final AddTeamToProjectPort addTeamToProjectPort; + private final GetTeamPort getTeamPort; public AddTeamToProjectService( - GetProjectPort getProjectPort, AddTeamToProjectPort addTeamToProjectPort) { + GetProjectPort getProjectPort, + AddTeamToProjectPort addTeamToProjectPort, + GetTeamPort getTeamPort) { this.getProjectPort = getProjectPort; this.addTeamToProjectPort = addTeamToProjectPort; + this.getTeamPort = getTeamPort; } @Override @@ -24,6 +30,9 @@ public void addTeamToProject(long projectId, long teamId, ProjectRole role) { if (!getProjectPort.existsById(projectId)) { throw new ProjectNotFoundException(projectId); } + if (!getTeamPort.existsById(teamId)) { + throw new TeamNotFoundException(teamId); + } addTeamToProjectPort.addTeamToProject(projectId, teamId, role); } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java index 027ed925a..12ef08ae0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveTeamFromProjectService.java @@ -1,7 +1,11 @@ package io.reflectoring.coderadar.useradministration.service.teams; +import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; +import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; +import io.reflectoring.coderadar.useradministration.TeamNotAssignedException; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; +import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsForProjectPort; import io.reflectoring.coderadar.useradministration.port.driven.RemoveTeamFromProjectPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveTeamFromProjectUseCase; import org.springframework.stereotype.Service; @@ -10,20 +14,34 @@ public class RemoveTeamFromProjectService implements RemoveTeamFromProjectUseCase { private final GetTeamPort getTeamPort; + private final GetProjectPort getProjectPort; private final RemoveTeamFromProjectPort removeTeamFromProjectPort; + private final ListTeamsForProjectPort listTeamsForProjectPort; public RemoveTeamFromProjectService( - GetTeamPort getTeamPort, RemoveTeamFromProjectPort removeTeamFromProjectPort) { + GetTeamPort getTeamPort, + GetProjectPort getProjectPort, + RemoveTeamFromProjectPort removeTeamFromProjectPort, + ListTeamsForProjectPort listTeamsForProjectPort) { this.getTeamPort = getTeamPort; + this.getProjectPort = getProjectPort; this.removeTeamFromProjectPort = removeTeamFromProjectPort; + this.listTeamsForProjectPort = listTeamsForProjectPort; } @Override public void removeTeam(long projectId, long teamId) { - if (getTeamPort.existsById(teamId)) { + if (!getProjectPort.existsById(projectId)) { + throw new ProjectNotFoundException(projectId); + } + if (!getTeamPort.existsById(teamId)) { + throw new TeamNotFoundException(teamId); + } + if (listTeamsForProjectPort.listTeamsForProject(projectId).stream() + .anyMatch(team -> team.getId() == teamId)) { removeTeamFromProjectPort.removeTeam(projectId, teamId); } else { - throw new TeamNotFoundException(teamId); + throw new TeamNotAssignedException(projectId, teamId); } } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListUsersForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListUsersForProjectService.java new file mode 100644 index 000000000..96a563e75 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListUsersForProjectService.java @@ -0,0 +1,31 @@ +package io.reflectoring.coderadar.useradministration.service.teams.get; + +import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; +import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; +import io.reflectoring.coderadar.useradministration.domain.User; +import io.reflectoring.coderadar.useradministration.port.driven.ListUsersForProjectPort; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListUsersForProjectUseCase; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public class ListUsersForProjectService implements ListUsersForProjectUseCase { + + private final GetProjectPort getProjectPort; + private final ListUsersForProjectPort listUsersForProjectPort; + + public ListUsersForProjectService( + GetProjectPort getProjectPort, ListUsersForProjectPort listUsersForProjectPort) { + this.getProjectPort = getProjectPort; + this.listUsersForProjectPort = listUsersForProjectPort; + } + + @Override + public List listUsers(long projectId) { + if (getProjectPort.existsById(projectId)) { + return listUsersForProjectPort.listUsers(projectId); + } else { + throw new ProjectNotFoundException(projectId); + } + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListUsersForProjectAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListUsersForProjectAdapter.java new file mode 100644 index 000000000..e66721049 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListUsersForProjectAdapter.java @@ -0,0 +1,24 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter.teams; + +import io.reflectoring.coderadar.graph.useradministration.UserMapper; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import io.reflectoring.coderadar.useradministration.domain.User; +import io.reflectoring.coderadar.useradministration.port.driven.ListUsersForProjectPort; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +public class ListUsersForProjectAdapter implements ListUsersForProjectPort { + + private final UserRepository userRepository; + private final UserMapper userMapper = new UserMapper(); + + public ListUsersForProjectAdapter(UserRepository userRepository) { + this.userRepository = userRepository; + } + + @Override + public List listUsers(long projectId) { + return userMapper.mapNodeEntities(userRepository.listUsersForProject(projectId)); + } +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java index 30a98af2e..a49d63702 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java @@ -30,7 +30,7 @@ public interface TeamRepository extends Neo4jRepository { void addTeamToProject(long projectId, long teamId, String role); @Query( - "MATCH (t) WHERE ID(t) = {0} WITH t" + "MATCH (t) WHERE ID(t) = {0} WITH t " + "UNWIND {1} as x " + "MATCH (u) WHERE ID(u) = x " + "CREATE (u)-[r:IS_IN]->(t)") diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java index 229f37b4e..363f86674 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/UserRepository.java @@ -65,6 +65,11 @@ public interface UserRepository extends Neo4jRepository { * @param projectId The project id. * @param userId The user id. */ - @Query("MATCH (p)<-[r:ASSIGNED_TO]-(u) WHERE ID(p) = {0} AND ID(u) = {1} DELETE r") + @Query("MATCH (p)<-[r:ASSIGNED_TO]-(u:UserEntity) WHERE ID(p) = {0} AND ID(u) = {1} DELETE r") void removeUserRoleFromProject(long projectId, long userId); + + @Query( + "OPTIONAL MATCH (p)<-[:ASSIGNED_TO]-(u:UserEntity) WHERE ID(p) = {0} WITH p, collect(u) as users " + + "OPTIONAL MATCH (p)<-[:ASSIGNED_TO]-(t:TeamEntity)<-[:IS_IN]-(u) RETURN collect(u) + users as users") + List listUsersForProject(long projectId); } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java index 22db03325..010285a1c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java @@ -10,8 +10,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +@RestController +@Transactional public class ListTeamsController implements AbstractBaseController { private final ListTeamsUseCase listTeamsUseCase; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListUsersForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListUsersForProjectController.java new file mode 100644 index 000000000..b3c542aec --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListUsersForProjectController.java @@ -0,0 +1,32 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + +import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.rest.domain.GetUserResponse; +import io.reflectoring.coderadar.useradministration.domain.User; +import io.reflectoring.coderadar.useradministration.port.driven.ListUsersForProjectPort; +import java.util.List; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Transactional +public class ListUsersForProjectController implements AbstractBaseController { + private final ListUsersForProjectPort listUsersForProjectPort; + + public ListUsersForProjectController(ListUsersForProjectPort listUsersForProjectPort) { + this.listUsersForProjectPort = listUsersForProjectPort; + } + + @GetMapping(path = "/projects/{projectId}/users", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity> listTeamsForUser(@PathVariable long projectId) { + List users = listUsersForProjectPort.listUsers(projectId); + return new ResponseEntity<>(mapUsers(users), HttpStatus.OK); + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java index 6231591fa..5668acfbf 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java @@ -1,6 +1,8 @@ package io.reflectoring.coderadar.rest.useradministration.teams; import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; +import io.reflectoring.coderadar.useradministration.TeamNotAssignedException; import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveTeamFromProjectUseCase; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -20,9 +22,13 @@ public RemoveTeamFromProjectController( } @PostMapping(path = "/projects/{projectId}/teams/{teamId}") - public ResponseEntity removeTeamFromProject( + public ResponseEntity removeTeamFromProject( @PathVariable long projectId, @PathVariable long teamId) { - removeTeamFromProjectUseCase.removeTeam(projectId, teamId); - return new ResponseEntity<>(HttpStatus.OK); + try { + removeTeamFromProjectUseCase.removeTeam(projectId, teamId); + return new ResponseEntity<>(HttpStatus.OK); + } catch (TeamNotAssignedException e) { + return new ResponseEntity<>(new ErrorMessageResponse(e.getMessage()), HttpStatus.BAD_REQUEST); + } } } From f7c91f1bd14a39ab3a308faa7507c093fa816e07 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 6 May 2020 14:26:08 +0200 Subject: [PATCH 21/76] fix the addUsersToTeam Query in TeamRepository --- .../graph/useradministration/repository/TeamRepository.java | 3 ++- .../java/io/reflectoring/coderadar/rest/JsonListWrapper.java | 5 ++--- .../useradministration/teams/AddUsersToTeamController.java | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java index f47a15bdb..df4a23be1 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java @@ -33,7 +33,8 @@ public interface TeamRepository extends Neo4jRepository { "MATCH (t) WHERE ID(t) = {0} WITH t " + "UNWIND {1} as x " + "MATCH (u) WHERE ID(u) = x " - + "CREATE (u)-[r:IS_IN]->(t)") + + "OPTIONAL MATCH (u)-[r:ASSIGNED_TO]->(t) DELETE r " + + "CREATE (u)-[r1:IS_IN]->(t)") void addUsersToTeam(long teamId, List userIds); @Query( diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java index 06a3a3fc4..3126d9b86 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.rest; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data @NoArgsConstructor @AllArgsConstructor public class JsonListWrapper { - private List elements; + private List elements; } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java index c644bbb60..1ebcc9255 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java @@ -3,7 +3,6 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.JsonListWrapper; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -24,7 +23,7 @@ public AddUsersToTeamController(AddUsersToTeamUseCase addUsersToTeamUseCase) { @PostMapping(path = "/teams/{teamId}/users", consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity addUsersToTeam( - @PathVariable long teamId, @RequestBody JsonListWrapper userIds) { + @PathVariable long teamId, @RequestBody JsonListWrapper userIds) { addUsersToTeamUseCase.addUsersToTeam(teamId, userIds.getElements()); return new ResponseEntity<>(HttpStatus.OK); } From 70d38a83364c8d89f8b38db3bdc395c647b7ed69 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 6 May 2020 15:17:52 +0200 Subject: [PATCH 22/76] rename DeleteUserRoleForProject* to RemoveUserFromProject* and implement ListTeamsService --- ...ort.java => RemoveUserFromProjectPort.java} | 4 ++-- ....java => RemoveUserFromProjectUseCase.java} | 4 ++-- ....java => RemoveUserFromProjectService.java} | 18 +++++++++--------- .../service/teams/get/ListTeamsService.java | 9 ++++++++- .../AnalyzerConfigurationRepository.java | 2 +- .../repository/FilePatternRepository.java | 2 +- ....java => RemoveUserFromProjectAdapter.java} | 8 ++++---- .../repository/TeamRepository.java | 9 ++++----- ...va => RemoveUserFromProjectController.java} | 16 ++++++++-------- coderadar-test/src/main/asciidoc/restapi.adoc | 4 ++-- .../GetUserControllerIntegrationTest.java | 6 +++--- 11 files changed, 44 insertions(+), 38 deletions(-) rename coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/{DeleteUserRoleForProjectPort.java => RemoveUserFromProjectPort.java} (76%) rename coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/{DeleteUserRoleForProjectUseCase.java => RemoveUserFromProjectUseCase.java} (76%) rename coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/{DeleteUserRoleForProjectService.java => RemoveUserFromProjectService.java} (66%) rename coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/{DeleteUserRoleForProjectAdapter.java => RemoveUserFromProjectAdapter.java} (65%) rename coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/{DeleteUserRoleForProjectController.java => RemoveUserFromProjectController.java} (58%) diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveUserFromProjectPort.java similarity index 76% rename from coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java rename to coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveUserFromProjectPort.java index 59745885c..340659e74 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUserRoleForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveUserFromProjectPort.java @@ -1,6 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driven; -public interface DeleteUserRoleForProjectPort { +public interface RemoveUserFromProjectPort { /** * Removes the role a given user has to a project. If the user is not in any team with access to @@ -9,5 +9,5 @@ public interface DeleteUserRoleForProjectPort { * @param projectId The id of the project. * @param userId The id of the user. */ - void deleteRole(long projectId, long userId); + void removeUserFromProject(long projectId, long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/DeleteUserRoleForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/RemoveUserFromProjectUseCase.java similarity index 76% rename from coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/DeleteUserRoleForProjectUseCase.java rename to coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/RemoveUserFromProjectUseCase.java index 042911ce7..6cac0dd94 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/DeleteUserRoleForProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/RemoveUserFromProjectUseCase.java @@ -1,6 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driver.permissions; -public interface DeleteUserRoleForProjectUseCase { +public interface RemoveUserFromProjectUseCase { /** * Removes the role a given user has to a project. If the user is not in any team with access to @@ -9,5 +9,5 @@ public interface DeleteUserRoleForProjectUseCase { * @param projectId The id of the project. * @param userId The id of the user. */ - void deleteRole(long projectId, long userId); + void removeUserFromProject(long projectId, long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/RemoveUserFromProjectService.java similarity index 66% rename from coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java rename to coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/RemoveUserFromProjectService.java index 18bd6a8b2..faeb33f55 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/DeleteUserRoleForProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/RemoveUserFromProjectService.java @@ -3,35 +3,35 @@ import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.useradministration.UserNotFoundException; -import io.reflectoring.coderadar.useradministration.port.driven.DeleteUserRoleForProjectPort; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; -import io.reflectoring.coderadar.useradministration.port.driver.permissions.DeleteUserRoleForProjectUseCase; +import io.reflectoring.coderadar.useradministration.port.driven.RemoveUserFromProjectPort; +import io.reflectoring.coderadar.useradministration.port.driver.permissions.RemoveUserFromProjectUseCase; import org.springframework.stereotype.Service; @Service -public class DeleteUserRoleForProjectService implements DeleteUserRoleForProjectUseCase { +public class RemoveUserFromProjectService implements RemoveUserFromProjectUseCase { private final GetProjectPort getProjectPort; private final GetUserPort getUserPort; - private final DeleteUserRoleForProjectPort deleteUserRoleForProjectPort; + private final RemoveUserFromProjectPort removeUserFromProjectPort; - public DeleteUserRoleForProjectService( + public RemoveUserFromProjectService( GetProjectPort getProjectPort, GetUserPort getUserPort, - DeleteUserRoleForProjectPort deleteUserRoleForProjectPort) { + RemoveUserFromProjectPort removeUserFromProjectPort) { this.getProjectPort = getProjectPort; this.getUserPort = getUserPort; - this.deleteUserRoleForProjectPort = deleteUserRoleForProjectPort; + this.removeUserFromProjectPort = removeUserFromProjectPort; } @Override - public void deleteRole(long projectId, long userId) { + public void removeUserFromProject(long projectId, long userId) { if (!getProjectPort.existsById(projectId)) { throw new ProjectNotFoundException(projectId); } if (!getUserPort.existsById(userId)) { throw new UserNotFoundException(userId); } - deleteUserRoleForProjectPort.deleteRole(projectId, userId); + removeUserFromProjectPort.removeUserFromProject(projectId, userId); } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java index 764b47424..d954fe628 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.service.teams.get; import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; import java.util.List; import org.springframework.stereotype.Service; @@ -8,8 +9,14 @@ @Service public class ListTeamsService implements ListTeamsUseCase { + private final ListTeamsPort listTeamsPort; + + public ListTeamsService(ListTeamsPort listTeamsPort) { + this.listTeamsPort = listTeamsPort; + } + @Override public List listTeams() { - return null; + return listTeamsPort.listTeams(); } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/repository/AnalyzerConfigurationRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/repository/AnalyzerConfigurationRepository.java index 70ab5f893..55bc81859 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/repository/AnalyzerConfigurationRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/repository/AnalyzerConfigurationRepository.java @@ -19,6 +19,6 @@ public interface AnalyzerConfigurationRepository @NonNull List findByProjectId(long projectId); - @Query("MATCH (a) WHERE ID(a) = {0} RETURN COUNT(a) > 0") + @Query("MATCH (a:AnalyzerConfigurationEntity) WHERE ID(a) = {0} RETURN COUNT(a) > 0") boolean existsById(long id); } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/repository/FilePatternRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/repository/FilePatternRepository.java index d6d303390..471c1f277 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/repository/FilePatternRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/repository/FilePatternRepository.java @@ -18,6 +18,6 @@ public interface FilePatternRepository extends Neo4jRepository findByProjectId(long projectId); - @Query("MATCH (f) WHERE ID(f) = {0} RETURN COUNT(f) > 0") + @Query("MATCH (f:FilePatternEntity) WHERE ID(f) = {0} RETURN COUNT(f) > 0") boolean existsById(long id); } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/DeleteUserRoleForProjectAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/RemoveUserFromProjectAdapter.java similarity index 65% rename from coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/DeleteUserRoleForProjectAdapter.java rename to coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/RemoveUserFromProjectAdapter.java index ad70cf20f..7b6ab2f85 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/DeleteUserRoleForProjectAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/permissions/RemoveUserFromProjectAdapter.java @@ -1,20 +1,20 @@ package io.reflectoring.coderadar.graph.useradministration.adapter.permissions; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; -import io.reflectoring.coderadar.useradministration.port.driven.DeleteUserRoleForProjectPort; +import io.reflectoring.coderadar.useradministration.port.driven.RemoveUserFromProjectPort; import org.springframework.stereotype.Service; @Service -public class DeleteUserRoleForProjectAdapter implements DeleteUserRoleForProjectPort { +public class RemoveUserFromProjectAdapter implements RemoveUserFromProjectPort { private final UserRepository userRepository; - public DeleteUserRoleForProjectAdapter(UserRepository userRepository) { + public RemoveUserFromProjectAdapter(UserRepository userRepository) { this.userRepository = userRepository; } @Override - public void deleteRole(long projectId, long userId) { + public void removeUserFromProject(long projectId, long userId) { userRepository.removeUserRoleFromProject(projectId, userId); } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java index df4a23be1..f8b32d10b 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java @@ -23,18 +23,17 @@ public interface TeamRepository extends Neo4jRepository { * @param role The role of the team in the project. */ @Query( - "MATCH (p) WHERE ID(p) = {0} " + "MATCH (p:ProjectEntity) WHERE ID(p) = {0} " + "MATCH (t) WHERE ID(t) = {1} WITH p, t " + "OPTIONAL MATCH (t)-[r:ASSIGNED_TO]->(p) DELETE r " + "CREATE (t)-[r1:ASSIGNED_TO {role: {2}}]->(p)") void addTeamToProject(long projectId, long teamId, String role); @Query( - "MATCH (t) WHERE ID(t) = {0} WITH t " + "MATCH (t:TeamEntity) WHERE ID(t) = {0} WITH t " + "UNWIND {1} as x " - + "MATCH (u) WHERE ID(u) = x " - + "OPTIONAL MATCH (u)-[r:ASSIGNED_TO]->(t) DELETE r " - + "CREATE (u)-[r1:IS_IN]->(t)") + + "MATCH (u:UserEntity) WHERE ID(u) = x " + + "MERGE (u)-[r:IS_IN]->(t)") void addUsersToTeam(long teamId, List userIds); @Query( diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/DeleteUserRoleForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectController.java similarity index 58% rename from coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/DeleteUserRoleForProjectController.java rename to coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectController.java index 1c0dc15a0..76fbfb0b6 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/DeleteUserRoleForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectController.java @@ -1,7 +1,7 @@ package io.reflectoring.coderadar.rest.useradministration.permissions; import io.reflectoring.coderadar.rest.AbstractBaseController; -import io.reflectoring.coderadar.useradministration.port.driver.permissions.DeleteUserRoleForProjectUseCase; +import io.reflectoring.coderadar.useradministration.port.driver.permissions.RemoveUserFromProjectUseCase; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; @@ -11,18 +11,18 @@ @RestController @Transactional -public class DeleteUserRoleForProjectController implements AbstractBaseController { - private final DeleteUserRoleForProjectUseCase deleteUserRoleForProjectUseCase; +public class RemoveUserFromProjectController implements AbstractBaseController { + private final RemoveUserFromProjectUseCase removeUserFromProjectUseCase; - public DeleteUserRoleForProjectController( - DeleteUserRoleForProjectUseCase deleteUserRoleForProjectUseCase) { - this.deleteUserRoleForProjectUseCase = deleteUserRoleForProjectUseCase; + public RemoveUserFromProjectController( + RemoveUserFromProjectUseCase removeUserFromProjectUseCase) { + this.removeUserFromProjectUseCase = removeUserFromProjectUseCase; } @DeleteMapping(path = "/projects/{projectId}/users/{userId}") - public ResponseEntity deleteUserRoleForProject( + public ResponseEntity removeUserRoleFromProject( @PathVariable long projectId, @PathVariable long userId) { - deleteUserRoleForProjectUseCase.deleteRole(projectId, userId); + removeUserFromProjectUseCase.removeUserFromProject(projectId, userId); return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/coderadar-test/src/main/asciidoc/restapi.adoc b/coderadar-test/src/main/asciidoc/restapi.adoc index 3a5db6e3a..267096643 100644 --- a/coderadar-test/src/main/asciidoc/restapi.adoc +++ b/coderadar-test/src/main/asciidoc/restapi.adoc @@ -103,11 +103,11 @@ include::{snippets}/user/registration/http-response.adoc[] ===== Example Request -include::{snippets}/user/get/http-request.adoc[] +include::{snippets}/users/get/http-request.adoc[] ===== Example Response -include::{snippets}/user/get/http-response.adoc[] +include::{snippets}/users/get/http-response.adoc[] ==== Login anchor:login[] diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java index 66aff52c2..c5f3fad47 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java @@ -27,7 +27,7 @@ void loadUserWithId() throws Exception { final Long userId = testUser.getId(); mvc() - .perform(get("/api/user/" + userId)) + .perform(get("/api/users/" + userId)) .andExpect(MockMvcResultMatchers.status().isOk()) .andExpect(containsResource(GetUserResponse.class)) .andDo( @@ -37,13 +37,13 @@ void loadUserWithId() throws Exception { Assertions.assertEquals("username2", response.getUsername()); Assertions.assertEquals(userId, response.getId()); }) - .andDo(document("user/get")); + .andDo(document("users/get")); } @Test void loadUserWithIdOneReturnsErrorWhenUserNotFound() throws Exception { mvc() - .perform(get("/api/user/1")) + .perform(get("/api/users/1")) .andExpect(MockMvcResultMatchers.status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage").value("User with id 1 not found.")); From 411b2342a1aacfed28448ceffee82da1de5d8743 Mon Sep 17 00:00:00 2001 From: Krause Date: Wed, 6 May 2020 15:18:31 +0200 Subject: [PATCH 23/76] change method parameter of controller --- .../teams/DeleteUsersFromTeamController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java index 2b561638f..13a41b8dc 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java @@ -1,8 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration.teams; import io.reflectoring.coderadar.rest.AbstractBaseController; +import io.reflectoring.coderadar.rest.JsonListWrapper; import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteUsersFromTeamUseCase; -import java.util.List; + import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -23,8 +24,8 @@ public DeleteUsersFromTeamController(DeleteUsersFromTeamUseCase deleteUsersFromT @DeleteMapping(path = "/teams/{teamId}/users", consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity deleteUsersFromTeam( - @PathVariable long teamId, @RequestBody List userIds) { - deleteUsersFromTeamUseCase.deleteUsersFromTeam(teamId, userIds); + @PathVariable long teamId, @RequestBody JsonListWrapper userIds) { + deleteUsersFromTeamUseCase.deleteUsersFromTeam(teamId, userIds.getElements()); return new ResponseEntity<>(HttpStatus.OK); } } From 729584f8b2ee5880d9b4498780d252c07c8a29e4 Mon Sep 17 00:00:00 2001 From: Krause Date: Wed, 6 May 2020 15:40:45 +0200 Subject: [PATCH 24/76] some fixes --- .../adapter/teams/ListTeamsAdapter.java | 4 +++- .../graph/useradministration/domain/TeamEntity.java | 3 ++- .../useradministration/repository/TeamRepository.java | 11 ++++++----- .../teams/DeleteUsersFromTeamController.java | 1 - 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java index 5cc18b8ee..0196834a9 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListTeamsAdapter.java @@ -1,5 +1,6 @@ package io.reflectoring.coderadar.graph.useradministration.adapter.teams; +import io.reflectoring.coderadar.graph.useradministration.TeamMapper; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsPort; @@ -10,6 +11,7 @@ public class ListTeamsAdapter implements ListTeamsPort { private final TeamRepository teamRepository; + private final TeamMapper mapper = new TeamMapper(); public ListTeamsAdapter(TeamRepository teamRepository) { this.teamRepository = teamRepository; @@ -17,6 +19,6 @@ public ListTeamsAdapter(TeamRepository teamRepository) { @Override public List listTeams() { - return teamRepository.findAllWithMembers(); + return mapper.mapNodeEntities(teamRepository.findAllWithMembers()); } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java index 6b3d81683..ea2320631 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/domain/TeamEntity.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.graph.useradministration.domain; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; +import java.util.Collections; import java.util.List; import lombok.Data; import lombok.NoArgsConstructor; @@ -15,7 +16,7 @@ public class TeamEntity { private String name; @Relationship(value = "IS_IN", direction = Relationship.INCOMING) - private List members; + private List members = Collections.emptyList(); @Relationship(type = "ASSIGNED_TO") private List projects; diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java index f8b32d10b..be292ce68 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.graph.useradministration.repository; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; -import io.reflectoring.coderadar.useradministration.domain.Team; import java.util.List; import org.springframework.data.neo4j.annotation.Query; import org.springframework.data.neo4j.repository.Neo4jRepository; @@ -12,7 +11,9 @@ public interface TeamRepository extends Neo4jRepository { * @param userId The user id. * @return All teams the user is in. */ - @Query("MATCH (u)-[:IS_IN]->(t) WHERE ID(u) = {0} RETURN t") + @Query( + "MATCH (u)-[:IS_IN]->(t) WHERE ID(u) = {0} WITH t " + + "OPTIONAL MATCH (t)<-[r:IS_IN]-(u) RETURN t, r, u") List listTeamsByUserId(long userId); /** @@ -37,7 +38,7 @@ public interface TeamRepository extends Neo4jRepository { void addUsersToTeam(long teamId, List userIds); @Query( - "MATCH (t) WHERE ID(t) = {0} WITH t" + "MATCH (t) WHERE ID(t) = {0} WITH t " + "UNWIND {1} as x " + "MATCH (u)-[r:IS_IN]->(t) WHERE ID(u) = x " + "DELETE r") @@ -73,6 +74,6 @@ public interface TeamRepository extends Neo4jRepository { void removeTeamFromProject(long projectId, long teamId); /** @return All teams in the database along with their members. */ - @Query("MATCH (t:TeamEntity)<-[r:IS_IN]-(u) RETURN t, r, u") - List findAllWithMembers(); + @Query("MATCH (t:TeamEntity)<-[r:IS_IN*0..1]-(u) RETURN t, r, u") + List findAllWithMembers(); } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java index 13a41b8dc..b468b596c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java @@ -3,7 +3,6 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.JsonListWrapper; import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteUsersFromTeamUseCase; - import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; From 149414eaf520f104ffd31435549bb0f162c79ef1 Mon Sep 17 00:00:00 2001 From: Kilian Krause Date: Wed, 6 May 2020 17:17:47 +0200 Subject: [PATCH 25/76] add mapper for response classes in the rest module --- ...etAnalyzerConfigurationResponseMapper.java | 25 +++++++++++++++ .../rest/GetBranchResponseMapper.java | 18 +++++++++++ .../rest/GetContributorResponseMapper.java | 31 +++++++++++++++++++ .../GetAnalyzerConfigurationController.java | 9 ++---- ...erConfigurationsFromProjectController.java | 17 ++++------ .../rest/branch/ListBranchesController.java | 9 ++---- .../contributor/GetContributorController.java | 13 ++------ .../ListContributorsController.java | 22 +++---------- 8 files changed, 94 insertions(+), 50 deletions(-) create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java new file mode 100644 index 000000000..f6883155b --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java @@ -0,0 +1,25 @@ +package io.reflectoring.coderadar.rest; + +import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; +import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; +import java.util.ArrayList; +import java.util.List; + +public class GetAnalyzerConfigurationResponseMapper { + private GetAnalyzerConfigurationResponseMapper() {} + + public static GetAnalyzerConfigurationResponse mapAnalyzerConfiguration( + AnalyzerConfiguration ac) { + return new GetAnalyzerConfigurationResponse(ac.getId(), ac.getAnalyzerName(), ac.isEnabled()); + } + + public static List mapAnalyzerConfigurations( + List analyzerConfigurations) { + List result = new ArrayList<>(analyzerConfigurations.size()); + for (AnalyzerConfiguration ac : analyzerConfigurations) { + result.add( + new GetAnalyzerConfigurationResponse(ac.getId(), ac.getAnalyzerName(), ac.isEnabled())); + } + return result; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java new file mode 100644 index 000000000..65fd5c37e --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java @@ -0,0 +1,18 @@ +package io.reflectoring.coderadar.rest; + +import io.reflectoring.coderadar.projectadministration.domain.Branch; +import io.reflectoring.coderadar.rest.domain.GetBranchResponse; +import java.util.ArrayList; +import java.util.List; + +public class GetBranchResponseMapper { + private GetBranchResponseMapper() {} + + public static List mapBranches(List branches) { + List result = new ArrayList<>(branches.size()); + for (Branch branch : branches) { + result.add(new GetBranchResponse(branch.getName(), branch.getCommitHash())); + } + return result; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java new file mode 100644 index 000000000..0ec933aa9 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java @@ -0,0 +1,31 @@ +package io.reflectoring.coderadar.rest; + +import io.reflectoring.coderadar.contributor.domain.Contributor; +import io.reflectoring.coderadar.rest.domain.GetContributorResponse; +import java.util.ArrayList; +import java.util.List; + +public class GetContributorResponseMapper { + private GetContributorResponseMapper() {} + + public static GetContributorResponse mapContributor(Contributor contributor) { + return new GetContributorResponse( + contributor.getId(), + contributor.getDisplayName(), + contributor.getNames(), + contributor.getEmailAddresses()); + } + + public static List mapContributors(List contributors) { + List result = new ArrayList<>(contributors.size()); + for (Contributor c : contributors) { + GetContributorResponse responseItem = new GetContributorResponse(); + responseItem.setId(c.getId()); + responseItem.setDisplayName(c.getDisplayName()); + responseItem.setNames(c.getNames()); + responseItem.setEmailAddresses(c.getEmailAddresses()); + result.add(responseItem); + } + return result; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java index 441240a79..16cb8f6fe 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.analyzerconfig; +import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfiguration; + import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.GetAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; @@ -29,11 +31,6 @@ public ResponseEntity getAnalyzerConfiguration @PathVariable long analyzerConfigurationId) { AnalyzerConfiguration analyzerConfiguration = getAnalyzerConfigurationUseCase.getAnalyzerConfiguration(analyzerConfigurationId); - return new ResponseEntity<>( - new GetAnalyzerConfigurationResponse( - analyzerConfiguration.getId(), - analyzerConfiguration.getAnalyzerName(), - analyzerConfiguration.isEnabled()), - HttpStatus.OK); + return new ResponseEntity<>(mapAnalyzerConfiguration(analyzerConfiguration), HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java index 6e5419057..48678362b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java @@ -1,10 +1,12 @@ package io.reflectoring.coderadar.rest.analyzerconfig; +import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfigurations; + +import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.ListAnalyzerConfigurationsUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; import java.util.List; -import java.util.stream.Collectors; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -26,15 +28,8 @@ public ListAnalyzerConfigurationsFromProjectController( @GetMapping(path = "/projects/{projectId}/analyzers", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> getAnalyzerConfigurationsFromProject(@PathVariable long projectId) { - return new ResponseEntity<>( - listAnalyzerConfigurationsUseCase.get(projectId).stream() - .map( - analyzerConfiguration -> - new GetAnalyzerConfigurationResponse( - analyzerConfiguration.getId(), - analyzerConfiguration.getAnalyzerName(), - analyzerConfiguration.isEnabled())) - .collect(Collectors.toList()), - HttpStatus.OK); + List analyzerConfigurations = + listAnalyzerConfigurationsUseCase.get(projectId); + return new ResponseEntity<>(mapAnalyzerConfigurations(analyzerConfigurations), HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java index e24ecd476..060702f2e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.rest.branch; +import static io.reflectoring.coderadar.rest.GetBranchResponseMapper.mapBranches; + import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.projectadministration.port.driver.branch.list.ListBranchesUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetBranchResponse; -import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -26,10 +27,6 @@ public ListBranchesController(ListBranchesUseCase listBranchesUseCase) { @GetMapping(path = "/projects/{projectId}/branches", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> listBranches(@PathVariable long projectId) { List branches = listBranchesUseCase.listBranchesInProject(projectId); - List responses = new ArrayList<>(branches.size()); - for (Branch branch : branches) { - responses.add(new GetBranchResponse(branch.getName(), branch.getCommitHash())); - } - return new ResponseEntity<>(responses, HttpStatus.OK); + return new ResponseEntity<>(mapBranches(branches), HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java index a05ebfba5..7f4ee8d48 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.rest.contributor; -import io.reflectoring.coderadar.contributor.domain.Contributor; +import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributor; + import io.reflectoring.coderadar.contributor.port.driver.GetContributorUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; @@ -22,14 +23,6 @@ public GetContributorController(GetContributorUseCase getContributorUseCase) { @GetMapping(path = "/contributors/{id}") public ResponseEntity getById(@PathVariable long id) { - return new ResponseEntity<>(map(getContributorUseCase.getById(id)), HttpStatus.OK); - } - - private GetContributorResponse map(Contributor contributor) { - return new GetContributorResponse( - contributor.getId(), - contributor.getDisplayName(), - contributor.getNames(), - contributor.getEmailAddresses()); + return new ResponseEntity<>(mapContributor(getContributorUseCase.getById(id)), HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java index dee5f0656..2f2428d71 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java @@ -1,11 +1,11 @@ package io.reflectoring.coderadar.rest.contributor; -import io.reflectoring.coderadar.contributor.domain.Contributor; +import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributors; + import io.reflectoring.coderadar.contributor.port.driver.GetContributorsForPathCommand; import io.reflectoring.coderadar.contributor.port.driver.ListContributorsUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; -import java.util.ArrayList; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -29,7 +29,7 @@ public ListContributorsController(ListContributorsUseCase listContributorsUseCas public ResponseEntity> listContributors( @PathVariable long projectId) { return new ResponseEntity<>( - map(listContributorsUseCase.listContributors(projectId)), HttpStatus.OK); + mapContributors(listContributorsUseCase.listContributors(projectId)), HttpStatus.OK); } @RequestMapping( @@ -40,20 +40,8 @@ public ResponseEntity> listContributors( public ResponseEntity> listContributorsForFile( @PathVariable long projectId, @RequestBody @Validated GetContributorsForPathCommand command) { return new ResponseEntity<>( - map(listContributorsUseCase.listContributorsForProjectAndPathInCommit(projectId, command)), + mapContributors( + listContributorsUseCase.listContributorsForProjectAndPathInCommit(projectId, command)), HttpStatus.OK); } - - private List map(List contributors) { - List result = new ArrayList<>(contributors.size()); - for (Contributor c : contributors) { - GetContributorResponse responseItem = new GetContributorResponse(); - responseItem.setId(c.getId()); - responseItem.setDisplayName(c.getDisplayName()); - responseItem.setNames(c.getNames()); - responseItem.setEmailAddresses(c.getEmailAddresses()); - result.add(responseItem); - } - return result; - } } From 2883093b4777f0b936a89365ef6eba778c86da8c Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 6 May 2020 18:17:45 +0200 Subject: [PATCH 26/76] wrote controller tests for the new controllers and adjusted some of the old tests --- .../useradministration/domain/Team.java | 3 +- .../teams/CreateTeamController.java | 2 +- .../teams/ListUsersForProjectController.java | 10 +-- ...teAnalyzerConfigurationControllerTest.java | 5 +- ...teAnalyzerConfigurationControllerTest.java | 4 +- ...etAnalyzerConfigurationControllerTest.java | 7 +- ...nfigurationsFromProjectControllerTest.java | 5 +- ...teAnalyzerConfigurationControllerTest.java | 4 +- .../CreateFilePatternControllerTest.java | 6 +- .../DeleteFilePatternControllerTest.java | 4 +- .../GetFilePatternControllerTest.java | 5 +- ...stFilePatternsOfProjectControllerTest.java | 5 +- .../module/CreateModuleControllerTest.java | 31 +++++++-- .../module/DeleteModuleControllerTest.java | 4 +- .../unit/module/GetModuleControllerTest.java | 5 +- .../ListModulesOfProjectControllerTest.java | 5 +- .../project/CreateProjectControllerTest.java | 7 +- .../project/DeleteProjectControllerTest.java | 6 +- .../project/GetProjectControllerTest.java | 3 +- .../project/ListProjectsControllerTest.java | 4 +- .../project/UpdateProjectControllerTest.java | 5 +- .../user/ChangePasswordControllerTest.java | 2 +- .../rest/unit/user/GetUserControllerTest.java | 2 +- .../unit/user/LoginUserControllerTest.java | 2 +- .../unit/user/RefreshTokenControllerTest.java | 2 +- .../unit/user/RegisterUserControllerTest.java | 2 +- .../RemoveUserFromProjectControllerTest.java | 44 ++++++++++++ .../unit/user/SetUserRoleForProjectTest.java | 53 +++++++++++++++ .../teams/AddTeamToProjectControllerTest.java | 51 ++++++++++++++ .../teams/AddUsersToTeamControllerTest.java | 54 +++++++++++++++ .../user/teams/CreateTeamControllerTest.java | 46 +++++++++++++ .../user/teams/DeleteTeamControllerTest.java | 31 +++++++++ .../rest/unit/user/teams/GetTeamTest.java | 53 +++++++++++++++ .../ListProjectsForTeamControllerTest.java | 44 ++++++++++++ .../ListProjectsForUserControllerTest.java | 47 +++++++++++++ .../user/teams/ListTeamsControllerTest.java | 56 +++++++++++++++ .../ListTeamsForProjectControllerTest.java | 68 +++++++++++++++++++ .../teams/ListTeamsForUserControllerTest.java | 67 ++++++++++++++++++ .../ListUsersForProjectControllerTest.java | 48 +++++++++++++ .../RemoveTeamFromProjectControllerTest.java | 45 ++++++++++++ 40 files changed, 789 insertions(+), 58 deletions(-) create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RemoveUserFromProjectControllerTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddTeamToProjectControllerTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddUsersToTeamControllerTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/CreateTeamControllerTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/DeleteTeamControllerTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForTeamControllerTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForUserControllerTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsControllerTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForProjectControllerTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForUserControllerTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListUsersForProjectControllerTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveTeamFromProjectControllerTest.java diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java index f53caa593..651fd1f6c 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java @@ -1,5 +1,6 @@ package io.reflectoring.coderadar.useradministration.domain; +import java.util.Collections; import java.util.List; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,5 +10,5 @@ public class Team { private long id; private String name; - private List members; + private List members = Collections.emptyList(); } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamController.java index 8b41d07ae..047421806 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamController.java @@ -27,6 +27,6 @@ public CreateTeamController(CreateTeamUseCase createTeamUseCase) { produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity createTeam(@RequestBody CreateTeamCommand command) { Long teamId = createTeamUseCase.createTeam(command); - return new ResponseEntity<>(new IdResponse(teamId), HttpStatus.OK); + return new ResponseEntity<>(new IdResponse(teamId), HttpStatus.CREATED); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListUsersForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListUsersForProjectController.java index b3c542aec..1aeb9679b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListUsersForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListUsersForProjectController.java @@ -5,7 +5,7 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; -import io.reflectoring.coderadar.useradministration.port.driven.ListUsersForProjectPort; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListUsersForProjectUseCase; import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -18,15 +18,15 @@ @RestController @Transactional public class ListUsersForProjectController implements AbstractBaseController { - private final ListUsersForProjectPort listUsersForProjectPort; + private final ListUsersForProjectUseCase listUsersForProjectUseCase; - public ListUsersForProjectController(ListUsersForProjectPort listUsersForProjectPort) { - this.listUsersForProjectPort = listUsersForProjectPort; + public ListUsersForProjectController(ListUsersForProjectUseCase listUsersForProjectUseCase) { + this.listUsersForProjectUseCase = listUsersForProjectUseCase; } @GetMapping(path = "/projects/{projectId}/users", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> listTeamsForUser(@PathVariable long projectId) { - List users = listUsersForProjectPort.listUsers(projectId); + List users = listUsersForProjectUseCase.listUsers(projectId); return new ResponseEntity<>(mapUsers(users), HttpStatus.OK); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java index 988206852..64ae3c075 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java @@ -14,11 +14,11 @@ class CreateAnalyzerConfigurationControllerTest { - private CreateAnalyzerConfigurationUseCase createAnalyzerConfigurationUseCase = + private final CreateAnalyzerConfigurationUseCase createAnalyzerConfigurationUseCase = mock(CreateAnalyzerConfigurationUseCase.class); @Test - void returnsIdOneForNewAnalyzerConfiguration() { + void testCreateAnalyzer() { CreateAnalyzerConfigurationController testSubject = new CreateAnalyzerConfigurationController(createAnalyzerConfigurationUseCase); @@ -29,6 +29,7 @@ void returnsIdOneForNewAnalyzerConfiguration() { ResponseEntity responseEntity = testSubject.addAnalyzerConfiguration(command, 5L); Assertions.assertEquals(HttpStatus.CREATED, responseEntity.getStatusCode()); + Assertions.assertNotNull(responseEntity.getBody()); Assertions.assertEquals(1L, ((IdResponse) responseEntity.getBody()).getId()); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java index a6d32de04..6f5e2757a 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java @@ -12,11 +12,11 @@ class DeleteAnalyzerConfigurationControllerTest { - private DeleteAnalyzerConfigurationUseCase deleteAnalyzerConfigurationUseCase = + private final DeleteAnalyzerConfigurationUseCase deleteAnalyzerConfigurationUseCase = mock(DeleteAnalyzerConfigurationUseCase.class); @Test - void deleteAnalyzerConfigurationWithIdOne() { + void testDeleteAnalyzerConfiguration() { DeleteAnalyzerConfigurationController testSubject = new DeleteAnalyzerConfigurationController(deleteAnalyzerConfigurationUseCase); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java index 0dfd4f4a7..b570bb511 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java @@ -14,11 +14,11 @@ class GetAnalyzerConfigurationControllerTest { - private GetAnalyzerConfigurationUseCase getAnalyzerConfigurationUseCase = + private final GetAnalyzerConfigurationUseCase getAnalyzerConfigurationUseCase = mock(GetAnalyzerConfigurationUseCase.class); @Test - void returnsAnalyzerConfigurationWithIdOne() { + void testGetAnalyzerConfiguration() { GetAnalyzerConfigurationController testSubject = new GetAnalyzerConfigurationController(getAnalyzerConfigurationUseCase); @@ -31,8 +31,9 @@ void returnsAnalyzerConfigurationWithIdOne() { testSubject.getAnalyzerConfiguration(1L); Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); + Assertions.assertNotNull(responseEntity.getBody()); Assertions.assertEquals(1L, responseEntity.getBody().getId()); Assertions.assertEquals("analyzer", responseEntity.getBody().getAnalyzerName()); - Assertions.assertEquals(true, responseEntity.getBody().isEnabled()); + Assertions.assertTrue(responseEntity.getBody().isEnabled()); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java index 50f7f6139..abf6444bb 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java @@ -16,11 +16,11 @@ class ListAnalyzerConfigurationsFromProjectControllerTest { - private ListAnalyzerConfigurationsUseCase listAnalyzerConfigurationsUseCase = + private final ListAnalyzerConfigurationsUseCase listAnalyzerConfigurationsUseCase = mock(ListAnalyzerConfigurationsUseCase.class); @Test - void returnsTwoGetAnalyzerConfigurationResponsesFromProject() { + void testListAnalyzerConfigurationsFromProject() { ListAnalyzerConfigurationsFromProjectController testSubject = new ListAnalyzerConfigurationsFromProjectController(listAnalyzerConfigurationsUseCase); @@ -37,6 +37,7 @@ void returnsTwoGetAnalyzerConfigurationResponsesFromProject() { testSubject.getAnalyzerConfigurationsFromProject(1L); Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); + Assertions.assertNotNull(responseEntity.getBody()); Assertions.assertEquals(responses.size(), responseEntity.getBody().size()); Assertions.assertEquals(response1.getId(), responseEntity.getBody().get(0).getId()); Assertions.assertEquals( diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java index 6ed69ed19..3f4e7f1ef 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java @@ -13,11 +13,11 @@ class UpdateAnalyzerConfigurationControllerTest { - private UpdateAnalyzerConfigurationUseCase updateAnalyzerConfigurationUseCase = + private final UpdateAnalyzerConfigurationUseCase updateAnalyzerConfigurationUseCase = mock(UpdateAnalyzerConfigurationUseCase.class); @Test - void updateAnalyzerConfigurationWithIdOne() { + void testUpdateAnalyzerConfiguration() { UpdateAnalyzerConfigurationController testSubject = new UpdateAnalyzerConfigurationController(updateAnalyzerConfigurationUseCase); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java index 6eebce4f5..82af20990 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java @@ -15,10 +15,11 @@ class CreateFilePatternControllerTest { - private CreateFilePatternUseCase createFilePatternUseCase = mock(CreateFilePatternUseCase.class); + private final CreateFilePatternUseCase createFilePatternUseCase = + mock(CreateFilePatternUseCase.class); @Test - void createFilePatternSuccessfully() { + void testCreateFilePattern() { CreateFilePatternController testSubject = new CreateFilePatternController(createFilePatternUseCase); @@ -29,6 +30,7 @@ void createFilePatternSuccessfully() { ResponseEntity responseEntity = testSubject.createFilePattern(command, 5L); Assertions.assertEquals(HttpStatus.CREATED, responseEntity.getStatusCode()); + Assertions.assertNotNull(responseEntity.getBody()); Assertions.assertEquals(1L, responseEntity.getBody().getId()); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java index ae7667681..12e2065af 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java @@ -12,11 +12,11 @@ class DeleteFilePatternControllerTest { - private DeleteFilePatternFromProjectUseCase deleteFilePatternFromProjectUseCase = + private final DeleteFilePatternFromProjectUseCase deleteFilePatternFromProjectUseCase = mock(DeleteFilePatternFromProjectUseCase.class); @Test - void deleteFilePatternWithIdOne() { + void testDeleteFilePattern() { DeleteFilePatternController testSubject = new DeleteFilePatternController(deleteFilePatternFromProjectUseCase); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java index be46d25b2..ee0f2431e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java @@ -15,10 +15,10 @@ class GetFilePatternControllerTest { - private GetFilePatternUseCase getFilePatternUseCase = mock(GetFilePatternUseCase.class); + private final GetFilePatternUseCase getFilePatternUseCase = mock(GetFilePatternUseCase.class); @Test - void returnsFilePatternWithIdOne() { + void testDeleteFilePattern() { GetFilePatternController testSubject = new GetFilePatternController(getFilePatternUseCase); FilePattern filePattern = new FilePattern(1L, "**/*.java", InclusionType.INCLUDE); @@ -27,6 +27,7 @@ void returnsFilePatternWithIdOne() { ResponseEntity responseEntity = testSubject.getFilePattern(1L); Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); + Assertions.assertNotNull(responseEntity.getBody()); Assertions.assertEquals(filePattern.getId(), responseEntity.getBody().getId()); Assertions.assertEquals(filePattern.getPattern(), responseEntity.getBody().getPattern()); Assertions.assertEquals( diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java index 679744146..fab7bce3b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java @@ -17,11 +17,11 @@ class ListFilePatternsOfProjectControllerTest { - private ListFilePatternsOfProjectUseCase listFilePatternsOfProjectUseCase = + private final ListFilePatternsOfProjectUseCase listFilePatternsOfProjectUseCase = mock(ListFilePatternsOfProjectUseCase.class); @Test - void returnsModulesForProjectWithIdOne() { + void testListFilePatternsOfProject() { ListFilePatternsOfProjectController testSubject = new ListFilePatternsOfProjectController(listFilePatternsOfProjectUseCase); @@ -36,6 +36,7 @@ void returnsModulesForProjectWithIdOne() { ResponseEntity> responseEntity = testSubject.listFilePatterns(1L); Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); + Assertions.assertNotNull(responseEntity.getBody()); Assertions.assertEquals(responses.size(), responseEntity.getBody().size()); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java index 34ef8ec6e..3a12db891 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java @@ -2,11 +2,10 @@ import static org.mockito.Mockito.mock; -import io.reflectoring.coderadar.projectadministration.ModuleAlreadyExistsException; import io.reflectoring.coderadar.projectadministration.ModulePathInvalidException; -import io.reflectoring.coderadar.projectadministration.ProjectIsBeingProcessedException; import io.reflectoring.coderadar.projectadministration.port.driver.module.create.CreateModuleCommand; import io.reflectoring.coderadar.projectadministration.port.driver.module.create.CreateModuleUseCase; +import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; import io.reflectoring.coderadar.rest.module.CreateModuleController; import org.junit.jupiter.api.Assertions; @@ -17,20 +16,38 @@ class CreateModuleControllerTest { - private CreateModuleUseCase createModuleUseCase = mock(CreateModuleUseCase.class); + private final CreateModuleUseCase createModuleUseCase = mock(CreateModuleUseCase.class); @Test - void createModuleSuccessfully() - throws ModuleAlreadyExistsException, ModulePathInvalidException, - ProjectIsBeingProcessedException { + void testCreateModule() throws ModulePathInvalidException { CreateModuleController testSubject = new CreateModuleController(createModuleUseCase); CreateModuleCommand command = new CreateModuleCommand("module-path-test"); Mockito.when(createModuleUseCase.createModule(command, 5L)).thenReturn(1L); - ResponseEntity responseEntity = testSubject.createModule(command, 5L); + ResponseEntity responseEntity = testSubject.createModule(command, 5L); Assertions.assertEquals(HttpStatus.CREATED, responseEntity.getStatusCode()); + Assertions.assertNotNull(responseEntity.getBody()); + Assertions.assertTrue(responseEntity.getBody() instanceof IdResponse); Assertions.assertEquals(1L, ((IdResponse) responseEntity.getBody()).getId()); } + + @Test + void testCreateModuleReturnsErrorWhenPathInvalid() throws ModulePathInvalidException { + CreateModuleController testSubject = new CreateModuleController(createModuleUseCase); + + CreateModuleCommand command = new CreateModuleCommand("module-path-test//"); + Mockito.when(createModuleUseCase.createModule(command, 5L)) + .thenThrow(new ModulePathInvalidException(command.getPath())); + + ResponseEntity responseEntity = testSubject.createModule(command, 5L); + + Assertions.assertEquals(HttpStatus.UNPROCESSABLE_ENTITY, responseEntity.getStatusCode()); + Assertions.assertNotNull(responseEntity.getBody()); + Assertions.assertTrue(responseEntity.getBody() instanceof ErrorMessageResponse); + Assertions.assertEquals( + "module-path-test// is not a valid path!", + ((ErrorMessageResponse) responseEntity.getBody()).getErrorMessage()); + } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java index 5e05deefe..0bd3cc6b2 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java @@ -13,10 +13,10 @@ class DeleteModuleControllerTest { - private DeleteModuleUseCase deleteModuleUseCase = mock(DeleteModuleUseCase.class); + private final DeleteModuleUseCase deleteModuleUseCase = mock(DeleteModuleUseCase.class); @Test - void deleteModuleWithIdOne() throws ProjectIsBeingProcessedException { + void testDeleteModule() throws ProjectIsBeingProcessedException { DeleteModuleController testSubject = new DeleteModuleController(deleteModuleUseCase); ResponseEntity responseEntity = testSubject.deleteModule(1L, 2L); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java index 4377899da..0829935a7 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java @@ -14,10 +14,10 @@ class GetModuleControllerTest { - private GetModuleUseCase getModuleUseCase = mock(GetModuleUseCase.class); + private final GetModuleUseCase getModuleUseCase = mock(GetModuleUseCase.class); @Test - void returnsModuleWithIdOne() { + void testGetModule() { GetModuleController testSubject = new GetModuleController(getModuleUseCase); Module module = new Module(1L, "module-path"); @@ -26,6 +26,7 @@ void returnsModuleWithIdOne() { ResponseEntity responseEntity = testSubject.getModule(1L); Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); + Assertions.assertNotNull(responseEntity.getBody()); Assertions.assertEquals(1L, responseEntity.getBody().getId()); Assertions.assertEquals("module-path", responseEntity.getBody().getPath()); } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java index 2f3707814..6d482ad81 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java @@ -16,11 +16,11 @@ class ListModulesOfProjectControllerTest { - private ListModulesOfProjectUseCase listModulesOfProjectUseCase = + private final ListModulesOfProjectUseCase listModulesOfProjectUseCase = mock(ListModulesOfProjectUseCase.class); @Test - void returnsModulesForProjectWithIdOne() { + void testListModulesOfProject() { ListModulesOfProjectController testSubject = new ListModulesOfProjectController(listModulesOfProjectUseCase); @@ -35,6 +35,7 @@ void returnsModulesForProjectWithIdOne() { ResponseEntity> responseEntity = testSubject.listModules(1L); Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); + Assertions.assertNotNull(responseEntity.getBody()); Assertions.assertEquals(responses.size(), responseEntity.getBody().size()); Assertions.assertEquals(response1.getId(), responseEntity.getBody().get(0).getId()); Assertions.assertEquals(response1.getPath(), responseEntity.getBody().get(0).getPath()); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java index 02d02abf8..00115130f 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java @@ -2,7 +2,6 @@ import static org.mockito.Mockito.mock; -import io.reflectoring.coderadar.projectadministration.ProjectIsBeingProcessedException; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectUseCase; import io.reflectoring.coderadar.rest.domain.IdResponse; @@ -17,11 +16,10 @@ class CreateProjectControllerTest { - private CreateProjectUseCase createProjectUseCase = mock(CreateProjectUseCase.class); + private final CreateProjectUseCase createProjectUseCase = mock(CreateProjectUseCase.class); @Test - void createNewProjectSuccessfully() - throws MalformedURLException, ProjectIsBeingProcessedException { + void createNewProjectSuccessfully() throws MalformedURLException { CreateProjectController testSubject = new CreateProjectController(createProjectUseCase); CreateProjectCommand command = @@ -33,6 +31,7 @@ void createNewProjectSuccessfully() ResponseEntity responseEntity = testSubject.createProject(command); Assertions.assertEquals(HttpStatus.CREATED, responseEntity.getStatusCode()); + Assertions.assertNotNull(responseEntity.getBody()); Assertions.assertEquals(1L, responseEntity.getBody().getId()); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java index c5f24847a..ebb29603b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java @@ -2,8 +2,6 @@ import static org.mockito.Mockito.mock; -import com.fasterxml.jackson.core.JsonProcessingException; -import io.reflectoring.coderadar.projectadministration.ProjectIsBeingProcessedException; import io.reflectoring.coderadar.projectadministration.port.driver.project.delete.DeleteProjectUseCase; import io.reflectoring.coderadar.rest.project.DeleteProjectController; import org.junit.jupiter.api.Assertions; @@ -14,10 +12,10 @@ class DeleteProjectControllerTest { - private DeleteProjectUseCase deleteProjectUseCase = mock(DeleteProjectUseCase.class); + private final DeleteProjectUseCase deleteProjectUseCase = mock(DeleteProjectUseCase.class); @Test - void deleteProjectWithIdOne() throws JsonProcessingException, ProjectIsBeingProcessedException { + void deleteProjectWithIdOne() { DeleteProjectController testSubject = new DeleteProjectController(deleteProjectUseCase); ResponseEntity responseEntity = testSubject.deleteProject(1L); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java index f82b07c2f..e85839372 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java @@ -14,7 +14,7 @@ class GetProjectControllerTest { - private GetProjectUseCase getProjectUseCase = mock(GetProjectUseCase.class); + private final GetProjectUseCase getProjectUseCase = mock(GetProjectUseCase.class); @Test void returnsProjectWithIdOne() { @@ -28,6 +28,7 @@ void returnsProjectWithIdOne() { ResponseEntity responseEntity = testSubject.getProject(1L); Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); + Assertions.assertNotNull(responseEntity.getBody()); Assertions.assertEquals(project.getId(), responseEntity.getBody().getId()); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java index 3ad655575..5c8b2f3ce 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java @@ -16,7 +16,7 @@ class ListProjectsControllerTest { - private ListProjectsUseCase listProjectsUseCase = mock(ListProjectsUseCase.class); + private final ListProjectsUseCase listProjectsUseCase = mock(ListProjectsUseCase.class); @Test void listAllProjects() { @@ -34,7 +34,7 @@ void listAllProjects() { Mockito.when(listProjectsUseCase.listProjects()).thenReturn(projects); ResponseEntity> responseEntity = testSubject.listProjects(); - + Assertions.assertNotNull(responseEntity.getBody()); Assertions.assertEquals(3L, responseEntity.getBody().size()); Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java index 3a47a820b..03f92f355 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java @@ -2,7 +2,6 @@ import static org.mockito.Mockito.mock; -import io.reflectoring.coderadar.projectadministration.ProjectIsBeingProcessedException; import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectUseCase; import io.reflectoring.coderadar.rest.project.UpdateProjectController; @@ -16,10 +15,10 @@ class UpdateProjectControllerTest { - private UpdateProjectUseCase updateProjectUseCase = mock(UpdateProjectUseCase.class); + private final UpdateProjectUseCase updateProjectUseCase = mock(UpdateProjectUseCase.class); @Test - void updateProjectWithIdOne() throws MalformedURLException, ProjectIsBeingProcessedException { + void updateProjectWithIdOne() throws MalformedURLException { UpdateProjectController testSubject = new UpdateProjectController(updateProjectUseCase); UpdateProjectCommand command = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java index b9a6a4dd1..1a7b6f49b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java @@ -13,7 +13,7 @@ class ChangePasswordControllerTest { - private ChangePasswordUseCase changePasswordUseCase = mock(ChangePasswordUseCase.class); + private final ChangePasswordUseCase changePasswordUseCase = mock(ChangePasswordUseCase.class); @Test void changePasswordSuccessfully() { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java index cd2645264..77ea915ad 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java @@ -14,7 +14,7 @@ class GetUserControllerTest { - private GetUserUseCase getUserUseCase = mock(GetUserUseCase.class); + private final GetUserUseCase getUserUseCase = mock(GetUserUseCase.class); @Test void loadUserWithIdOne() { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java index 41014efa0..4aa562180 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java @@ -14,7 +14,7 @@ class LoginUserControllerTest { - private LoginUserUseCase loginUserUseCase = mock(LoginUserUseCase.class); + private final LoginUserUseCase loginUserUseCase = mock(LoginUserUseCase.class); @Test void loginUserWithUsernameAndPassword() { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java index 07dae9b3c..f89e75d16 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java @@ -14,7 +14,7 @@ class RefreshTokenControllerTest { - private RefreshTokenUseCase refreshTokenUseCase = mock(RefreshTokenUseCase.class); + private final RefreshTokenUseCase refreshTokenUseCase = mock(RefreshTokenUseCase.class); @Test void refreshTokenSuccessfully() { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java index d81587589..0df84737b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java @@ -14,7 +14,7 @@ class RegisterUserControllerTest { - private RegisterUserUseCase registerUserUseCase = mock(RegisterUserUseCase.class); + private final RegisterUserUseCase registerUserUseCase = mock(RegisterUserUseCase.class); @Test void registerUserWithIdOne() { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RemoveUserFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RemoveUserFromProjectControllerTest.java new file mode 100644 index 000000000..3a5e28e25 --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RemoveUserFromProjectControllerTest.java @@ -0,0 +1,44 @@ +package io.reflectoring.coderadar.rest.unit.user; + +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; +import io.reflectoring.coderadar.rest.useradministration.permissions.RemoveUserFromProjectController; +import io.reflectoring.coderadar.useradministration.UserNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driver.permissions.RemoveUserFromProjectUseCase; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class RemoveUserFromProjectControllerTest { + private final RemoveUserFromProjectUseCase removeUserFromProjectUseCase = + mock(RemoveUserFromProjectUseCase.class); + private final RemoveUserFromProjectController testController = + new RemoveUserFromProjectController(removeUserFromProjectUseCase); + + @Test + public void testRemoveUserFromProjectController() { + ResponseEntity response = testController.removeUserRoleFromProject(1L, 2L); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + } + + @Test + public void testRemoveUserFromProjectControllerThrowsExceptionWhenUserNotFound() { + Mockito.doThrow(UserNotFoundException.class) + .when(removeUserFromProjectUseCase) + .removeUserFromProject(1L, 2L); + Assertions.assertThrows( + UserNotFoundException.class, () -> testController.removeUserRoleFromProject(1L, 2L)); + } + + @Test + public void testRemoveUserFromProjectControllerThrowsExceptionWhenProjectNotFound() { + Mockito.doThrow(ProjectNotFoundException.class) + .when(removeUserFromProjectUseCase) + .removeUserFromProject(1L, 2L); + Assertions.assertThrows( + ProjectNotFoundException.class, () -> testController.removeUserRoleFromProject(1L, 2L)); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectTest.java new file mode 100644 index 000000000..08321d8ac --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectTest.java @@ -0,0 +1,53 @@ +package io.reflectoring.coderadar.rest.unit.user; + +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; +import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; +import io.reflectoring.coderadar.rest.useradministration.permissions.SetUserRoleForProjectController; +import io.reflectoring.coderadar.useradministration.UserNotFoundException; +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import io.reflectoring.coderadar.useradministration.port.driver.permissions.SetUserRoleForProjectUseCase; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class SetUserRoleForProjectTest { + private final SetUserRoleForProjectUseCase setUserRoleForProjectUseCase = + mock(SetUserRoleForProjectUseCase.class); + private final SetUserRoleForProjectController testController = + new SetUserRoleForProjectController(setUserRoleForProjectUseCase); + + @Test + public void testSetUserRoleForProject() { + ResponseEntity response = + testController.setUserRoleForProject(1L, 2L, new ProjectRoleJsonWrapper(ProjectRole.ADMIN)); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + } + + @Test + public void testSetUserRoleForProjectThrowsExceptionWhenUserNotFound() { + Mockito.doThrow(UserNotFoundException.class) + .when(setUserRoleForProjectUseCase) + .setRole(1L, 2L, ProjectRole.ADMIN); + Assertions.assertThrows( + UserNotFoundException.class, + () -> + testController.setUserRoleForProject( + 1L, 2L, new ProjectRoleJsonWrapper(ProjectRole.ADMIN))); + } + + @Test + public void testSetUserRoleForProjectThrowsExceptionWhenProjectNotFound() { + Mockito.doThrow(ProjectNotFoundException.class) + .when(setUserRoleForProjectUseCase) + .setRole(1L, 2L, ProjectRole.ADMIN); + Assertions.assertThrows( + ProjectNotFoundException.class, + () -> + testController.setUserRoleForProject( + 1L, 2L, new ProjectRoleJsonWrapper(ProjectRole.ADMIN))); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddTeamToProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddTeamToProjectControllerTest.java new file mode 100644 index 000000000..5053372e1 --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddTeamToProjectControllerTest.java @@ -0,0 +1,51 @@ +package io.reflectoring.coderadar.rest.unit.user.teams; + +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; +import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; +import io.reflectoring.coderadar.rest.useradministration.teams.AddTeamToProjectController; +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import io.reflectoring.coderadar.useradministration.port.driver.teams.AddTeamToProjectUseCase; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class AddTeamToProjectControllerTest { + private final AddTeamToProjectUseCase addTeamToProjectUseCase = + mock(AddTeamToProjectUseCase.class); + private final AddTeamToProjectController testController = + new AddTeamToProjectController(addTeamToProjectUseCase); + + @Test + public void testAddTeamToProject() { + ResponseEntity response = + testController.addTeamToProject(1L, 2L, new ProjectRoleJsonWrapper(ProjectRole.ADMIN)); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + } + + @Test + public void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { + Mockito.doThrow(TeamNotFoundException.class) + .when(addTeamToProjectUseCase) + .addTeamToProject(1L, 2L, ProjectRole.ADMIN); + Assertions.assertThrows( + TeamNotFoundException.class, + () -> + testController.addTeamToProject(1L, 2L, new ProjectRoleJsonWrapper(ProjectRole.ADMIN))); + } + + @Test + public void testRemoveTeamFromProjectThrowsExceptionWhenProjectNotFound() { + Mockito.doThrow(ProjectNotFoundException.class) + .when(addTeamToProjectUseCase) + .addTeamToProject(1L, 2L, ProjectRole.ADMIN); + Assertions.assertThrows( + ProjectNotFoundException.class, + () -> + testController.addTeamToProject(1L, 2L, new ProjectRoleJsonWrapper(ProjectRole.ADMIN))); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddUsersToTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddUsersToTeamControllerTest.java new file mode 100644 index 000000000..a2d2b6a5d --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddUsersToTeamControllerTest.java @@ -0,0 +1,54 @@ +package io.reflectoring.coderadar.rest.unit.user.teams; + +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.rest.JsonListWrapper; +import io.reflectoring.coderadar.rest.useradministration.teams.AddUsersToTeamController; +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; +import io.reflectoring.coderadar.useradministration.UserNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; +import java.util.Collections; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class AddUsersToTeamControllerTest { + private final AddUsersToTeamUseCase addUsersToTeamUseCase = mock(AddUsersToTeamUseCase.class); + private final AddUsersToTeamController testController = + new AddUsersToTeamController(addUsersToTeamUseCase); + + @Test + public void testAddUsersToTeamController() { + ResponseEntity response = + testController.addUsersToTeam(1L, new JsonListWrapper<>(Collections.singletonList(2L))); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + } + + @Test + public void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { + Mockito.doThrow(TeamNotFoundException.class) + .when(addUsersToTeamUseCase) + .addUsersToTeam(anyLong(), anyList()); + Assertions.assertThrows( + TeamNotFoundException.class, + () -> + testController.addUsersToTeam( + 1L, new JsonListWrapper<>(Collections.singletonList(2L)))); + } + + @Test + public void testRemoveTeamFromProjectThrowsExceptionWhenUserNotFound() { + Mockito.doThrow(UserNotFoundException.class) + .when(addUsersToTeamUseCase) + .addUsersToTeam(anyLong(), anyList()); + Assertions.assertThrows( + UserNotFoundException.class, + () -> + testController.addUsersToTeam( + 1L, new JsonListWrapper<>(Collections.singletonList(2L)))); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/CreateTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/CreateTeamControllerTest.java new file mode 100644 index 000000000..bedec444e --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/CreateTeamControllerTest.java @@ -0,0 +1,46 @@ +package io.reflectoring.coderadar.rest.unit.user.teams; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.rest.domain.IdResponse; +import io.reflectoring.coderadar.rest.useradministration.teams.CreateTeamController; +import io.reflectoring.coderadar.useradministration.UserNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; +import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamUseCase; +import java.util.Collections; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class CreateTeamControllerTest { + private final CreateTeamUseCase createTeamUseCase = mock(CreateTeamUseCase.class); + + private final CreateTeamController testController = new CreateTeamController(createTeamUseCase); + + @Test + public void testCreateTeam() { + + // Set up + CreateTeamCommand testCommand = new CreateTeamCommand(); + testCommand.setName("TestTeam1"); + testCommand.setUserIds(Collections.singletonList(1L)); + + Mockito.when(createTeamUseCase.createTeam(testCommand)).thenReturn(2L); + + // Test + ResponseEntity responseEntity = testController.createTeam(testCommand); + Assertions.assertEquals(HttpStatus.CREATED, responseEntity.getStatusCode()); + Assertions.assertNotNull(responseEntity.getBody()); + Assertions.assertEquals(2L, responseEntity.getBody().getId()); + } + + @Test + public void testCreateTeamThrowsExceptionWhenUserNotFound() { + Mockito.when(createTeamUseCase.createTeam(any())).thenThrow(new UserNotFoundException(1L)); + Assertions.assertThrows( + UserNotFoundException.class, () -> testController.createTeam(new CreateTeamCommand())); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/DeleteTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/DeleteTeamControllerTest.java new file mode 100644 index 000000000..acb853411 --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/DeleteTeamControllerTest.java @@ -0,0 +1,31 @@ +package io.reflectoring.coderadar.rest.unit.user.teams; + +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.rest.useradministration.teams.DeleteTeamController; +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteTeamUseCase; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class DeleteTeamControllerTest { + private final DeleteTeamUseCase deleteTeamUseCase = mock(DeleteTeamUseCase.class); + + private final DeleteTeamController testController = new DeleteTeamController(deleteTeamUseCase); + + @Test + public void testDeleteTeam() { + ResponseEntity response = testController.deleteTeam(1L); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + } + + @Test + public void testDeleteTeamThrowsExceptionIfTeamNotFound() { + Mockito.doThrow(TeamNotFoundException.class).when(deleteTeamUseCase).deleteTeam(anyLong()); + Assertions.assertThrows(TeamNotFoundException.class, () -> testController.deleteTeam(1L)); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamTest.java new file mode 100644 index 000000000..c3d0499c7 --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamTest.java @@ -0,0 +1,53 @@ +package io.reflectoring.coderadar.rest.unit.user.teams; + +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import io.reflectoring.coderadar.rest.useradministration.teams.GetTeamController; +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; +import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.domain.User; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.GetTeamUseCase; +import java.util.Collections; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class GetTeamTest { + private final GetTeamUseCase getTeamUseCase = mock(GetTeamUseCase.class); + private final GetTeamController testController = new GetTeamController(getTeamUseCase); + + @Test + public void testGetTeam() { + // Set up + Mockito.when(getTeamUseCase.get(1L)) + .thenReturn( + new Team() + .setId(1L) + .setName("TestTeam1") + .setMembers( + Collections.singletonList(new User().setId(3L).setUsername("TestUser1")))); + + // Test + ResponseEntity responseEntity = testController.getTeam(1L); + Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); + + Assertions.assertNotNull(responseEntity.getBody()); + Assertions.assertEquals(1L, responseEntity.getBody().getId()); + Assertions.assertEquals("TestTeam1", responseEntity.getBody().getName()); + + Assertions.assertNotNull(responseEntity.getBody().getMembers()); + Assertions.assertEquals(1, responseEntity.getBody().getMembers().size()); + Assertions.assertEquals(3L, responseEntity.getBody().getMembers().get(0).getId()); + Assertions.assertEquals( + "TestUser1", responseEntity.getBody().getMembers().get(0).getUsername()); + } + + @Test + public void testGetTeamReturnsErrorWhenTeamNotFound() { + Mockito.when(getTeamUseCase.get(1L)).thenThrow(new TeamNotFoundException(1L)); + Assertions.assertThrows(TeamNotFoundException.class, () -> testController.getTeam(1L)); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForTeamControllerTest.java new file mode 100644 index 000000000..372d8f4d3 --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForTeamControllerTest.java @@ -0,0 +1,44 @@ +package io.reflectoring.coderadar.rest.unit.user.teams; + +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.projectadministration.domain.Project; +import io.reflectoring.coderadar.rest.domain.GetProjectResponse; +import io.reflectoring.coderadar.rest.useradministration.teams.ListProjectsForTeamController; +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; +import java.util.Collections; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class ListProjectsForTeamControllerTest { + private final ListProjectsForTeamUseCase listProjectsForTeamUseCase = + mock(ListProjectsForTeamUseCase.class); + private final ListProjectsForTeamController testController = + new ListProjectsForTeamController(listProjectsForTeamUseCase); + + @Test + public void testListProjectsForTeam() { + // Set up + Mockito.when(listProjectsForTeamUseCase.listProjects(1L)) + .thenReturn(Collections.singletonList(new Project().setName("TestProject1").setId(2L))); + + ResponseEntity> response = testController.listProjectsForTeam(1L); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + Assertions.assertNotNull(response.getBody()); + Assertions.assertEquals(1L, response.getBody().size()); + Assertions.assertEquals(2L, response.getBody().get(0).getId()); + Assertions.assertEquals("TestProject1", response.getBody().get(0).getName()); + } + + @Test + public void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { + Mockito.doThrow(TeamNotFoundException.class).when(listProjectsForTeamUseCase).listProjects(1L); + Assertions.assertThrows( + TeamNotFoundException.class, () -> testController.listProjectsForTeam(1L)); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForUserControllerTest.java new file mode 100644 index 000000000..1f22d5911 --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForUserControllerTest.java @@ -0,0 +1,47 @@ +package io.reflectoring.coderadar.rest.unit.user.teams; + +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.projectadministration.domain.Project; +import io.reflectoring.coderadar.rest.domain.GetProjectResponse; +import io.reflectoring.coderadar.rest.useradministration.ListProjectsForUserController; +import io.reflectoring.coderadar.useradministration.UserNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; +import java.util.Collections; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class ListProjectsForUserControllerTest { + private final ListProjectsForUserUseCase listProjectsForUserUseCase = + mock(ListProjectsForUserUseCase.class); + + private final ListProjectsForUserController testController = + new ListProjectsForUserController(listProjectsForUserUseCase); + + @Test + public void testListProjectsForUser() { + // Set up + Mockito.when(listProjectsForUserUseCase.listProjects(1L)) + .thenReturn(Collections.singletonList(new Project().setName("TestProject1").setId(2L))); + + ResponseEntity> response = testController.listProjectsForUser(1L); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + Assertions.assertNotNull(response.getBody()); + Assertions.assertEquals(1L, response.getBody().size()); + Assertions.assertEquals(2L, response.getBody().get(0).getId()); + Assertions.assertEquals("TestProject1", response.getBody().get(0).getName()); + } + + @Test + public void testListProjectsForUserThrowsWhenUserNotFound() { // TODO: Exception is caught by the + // ExceptionHandler, is this test needed? + Mockito.when(listProjectsForUserUseCase.listProjects(1L)) + .thenThrow(new UserNotFoundException(1L)); + Assertions.assertThrows( + UserNotFoundException.class, () -> testController.listProjectsForUser(1L)); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsControllerTest.java new file mode 100644 index 000000000..e91eaa39f --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsControllerTest.java @@ -0,0 +1,56 @@ +package io.reflectoring.coderadar.rest.unit.user.teams; + +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import io.reflectoring.coderadar.rest.useradministration.teams.ListTeamsController; +import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.domain.User; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class ListTeamsControllerTest { + private final ListTeamsUseCase listTeamsUseCase = mock(ListTeamsUseCase.class); + private final ListTeamsController testController = new ListTeamsController(listTeamsUseCase); + + @BeforeEach + public void setUp() { + Mockito.when(listTeamsUseCase.listTeams()) + .thenReturn( + Arrays.asList( + new Team().setId(1L).setName("TestTeam1"), + new Team() + .setId(2L) + .setName("TestTeam2") + .setMembers( + Collections.singletonList(new User().setId(3L).setUsername("TestUser1"))))); + } + + @Test + public void testListTeams() { + ResponseEntity> responseEntity = testController.listTeams(); + Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); + + Assertions.assertNotNull(responseEntity.getBody()); + Assertions.assertEquals(2, responseEntity.getBody().size()); + Assertions.assertEquals(1L, responseEntity.getBody().get(0).getId()); + Assertions.assertEquals("TestTeam1", responseEntity.getBody().get(0).getName()); + + Assertions.assertEquals(2L, responseEntity.getBody().get(1).getId()); + Assertions.assertEquals("TestTeam2", responseEntity.getBody().get(1).getName()); + + Assertions.assertNotNull(responseEntity.getBody().get(1).getMembers()); + Assertions.assertEquals(1, responseEntity.getBody().get(1).getMembers().size()); + Assertions.assertEquals(3L, responseEntity.getBody().get(1).getMembers().get(0).getId()); + Assertions.assertEquals( + "TestUser1", responseEntity.getBody().get(1).getMembers().get(0).getUsername()); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForProjectControllerTest.java new file mode 100644 index 000000000..66f205cf5 --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForProjectControllerTest.java @@ -0,0 +1,68 @@ +package io.reflectoring.coderadar.rest.unit.user.teams; + +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; +import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import io.reflectoring.coderadar.rest.useradministration.teams.ListTeamsForProjectController; +import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.domain.User; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class ListTeamsForProjectControllerTest { + + private final ListTeamsForProjectUseCase listTeamsForProjectUseCase = + mock(ListTeamsForProjectUseCase.class); + private final ListTeamsForProjectController testController = + new ListTeamsForProjectController(listTeamsForProjectUseCase); + + @BeforeEach + public void setUp() { + Mockito.when(listTeamsForProjectUseCase.listTeamsForProject(5L)) + .thenReturn( + Arrays.asList( + new Team().setId(1L).setName("TestTeam1"), + new Team() + .setId(2L) + .setName("TestTeam2") + .setMembers( + Collections.singletonList(new User().setId(3L).setUsername("TestUser1"))))); + } + + @Test + public void testListTeams() { + ResponseEntity> responseEntity = testController.listTeamsForProject(5L); + Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); + + Assertions.assertNotNull(responseEntity.getBody()); + Assertions.assertEquals(2, responseEntity.getBody().size()); + Assertions.assertEquals(1L, responseEntity.getBody().get(0).getId()); + Assertions.assertEquals("TestTeam1", responseEntity.getBody().get(0).getName()); + + Assertions.assertEquals(2L, responseEntity.getBody().get(1).getId()); + Assertions.assertEquals("TestTeam2", responseEntity.getBody().get(1).getName()); + + Assertions.assertNotNull(responseEntity.getBody().get(1).getMembers()); + Assertions.assertEquals(1, responseEntity.getBody().get(1).getMembers().size()); + Assertions.assertEquals(3L, responseEntity.getBody().get(1).getMembers().get(0).getId()); + Assertions.assertEquals( + "TestUser1", responseEntity.getBody().get(1).getMembers().get(0).getUsername()); + } + + @Test + public void testListProjectsForUserThrowsWhenProjectNotFound() { + Mockito.when(listTeamsForProjectUseCase.listTeamsForProject(8L)) + .thenThrow(new ProjectNotFoundException(1L)); + Assertions.assertThrows( + ProjectNotFoundException.class, () -> testController.listTeamsForProject(8L)); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForUserControllerTest.java new file mode 100644 index 000000000..e6e289b2a --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForUserControllerTest.java @@ -0,0 +1,67 @@ +package io.reflectoring.coderadar.rest.unit.user.teams; + +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import io.reflectoring.coderadar.rest.useradministration.teams.ListTeamsForUserController; +import io.reflectoring.coderadar.useradministration.UserNotFoundException; +import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.domain.User; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class ListTeamsForUserControllerTest { + + private final ListTeamsForUserUseCase listTeamsForUserUseCase = + mock(ListTeamsForUserUseCase.class); + private final ListTeamsForUserController testController = + new ListTeamsForUserController(listTeamsForUserUseCase); + + @BeforeEach + public void setUp() { + Mockito.when(listTeamsForUserUseCase.listTeamsForUser(5L)) + .thenReturn( + Arrays.asList( + new Team().setId(1L).setName("TestTeam1"), + new Team() + .setId(2L) + .setName("TestTeam2") + .setMembers( + Collections.singletonList(new User().setId(3L).setUsername("TestUser1"))))); + } + + @Test + public void testListTeamsForUser() { + ResponseEntity> responseEntity = testController.listTeamsForUser(5L); + Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); + + Assertions.assertNotNull(responseEntity.getBody()); + Assertions.assertEquals(2, responseEntity.getBody().size()); + Assertions.assertEquals(1L, responseEntity.getBody().get(0).getId()); + Assertions.assertEquals("TestTeam1", responseEntity.getBody().get(0).getName()); + + Assertions.assertEquals(2L, responseEntity.getBody().get(1).getId()); + Assertions.assertEquals("TestTeam2", responseEntity.getBody().get(1).getName()); + + Assertions.assertNotNull(responseEntity.getBody().get(1).getMembers()); + Assertions.assertEquals(1, responseEntity.getBody().get(1).getMembers().size()); + Assertions.assertEquals(3L, responseEntity.getBody().get(1).getMembers().get(0).getId()); + Assertions.assertEquals( + "TestUser1", responseEntity.getBody().get(1).getMembers().get(0).getUsername()); + } + + @Test + public void testListProjectsForUserThrowsWhenUserNotFound() { + Mockito.when(listTeamsForUserUseCase.listTeamsForUser(8L)) + .thenThrow(new UserNotFoundException(1L)); + Assertions.assertThrows(UserNotFoundException.class, () -> testController.listTeamsForUser(8L)); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListUsersForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListUsersForProjectControllerTest.java new file mode 100644 index 000000000..ccdd0798b --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListUsersForProjectControllerTest.java @@ -0,0 +1,48 @@ +package io.reflectoring.coderadar.rest.unit.user.teams; + +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; +import io.reflectoring.coderadar.rest.domain.GetUserResponse; +import io.reflectoring.coderadar.rest.useradministration.teams.ListUsersForProjectController; +import io.reflectoring.coderadar.useradministration.domain.User; +import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListUsersForProjectUseCase; +import java.util.Arrays; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class ListUsersForProjectControllerTest { + private final ListUsersForProjectUseCase listUsersForProjectUseCase = + mock(ListUsersForProjectUseCase.class); + private final ListUsersForProjectController testController = + new ListUsersForProjectController(listUsersForProjectUseCase); + + @Test + public void testListUsersForProject() { + Mockito.when(listUsersForProjectUseCase.listUsers(1L)) + .thenReturn( + Arrays.asList( + new User().setId(2L).setUsername("TestUser1"), + new User().setId(3L).setUsername("TestUser2"))); + + ResponseEntity> response = testController.listTeamsForUser(1L); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + Assertions.assertNotNull(response.getBody()); + Assertions.assertEquals(2, response.getBody().size()); + Assertions.assertEquals(2L, response.getBody().get(0).getId()); + Assertions.assertEquals("TestUser1", response.getBody().get(0).getUsername()); + Assertions.assertEquals(3L, response.getBody().get(1).getId()); + Assertions.assertEquals("TestUser2", response.getBody().get(1).getUsername()); + } + + @Test + public void testListUsersForProjectThrowsExceptionWhenProjectNotFound() { + Mockito.doThrow(ProjectNotFoundException.class).when(listUsersForProjectUseCase).listUsers(1L); + Assertions.assertThrows( + ProjectNotFoundException.class, () -> testController.listTeamsForUser(1L)); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveTeamFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveTeamFromProjectControllerTest.java new file mode 100644 index 000000000..aede4e427 --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveTeamFromProjectControllerTest.java @@ -0,0 +1,45 @@ +package io.reflectoring.coderadar.rest.unit.user.teams; + +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; +import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; +import io.reflectoring.coderadar.rest.useradministration.teams.RemoveTeamFromProjectController; +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveTeamFromProjectUseCase; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class RemoveTeamFromProjectControllerTest { + private final RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase = + mock(RemoveTeamFromProjectUseCase.class); + private final RemoveTeamFromProjectController testController = + new RemoveTeamFromProjectController(removeTeamFromProjectUseCase); + + @Test + public void testRemoveTeamFromProject() { + ResponseEntity response = testController.removeTeamFromProject(1L, 2L); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + } + + @Test + public void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { + Mockito.doThrow(TeamNotFoundException.class) + .when(removeTeamFromProjectUseCase) + .removeTeam(1L, 2L); + Assertions.assertThrows( + TeamNotFoundException.class, () -> testController.removeTeamFromProject(1L, 2L)); + } + + @Test + public void testRemoveTeamFromProjectThrowsExceptionWhenProjectNotFound() { + Mockito.doThrow(ProjectNotFoundException.class) + .when(removeTeamFromProjectUseCase) + .removeTeam(1L, 2L); + Assertions.assertThrows( + ProjectNotFoundException.class, () -> testController.removeTeamFromProject(1L, 2L)); + } +} From d5946644f4718b4d8faddd0290997d98f1aa77a9 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 6 May 2020 23:09:04 +0200 Subject: [PATCH 27/76] add team-service.ts, user.ts, project-role.ts, team.ts and rename DeleteUsersFromTeamController to RemoveUsersFromTeamController --- ...Port.java => RemoveUsersFromTeamPort.java} | 6 +- ...e.java => RemoveUsersFromTeamUseCase.java} | 6 +- ...e.java => RemoveUsersFromTeamService.java} | 18 ++--- ...r.java => RemoveUsersFromTeamAdapter.java} | 8 +- .../ListUsersForProjectController.java | 2 +- ...ava => RemoveUsersFromTeamController.java} | 14 ++-- .../ListProjectsForUserControllerTest.java | 2 +- .../unit/user/ListUsersControllerTest.java | 38 ++++++++++ .../ListUsersForProjectControllerTest.java | 4 +- .../RemoveUsersFromTeamControllerTest.java | 56 ++++++++++++++ coderadar-ui/src/app/model/project-role.ts | 4 + coderadar-ui/src/app/model/team.ts | 7 ++ coderadar-ui/src/app/model/user.ts | 4 + .../src/app/service/project.service.ts | 14 +--- coderadar-ui/src/app/service/team.service.ts | 75 +++++++++++++++++++ coderadar-ui/src/app/service/user.service.ts | 20 ++++- 16 files changed, 234 insertions(+), 44 deletions(-) rename coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/{DeleteUsersFromTeamPort.java => RemoveUsersFromTeamPort.java} (60%) rename coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/{DeleteUsersFromTeamUseCase.java => RemoveUsersFromTeamUseCase.java} (60%) rename coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/{DeleteUsersFromTeamService.java => RemoveUsersFromTeamService.java} (69%) rename coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/{DeleteUsersFromTeamAdapter.java => RemoveUsersFromTeamAdapter.java} (69%) rename coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/{teams => }/ListUsersForProjectController.java (95%) rename coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/{DeleteUsersFromTeamController.java => RemoveUsersFromTeamController.java} (69%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/{teams => }/ListProjectsForUserControllerTest.java (97%) create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersControllerTest.java rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/{teams => }/ListUsersForProjectControllerTest.java (93%) create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveUsersFromTeamControllerTest.java create mode 100644 coderadar-ui/src/app/model/project-role.ts create mode 100644 coderadar-ui/src/app/model/team.ts create mode 100644 coderadar-ui/src/app/model/user.ts create mode 100644 coderadar-ui/src/app/service/team.service.ts diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveUsersFromTeamPort.java similarity index 60% rename from coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java rename to coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveUsersFromTeamPort.java index 1c36887c5..8a6b3c430 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/DeleteUsersFromTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveUsersFromTeamPort.java @@ -2,14 +2,14 @@ import java.util.List; -public interface DeleteUsersFromTeamPort { +public interface RemoveUsersFromTeamPort { /** - * Deletes users from a team. Any permissions users had for a project because of the team will be + * Removes users from a team. Any permissions users had for a project because of the team will be * lost after this operation. * * @param teamId The id of the team. * @param userIds The ids of the users. */ - void deleteUsersFromTeam(long teamId, List userIds); + void removeUsersFromTeam(long teamId, List userIds); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteUsersFromTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveUsersFromTeamUseCase.java similarity index 60% rename from coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteUsersFromTeamUseCase.java rename to coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveUsersFromTeamUseCase.java index c07b7ef43..638b347d7 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/DeleteUsersFromTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/RemoveUsersFromTeamUseCase.java @@ -2,14 +2,14 @@ import java.util.List; -public interface DeleteUsersFromTeamUseCase { +public interface RemoveUsersFromTeamUseCase { /** - * Deletes users from a team. Any permissions users had for a project because of the team will be + * Removes users from a team. Any permissions users had for a project because of the team will be * lost after this operation. * * @param teamId The id of the team. * @param userIds The ids of the users. */ - void deleteUsersFromTeam(long teamId, List userIds); + void removeUsersFromTeam(long teamId, List userIds); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveUsersFromTeamService.java similarity index 69% rename from coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java rename to coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveUsersFromTeamService.java index 4f40dc3b5..25bbfa291 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/DeleteUsersFromTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveUsersFromTeamService.java @@ -2,31 +2,31 @@ import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.UserNotFoundException; -import io.reflectoring.coderadar.useradministration.port.driven.DeleteUsersFromTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; -import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteUsersFromTeamUseCase; +import io.reflectoring.coderadar.useradministration.port.driven.RemoveUsersFromTeamPort; +import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveUsersFromTeamUseCase; import java.util.List; import org.springframework.stereotype.Service; @Service -public class DeleteUsersFromTeamService implements DeleteUsersFromTeamUseCase { +public class RemoveUsersFromTeamService implements RemoveUsersFromTeamUseCase { private final GetTeamPort getTeamPort; private final GetUserPort getUserPort; - private final DeleteUsersFromTeamPort deleteUsersFromTeamPort; + private final RemoveUsersFromTeamPort removeUsersFromTeamPort; - public DeleteUsersFromTeamService( + public RemoveUsersFromTeamService( GetTeamPort getTeamPort, GetUserPort getUserPort, - DeleteUsersFromTeamPort deleteUsersFromTeamPort) { + RemoveUsersFromTeamPort removeUsersFromTeamPort) { this.getTeamPort = getTeamPort; this.getUserPort = getUserPort; - this.deleteUsersFromTeamPort = deleteUsersFromTeamPort; + this.removeUsersFromTeamPort = removeUsersFromTeamPort; } @Override - public void deleteUsersFromTeam(long teamId, List userIds) { + public void removeUsersFromTeam(long teamId, List userIds) { if (!getTeamPort.existsById(teamId)) { throw new TeamNotFoundException(teamId); } @@ -35,6 +35,6 @@ public void deleteUsersFromTeam(long teamId, List userIds) { throw new UserNotFoundException(userId); } } - deleteUsersFromTeamPort.deleteUsersFromTeam(teamId, userIds); + removeUsersFromTeamPort.removeUsersFromTeam(teamId, userIds); } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteUsersFromTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/RemoveUsersFromTeamAdapter.java similarity index 69% rename from coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteUsersFromTeamAdapter.java rename to coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/RemoveUsersFromTeamAdapter.java index 811b20ca1..ced9cf654 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/DeleteUsersFromTeamAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/RemoveUsersFromTeamAdapter.java @@ -1,21 +1,21 @@ package io.reflectoring.coderadar.graph.useradministration.adapter.teams; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; -import io.reflectoring.coderadar.useradministration.port.driven.DeleteUsersFromTeamPort; +import io.reflectoring.coderadar.useradministration.port.driven.RemoveUsersFromTeamPort; import java.util.List; import org.springframework.stereotype.Service; @Service -public class DeleteUsersFromTeamAdapter implements DeleteUsersFromTeamPort { +public class RemoveUsersFromTeamAdapter implements RemoveUsersFromTeamPort { private final TeamRepository teamRepository; - public DeleteUsersFromTeamAdapter(TeamRepository teamRepository) { + public RemoveUsersFromTeamAdapter(TeamRepository teamRepository) { this.teamRepository = teamRepository; } @Override - public void deleteUsersFromTeam(long teamId, List userIds) { + public void removeUsersFromTeam(long teamId, List userIds) { teamRepository.deleteUsersFromTeam(teamId, userIds); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListUsersForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java similarity index 95% rename from coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListUsersForProjectController.java rename to coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java index 1aeb9679b..cec80408d 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListUsersForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.useradministration.teams; +package io.reflectoring.coderadar.rest.useradministration; import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamController.java similarity index 69% rename from coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java rename to coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamController.java index b468b596c..2eeaa3404 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteUsersFromTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamController.java @@ -2,7 +2,7 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.JsonListWrapper; -import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteUsersFromTeamUseCase; +import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveUsersFromTeamUseCase; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,17 +14,17 @@ @RestController @Transactional -public class DeleteUsersFromTeamController implements AbstractBaseController { - private final DeleteUsersFromTeamUseCase deleteUsersFromTeamUseCase; +public class RemoveUsersFromTeamController implements AbstractBaseController { + private final RemoveUsersFromTeamUseCase removeUsersFromTeamUseCase; - public DeleteUsersFromTeamController(DeleteUsersFromTeamUseCase deleteUsersFromTeamUseCase) { - this.deleteUsersFromTeamUseCase = deleteUsersFromTeamUseCase; + public RemoveUsersFromTeamController(RemoveUsersFromTeamUseCase removeUsersFromTeamUseCase) { + this.removeUsersFromTeamUseCase = removeUsersFromTeamUseCase; } @DeleteMapping(path = "/teams/{teamId}/users", consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity deleteUsersFromTeam( + public ResponseEntity removeUsersFromTeam( @PathVariable long teamId, @RequestBody JsonListWrapper userIds) { - deleteUsersFromTeamUseCase.deleteUsersFromTeam(teamId, userIds.getElements()); + removeUsersFromTeamUseCase.removeUsersFromTeam(teamId, userIds.getElements()); return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListProjectsForUserControllerTest.java similarity index 97% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForUserControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListProjectsForUserControllerTest.java index 1f22d5911..76f2a7af3 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListProjectsForUserControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user.teams; +package io.reflectoring.coderadar.rest.unit.user; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersControllerTest.java new file mode 100644 index 000000000..ae3e8a69f --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersControllerTest.java @@ -0,0 +1,38 @@ +package io.reflectoring.coderadar.rest.unit.user; + +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.rest.domain.GetUserResponse; +import io.reflectoring.coderadar.rest.useradministration.ListUsersController; +import io.reflectoring.coderadar.useradministration.domain.User; +import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; +import java.util.Arrays; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class ListUsersControllerTest { + private final ListUsersUseCase listUsersUseCase = mock(ListUsersUseCase.class); + private final ListUsersController testController = new ListUsersController(listUsersUseCase); + + @Test + public void testListUsers() { + Mockito.when(listUsersUseCase.listUsers()) + .thenReturn( + Arrays.asList( + new User().setId(2L).setUsername("TestUser1"), + new User().setId(3L).setUsername("TestUser2"))); + + ResponseEntity> response = testController.listUsers(); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + Assertions.assertNotNull(response.getBody()); + Assertions.assertEquals(2, response.getBody().size()); + Assertions.assertEquals(2L, response.getBody().get(0).getId()); + Assertions.assertEquals("TestUser1", response.getBody().get(0).getUsername()); + Assertions.assertEquals(3L, response.getBody().get(1).getId()); + Assertions.assertEquals("TestUser2", response.getBody().get(1).getUsername()); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListUsersForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersForProjectControllerTest.java similarity index 93% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListUsersForProjectControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersForProjectControllerTest.java index ccdd0798b..1799877db 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListUsersForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersForProjectControllerTest.java @@ -1,10 +1,10 @@ -package io.reflectoring.coderadar.rest.unit.user.teams; +package io.reflectoring.coderadar.rest.unit.user; import static org.mockito.Mockito.mock; import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.domain.GetUserResponse; -import io.reflectoring.coderadar.rest.useradministration.teams.ListUsersForProjectController; +import io.reflectoring.coderadar.rest.useradministration.ListUsersForProjectController; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListUsersForProjectUseCase; import java.util.Arrays; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveUsersFromTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveUsersFromTeamControllerTest.java new file mode 100644 index 000000000..110f583aa --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveUsersFromTeamControllerTest.java @@ -0,0 +1,56 @@ +package io.reflectoring.coderadar.rest.unit.user.teams; + +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; + +import io.reflectoring.coderadar.rest.JsonListWrapper; +import io.reflectoring.coderadar.rest.useradministration.teams.RemoveUsersFromTeamController; +import io.reflectoring.coderadar.useradministration.TeamNotFoundException; +import io.reflectoring.coderadar.useradministration.UserNotFoundException; +import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveUsersFromTeamUseCase; +import java.util.Collections; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +public class RemoveUsersFromTeamControllerTest { + private final RemoveUsersFromTeamUseCase removeUsersFromTeamUseCase = + mock(RemoveUsersFromTeamUseCase.class); + private final RemoveUsersFromTeamController testController = + new RemoveUsersFromTeamController(removeUsersFromTeamUseCase); + + @Test + public void testRemoveUsersFromTeam() { + ResponseEntity response = + testController.removeUsersFromTeam( + 1L, new JsonListWrapper<>(Collections.singletonList(2L))); + Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); + } + + @Test + public void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { + Mockito.doThrow(TeamNotFoundException.class) + .when(removeUsersFromTeamUseCase) + .removeUsersFromTeam(anyLong(), anyList()); + Assertions.assertThrows( + TeamNotFoundException.class, + () -> + testController.removeUsersFromTeam( + 1L, new JsonListWrapper<>(Collections.singletonList(2L)))); + } + + @Test + public void testRemoveTeamFromProjectThrowsExceptionWhenUserNotFound() { + Mockito.doThrow(UserNotFoundException.class) + .when(removeUsersFromTeamUseCase) + .removeUsersFromTeam(anyLong(), anyList()); + Assertions.assertThrows( + UserNotFoundException.class, + () -> + testController.removeUsersFromTeam( + 1L, new JsonListWrapper<>(Collections.singletonList(2L)))); + } +} diff --git a/coderadar-ui/src/app/model/project-role.ts b/coderadar-ui/src/app/model/project-role.ts new file mode 100644 index 000000000..20bbdf611 --- /dev/null +++ b/coderadar-ui/src/app/model/project-role.ts @@ -0,0 +1,4 @@ +export enum ProjectRole { + ADMIN= "admin", + MEMBER = "member" +} diff --git a/coderadar-ui/src/app/model/team.ts b/coderadar-ui/src/app/model/team.ts new file mode 100644 index 000000000..88a8464f4 --- /dev/null +++ b/coderadar-ui/src/app/model/team.ts @@ -0,0 +1,7 @@ +import {User} from "./user"; + +export class Team { + public id: number; + public name: string; + public members: User[]; +} diff --git a/coderadar-ui/src/app/model/user.ts b/coderadar-ui/src/app/model/user.ts new file mode 100644 index 000000000..94508e1e1 --- /dev/null +++ b/coderadar-ui/src/app/model/user.ts @@ -0,0 +1,4 @@ +export class User { + public id: number; + public username: string; +} diff --git a/coderadar-ui/src/app/service/project.service.ts b/coderadar-ui/src/app/service/project.service.ts index ee80f0a03..f4d7f48c0 100644 --- a/coderadar-ui/src/app/service/project.service.ts +++ b/coderadar-ui/src/app/service/project.service.ts @@ -19,6 +19,7 @@ import {FileContentWithMetrics} from '../model/file-content-with-metrics'; }) export class ProjectService { + private apiURL = AppComponent.getApiUrl(); constructor(private httpClient: HttpClient) { @@ -108,17 +109,6 @@ export class ProjectService { {observe: 'response'}).toPromise(); } - /** - * Edits a module of a project. - * Sends a POST request to /projects/{id}/modules/{moduleId} - * @param id The id of the project. - * @param module The name (path) of the module. - */ - public editProjectModule(id: number, module: Module): Promise> { - return this.httpClient.post(this.apiURL + 'projects/' + id + '/modules/' + module.id, JSON.stringify(module), - {observe: 'response'}).toPromise(); - } - /** * Deletes a module of a project. * Sends a DELETE request to /projects/{id}/modules/{moduleId} @@ -249,7 +239,7 @@ export class ProjectService { } /** - * Returnsthe delta three of a project given two commits and a metric mapping + * Returns the delta three of a project given two commits and a metric mapping * @param firstCommit The first commit * @param secondCommit The second commit * @param metricMapping The metric mapping diff --git a/coderadar-ui/src/app/service/team.service.ts b/coderadar-ui/src/app/service/team.service.ts new file mode 100644 index 000000000..f59efc8af --- /dev/null +++ b/coderadar-ui/src/app/service/team.service.ts @@ -0,0 +1,75 @@ +import {Injectable} from '@angular/core'; +import {HttpClient, HttpResponse} from "@angular/common/http"; +import {AppComponent} from "../app.component"; +import {ProjectRole} from "../model/project-role"; +import {Team} from "../model/team"; +import {Project} from "../model/project"; + +@Injectable({ + providedIn: 'root' +}) +export class TeamService { + + private apiURL = AppComponent.getApiUrl(); + + constructor(private httpClient: HttpClient) { + } + + /** + * Gets all the teams. + * Sends a GET request to /projects + */ + public listTeams(): Promise> { + return this.httpClient.get(this.apiURL + 'teams', {observe: 'response'}).toPromise(); + } + + public addTeamToProject(projectId: number, teamId: number, role: ProjectRole): Promise> { + return this.httpClient.post(this.apiURL + 'projects/'+projectId+'/teams/' + teamId, {role}, + {observe: 'response'}).toPromise(); + } + + public addUsersToTeam(teamId: number, userIds: number[]): Promise> { + return this.httpClient.post(this.apiURL + 'teams/'+teamId+'/users', {userIds}, + {observe: 'response'}).toPromise(); + } + + public removeUsersFromTeam(teamId: number, userIds: number[]): Promise> { + return this.httpClient.post(this.apiURL + 'teams/'+teamId+'/users', {userIds}, + {observe: 'response'}).toPromise(); + } + + public createTeam(name: string, userIds: number[]): Promise> { + return this.httpClient.post(this.apiURL + 'teams', {name, userIds}, + {observe: 'response'}).toPromise() + } + + public deleteTeam(teamId: number): Promise> { + return this.httpClient.delete(this.apiURL + 'teams/'+teamId, + {observe: 'response'}).toPromise() + } + + public getTeam(teamId: number): Promise> { + return this.httpClient.get(this.apiURL + 'teams/'+teamId, + {observe: 'response'}).toPromise() + } + + public listProjectsForTeam(teamId: number): Promise> { + return this.httpClient.get(this.apiURL + 'teams/'+teamId+'/projects', + {observe: 'response'}).toPromise(); + } + + public listTeamsForProject(projectId: number): Promise> { + return this.httpClient.get(this.apiURL + 'projects/'+projectId+'/teams', + {observe: 'response'}).toPromise(); + } + + public listTeamsForUser(userId: number): Promise> { + return this.httpClient.get(this.apiURL + 'users/'+userId+'/teams', + {observe: 'response'}).toPromise(); + } + + public removeTeamFromProject(projectId:number, teamId: number): Promise> { + return this.httpClient.get(this.apiURL + 'projects/'+projectId+'/teams/'+teamId, + {observe: 'response'}).toPromise(); + } +} diff --git a/coderadar-ui/src/app/service/user.service.ts b/coderadar-ui/src/app/service/user.service.ts index 74dd3f63a..bd897aa9c 100644 --- a/coderadar-ui/src/app/service/user.service.ts +++ b/coderadar-ui/src/app/service/user.service.ts @@ -1,7 +1,9 @@ import {Injectable} from '@angular/core'; -import {HttpClient} from '@angular/common/http'; +import {HttpClient, HttpResponse} from '@angular/common/http'; import {Router} from '@angular/router'; import {AppComponent} from '../app.component'; +import {Project} from "../model/project"; +import {User} from "../model/user"; @Injectable({ @@ -67,7 +69,6 @@ export class UserService { }); } - /** * Sends a POST request to /user/refresh with the current access and refresh tokens. * Upon receiving a successful response from the server, the new access token is saved in the localStorage. @@ -112,4 +113,19 @@ export class UserService { return this.httpClient.post(this.apiURL + 'user/password/change', {refreshToken: UserService.getLoggedInUser().refreshToken, newPassword: password}, {observe: 'response'}).toPromise(); } + + public listProjectsForUser(userId: number): Promise> { + return this.httpClient.get(this.apiURL + 'users/'+userId+'/projects', + {observe: 'response'}).toPromise(); + } + + public listUsersForProject(projectId: number): Promise>{ + return this.httpClient.get(this.apiURL + 'projects/'+projectId+'/users', + {observe: 'response'}).toPromise(); + } + + public listUsers(): Promise>{ + return this.httpClient.get(this.apiURL + 'users', + {observe: 'response'}).toPromise(); + } } From b83199132baabee256dea6e0a24641caf09e5c4b Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Thu, 7 May 2020 11:12:06 +0200 Subject: [PATCH 28/76] wrote response mapper tests --- .../contributor/domain/Contributor.java | 2 + .../GetAnalyzerConfigurationAdapterTest.java | 2 +- ...rConfigurationsFromProjectServiceTest.java | 4 +- ...pdateAnalyzerConfigurationAdapterTest.java | 2 +- .../CreateFilePatternAdapterTest.java | 4 +- .../rest/GetProjectResponseMapper.java | 9 +-- .../coderadar/rest/GetTeamResponseMapper.java | 2 +- .../coderadar/rest/GetUserResponseMapper.java | 2 +- .../rest/domain/GetProjectResponse.java | 1 - .../unit/GetBranchResponseMapperTest.java | 29 +++++++ .../unit/GetCommitResponseMapperTest.java | 51 ++++++++++++ .../GetContributorResponseMapperTest.java | 46 +++++++++++ .../unit/GetProjectResponseMapperTest.java | 79 +++++++++++++++++++ .../GetTeamResponseMapperControllerTest.java | 77 ++++++++++++++++++ .../rest/unit/GetTeamResponseMapperTest.java | 35 ++++++++ ... SetUserRoleForProjectControllerTest.java} | 2 +- ...amTest.java => GetTeamControllerTest.java} | 2 +- 17 files changed, 330 insertions(+), 19 deletions(-) create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/{SetUserRoleForProjectTest.java => SetUserRoleForProjectControllerTest.java} (97%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/{GetTeamTest.java => GetTeamControllerTest.java} (98%) diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/domain/Contributor.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/domain/Contributor.java index cce3f57e2..529de0248 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/domain/Contributor.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/domain/Contributor.java @@ -2,8 +2,10 @@ import java.util.Set; import lombok.Data; +import lombok.NoArgsConstructor; @Data +@NoArgsConstructor public class Contributor { private Long id; private String displayName; diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/GetAnalyzerConfigurationAdapterTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/GetAnalyzerConfigurationAdapterTest.java index 711a5813b..efa391396 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/GetAnalyzerConfigurationAdapterTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/GetAnalyzerConfigurationAdapterTest.java @@ -15,7 +15,7 @@ @DisplayName("Get analyzer configuration") class GetAnalyzerConfigurationAdapterTest { - private AnalyzerConfigurationRepository analyzerConfigurationRepository = + private final AnalyzerConfigurationRepository analyzerConfigurationRepository = mock(AnalyzerConfigurationRepository.class); private GetAnalyzerConfigurationAdapter getAnalyzerConfigurationAdapter; diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java index 056691894..2a48ae205 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java @@ -15,10 +15,10 @@ @DisplayName("Get analyzer configurations from project") class ListAnalyzerConfigurationsFromProjectServiceTest { - private AnalyzerConfigurationRepository analyzerConfigurationRepository = + private final AnalyzerConfigurationRepository analyzerConfigurationRepository = mock(AnalyzerConfigurationRepository.class); - private ProjectRepository projectRepository = mock(ProjectRepository.class); + private final ProjectRepository projectRepository = mock(ProjectRepository.class); private ListAnalyzerConfigurationsAdapter getAnalyzerConfigurationsFromProjectAdapter; diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationAdapterTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationAdapterTest.java index be215d363..2234579a6 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationAdapterTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationAdapterTest.java @@ -16,7 +16,7 @@ @DisplayName("Update analyzer configuration") class UpdateAnalyzerConfigurationAdapterTest { - private AnalyzerConfigurationRepository analyzerConfigurationRepository = + private final AnalyzerConfigurationRepository analyzerConfigurationRepository = mock(AnalyzerConfigurationRepository.class); private UpdateAnalyzerConfigurationAdapter updateAnalyzerConfigurationAdapter; diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/CreateFilePatternAdapterTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/CreateFilePatternAdapterTest.java index e29c8697b..839e54acd 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/CreateFilePatternAdapterTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/CreateFilePatternAdapterTest.java @@ -17,8 +17,8 @@ @DisplayName("Create file pattern") class CreateFilePatternAdapterTest { - private FilePatternRepository filePatternRepository = mock(FilePatternRepository.class); - private ProjectRepository projectRepository = mock(ProjectRepository.class); + private final FilePatternRepository filePatternRepository = mock(FilePatternRepository.class); + private final ProjectRepository projectRepository = mock(ProjectRepository.class); @Test @DisplayName("Should return long when passing a valid argument") diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java index 09718d5a1..d3ad95d8f 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java @@ -21,14 +21,7 @@ public static GetProjectResponse mapProject(Project project) { public static List mapProjects(List projects) { List responses = new ArrayList<>(projects.size()); for (Project project : projects) { - responses.add( - new GetProjectResponse() - .setName(project.getName()) - .setId(project.getId()) - .setStartDate(project.getVcsStart()) - .setVcsOnline(project.isVcsOnline()) - .setVcsUrl(project.getVcsUrl()) - .setVcsUsername(project.getVcsUsername())); + responses.add(mapProject(project)); } return responses; } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java index b6bc666a9..eaeeb9419 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java @@ -17,7 +17,7 @@ public static GetTeamResponse mapTeam(Team team) { public static List mapTeams(List teams) { List result = new ArrayList<>(teams.size()); for (Team team : teams) { - result.add(new GetTeamResponse(team.getId(), team.getName(), mapUsers(team.getMembers()))); + result.add(mapTeam(team)); } return result; } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java index 00a583bac..139f3329b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java @@ -15,7 +15,7 @@ public static GetUserResponse mapUser(User user) { public static List mapUsers(List users) { List result = new ArrayList<>(users.size()); for (User user : users) { - result.add(new GetUserResponse(user.getId(), user.getUsername())); + result.add(mapUser(user)); } return result; } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java index 066172d99..fb10c32db 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java @@ -12,5 +12,4 @@ public class GetProjectResponse { private String vcsUrl; private boolean vcsOnline; private Date startDate; - private Date endDate; } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java new file mode 100644 index 000000000..65690036a --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java @@ -0,0 +1,29 @@ +package io.reflectoring.coderadar.rest.unit; + +import io.reflectoring.coderadar.projectadministration.domain.Branch; +import io.reflectoring.coderadar.rest.GetBranchResponseMapper; +import io.reflectoring.coderadar.rest.domain.GetBranchResponse; +import java.util.ArrayList; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class GetBranchResponseMapperTest { + + @Test + public void testBranchResponseMapper() { + List branches = new ArrayList<>(); + branches.add(new Branch("testBranch1", "testHash1")); + branches.add(new Branch("testBranch2", "testHash2")); + branches.add(new Branch("testBranch3", "testHash3")); + + List responses = GetBranchResponseMapper.mapBranches(branches); + Assertions.assertEquals(3L, responses.size()); + Assertions.assertEquals("testBranch1", responses.get(0).getName()); + Assertions.assertEquals("testHash1", responses.get(0).getCommitHash()); + Assertions.assertEquals("testBranch2", responses.get(1).getName()); + Assertions.assertEquals("testHash2", responses.get(1).getCommitHash()); + Assertions.assertEquals("testBranch3", responses.get(2).getName()); + Assertions.assertEquals("testHash3", responses.get(2).getCommitHash()); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java new file mode 100644 index 000000000..ec24f9660 --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java @@ -0,0 +1,51 @@ +package io.reflectoring.coderadar.rest.unit; + +import io.reflectoring.coderadar.projectadministration.domain.Commit; +import io.reflectoring.coderadar.rest.GetCommitResponseMapper; +import io.reflectoring.coderadar.rest.domain.GetCommitResponse; +import java.util.ArrayList; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class GetCommitResponseMapperTest { + + @Test + public void testCommitResponseMapper() { + List commits = new ArrayList<>(); + commits.add( + new Commit() + .setName("testHash1") + .setAnalyzed(true) + .setAuthor("testAuthor1") + .setAuthorEmail("testEmail1") + .setComment("testComment1") + .setId(1L) + .setTimestamp(0L)); + commits.add( + new Commit() + .setName("testHash2") + .setAnalyzed(false) + .setAuthor("testAuthor2") + .setAuthorEmail("testEmail2") + .setComment("testComment2") + .setId(2L) + .setTimestamp(1L)); + + List responses = GetCommitResponseMapper.mapCommits(commits); + Assertions.assertEquals(2L, responses.size()); + Assertions.assertEquals("testHash1", responses.get(0).getName()); + Assertions.assertTrue(responses.get(0).isAnalyzed()); + Assertions.assertEquals("testAuthor1", responses.get(0).getAuthor()); + Assertions.assertEquals("testEmail1", responses.get(0).getAuthorEmail()); + Assertions.assertEquals("testComment1", responses.get(0).getComment()); + Assertions.assertEquals(0L, responses.get(0).getTimestamp()); + + Assertions.assertEquals("testHash2", responses.get(1).getName()); + Assertions.assertFalse(responses.get(1).isAnalyzed()); + Assertions.assertEquals("testAuthor2", responses.get(1).getAuthor()); + Assertions.assertEquals("testEmail2", responses.get(1).getAuthorEmail()); + Assertions.assertEquals("testComment2", responses.get(1).getComment()); + Assertions.assertEquals(1L, responses.get(1).getTimestamp()); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java new file mode 100644 index 000000000..dee70c868 --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java @@ -0,0 +1,46 @@ +package io.reflectoring.coderadar.rest.unit; + +import io.reflectoring.coderadar.contributor.domain.Contributor; +import io.reflectoring.coderadar.rest.GetContributorResponseMapper; +import io.reflectoring.coderadar.rest.domain.GetContributorResponse; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class GetContributorResponseMapperTest { + + @Test + public void testContributorResponseMapper() { + List contributors = new ArrayList<>(); + contributors.add( + new Contributor() + .setId(1L) + .setDisplayName("testName1") + .setEmailAddresses(Collections.singleton("testEmail1")) + .setNames(Collections.singleton("testDisplayName1"))); + contributors.add( + new Contributor() + .setId(2L) + .setDisplayName("testName2") + .setEmailAddresses(Collections.singleton("testEmail2")) + .setNames(Collections.singleton("testDisplayName2"))); + + List responses = + GetContributorResponseMapper.mapContributors(contributors); + Assertions.assertEquals(2L, responses.size()); + + Assertions.assertEquals("testName1", responses.get(0).getDisplayName()); + Assertions.assertEquals(1L, responses.get(0).getId()); + Assertions.assertEquals(Collections.singleton("testDisplayName1"), responses.get(0).getNames()); + Assertions.assertEquals( + Collections.singleton("testEmail1"), responses.get(0).getEmailAddresses()); + + Assertions.assertEquals("testName2", responses.get(1).getDisplayName()); + Assertions.assertEquals(2L, responses.get(1).getId()); + Assertions.assertEquals(Collections.singleton("testDisplayName2"), responses.get(1).getNames()); + Assertions.assertEquals( + Collections.singleton("testEmail2"), responses.get(1).getEmailAddresses()); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java new file mode 100644 index 000000000..09740ec48 --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java @@ -0,0 +1,79 @@ +package io.reflectoring.coderadar.rest.unit; + +import io.reflectoring.coderadar.projectadministration.domain.Project; +import io.reflectoring.coderadar.rest.GetProjectResponseMapper; +import io.reflectoring.coderadar.rest.domain.GetProjectResponse; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class GetProjectResponseMapperTest { + + @Test + public void testProjectResponseMapper() { + List projects = new ArrayList<>(); + projects.add( + new Project() + .setName("testProject1") + .setVcsOnline(true) + .setVcsUsername("testUsername1") + .setVcsPassword("testPassword1") + .setId(1L) + .setVcsStart(new Date(123L)) + .setVcsUrl("testUrl1")); + + projects.add( + new Project() + .setName("testProject2") + .setVcsOnline(false) + .setVcsUsername("testUsername2") + .setVcsPassword("testPassword2") + .setId(2L) + .setVcsStart(new Date(345L)) + .setVcsUrl("testUrl2")); + + List responses = GetProjectResponseMapper.mapProjects(projects); + Assertions.assertEquals(2L, responses.size()); + + Assertions.assertEquals("testProject1", responses.get(0).getName()); + Assertions.assertEquals(1L, responses.get(0).getId()); + Assertions.assertEquals(new Date(123L), responses.get(0).getStartDate()); + Assertions.assertEquals("testUsername1", responses.get(0).getVcsUsername()); + Assertions.assertNull(responses.get(0).getVcsPassword()); + Assertions.assertTrue(responses.get(0).isVcsOnline()); + Assertions.assertEquals("testUrl1", responses.get(0).getVcsUrl()); + + Assertions.assertEquals("testProject2", responses.get(1).getName()); + Assertions.assertEquals(2L, responses.get(1).getId()); + Assertions.assertEquals(new Date(345L), responses.get(1).getStartDate()); + Assertions.assertEquals("testUsername2", responses.get(1).getVcsUsername()); + Assertions.assertNull(responses.get(1).getVcsPassword()); + Assertions.assertFalse(responses.get(1).isVcsOnline()); + Assertions.assertEquals("testUrl2", responses.get(1).getVcsUrl()); + } + + @Test + public void testSingleProjectResponseMapper() { + Project testProject = + new Project() + .setName("testProject1") + .setVcsOnline(true) + .setVcsUsername("testUsername1") + .setVcsPassword("testPassword1") + .setId(1L) + .setVcsStart(new Date(123L)) + .setVcsUrl("testUrl1"); + + GetProjectResponse response = GetProjectResponseMapper.mapProject(testProject); + + Assertions.assertEquals("testProject1", response.getName()); + Assertions.assertEquals(1L, response.getId()); + Assertions.assertEquals(new Date(123L), response.getStartDate()); + Assertions.assertEquals("testUsername1", response.getVcsUsername()); + Assertions.assertNull(response.getVcsPassword()); + Assertions.assertTrue(response.isVcsOnline()); + Assertions.assertEquals("testUrl1", response.getVcsUrl()); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java new file mode 100644 index 000000000..f46e15c0d --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java @@ -0,0 +1,77 @@ +package io.reflectoring.coderadar.rest.unit; + +import io.reflectoring.coderadar.rest.GetTeamResponseMapper; +import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import io.reflectoring.coderadar.rest.domain.GetUserResponse; +import io.reflectoring.coderadar.useradministration.domain.Team; +import io.reflectoring.coderadar.useradministration.domain.User; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class GetTeamResponseMapperControllerTest { + + @Test + public void testTeamResponseMapper() { + List teams = new ArrayList<>(); + teams.add( + new Team() + .setName("testTeam1") + .setId(1L) + .setMembers( + Collections.singletonList( + new User() + .setUsername("testUsername1") + .setId(2L) + .setPassword("testPassword1")))); + + teams.add( + new Team() + .setName("testTeam2") + .setId(3L) + .setMembers( + Collections.singletonList( + new User() + .setUsername("testUsername2") + .setId(4L) + .setPassword("testPassword2")))); + + List responses = GetTeamResponseMapper.mapTeams(teams); + + Assertions.assertEquals(2L, responses.size()); + Assertions.assertEquals("testTeam1", responses.get(0).getName()); + Assertions.assertEquals(1L, responses.get(0).getId()); + Assertions.assertEquals(1L, responses.get(0).getMembers().size()); + Assertions.assertEquals( + new GetUserResponse(2L, "testUsername1"), responses.get(0).getMembers().get(0)); + + Assertions.assertEquals("testTeam2", responses.get(1).getName()); + Assertions.assertEquals(3L, responses.get(1).getId()); + Assertions.assertEquals(1L, responses.get(1).getMembers().size()); + Assertions.assertEquals( + new GetUserResponse(4L, "testUsername2"), responses.get(1).getMembers().get(0)); + } + + @Test + public void testTeamResponseSingleMapper() { + Team team = + new Team() + .setName("testTeam1") + .setId(1L) + .setMembers( + Collections.singletonList( + new User() + .setUsername("testUsername1") + .setId(2L) + .setPassword("testPassword1"))); + + GetTeamResponse response = GetTeamResponseMapper.mapTeam(team); + + Assertions.assertEquals("testTeam1", response.getName()); + Assertions.assertEquals(1L, response.getId()); + Assertions.assertEquals(1L, response.getMembers().size()); + Assertions.assertEquals(new GetUserResponse(2L, "testUsername1"), response.getMembers().get(0)); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java new file mode 100644 index 000000000..124ffea65 --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java @@ -0,0 +1,35 @@ +package io.reflectoring.coderadar.rest.unit; + +import io.reflectoring.coderadar.rest.GetUserResponseMapper; +import io.reflectoring.coderadar.rest.domain.GetUserResponse; +import io.reflectoring.coderadar.useradministration.domain.User; +import java.util.ArrayList; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class GetTeamResponseMapperTest { + + @Test + public void testUserResponseMapper() { + List users = new ArrayList<>(); + users.add(new User().setUsername("testUser1").setId(1L).setPassword("testPassword1")); + users.add(new User().setUsername("testUser2").setId(2L).setPassword("testPassword2")); + + List responses = GetUserResponseMapper.mapUsers(users); + Assertions.assertEquals(2L, responses.size()); + + Assertions.assertEquals("testUser1", responses.get(0).getUsername()); + Assertions.assertEquals(1L, responses.get(0).getId()); + Assertions.assertEquals("testUser2", responses.get(1).getUsername()); + Assertions.assertEquals(2L, responses.get(1).getId()); + } + + @Test + public void testUserResponseSingleMapper() { + User user = new User().setUsername("testUser1").setId(1L).setPassword("testPassword1"); + GetUserResponse response = GetUserResponseMapper.mapUser(user); + Assertions.assertEquals("testUser1", response.getUsername()); + Assertions.assertEquals(1L, response.getId()); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectControllerTest.java similarity index 97% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectControllerTest.java index 08321d8ac..4ae99b7dd 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectControllerTest.java @@ -14,7 +14,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class SetUserRoleForProjectTest { +public class SetUserRoleForProjectControllerTest { private final SetUserRoleForProjectUseCase setUserRoleForProjectUseCase = mock(SetUserRoleForProjectUseCase.class); private final SetUserRoleForProjectController testController = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamControllerTest.java similarity index 98% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamControllerTest.java index c3d0499c7..18e445f05 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamControllerTest.java @@ -15,7 +15,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class GetTeamTest { +public class GetTeamControllerTest { private final GetTeamUseCase getTeamUseCase = mock(GetTeamUseCase.class); private final GetTeamController testController = new GetTeamController(getTeamUseCase); From 363611f0859db7fbd4e908d1df96d50f21b190ad Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Thu, 7 May 2020 12:48:13 +0200 Subject: [PATCH 29/76] Write graph mapper tests --- .../src/main/resources/application.properties | 2 +- .../filepattern/FilePatternMapper.java | 1 - .../AnalyzerConfigurationMapperTest.java | 33 +++++++++++ .../coderadar/graph/BranchMapperTest.java | 31 ++++++++++ .../graph/ContributorMapperTest.java | 44 ++++++++++++++ .../graph/FilePatternMapperTest.java | 40 +++++++++++++ .../coderadar/graph/FindingsMapperTest.java | 50 ++++++++++++++++ .../coderadar/graph/ModuleMapperTest.java | 29 +++++++++ .../coderadar/graph/ProjectMapperTest.java | 59 +++++++++++++++++++ .../coderadar/graph/TeamMapperTest.java | 39 ++++++++++++ .../coderadar/graph/UserMapperTest.java | 32 ++++++++++ ...eleteAnalyzerConfigurationAdapterTest.java | 2 +- 12 files changed, 359 insertions(+), 3 deletions(-) create mode 100644 coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/AnalyzerConfigurationMapperTest.java create mode 100644 coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/BranchMapperTest.java create mode 100644 coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ContributorMapperTest.java create mode 100644 coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FilePatternMapperTest.java create mode 100644 coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FindingsMapperTest.java create mode 100644 coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ModuleMapperTest.java create mode 100644 coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ProjectMapperTest.java create mode 100644 coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/TeamMapperTest.java create mode 100644 coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/UserMapperTest.java diff --git a/coderadar-app/src/main/resources/application.properties b/coderadar-app/src/main/resources/application.properties index f5cf01808..4a161ea99 100644 --- a/coderadar-app/src/main/resources/application.properties +++ b/coderadar-app/src/main/resources/application.properties @@ -6,7 +6,7 @@ coderadar.workdir=coderadar-workdir coderadar.dateLocale=de_DE coderadar.authentication.accessToken.durationInMinutes=15 coderadar.authentication.refreshToken.durationInMinutes=86400 -coderadar.authentication.enabled=false +coderadar.authentication.enabled=true coderadar.cors.enabled=true logging.level.io.reflectoring.coderadar=DEBUG diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/FilePatternMapper.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/FilePatternMapper.java index ad895ef21..c749e4460 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/FilePatternMapper.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/FilePatternMapper.java @@ -18,7 +18,6 @@ public FilePattern mapGraphObject(FilePatternEntity nodeEntity) { @Override public FilePatternEntity mapDomainObject(FilePattern domainObject) { FilePatternEntity filePatternEntity = new FilePatternEntity(); - filePatternEntity.setId(domainObject.getId()); filePatternEntity.setInclusionType(domainObject.getInclusionType()); filePatternEntity.setPattern(domainObject.getPattern()); return filePatternEntity; diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/AnalyzerConfigurationMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/AnalyzerConfigurationMapperTest.java new file mode 100644 index 000000000..58afb2922 --- /dev/null +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/AnalyzerConfigurationMapperTest.java @@ -0,0 +1,33 @@ +package io.reflectoring.coderadar.graph; + +import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; +import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; +import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.AnalyzerConfigurationMapper; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class AnalyzerConfigurationMapperTest { + private final AnalyzerConfigurationMapper configurationMapper = new AnalyzerConfigurationMapper(); + + @Test + public void testMapDomainObject() { + AnalyzerConfiguration testBranch = + new AnalyzerConfiguration().setEnabled(true).setId(1L).setAnalyzerName("testName"); + + AnalyzerConfigurationEntity result = configurationMapper.mapDomainObject(testBranch); + Assertions.assertTrue(result.getEnabled()); + Assertions.assertEquals("testName", result.getAnalyzerName()); + Assertions.assertNull(result.getId()); + } + + @Test + public void testMapGraphObject() { + AnalyzerConfigurationEntity testBranch = + new AnalyzerConfigurationEntity().setEnabled(true).setId(1L).setAnalyzerName("testName"); + + AnalyzerConfiguration result = configurationMapper.mapGraphObject(testBranch); + Assertions.assertTrue(result.isEnabled()); + Assertions.assertEquals("testName", result.getAnalyzerName()); + Assertions.assertEquals(1L, result.getId()); + } +} diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/BranchMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/BranchMapperTest.java new file mode 100644 index 000000000..6d1414036 --- /dev/null +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/BranchMapperTest.java @@ -0,0 +1,31 @@ +package io.reflectoring.coderadar.graph; + +import io.reflectoring.coderadar.graph.projectadministration.branch.BranchMapper; +import io.reflectoring.coderadar.graph.projectadministration.domain.BranchEntity; +import io.reflectoring.coderadar.projectadministration.domain.Branch; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class BranchMapperTest { + private final BranchMapper branchMapper = new BranchMapper(); + + @Test + public void testMapDomainObject() { + Branch testBranch = new Branch().setCommitHash("testHash").setName("testName"); + + BranchEntity result = branchMapper.mapDomainObject(testBranch); + Assertions.assertEquals("testHash", result.getCommitHash()); + Assertions.assertEquals("testName", result.getName()); + Assertions.assertNull(result.getId()); + } + + @Test + public void testMapGraphObject() { + BranchEntity testBranch = + new BranchEntity().setId(1L).setCommitHash("testHash").setName("testName"); + + Branch result = branchMapper.mapGraphObject(testBranch); + Assertions.assertEquals("testHash", result.getCommitHash()); + Assertions.assertEquals("testName", result.getName()); + } +} diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ContributorMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ContributorMapperTest.java new file mode 100644 index 000000000..934d129da --- /dev/null +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ContributorMapperTest.java @@ -0,0 +1,44 @@ +package io.reflectoring.coderadar.graph; + +import io.reflectoring.coderadar.contributor.domain.Contributor; +import io.reflectoring.coderadar.graph.contributor.ContributorMapper; +import io.reflectoring.coderadar.graph.contributor.domain.ContributorEntity; +import java.util.Collections; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class ContributorMapperTest { + private final ContributorMapper contributorMapper = new ContributorMapper(); + + @Test + public void testMapDomainObject() { + Contributor testContributor = + new Contributor() + .setDisplayName("testDisplayName") + .setEmailAddresses(Collections.singleton("testEmail")) + .setId(1L) + .setNames(Collections.singleton("testName")); + + ContributorEntity result = contributorMapper.mapDomainObject(testContributor); + Assertions.assertEquals("testDisplayName", result.getDisplayName()); + Assertions.assertEquals(Collections.singleton("testEmail"), result.getEmails()); + Assertions.assertEquals(Collections.singleton("testName"), result.getNames()); + Assertions.assertEquals(1L, result.getId()); // The only mapper with this edge case + } + + @Test + public void testMapGraphObject() { + ContributorEntity testContributor = + new ContributorEntity() + .setDisplayName("testDisplayName") + .setEmails(Collections.singleton("testEmail")) + .setId(1L) + .setNames(Collections.singleton("testName")); + + Contributor result = contributorMapper.mapGraphObject(testContributor); + Assertions.assertEquals("testDisplayName", result.getDisplayName()); + Assertions.assertEquals(Collections.singleton("testEmail"), result.getEmailAddresses()); + Assertions.assertEquals(Collections.singleton("testName"), result.getNames()); + Assertions.assertEquals(1L, result.getId()); + } +} diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FilePatternMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FilePatternMapperTest.java new file mode 100644 index 000000000..c6d115e17 --- /dev/null +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FilePatternMapperTest.java @@ -0,0 +1,40 @@ +package io.reflectoring.coderadar.graph; + +import io.reflectoring.coderadar.graph.projectadministration.domain.FilePatternEntity; +import io.reflectoring.coderadar.graph.projectadministration.filepattern.FilePatternMapper; +import io.reflectoring.coderadar.projectadministration.domain.FilePattern; +import io.reflectoring.coderadar.projectadministration.domain.InclusionType; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class FilePatternMapperTest { + private final FilePatternMapper filePatternMapper = new FilePatternMapper(); + + @Test + public void testMapDomainObject() { + FilePattern testPattern = + new FilePattern() + .setId(1L) + .setPattern("testPattern") + .setInclusionType(InclusionType.EXCLUDE); + + FilePatternEntity result = filePatternMapper.mapDomainObject(testPattern); + Assertions.assertEquals("testPattern", result.getPattern()); + Assertions.assertNull(result.getId()); + Assertions.assertEquals(InclusionType.EXCLUDE, result.getInclusionType()); + } + + @Test + public void testMapGraphObject() { + FilePatternEntity testPattern = + new FilePatternEntity() + .setId(1L) + .setPattern("testPattern") + .setInclusionType(InclusionType.EXCLUDE); + + FilePattern result = filePatternMapper.mapGraphObject(testPattern); + Assertions.assertEquals("testPattern", result.getPattern()); + Assertions.assertEquals(1L, result.getId()); + Assertions.assertEquals(InclusionType.EXCLUDE, result.getInclusionType()); + } +} diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FindingsMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FindingsMapperTest.java new file mode 100644 index 000000000..795e93864 --- /dev/null +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FindingsMapperTest.java @@ -0,0 +1,50 @@ +package io.reflectoring.coderadar.graph; + +import io.reflectoring.coderadar.analyzer.domain.Finding; +import io.reflectoring.coderadar.graph.analyzer.FindingsMapper; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class FindingsMapperTest { + private final FindingsMapper findingsMapper = new FindingsMapper(); + + @Test + public void testMapFindingDomainWithMessage() { + Finding testFinding = new Finding(1, 2, 3, 4, "message"); + + String result = findingsMapper.mapDomainObject(testFinding); + Assertions.assertEquals("1-2-3-4-message", result); + } + + @Test + public void testMapFindingDomainWithMessageDash() { + Finding testFinding = new Finding(1, 2, 3, 4, "message-2"); + + String result = findingsMapper.mapDomainObject(testFinding); + Assertions.assertEquals("1-2-3-4-message-2", result); + } + + @Test + public void testMapFindingGraphWithMessage() { + String testFinding = "1-2-3-4-message"; + + Finding result = findingsMapper.mapGraphObject(testFinding); + Assertions.assertEquals(1, result.getLineStart()); + Assertions.assertEquals(2, result.getLineEnd()); + Assertions.assertEquals(3, result.getCharStart()); + Assertions.assertEquals(4, result.getCharEnd()); + Assertions.assertEquals("message", result.getMessage()); + } + + @Test + public void testMapFindingGraphWithMessageDash() { + String testFinding = "1-2-3-4-message-2"; + + Finding result = findingsMapper.mapGraphObject(testFinding); + Assertions.assertEquals(1, result.getLineStart()); + Assertions.assertEquals(2, result.getLineEnd()); + Assertions.assertEquals(3, result.getCharStart()); + Assertions.assertEquals(4, result.getCharEnd()); + Assertions.assertEquals("message-2", result.getMessage()); + } +} diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ModuleMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ModuleMapperTest.java new file mode 100644 index 000000000..0b0d7b37e --- /dev/null +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ModuleMapperTest.java @@ -0,0 +1,29 @@ +package io.reflectoring.coderadar.graph; + +import io.reflectoring.coderadar.graph.projectadministration.domain.ModuleEntity; +import io.reflectoring.coderadar.graph.projectadministration.module.ModuleMapper; +import io.reflectoring.coderadar.projectadministration.domain.Module; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class ModuleMapperTest { + private final ModuleMapper moduleMapper = new ModuleMapper(); + + @Test + public void testMapDomainObject() { + Module testModule = new Module(2L, "testPath"); + + ModuleEntity result = moduleMapper.mapDomainObject(testModule); + Assertions.assertEquals("testPath", result.getPath()); + Assertions.assertNull(result.getId()); + } + + @Test + public void testMapGraphObject() { + ModuleEntity testModule = new ModuleEntity().setId(1L).setPath("testPath"); + + Module result = moduleMapper.mapGraphObject(testModule); + Assertions.assertEquals("testPath", result.getPath()); + Assertions.assertEquals(1L, result.getId()); + } +} diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ProjectMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ProjectMapperTest.java new file mode 100644 index 000000000..1dcdb6ea5 --- /dev/null +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ProjectMapperTest.java @@ -0,0 +1,59 @@ +package io.reflectoring.coderadar.graph; + +import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; +import io.reflectoring.coderadar.graph.projectadministration.project.ProjectMapper; +import io.reflectoring.coderadar.projectadministration.domain.Project; +import java.util.Date; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class ProjectMapperTest { + private final ProjectMapper projectMapper = new ProjectMapper(); + + @Test + public void testMapDomainObject() { + Project testProject = + new Project() + .setId(1L) + .setName("testName") + .setVcsStart(new Date(123L)) + .setVcsPassword("testPassword") + .setVcsUsername("testUsername") + .setVcsOnline(true) + .setWorkdirName("workdir") + .setVcsUrl("testUrl"); + + ProjectEntity result = projectMapper.mapDomainObject(testProject); + Assertions.assertEquals("testName", result.getName()); + Assertions.assertEquals("testUsername", result.getVcsUsername()); + Assertions.assertEquals("testPassword", result.getVcsPassword()); + Assertions.assertEquals("testUrl", result.getVcsUrl()); + Assertions.assertEquals(new Date(123L), result.getVcsStart()); + Assertions.assertEquals("workdir", result.getWorkdirName()); + Assertions.assertTrue(result.isVcsOnline()); + Assertions.assertNull(result.getId()); + } + + @Test + public void testMapGraphObject() { + ProjectEntity testProject = + new ProjectEntity() + .setId(1L) + .setName("testName") + .setVcsStart(new Date(123L)) + .setVcsPassword("testPassword") + .setVcsUsername("testUsername") + .setVcsOnline(true) + .setWorkdirName("workdir") + .setVcsUrl("testUrl"); + Project result = projectMapper.mapGraphObject(testProject); + Assertions.assertEquals("testName", result.getName()); + Assertions.assertEquals("testUsername", result.getVcsUsername()); + Assertions.assertEquals("testPassword", result.getVcsPassword()); + Assertions.assertEquals("testUrl", result.getVcsUrl()); + Assertions.assertEquals(new Date(123L), result.getVcsStart()); + Assertions.assertEquals("workdir", result.getWorkdirName()); + Assertions.assertTrue(result.isVcsOnline()); + Assertions.assertEquals(1L, result.getId()); + } +} diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/TeamMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/TeamMapperTest.java new file mode 100644 index 000000000..c4d682342 --- /dev/null +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/TeamMapperTest.java @@ -0,0 +1,39 @@ +package io.reflectoring.coderadar.graph; + +import io.reflectoring.coderadar.graph.useradministration.TeamMapper; +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; +import io.reflectoring.coderadar.useradministration.domain.Team; +import java.util.Collections; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class TeamMapperTest { + private final TeamMapper teamMapper = new TeamMapper(); + + @Test + public void testMapDomainObject() { + Team testTeam = new Team().setId(1L).setName("testTeam"); + + TeamEntity result = teamMapper.mapDomainObject(testTeam); + Assertions.assertEquals("testTeam", result.getName()); + Assertions.assertNull(result.getId()); + } + + @Test + public void testMapGraphObject() { + TeamEntity testModule = + new TeamEntity() + .setId(1L) + .setName("testTeam") + .setMembers( + Collections.singletonList(new UserEntity().setId(2L).setUsername("testUsername"))); + + Team result = teamMapper.mapGraphObject(testModule); + Assertions.assertEquals("testTeam", result.getName()); + Assertions.assertEquals(1L, result.getId()); + Assertions.assertEquals(1L, result.getMembers().size()); + Assertions.assertEquals(2L, result.getMembers().get(0).getId()); + Assertions.assertEquals("testUsername", result.getMembers().get(0).getUsername()); + } +} diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/UserMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/UserMapperTest.java new file mode 100644 index 000000000..e1819e47f --- /dev/null +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/UserMapperTest.java @@ -0,0 +1,32 @@ +package io.reflectoring.coderadar.graph; + +import io.reflectoring.coderadar.graph.useradministration.UserMapper; +import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; +import io.reflectoring.coderadar.useradministration.domain.User; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class UserMapperTest { + private final UserMapper userMapper = new UserMapper(); + + @Test + public void testMapDomainObject() { + User testUser = new User().setId(1L).setUsername("testUsername").setPassword("testPassword"); + + UserEntity result = userMapper.mapDomainObject(testUser); + Assertions.assertEquals("testUsername", result.getUsername()); + Assertions.assertEquals("testPassword", result.getPassword()); + Assertions.assertNull(result.getId()); + } + + @Test + public void testMapGraphObject() { + UserEntity testUser = + new UserEntity().setId(1L).setUsername("testUsername").setPassword("testPassword"); + + User result = userMapper.mapGraphObject(testUser); + Assertions.assertEquals("testUsername", result.getUsername()); + Assertions.assertEquals("testPassword", result.getPassword()); + Assertions.assertEquals(1L, result.getId()); + } +} diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/DeleteAnalyzerConfigurationAdapterTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/DeleteAnalyzerConfigurationAdapterTest.java index 8a475dd49..c5f6d90ca 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/DeleteAnalyzerConfigurationAdapterTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/DeleteAnalyzerConfigurationAdapterTest.java @@ -11,7 +11,7 @@ @DisplayName("Delete analyzer configuration") class DeleteAnalyzerConfigurationAdapterTest { - private AnalyzerConfigurationRepository analyzerConfigurationRepository = + private final AnalyzerConfigurationRepository analyzerConfigurationRepository = mock(AnalyzerConfigurationRepository.class); private DeleteAnalyzerConfigurationAdapter deleteAnalyzerConfigurationAdapter; From cce780d1380a0f210c7aad48d2ff79a851156a9e Mon Sep 17 00:00:00 2001 From: Kilian Krause Date: Wed, 3 Jun 2020 15:27:59 +0200 Subject: [PATCH 30/76] implement mapper for GetFilePatternResponse and GetModuleResponse --- .../rest/GetFilePatternResponseMapper.java | 25 +++++++++++++++++++ .../rest/GetModuleResponseMapper.java | 23 +++++++++++++++++ .../filepattern/GetFilePatternController.java | 6 ++--- .../ListFilePatternsOfProjectController.java | 14 ++++------- .../rest/module/GetModuleController.java | 5 ++-- .../ListModulesOfProjectController.java | 12 ++++----- 6 files changed, 64 insertions(+), 21 deletions(-) create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java create mode 100644 coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java new file mode 100644 index 000000000..bcdd13b7b --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java @@ -0,0 +1,25 @@ +package io.reflectoring.coderadar.rest; + +import io.reflectoring.coderadar.projectadministration.domain.FilePattern; +import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; + +import java.util.ArrayList; +import java.util.List; + +public class GetFilePatternResponseMapper { + private GetFilePatternResponseMapper() {} + + public static GetFilePatternResponse mapFilePattern(FilePattern filePattern) { + return new GetFilePatternResponse(filePattern.getId(), filePattern.getPattern(), filePattern.getInclusionType()); + } + + public static List mapFilePatterns(List filePatterns) { + List responses = new ArrayList<>(filePatterns.size()); + for (FilePattern filePattern : filePatterns) { + responses.add( + new GetFilePatternResponse( + filePattern.getId(), filePattern.getPattern(), filePattern.getInclusionType())); + } + return responses; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java new file mode 100644 index 000000000..aac9e99f4 --- /dev/null +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java @@ -0,0 +1,23 @@ +package io.reflectoring.coderadar.rest; + +import io.reflectoring.coderadar.projectadministration.domain.Module; +import io.reflectoring.coderadar.rest.domain.GetModuleResponse; + +import java.util.ArrayList; +import java.util.List; + +public class GetModuleResponseMapper { + private GetModuleResponseMapper() {} + + public static GetModuleResponse mapModule(Module module) { + return new GetModuleResponse(module.getId(), module.getPath()); + } + + public static List mapModules(List modules) { + List responses = new ArrayList<>(modules.size()); + for (Module module : modules) { + responses.add(mapModule(module)); + } + return responses; + } +} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java index 9b3645096..f27590381 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java @@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePattern; + @Transactional @RestController public class GetFilePatternController implements AbstractBaseController { @@ -27,9 +29,7 @@ public GetFilePatternController(GetFilePatternUseCase getFilePatternUseCase) { public ResponseEntity getFilePattern( @PathVariable(name = "filePatternId") long filePatternId) { FilePattern filePattern = getFilePatternUseCase.get(filePatternId); - return new ResponseEntity<>( - new GetFilePatternResponse( - filePatternId, filePattern.getPattern(), filePattern.getInclusionType()), + return new ResponseEntity<>(mapFilePattern(filePattern), HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java index e877c3fc1..faf268b96 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java @@ -4,8 +4,6 @@ import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.ListFilePatternsOfProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; -import java.util.ArrayList; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePatterns; + @Transactional @RestController public class ListFilePatternsOfProjectController implements AbstractBaseController { @@ -30,12 +32,6 @@ public ListFilePatternsOfProjectController( public ResponseEntity> listFilePatterns( @PathVariable long projectId) { List filePatterns = listFilePatternsOfProjectUseCase.listFilePatterns(projectId); - List responses = new ArrayList<>(filePatterns.size()); - for (FilePattern filePattern : filePatterns) { - responses.add( - new GetFilePatternResponse( - filePattern.getId(), filePattern.getPattern(), filePattern.getInclusionType())); - } - return new ResponseEntity<>(responses, HttpStatus.OK); + return new ResponseEntity<>(mapFilePatterns(filePatterns), HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java index d53dc6893..447f57ef0 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java @@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModule; + @Transactional @RestController public class GetModuleController implements AbstractBaseController { @@ -25,7 +27,6 @@ public GetModuleController(GetModuleUseCase getModuleUseCase) { produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getModule( @PathVariable(name = "moduleId") long moduleId) { - return new ResponseEntity<>( - new GetModuleResponse(moduleId, getModuleUseCase.get(moduleId).getPath()), HttpStatus.OK); + return new ResponseEntity<>(mapModule(getModuleUseCase.get(moduleId)), HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java index 65a67738b..a6ab7a017 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java @@ -4,8 +4,6 @@ import io.reflectoring.coderadar.projectadministration.port.driver.module.get.ListModulesOfProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; -import java.util.ArrayList; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModules; + @Transactional @RestController public class ListModulesOfProjectController implements AbstractBaseController { @@ -26,10 +28,6 @@ public ListModulesOfProjectController(ListModulesOfProjectUseCase listModulesOfP @GetMapping(path = "/projects/{projectId}/modules", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> listModules(@PathVariable long projectId) { List modules = listModulesOfProjectUseCase.listModules(projectId); - List responses = new ArrayList<>(modules.size()); - for (Module module : modules) { - responses.add(new GetModuleResponse(module.getId(), module.getPath())); - } - return new ResponseEntity<>(responses, HttpStatus.OK); + return new ResponseEntity<>(mapModules(modules), HttpStatus.OK); } } From facdda232d9cf3f1e48fa94a0d0d0ede7fa9bc85 Mon Sep 17 00:00:00 2001 From: Kilian Krause Date: Wed, 3 Jun 2020 15:51:51 +0200 Subject: [PATCH 31/76] make sure that controllers consume and produce JSON values where necessary --- .../rest/GetFilePatternResponseMapper.java | 26 +++++++++---------- .../rest/GetModuleResponseMapper.java | 21 +++++++-------- .../GetAnalyzingStatusController.java | 5 +++- .../contributor/GetContributorController.java | 3 ++- .../MergeContributorsController.java | 5 +--- .../UpdateContributorController.java | 5 +--- .../filepattern/GetFilePatternController.java | 7 +++-- .../ListFilePatternsOfProjectController.java | 7 +++-- .../rest/module/GetModuleController.java | 4 +-- .../ListModulesOfProjectController.java | 7 +++-- .../rest/project/UpdateProjectController.java | 5 +--- 11 files changed, 43 insertions(+), 52 deletions(-) diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java index bcdd13b7b..6f89df8e8 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java @@ -2,24 +2,24 @@ import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; - import java.util.ArrayList; import java.util.List; public class GetFilePatternResponseMapper { - private GetFilePatternResponseMapper() {} + private GetFilePatternResponseMapper() {} - public static GetFilePatternResponse mapFilePattern(FilePattern filePattern) { - return new GetFilePatternResponse(filePattern.getId(), filePattern.getPattern(), filePattern.getInclusionType()); - } + public static GetFilePatternResponse mapFilePattern(FilePattern filePattern) { + return new GetFilePatternResponse( + filePattern.getId(), filePattern.getPattern(), filePattern.getInclusionType()); + } - public static List mapFilePatterns(List filePatterns) { - List responses = new ArrayList<>(filePatterns.size()); - for (FilePattern filePattern : filePatterns) { - responses.add( - new GetFilePatternResponse( - filePattern.getId(), filePattern.getPattern(), filePattern.getInclusionType())); - } - return responses; + public static List mapFilePatterns(List filePatterns) { + List responses = new ArrayList<>(filePatterns.size()); + for (FilePattern filePattern : filePatterns) { + responses.add( + new GetFilePatternResponse( + filePattern.getId(), filePattern.getPattern(), filePattern.getInclusionType())); } + return responses; + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java index aac9e99f4..57b0b467d 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java @@ -2,22 +2,21 @@ import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; - import java.util.ArrayList; import java.util.List; public class GetModuleResponseMapper { - private GetModuleResponseMapper() {} + private GetModuleResponseMapper() {} - public static GetModuleResponse mapModule(Module module) { - return new GetModuleResponse(module.getId(), module.getPath()); - } + public static GetModuleResponse mapModule(Module module) { + return new GetModuleResponse(module.getId(), module.getPath()); + } - public static List mapModules(List modules) { - List responses = new ArrayList<>(modules.size()); - for (Module module : modules) { - responses.add(mapModule(module)); - } - return responses; + public static List mapModules(List modules) { + List responses = new ArrayList<>(modules.size()); + for (Module module : modules) { + responses.add(mapModule(module)); } + return responses; + } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/GetAnalyzingStatusController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/GetAnalyzingStatusController.java index 97cee154d..dc977a640 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/GetAnalyzingStatusController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/GetAnalyzingStatusController.java @@ -4,6 +4,7 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetAnalyzingStatusResponse; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; @@ -19,7 +20,9 @@ public GetAnalyzingStatusController(GetAnalyzingStatusUseCase getAnalyzingStatus this.getAnalyzingStatusUseCase = getAnalyzingStatusUseCase; } - @GetMapping(path = "/projects/{projectId}/analyzingStatus") + @GetMapping( + path = "/projects/{projectId}/analyzingStatus", + produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getProjectAnalyzingStatus( @PathVariable("projectId") long projectId) { return new ResponseEntity<>( diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java index 7f4ee8d48..9016007d7 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java @@ -6,6 +6,7 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; @@ -21,7 +22,7 @@ public GetContributorController(GetContributorUseCase getContributorUseCase) { this.getContributorUseCase = getContributorUseCase; } - @GetMapping(path = "/contributors/{id}") + @GetMapping(path = "/contributors/{id}", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity getById(@PathVariable long id) { return new ResponseEntity<>(mapContributor(getContributorUseCase.getById(id)), HttpStatus.OK); } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsController.java index 90d5bc1c6..35b412886 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsController.java @@ -21,10 +21,7 @@ public MergeContributorsController(MergeContributorsUseCase mergeContributorsUse this.mergeContributorsUseCase = mergeContributorsUseCase; } - @PostMapping( - path = "/contributors/merge", - consumes = MediaType.APPLICATION_JSON_VALUE, - produces = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(path = "/contributors/merge", consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity mergeContributors( @RequestBody @Validated MergeContributorsCommand command) { mergeContributorsUseCase.mergeContributors(command); diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorController.java index 4f40be7ad..e4bddd85b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorController.java @@ -22,10 +22,7 @@ public UpdateContributorController(UpdateContributorUseCase updateContributorUse this.updateContributorUseCase = updateContributorUseCase; } - @PostMapping( - path = "/contributors/{id}", - consumes = MediaType.APPLICATION_JSON_VALUE, - produces = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(path = "/contributors/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity updateContributor( @PathVariable long id, @RequestBody @Validated UpdateContributorCommand command) { updateContributorUseCase.updateContributor(id, command); diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java index f27590381..e99939b3c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.filepattern; +import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePattern; + import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.GetFilePatternUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; @@ -12,8 +14,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePattern; - @Transactional @RestController public class GetFilePatternController implements AbstractBaseController { @@ -29,7 +29,6 @@ public GetFilePatternController(GetFilePatternUseCase getFilePatternUseCase) { public ResponseEntity getFilePattern( @PathVariable(name = "filePatternId") long filePatternId) { FilePattern filePattern = getFilePatternUseCase.get(filePatternId); - return new ResponseEntity<>(mapFilePattern(filePattern), - HttpStatus.OK); + return new ResponseEntity<>(mapFilePattern(filePattern), HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java index faf268b96..f9d1ae26b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.filepattern; +import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePatterns; + import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.ListFilePatternsOfProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePatterns; - @Transactional @RestController public class ListFilePatternsOfProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java index 447f57ef0..02e1b742d 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.module; +import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModule; + import io.reflectoring.coderadar.projectadministration.port.driver.module.get.GetModuleUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; @@ -11,8 +13,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModule; - @Transactional @RestController public class GetModuleController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java index a6ab7a017..43c9dab41 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.module; +import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModules; + import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driver.module.get.ListModulesOfProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModules; - @Transactional @RestController public class ListModulesOfProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java index 39a404f93..b47543eea 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java @@ -23,10 +23,7 @@ public UpdateProjectController(UpdateProjectUseCase updateProjectUseCase) { this.updateProjectUseCase = updateProjectUseCase; } - @PostMapping( - path = "/projects/{projectId}", - consumes = MediaType.APPLICATION_JSON_VALUE, - produces = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(path = "/projects/{projectId}", consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity updateProject( @RequestBody @Validated UpdateProjectCommand command, @PathVariable(name = "projectId") long projectId) From e0223e34d43ae4d179028e967a0e662cfb0299e0 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Thu, 4 Jun 2020 10:31:12 +0200 Subject: [PATCH 32/76] fix a few SonarCloud issues --- .../coderadar/app/CoderadarApplication.java | 11 +- .../reflectoring/coderadar/app/Injector.java | 6 +- .../service/AnalyzerPluginService.java | 8 +- .../service/filepatterns/StringUtils.java | 138 ------------------ .../dependencymap/domain/CompareNode.java | 50 +++---- .../port/driven/module/CreateModulePort.java | 5 +- .../service/project/ScanProjectScheduler.java | 2 +- .../driver/register/RegisterUserUseCase.java | 4 +- .../port/driven/GetRawCommitContentPort.java | 13 +- .../adapter/DependencyCompareTreeAdapter.java | 4 +- .../dependencymap/analyzers/JavaAnalyzer.java | 88 ++++++----- .../dependencymap/util/NodeComparator.java | 4 +- .../dependencymap/util/RegexPatternCache.java | 13 +- .../dependencymap/CompareNodeTest.java | 26 ++-- .../dependencymap/JavaAnalyzerTest.java | 4 +- .../GetDeltaTreeForTwoCommitsAdapter.java | 14 +- ...heckstyleSourceCodeFileAnalyzerPlugin.java | 6 +- .../coderadar/analyzer/loc/LocCounter.java | 2 + 18 files changed, 125 insertions(+), 273 deletions(-) delete mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/filepatterns/StringUtils.java diff --git a/coderadar-app/src/main/java/io/reflectoring/coderadar/app/CoderadarApplication.java b/coderadar-app/src/main/java/io/reflectoring/coderadar/app/CoderadarApplication.java index 552981268..5d5cc352c 100644 --- a/coderadar-app/src/main/java/io/reflectoring/coderadar/app/CoderadarApplication.java +++ b/coderadar-app/src/main/java/io/reflectoring/coderadar/app/CoderadarApplication.java @@ -10,7 +10,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.EnableTransactionManagement; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.GetMapping; @EnableScheduling @EnableAsync(proxyTargetClass = true) @@ -20,21 +20,20 @@ @SpringBootApplication(scanBasePackages = "io.reflectoring.coderadar") @Controller public class CoderadarApplication implements ErrorController { + public static void main(String[] args) { Locale.setDefault(Locale.US); SpringApplication.run(CoderadarApplication.class, args); } - // Forward unknown paths to index.html (angular) - private static final String PATH = "/error"; - - @RequestMapping(path = PATH) + @GetMapping(path = "/error") public String error() { return "forward:/index.html"; } + // Forward unknown paths to index.html (angular) @Override public String getErrorPath() { - return PATH; + return "/error"; } } diff --git a/coderadar-app/src/main/java/io/reflectoring/coderadar/app/Injector.java b/coderadar-app/src/main/java/io/reflectoring/coderadar/app/Injector.java index f81effe78..d1ec87a80 100644 --- a/coderadar-app/src/main/java/io/reflectoring/coderadar/app/Injector.java +++ b/coderadar-app/src/main/java/io/reflectoring/coderadar/app/Injector.java @@ -1,8 +1,8 @@ package io.reflectoring.coderadar.app; -import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; +import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; /** @@ -15,7 +15,7 @@ public class Injector implements ApplicationContextAware { private static ApplicationContext applicationContext; - private static Injector INSTANCE = new Injector(); + private static final Injector INSTANCE = new Injector(); private Injector() {} @@ -34,7 +34,7 @@ public void inject(Object bean) { } @Override - public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + public void setApplicationContext(@NonNull ApplicationContext applicationContext) { Injector.applicationContext = applicationContext; } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzerPluginService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzerPluginService.java index bcf5466c1..186da17c0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzerPluginService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzerPluginService.java @@ -15,10 +15,10 @@ @Service public class AnalyzerPluginService { - private Logger logger = LoggerFactory.getLogger(AnalyzerPluginService.class); + private final Logger logger = LoggerFactory.getLogger(AnalyzerPluginService.class); - private Map> sourceCodeFileAnalyzerPlugins = - new HashMap<>(); + private final Map> + sourceCodeFileAnalyzerPlugins = new HashMap<>(); /** * Constructs a new AnalyzerPluginRegistry. This is a very expensive operation since the @@ -103,7 +103,7 @@ private void checkValidConfigurationFile( } throw new IllegalArgumentException( String.format( - "Not a valid configuration file for analyzer plugin %s. The first couple lines of configuration file are:\n %s", + "Not a valid configuration file for analyzer plugin %s. The first couple lines of configuration file are:%n %s", configurableAnalyzer.getClass(), firstCoupleLines.toString())); } catch (IOException e) { throw new IllegalArgumentException( diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/filepatterns/StringUtils.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/filepatterns/StringUtils.java deleted file mode 100644 index 714d76fa8..000000000 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/filepatterns/StringUtils.java +++ /dev/null @@ -1,138 +0,0 @@ -package io.reflectoring.coderadar.analyzer.service.filepatterns; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.StringTokenizer; - -/** - * The methods of this class are copied from the StringUtils class of the spring framework to avoid - * the full dependency to the spring framework. Big thanks to the Spring team! - */ -public class StringUtils { - - /** - * Tokenize the given {@code String} into a {@code String} array via a {@link StringTokenizer}. - * - *

The given {@code delimiters} string can consist of any number of delimiter characters. Each - * of those characters can be used to separate tokens. A delimiter is always a single character; - * for multi-character delimiters, consider using {@link #delimitedListToStringArray}. - * - * @param str the {@code String} to tokenize - * @param delimiters the delimiter characters, assembled as a {@code String} (each of the - * characters is individually considered as a delimiter) - * @param trimTokens trim the tokens via {@link String#trim()} - * @param ignoreEmptyTokens omit empty tokens from the result array (only applies to tokens that - * are empty after trimming; StringTokenizer will not consider subsequent delimiters as token - * in the first place). - * @return an array of the tokens ({@code null} if the input {@code String} was {@code null}) - * @see StringTokenizer - * @see String#trim() - */ - public static String[] tokenizeToStringArray( - String str, String delimiters, boolean trimTokens, boolean ignoreEmptyTokens) { - - if (str == null) { - return null; - } - StringTokenizer st = new StringTokenizer(str, delimiters); - List tokens = new ArrayList(); - while (st.hasMoreTokens()) { - String token = st.nextToken(); - if (trimTokens) { - token = token.trim(); - } - if (!ignoreEmptyTokens || token.length() > 0) { - tokens.add(token); - } - } - return toStringArray(tokens); - } - - /** - * Copy the given {@code Collection} into a {@code String} array. - * - *

The {@code Collection} must contain {@code String} elements only. - * - * @param collection the {@code Collection} to copy - * @return the {@code String} array ({@code null} if the supplied {@code Collection} was {@code - * null}) - */ - public static String[] toStringArray(Collection collection) { - if (collection == null) { - return null; - } - return collection.toArray(new String[collection.size()]); - } - - /** - * Check whether the given {@code CharSequence} contains actual text. - * - *

More specifically, this method returns {@code true} if the {@code CharSequence} is not - * {@code null}, its length is greater than 0, and it contains at least one non-whitespace - * character. - * - *

- * - * 

-   * StringUtils.hasText(null) = false
-   * StringUtils.hasText("") = false
-   * StringUtils.hasText(" ") = false
-   * StringUtils.hasText("12345") = true
-   * StringUtils.hasText(" 12345 ") = true
-   *
- * - * @param str the {@code CharSequence} to check (may be {@code null}) - * @return {@code true} if the {@code CharSequence} is not {@code null}, its length is greater - * than 0, and it does not contain whitespace only - * @see Character#isWhitespace - */ - public static boolean hasText(CharSequence str) { - if (!hasLength(str)) { - return false; - } - int strLen = str.length(); - for (int i = 0; i < strLen; i++) { - if (!Character.isWhitespace(str.charAt(i))) { - return true; - } - } - return false; - } - - /** - * Check that the given {@code String} is neither {@code null} nor of length 0. - * - *

Note: this method returns {@code true} for a {@code String} that purely consists of - * whitespace. - * - * @param str the {@code String} to check (may be {@code null}) - * @return {@code true} if the {@code String} is not {@code null} and has length - * @see #hasLength(CharSequence) - */ - public static boolean hasLength(String str) { - return hasLength((CharSequence) str); - } - - /** - * Check that the given {@code CharSequence} is neither {@code null} nor of length 0. - * - *

Note: this method returns {@code true} for a {@code CharSequence} that purely consists of - * whitespace. - * - *

- * - * 

-   * StringUtils.hasLength(null) = false
-   * StringUtils.hasLength("") = false
-   * StringUtils.hasLength(" ") = true
-   * StringUtils.hasLength("Hello") = true
-   *
- * - * @param str the {@code CharSequence} to check (may be {@code null}) - * @return {@code true} if the {@code CharSequence} is not {@code null} and has length - */ - public static boolean hasLength(CharSequence str) { - return (str != null && str.length() > 0); - } -} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java index c216f285a..1325d6dcf 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java @@ -1,9 +1,8 @@ package io.reflectoring.coderadar.dependencymap.domain; import io.reflectoring.coderadar.plugin.api.ChangeType; -import java.util.HashSet; -import java.util.List; -import java.util.Stack; + +import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; import lombok.Getter; import lombok.Setter; @@ -106,10 +105,10 @@ public CompareNode getNodeByPath(String nodePath) { if (nodePath == null || nodePath.equals("")) { return null; } - String[] path = nodePath.split("/"); + String[] pathString = nodePath.split("/"); CompareNode tmp = this; // iterate over every part of the new path - for (String s : path) { + for (String s : pathString) { // if the Node-object already exists, iterate over it if (tmp.getChildByName(s) != null) { tmp = tmp.getChildByName(s); @@ -131,12 +130,12 @@ public CompareNode createNodeByPath(String nodePath, ChangeType changeType) { if (nodePath == null || nodePath.equals("")) { return null; } - String[] path = nodePath.split("/"); + String[] pathString = nodePath.split("/"); CompareNode tmp = this; // iterate over every part of the new path int i = 0; - while (i < path.length) { - String s = path[i]; + while (i < pathString.length) { + String s = pathString[i]; // if the Node-object already exists, iterate over it if (tmp.getChildByName(s) != null) { tmp = tmp.getChildByName(s); @@ -193,15 +192,14 @@ public boolean hasDependencyOn(CompareNode node) { if (dependency.getPath().equals(node.getPath())) { return true; } - } else if (!this.hasChildren() && node.hasChildren() - || this.hasChildren() && node.hasChildren()) { - if (dependency - .getPath() - .contains( - (node.getPackageName().equals("") ? node.getFilename() : node.getPackageName()) - .replaceAll("\\.", "/"))) { - return true; - } + } else if ((!this.hasChildren() && node.hasChildren() + || this.hasChildren() && node.hasChildren()) + && dependency + .getPath() + .contains( + (node.getPackageName().equals("") ? node.getFilename() : node.getPackageName()) + .replaceAll("\\.", "/"))) { + return true; } } return false; @@ -219,7 +217,7 @@ public CompareNode getParent(CompareNode root) { } else if (!path.contains("/")) { return root; } else { - String parentPath = this.path.substring(0, this.path.lastIndexOf("/")); + String parentPath = this.path.substring(0, this.path.lastIndexOf('/')); return root.getNodeByPath(parentPath); } } @@ -246,16 +244,16 @@ public CompareNodeDTO getDependencyByPath(String path) { * @param traverseInterface method to call. */ public void traversePost(CompareTreeTraverseInterface traverseInterface) { - Stack stack = new Stack<>(); + Deque stack = new ArrayDeque<>(); HashSet hash = new HashSet<>(); CompareNode root = this; - stack.push(root); + stack.offer(root); while (!stack.isEmpty()) { - root = stack.peek(); + root = stack.peekLast(); if (root.children.isEmpty() || hash.contains(root)) { - traverseInterface.traverseMethod(stack.pop()); + traverseInterface.traverseMethod(stack.pollLast()); } else { - root.children.forEach(stack::push); + root.children.forEach(stack::offer); hash.add(root); } } @@ -268,11 +266,11 @@ public void traversePost(CompareTreeTraverseInterface traverseInterface) { */ public void traversePre(CompareTreeTraverseInterface traverseInterface) { CompareNode root = this; - Stack stack = new Stack<>(); - stack.add(root); + Deque stack = new ArrayDeque<>(); + stack.offer(root); while (!stack.isEmpty()) { - root = stack.pop(); + root = stack.pollLast(); stack.addAll(root.children); traverseInterface.traverseMethod(root); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/module/CreateModulePort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/module/CreateModulePort.java index 6b49bbebc..15e1160d3 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/module/CreateModulePort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/module/CreateModulePort.java @@ -1,6 +1,5 @@ package io.reflectoring.coderadar.projectadministration.port.driven.module; -import io.reflectoring.coderadar.projectadministration.ModuleAlreadyExistsException; import io.reflectoring.coderadar.projectadministration.ModulePathInvalidException; public interface CreateModulePort { @@ -11,9 +10,7 @@ public interface CreateModulePort { * @param modulePath The path of the module. * @param projectId The id of the project. * @return The id of the module. - * @throws ModuleAlreadyExistsException Thrown if a module with the given path already exists. * @throws ModulePathInvalidException Thrown if the supplied path is invalid. */ - Long createModule(String modulePath, long projectId) - throws ModuleAlreadyExistsException, ModulePathInvalidException; + Long createModule(String modulePath, long projectId) throws ModulePathInvalidException; } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ScanProjectScheduler.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ScanProjectScheduler.java index 718644621..f312d210b 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ScanProjectScheduler.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ScanProjectScheduler.java @@ -92,7 +92,7 @@ public void onApplicationEvent() { } taskScheduler.scheduleAtFixedRate( this::scheduleCheckTask, - coderadarConfigurationProperties.getScanIntervalInSeconds() * 1000); + coderadarConfigurationProperties.getScanIntervalInSeconds() * 1000L); } /** Starts update tasks for all projects that don't have one running already. */ diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/register/RegisterUserUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/register/RegisterUserUseCase.java index 4cdc0b6c0..35dc54fe3 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/register/RegisterUserUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/register/RegisterUserUseCase.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.useradministration.port.driver.register; -import io.reflectoring.coderadar.useradministration.UsernameAlreadyInUseException; - public interface RegisterUserUseCase { /** @@ -10,5 +8,5 @@ public interface RegisterUserUseCase { * @param command The user to register. * @return The DB id of the user. */ - Long register(RegisterUserCommand command) throws UsernameAlreadyInUseException; + Long register(RegisterUserCommand command); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java index ef44c33a2..8f48bf550 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java @@ -14,8 +14,7 @@ public interface GetRawCommitContentPort { * @param commitHash The commitHash * @return The raw commit data. */ - byte[] getCommitContent(String projectRoot, String filepath, String commitHash) - throws UnableToGetCommitContentException; + byte[] getCommitContent(String projectRoot, String filepath, String commitHash); /** * @param projectRoot The local repository. @@ -25,9 +24,7 @@ byte[] getCommitContent(String projectRoot, String filepath, String commitHash) * not exist * @throws UnableToGetCommitContentException Thrown if the commit is not found. */ - byte[] getFileDiff(String projectRoot, String filepath, String commitHash) - throws UnableToGetCommitContentException; - + byte[] getFileDiff(String projectRoot, String filepath, String commitHash); /** * Returns the raw content of a list of files in a commit. * @@ -37,8 +34,7 @@ byte[] getFileDiff(String projectRoot, String filepath, String commitHash) * @return The raw commit data grouped by the filepath. */ HashMap getCommitContentBulk( - String projectRoot, List filepaths, String commitHash) - throws UnableToGetCommitContentException; + String projectRoot, List filepaths, String commitHash); /** * Returns the raw content of a list of files in a commit. @@ -52,6 +48,5 @@ HashMap getCommitContentBulk( getCommitContentBulkWithFiles( String projectRoot, List files, - String commitHash) - throws UnableToGetCommitContentException; + String commitHash); } diff --git a/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/adapter/DependencyCompareTreeAdapter.java b/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/adapter/DependencyCompareTreeAdapter.java index 6516c7505..e51ae7de3 100644 --- a/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/adapter/DependencyCompareTreeAdapter.java +++ b/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/adapter/DependencyCompareTreeAdapter.java @@ -30,7 +30,6 @@ public class DependencyCompareTreeAdapter implements GetCompareTreePort { private String commitName2; private HashMap commit1Contents; private HashMap commit2Contents; - private CompareNodeComparator nodeComparator; private final JavaAnalyzer javaAnalyzer; private final WalkCommitTreePort walkCommitTreePort; @@ -47,7 +46,6 @@ public DependencyCompareTreeAdapter( this.walkCommitTreePort = walkCommitTreePort; this.getDiffEntriesForCommitsPort = getDiffEntriesForCommitsPort; this.rawCommitContentPort = rawCommitContentPort; - nodeComparator = new CompareNodeComparator(); } private void createTree() { @@ -217,7 +215,7 @@ private void setPackage(CompareNode node) { String childPackage = node.getChildren().get(0).getPackageName(); node.setPackageName( childPackage.contains(".") - ? childPackage.substring(0, childPackage.lastIndexOf(".")) + ? childPackage.substring(0, childPackage.lastIndexOf('.')) : ""); } } diff --git a/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/analyzers/JavaAnalyzer.java b/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/analyzers/JavaAnalyzer.java index dc825d2d3..9e335d26d 100644 --- a/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/analyzers/JavaAnalyzer.java +++ b/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/analyzers/JavaAnalyzer.java @@ -12,26 +12,25 @@ @Service public class JavaAnalyzer { - private RegexPatternCache cache; - private Pattern importPattern; - private Pattern fullyClassifiedPattern; - private Pattern skipPattern; - private Map separators; - public int count = 0; + private final RegexPatternCache cache; + private final Pattern importPattern; + private final Pattern fullyClassifiedPattern; + private final Pattern skipPattern; + private final Map separators; - private final String FILTER_PATTERN = "(\\/\\*(.|[\\r\\n])+?\\*\\/)|(\\/\\/.*[\\r\\n])"; - private final String IMPORT_PATTERN = " (([a-z_$][\\w$]*)\\.)+(([a-zA-Z_$][\\w$]*)|\\*);"; + private static final String FILTER_PATTERN = "(\\/\\*(.|[\\r\\n])+?\\*\\/)|(\\/\\/.*[\\r\\n])"; + private static final String IMPORT_PATTERN = " (([a-z_$][\\w$]*)\\.)+(([a-zA-Z_$][\\w$]*)|\\*);"; // " ([A-Za-z_$][\\w$]*\\.)*[A-Za-z_$][\\w$]*" - private final String FULLYCLASSIFIED_PATTERN = "([a-zA-Z_$][\\w$]*\\.)*[a-zA-Z_$][\\w$]*"; - private final String NAME_PATTERN = " (([A-Za-z_$][\\w$]*)\\.)*([A-Za-z_$][\\w$]*)"; - private final String SKIP_PATTERN = "[\\w$]+"; - private final String PACKAGE_PATTERN = + private static final String FULLYCLASSIFIED_PATTERN = "([a-zA-Z_$][\\w$]*\\.)*[a-zA-Z_$][\\w$]*"; + private static final String NAME_PATTERN = " (([A-Za-z_$][\\w$]*)\\.)*([A-Za-z_$][\\w$]*)"; + private static final String SKIP_PATTERN = "[\\w$]+"; + private static final String PACKAGE_PATTERN = "^(\\s*)package(\\s*)(([A-Za-z_$][\\w$]*)\\.)*([A-Za-z_$][\\w$]*);"; - private final String SINGLE_LINE_COMMENT = "^\\s*//.*$"; - private final String PACKAGE_DECLARATION = "^\\s*package.*$"; - private final String MULTILINE_COMMENT_START = "^\\s*/\\*.*$"; - private final String MULTILINE_COMMENT = "^\\s*\\*.*$"; - private final String IN_STRING = "^.*\".*$"; + private static final String SINGLE_LINE_COMMENT = "^\\s*//.*$"; + private static final String PACKAGE_DECLARATION = "^\\s*package.*$"; + private static final String MULTILINE_COMMENT_START = "^\\s*/\\*.*$"; + private static final String MULTILINE_COMMENT = "^\\s*\\*.*$"; + private static final String IN_STRING = "^.*\".*$"; @Autowired public JavaAnalyzer() { @@ -39,33 +38,31 @@ public JavaAnalyzer() { importPattern = cache.getPattern(IMPORT_PATTERN); fullyClassifiedPattern = cache.getPattern(FULLYCLASSIFIED_PATTERN); skipPattern = cache.getPattern(SKIP_PATTERN); - separators = new LinkedHashMap(); - { - // this list is ordered by the estimated order of the separators in a line to minimize - // skipPattern checks - separators.put("private ", false); - separators.put("public ", false); - separators.put("protected ", false); - separators.put("(", false); - separators.put(")", false); - separators.put("{", false); - separators.put("=", false); - separators.put(",", false); - separators.put("<", false); - separators.put(">", false); - separators.put("||", false); - separators.put("&&", false); - separators.put("?", false); - separators.put(":", false); - separators.put("new ", false); - separators.put("extends ", false); - separators.put("implements ", false); - separators.put("throws ", false); - separators.put("|", false); - separators.put("instanceof ", false); - separators.put("@[a-zA-Z_$][\\w$]*", true); - separators.put(";", false); - } + separators = new LinkedHashMap<>(); + // this list is ordered by the estimated order of the separators in a line to minimize + // skipPattern checks + separators.put("private ", false); + separators.put("public ", false); + separators.put("protected ", false); + separators.put("(", false); + separators.put(")", false); + separators.put("{", false); + separators.put("=", false); + separators.put(",", false); + separators.put("<", false); + separators.put(">", false); + separators.put("||", false); + separators.put("&&", false); + separators.put("?", false); + separators.put(":", false); + separators.put("new ", false); + separators.put("extends ", false); + separators.put("implements ", false); + separators.put("throws ", false); + separators.put("|", false); + separators.put("instanceof ", false); + separators.put("@[a-zA-Z_$][\\w$]*", true); + separators.put(";", false); } public String getPackageName(byte[] byteFileContent) { @@ -138,7 +135,7 @@ public List getDependenciesFromImportLine(String line) { foundDependencies.add(importString); } } - lineString = lineString.substring(lineString.indexOf(";") + 1); + lineString = lineString.substring(lineString.indexOf(';') + 1); } return foundDependencies; } @@ -219,7 +216,6 @@ && checkTmpString(entry.getKey(), toCheck)) { * @return true if there is a potential import, else false. */ private boolean checkTmpString(String border, String string) { - count++; return skipPattern .matcher(string.substring(0, string.indexOf(border) + border.length())) .find(); diff --git a/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/util/NodeComparator.java b/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/util/NodeComparator.java index 43e114dfa..29ad03e96 100644 --- a/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/util/NodeComparator.java +++ b/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/util/NodeComparator.java @@ -26,9 +26,9 @@ public int compare(Node o1, Node o2) { return -1; } else if (!o1.hasChildren() && o2.hasChildren()) { return 1; - } else if (o1.getDependencies().size() > 0 && o2.getDependencies().size() == 0) { + } else if (!o1.getDependencies().isEmpty() && o2.getDependencies().isEmpty()) { return -1; - } else if (o2.getDependencies().size() > 0 && o1.getDependencies().size() == 0) { + } else if (!o2.getDependencies().isEmpty() && o1.getDependencies().isEmpty()) { return 1; } else { return o1.getFilename().compareTo(o2.getFilename()); diff --git a/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/util/RegexPatternCache.java b/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/util/RegexPatternCache.java index 29288f6a8..bd0c84eda 100644 --- a/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/util/RegexPatternCache.java +++ b/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/util/RegexPatternCache.java @@ -7,7 +7,7 @@ public class RegexPatternCache { - private Map patternMap; + private final Map patternMap; public RegexPatternCache() { patternMap = new HashMap<>(); @@ -37,7 +37,7 @@ private Pattern getOrCreate(RegexPattern regexPattern) { return newPattern; } - class RegexPattern { + static class RegexPattern { String regex; int flags; @@ -48,9 +48,12 @@ public RegexPattern(String regex, int flags) { } public boolean equals(Object obj) { - RegexPattern other = (RegexPattern) obj; - if (other.regex.equals(regex) && other.flags == flags) return true; - return false; + if (obj instanceof RegexPattern) { + RegexPattern other = (RegexPattern) obj; + return other.regex.equals(regex) && other.flags == flags; + } else { + return false; + } } public int hashCode() { diff --git a/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/CompareNodeTest.java b/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/CompareNodeTest.java index 8bd183ef8..273e75704 100644 --- a/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/CompareNodeTest.java +++ b/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/CompareNodeTest.java @@ -11,7 +11,7 @@ @TestInstance(TestInstance.Lifecycle.PER_CLASS) @ExtendWith(MockitoExtension.class) -public class CompareNodeTest { +class CompareNodeTest { private CompareNode testRoot; @@ -47,32 +47,32 @@ public void init() { } @Test - public void testGetNodeByPath() { + void testGetNodeByPath() { CompareNode test = testRoot.getNodeByPath("testNode1_2/testNode2_4"); Assertions.assertNotNull(test); Assertions.assertEquals("testNode2_4", test.getFilename()); } @Test - public void testGetNodeByPathEmptyString() { + void testGetNodeByPathEmptyString() { CompareNode empty = testRoot.getNodeByPath(""); Assertions.assertNull(empty); } @Test - public void testGetNodeByPathInvalidString() { + void testGetNodeByPathInvalidString() { CompareNode empty = testRoot.getNodeByPath("jhsbdlfjs"); Assertions.assertNull(empty); } @Test - public void testGetNodeByPathNull() { + void testGetNodeByPathNull() { CompareNode empty = testRoot.getNodeByPath(null); Assertions.assertNull(empty); } @Test - public void testCreateNodeByPath() { + void testCreateNodeByPath() { CompareNode testRoot = new CompareNode("testRoot", "", "", ChangeType.UNCHANGED); testRoot.createNodeByPath("testNode1_5/testNode2_5/testNode3_1", ChangeType.UNCHANGED); @@ -86,19 +86,19 @@ public void testCreateNodeByPath() { } @Test - public void testCreateNodeByPathEmptyString() { + void testCreateNodeByPathEmptyString() { CompareNode empty = testRoot.createNodeByPath("", ChangeType.UNCHANGED); Assertions.assertNull(empty); } @Test - public void testCreateNodeByPathNull() { + void testCreateNodeByPathNull() { CompareNode empty = testRoot.createNodeByPath(null, ChangeType.UNCHANGED); Assertions.assertNull(empty); } @Test - public void testTraversePre() { + void testTraversePre() { Assertions.assertNotNull(testRoot); StringBuilder traversed = new StringBuilder(); testRoot.traversePre(node -> traversed.append(node.getFilename()).append("\n")); @@ -117,7 +117,7 @@ public void testTraversePre() { } @Test - public void testTraversePost() { + void testTraversePost() { Assertions.assertNotNull(testRoot); StringBuilder traversed = new StringBuilder(); testRoot.traversePost(node -> traversed.append(node.getFilename()).append("\n")); @@ -136,7 +136,7 @@ public void testTraversePost() { } @Test - public void testGetParent() { + void testGetParent() { Assertions.assertNotNull(testRoot); CompareNode testNode2_1 = testRoot.getNodeByPath("testNode1_1/testNode2_1"); System.out.println(testNode2_1.getPath()); @@ -145,14 +145,14 @@ public void testGetParent() { } @Test - public void testGetParentRootChild() { + void testGetParentRootChild() { Assertions.assertNotNull(testRoot); Assertions.assertEquals( "testRoot", testRoot.getNodeByPath("testNode1_1").getParent(testRoot).getFilename()); } @Test - public void testGetParentRoot() { + void testGetParentRoot() { Assertions.assertNotNull(testRoot); Assertions.assertNull(testRoot.getParent(testRoot)); } diff --git a/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/JavaAnalyzerTest.java b/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/JavaAnalyzerTest.java index 0287b6a66..4409368d1 100644 --- a/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/JavaAnalyzerTest.java +++ b/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/JavaAnalyzerTest.java @@ -9,9 +9,9 @@ import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) -public class JavaAnalyzerTest { +class JavaAnalyzerTest { - private String fileContent = + private final String fileContent = "package org.wickedsource.dependencytree.example;\n" + "\n" + "//These imports shouldn't matter to the DependencyTree\n" diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetDeltaTreeForTwoCommitsAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetDeltaTreeForTwoCommitsAdapter.java index 431b568ac..8cbf1c4cb 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetDeltaTreeForTwoCommitsAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetDeltaTreeForTwoCommitsAdapter.java @@ -10,6 +10,7 @@ import io.reflectoring.coderadar.query.port.driver.deltatree.GetDeltaTreeForTwoCommitsCommand; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import org.springframework.stereotype.Service; @Service @@ -132,22 +133,25 @@ private DeltaTree createDeltaTree( : null; if (getChangeType(metricTree1, metricTree2).equals(ChangeType.MODIFY)) { - if (metricTree1.getType().equals(MetricTreeNodeType.MODULE) - && metricTree2.getType().equals(MetricTreeNodeType.MODULE)) { + if (Objects.requireNonNull(metricTree1).getType().equals(MetricTreeNodeType.MODULE) + && Objects.requireNonNull(metricTree2).getType().equals(MetricTreeNodeType.MODULE)) { deltaTree .getChildren() .add(createDeltaTree(metricTree1, metricTree2, addedFiles, removedFiles)); } else { - deltaTree.getChildren().add(createFileNode(metricTree1, metricTree2)); + deltaTree + .getChildren() + .add(createFileNode(metricTree1, Objects.requireNonNull(metricTree2))); } tree1Counter++; tree2Counter++; } else if (getChangeType(metricTree1, metricTree2).equals(ChangeType.DELETE)) { - deltaTree.getChildren().add(createDeletedFileNode(metricTree1)); + deltaTree.getChildren().add(createDeletedFileNode(Objects.requireNonNull(metricTree1))); removedFiles.add(metricTree1.getName()); tree1Counter++; } else { - if (metricTree2.getType().equals(MetricTreeNodeType.MODULE) && metricTree1 != null) { + if (Objects.requireNonNull(metricTree2).getType().equals(MetricTreeNodeType.MODULE) + && metricTree1 != null) { deltaTree.getChildren().add(createAddedFileNode(metricTree1)); addedFiles.add(metricTree1.getName()); tree1Counter++; diff --git a/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java b/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java index 0e1eea6d8..7526fbfbf 100644 --- a/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java +++ b/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java @@ -73,9 +73,9 @@ private File createTempFile(byte[] fileContent, String filename) throws IOExcept String[] temp = filename.split("/"); File file = new File(Files.createTempDir(), temp[temp.length - 1]); file.deleteOnExit(); - FileOutputStream out = new FileOutputStream(file); - out.write(fileContent); - out.close(); + try (FileOutputStream out = new FileOutputStream(file)) { + out.write(fileContent); + } return file; } diff --git a/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LocCounter.java b/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LocCounter.java index 840f0b497..3c4c71663 100644 --- a/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LocCounter.java +++ b/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LocCounter.java @@ -74,6 +74,8 @@ private void updateContext(String line, LocProfile profile, LocContext context) withinMultiLineComment = false; } break; + default: + break; } } From dfc97c054688a79ee798c460c3a9c6102b25d863 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Thu, 4 Jun 2020 10:55:51 +0200 Subject: [PATCH 33/76] spotless --- .../reflectoring/coderadar/dependencymap/domain/CompareNode.java | 1 - 1 file changed, 1 deletion(-) diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java index 1325d6dcf..baf2dc35d 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.dependencymap.domain; import io.reflectoring.coderadar.plugin.api.ChangeType; - import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; import lombok.Getter; From d8c2573a069f9a2fdf9f3b3131120d2e3d8a97c4 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Mon, 8 Jun 2020 15:38:34 +0200 Subject: [PATCH 34/76] add tests for rest controller response mappers --- ...etAnalyzerConfigurationResponseMapper.java | 4 +- .../rest/GetBranchResponseMapper.java | 1 + .../rest/GetCommitResponseMapper.java | 1 + .../rest/GetContributorResponseMapper.java | 8 +--- .../rest/GetFilePatternResponseMapper.java | 5 +-- .../rest/GetModuleResponseMapper.java | 1 + .../rest/GetProjectResponseMapper.java | 1 + .../coderadar/rest/GetTeamResponseMapper.java | 5 ++- .../coderadar/rest/GetUserResponseMapper.java | 1 + .../coderadar/rest/JsonListWrapper.java | 3 +- .../GetAnalyzerConfigurationController.java | 4 +- ...erConfigurationsFromProjectController.java | 7 +-- .../analyzing/ListAnalyzersController.java | 3 +- .../rest/branch/ListBranchesController.java | 7 +-- .../contributor/GetContributorController.java | 4 +- .../ListContributorsController.java | 7 +-- .../FileAndCommitsForTimePeriodResponse.java | 3 +- .../rest/domain/GetContributorResponse.java | 3 +- .../rest/domain/GetProjectResponse.java | 3 +- .../rest/domain/GetTeamResponse.java | 3 +- .../filepattern/GetFilePatternController.java | 4 +- .../ListFilePatternsOfProjectController.java | 7 +-- .../rest/module/GetModuleController.java | 4 +- .../ListModulesOfProjectController.java | 7 +-- .../rest/project/CreateProjectController.java | 3 +- .../rest/project/GetProjectController.java | 4 +- .../rest/project/ListProjectsController.java | 7 +-- .../rest/project/UpdateProjectController.java | 3 +- ...etAvailableMetricsInProjectController.java | 3 +- .../rest/query/GetCommitLogController.java | 3 +- .../query/GetCommitsInProjectController.java | 3 +- .../query/GetCriticalFilesController.java | 9 ++-- .../GetMetricValuesOfCommitController.java | 3 +- .../useradministration/GetUserController.java | 4 +- .../ListProjectsForUserController.java | 7 +-- .../ListUsersController.java | 7 +-- .../ListUsersForProjectController.java | 7 +-- .../teams/GetTeamController.java | 4 +- .../teams/ListProjectsForTeamController.java | 7 +-- .../teams/ListTeamsController.java | 7 +-- .../teams/ListTeamsForProjectController.java | 7 +-- .../teams/ListTeamsForUserController.java | 7 +-- ...alyzerConfigurationResponseMapperTest.java | 39 +++++++++++++++++ .../unit/GetBranchResponseMapperTest.java | 5 ++- .../unit/GetCommitResponseMapperTest.java | 5 ++- .../GetContributorResponseMapperTest.java | 5 ++- .../GetFilePatternResponseMapperTest.java | 41 ++++++++++++++++++ .../unit/GetModuleResponseMapperTest.java | 36 ++++++++++++++++ .../unit/GetProjectResponseMapperTest.java | 5 ++- .../GetTeamResponseMapperControllerTest.java | 5 ++- .../rest/unit/GetTeamResponseMapperTest.java | 43 ++++++++++++------- .../rest/unit/GetUserResponseMapperTest.java | 35 +++++++++++++++ ...teAnalyzerConfigurationControllerTest.java | 4 +- ...teAnalyzerConfigurationControllerTest.java | 4 +- ...etAnalyzerConfigurationControllerTest.java | 4 +- ...nfigurationsFromProjectControllerTest.java | 9 ++-- ...teAnalyzerConfigurationControllerTest.java | 4 +- .../CreateFilePatternControllerTest.java | 4 +- .../DeleteFilePatternControllerTest.java | 4 +- .../GetFilePatternControllerTest.java | 4 +- ...stFilePatternsOfProjectControllerTest.java | 9 ++-- .../module/CreateModuleControllerTest.java | 4 +- .../module/DeleteModuleControllerTest.java | 4 +- .../unit/module/GetModuleControllerTest.java | 4 +- .../ListModulesOfProjectControllerTest.java | 9 ++-- .../project/CreateProjectControllerTest.java | 9 ++-- .../project/DeleteProjectControllerTest.java | 4 +- .../project/GetProjectControllerTest.java | 4 +- .../project/ListProjectsControllerTest.java | 9 ++-- .../project/UpdateProjectControllerTest.java | 9 ++-- .../user/ChangePasswordControllerTest.java | 4 +- .../rest/unit/user/GetUserControllerTest.java | 4 +- .../ListProjectsForUserControllerTest.java | 9 ++-- .../unit/user/ListUsersControllerTest.java | 9 ++-- .../ListUsersForProjectControllerTest.java | 9 ++-- .../unit/user/LoginUserControllerTest.java | 4 +- .../unit/user/RefreshTokenControllerTest.java | 4 +- .../unit/user/RegisterUserControllerTest.java | 4 +- .../RemoveUserFromProjectControllerTest.java | 4 +- .../SetUserRoleForProjectControllerTest.java | 4 +- .../teams/AddTeamToProjectControllerTest.java | 4 +- .../teams/AddUsersToTeamControllerTest.java | 11 ++--- .../user/teams/CreateTeamControllerTest.java | 9 ++-- .../user/teams/DeleteTeamControllerTest.java | 6 +-- .../user/teams/GetTeamControllerTest.java | 7 +-- .../ListProjectsForTeamControllerTest.java | 9 ++-- .../user/teams/ListTeamsControllerTest.java | 11 ++--- .../ListTeamsForProjectControllerTest.java | 11 ++--- .../teams/ListTeamsForUserControllerTest.java | 11 ++--- .../RemoveTeamFromProjectControllerTest.java | 4 +- .../RemoveUsersFromTeamControllerTest.java | 11 ++--- 91 files changed, 436 insertions(+), 225 deletions(-) create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java index f6883155b..07887ec0d 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; + import java.util.ArrayList; import java.util.List; @@ -17,8 +18,7 @@ public static List mapAnalyzerConfigurations( List analyzerConfigurations) { List result = new ArrayList<>(analyzerConfigurations.size()); for (AnalyzerConfiguration ac : analyzerConfigurations) { - result.add( - new GetAnalyzerConfigurationResponse(ac.getId(), ac.getAnalyzerName(), ac.isEnabled())); + result.add(mapAnalyzerConfiguration(ac)); } return result; } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java index 65fd5c37e..7d1a135f6 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.rest.domain.GetBranchResponse; + import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java index 09ed35a2b..ecef5b2cf 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.rest.domain.GetCommitResponse; + import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java index 0ec933aa9..751a12c63 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.contributor.domain.Contributor; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; + import java.util.ArrayList; import java.util.List; @@ -19,12 +20,7 @@ public static GetContributorResponse mapContributor(Contributor contributor) { public static List mapContributors(List contributors) { List result = new ArrayList<>(contributors.size()); for (Contributor c : contributors) { - GetContributorResponse responseItem = new GetContributorResponse(); - responseItem.setId(c.getId()); - responseItem.setDisplayName(c.getDisplayName()); - responseItem.setNames(c.getNames()); - responseItem.setEmailAddresses(c.getEmailAddresses()); - result.add(responseItem); + result.add(mapContributor(c)); } return result; } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java index 6f89df8e8..5bb4030f4 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; + import java.util.ArrayList; import java.util.List; @@ -16,9 +17,7 @@ public static GetFilePatternResponse mapFilePattern(FilePattern filePattern) { public static List mapFilePatterns(List filePatterns) { List responses = new ArrayList<>(filePatterns.size()); for (FilePattern filePattern : filePatterns) { - responses.add( - new GetFilePatternResponse( - filePattern.getId(), filePattern.getPattern(), filePattern.getInclusionType())); + responses.add(mapFilePattern(filePattern)); } return responses; } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java index 57b0b467d..fdd90e8db 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; + import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java index d3ad95d8f..164b7abd4 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; + import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java index eaeeb9419..603b07ffa 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java @@ -1,12 +1,13 @@ package io.reflectoring.coderadar.rest; -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; - import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; + import java.util.ArrayList; import java.util.List; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + public class GetTeamResponseMapper { private GetTeamResponseMapper() {} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java index 139f3329b..b0b47386b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; + import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java index 3126d9b86..87f5f2561 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.rest; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java index 16cb8f6fe..4890af7cd 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.analyzerconfig; -import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfiguration; - import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.GetAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; @@ -14,6 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfiguration; + @Transactional @RestController public class GetAnalyzerConfigurationController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java index 48678362b..6bdda511d 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.analyzerconfig; -import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfigurations; - import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.ListAnalyzerConfigurationsUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfigurations; + @Transactional @RestController public class ListAnalyzerConfigurationsFromProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java index ccc6b215a..3bde25578 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.analyzer.port.driver.ListAnalyzersUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -10,6 +9,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Transactional @RestController public class ListAnalyzersController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java index 060702f2e..22ab39625 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.branch; -import static io.reflectoring.coderadar.rest.GetBranchResponseMapper.mapBranches; - import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.projectadministration.port.driver.branch.list.ListBranchesUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetBranchResponse; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetBranchResponseMapper.mapBranches; + @Transactional @RestController public class ListBranchesController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java index 9016007d7..b1362eea7 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.contributor; -import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributor; - import io.reflectoring.coderadar.contributor.port.driver.GetContributorUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; @@ -13,6 +11,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributor; + @Transactional @RestController public class GetContributorController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java index 2f2428d71..16fa2194a 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.contributor; -import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributors; - import io.reflectoring.coderadar.contributor.port.driver.GetContributorsForPathCommand; import io.reflectoring.coderadar.contributor.port.driver.ListContributorsUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,6 +11,10 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributors; + @Transactional @RestController public class ListContributorsController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java index 139d5ae45..72eb9adab 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.rest.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java index a8c5dc6bf..a274e488e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.rest.domain; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Set; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java index fb10c32db..29dbf5841 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java @@ -1,8 +1,9 @@ package io.reflectoring.coderadar.rest.domain; -import java.util.Date; import lombok.Data; +import java.util.Date; + @Data public class GetProjectResponse { private long id; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java index d08e0a915..50bcc7c88 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.rest.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java index e99939b3c..29aa35d22 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.filepattern; -import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePattern; - import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.GetFilePatternUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; @@ -14,6 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePattern; + @Transactional @RestController public class GetFilePatternController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java index f9d1ae26b..faf268b96 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.filepattern; -import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePatterns; - import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.ListFilePatternsOfProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePatterns; + @Transactional @RestController public class ListFilePatternsOfProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java index 02e1b742d..447f57ef0 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.module; -import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModule; - import io.reflectoring.coderadar.projectadministration.port.driver.module.get.GetModuleUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; @@ -13,6 +11,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModule; + @Transactional @RestController public class GetModuleController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java index 43c9dab41..a6ab7a017 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.module; -import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModules; - import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driver.module.get.ListModulesOfProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModules; + @Transactional @RestController public class ListModulesOfProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java index 2074599bd..74b848947 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java @@ -4,7 +4,6 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.MalformedURLException; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.net.MalformedURLException; + @Transactional @RestController public class CreateProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java index edbdbc9a2..a6e2b145e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.project; -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProject; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.GetProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; @@ -14,6 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProject; + @Transactional @RestController public class GetProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java index cc7c13811..fbc84a64b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.project; -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.ListProjectsUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,6 +11,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + @Transactional @RestController public class ListProjectsController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java index b47543eea..8494afc8c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java @@ -3,7 +3,6 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; -import java.net.MalformedURLException; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.net.MalformedURLException; + @Transactional @RestController public class UpdateProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java index 9edae93a7..e810e3e58 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.query.port.driver.GetAvailableMetricsInProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,6 +10,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Transactional @RestController public class GetAvailableMetricsInProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java index f5e97131f..b6251e0c8 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java @@ -3,7 +3,6 @@ import io.reflectoring.coderadar.query.domain.CommitLog; import io.reflectoring.coderadar.query.port.driver.GetCommitLogUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,6 +11,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Transactional @RestController public class GetCommitLogController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java index 3b4dc591b..a0880c9a5 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java @@ -5,7 +5,6 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.GetCommitResponseMapper; import io.reflectoring.coderadar.rest.domain.GetCommitResponse; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Transactional @RestController public class GetCommitsInProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java index 27e19807c..26abd8ecd 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.query; -import static io.reflectoring.coderadar.rest.GetCommitResponseMapper.mapCommits; - import io.reflectoring.coderadar.query.domain.ContributorsForFile; import io.reflectoring.coderadar.query.domain.FileAndCommitsForTimePeriod; import io.reflectoring.coderadar.query.port.driver.criticalfiles.GetCriticalFilesUseCase; @@ -9,8 +7,6 @@ import io.reflectoring.coderadar.query.port.driver.criticalfiles.GetFrequentlyChangedFilesCommand; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.FileAndCommitsForTimePeriodResponse; -import java.util.ArrayList; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -18,6 +14,11 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetCommitResponseMapper.mapCommits; + @Transactional @RestController public class GetCriticalFilesController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java index cb9c62287..29179991e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java @@ -4,7 +4,6 @@ import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitCommand; import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,6 +11,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; + @Transactional @RestController public class GetMetricValuesOfCommitController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java index 02cc410cc..c94ca7fe1 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration; -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUser; - import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; @@ -14,6 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUser; + @RestController @Transactional public class GetUserController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java index c2ec50395..c89228b76 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration; -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + @RestController @Transactional public class ListProjectsForUserController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java index 152a5c8f5..40f05c86c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration; -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; - import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,6 +11,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + @RestController @Transactional public class ListUsersController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java index cec80408d..ce76a515e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration; -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; - import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListUsersForProjectUseCase; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + @RestController @Transactional public class ListUsersForProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java index 9f1a75db7..065134b5e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeam; - import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; @@ -14,6 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeam; + @RestController @Transactional public class GetTeamController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java index c2cb83147..e92cc7a45 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + @RestController @Transactional public class ListProjectsForTeamController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java index 010285a1c..2ff67e66c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,6 +11,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + @RestController @Transactional public class ListTeamsController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java index e30b81297..bce35b6f6 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + @RestController @Transactional public class ListTeamsForProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java index 7c172c950..919bbac42 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + @RestController @Transactional public class ListTeamsForUserController implements AbstractBaseController { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java new file mode 100644 index 000000000..8f474b7cc --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java @@ -0,0 +1,39 @@ +package io.reflectoring.coderadar.rest.unit; + +import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; +import io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper; +import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.List; + +public class GetAnalyzerConfigurationResponseMapperTest { + + @Test + public void testAnalyzerConfigurationResponseMapper() { + List analyzerConfigurations = new ArrayList<>(); + analyzerConfigurations.add(new AnalyzerConfiguration(1L, "testAnalyzer1", true)); + analyzerConfigurations.add(new AnalyzerConfiguration(2L, "testAnalyzer2", false)); + + List responses = GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfigurations(analyzerConfigurations); + Assertions.assertEquals(2L, responses.size()); + + Assertions.assertEquals("testAnalyzer1", responses.get(0).getAnalyzerName()); + Assertions.assertEquals(1L, responses.get(0).getId()); + Assertions.assertTrue(responses.get(0).isEnabled()); + Assertions.assertEquals("testAnalyzer2", responses.get(1).getAnalyzerName()); + Assertions.assertEquals(2L, responses.get(1).getId()); + Assertions.assertFalse(responses.get(1).isEnabled()); + } + + @Test + public void testModuleResponseSingleMapper() { + AnalyzerConfiguration analyzerConfiguration = new AnalyzerConfiguration(1L, "testAnalyzer1", true); + GetAnalyzerConfigurationResponse response = GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfiguration(analyzerConfiguration); + Assertions.assertEquals("testAnalyzer1", response.getAnalyzerName()); + Assertions.assertEquals(1L, response.getId()); + Assertions.assertTrue(response.isEnabled()); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java index 65690036a..4f5739110 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java @@ -3,11 +3,12 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.rest.GetBranchResponseMapper; import io.reflectoring.coderadar.rest.domain.GetBranchResponse; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.List; + public class GetBranchResponseMapperTest { @Test diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java index ec24f9660..f60953267 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java @@ -3,11 +3,12 @@ import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.rest.GetCommitResponseMapper; import io.reflectoring.coderadar.rest.domain.GetCommitResponse; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.List; + public class GetCommitResponseMapperTest { @Test diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java index dee70c868..ea8bc9345 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java @@ -3,11 +3,12 @@ import io.reflectoring.coderadar.contributor.domain.Contributor; import io.reflectoring.coderadar.rest.GetContributorResponseMapper; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; public class GetContributorResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java new file mode 100644 index 000000000..4a8475b13 --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java @@ -0,0 +1,41 @@ +package io.reflectoring.coderadar.rest.unit; + +import io.reflectoring.coderadar.projectadministration.domain.FilePattern; +import io.reflectoring.coderadar.projectadministration.domain.InclusionType; +import io.reflectoring.coderadar.rest.GetFilePatternResponseMapper; +import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.List; + +public class GetFilePatternResponseMapperTest { + + @Test + public void testFilePatternResponseMapper() { + List filePatterns = new ArrayList<>(); + filePatterns.add(new FilePattern(1L, "testPattern1/**.java", InclusionType.EXCLUDE)); + filePatterns.add(new FilePattern(2L, "testPattern2/**.java", InclusionType.INCLUDE)); + + List responses = GetFilePatternResponseMapper.mapFilePatterns(filePatterns); + Assertions.assertEquals(2L, responses.size()); + + Assertions.assertEquals("testPattern1/**.java", responses.get(0).getPattern()); + Assertions.assertEquals(1L, responses.get(0).getId()); + Assertions.assertEquals(InclusionType.EXCLUDE, responses.get(0).getInclusionType()); + + Assertions.assertEquals("testPattern2/**.java", responses.get(1).getPattern()); + Assertions.assertEquals(2L, responses.get(1).getId()); + Assertions.assertEquals(InclusionType.INCLUDE, responses.get(1).getInclusionType()); + } + + @Test + public void testFilePatternResponseSingleMapper() { + FilePattern filePattern = new FilePattern(1L, "testPattern1/**.java", InclusionType.EXCLUDE); + GetFilePatternResponse response = GetFilePatternResponseMapper.mapFilePattern(filePattern); + Assertions.assertEquals("testPattern1/**.java", response.getPattern()); + Assertions.assertEquals(1L, response.getId()); + Assertions.assertEquals(InclusionType.EXCLUDE, response.getInclusionType()); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java new file mode 100644 index 000000000..194518f9e --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java @@ -0,0 +1,36 @@ +package io.reflectoring.coderadar.rest.unit; + +import io.reflectoring.coderadar.projectadministration.domain.Module; +import io.reflectoring.coderadar.rest.GetModuleResponseMapper; +import io.reflectoring.coderadar.rest.domain.GetModuleResponse; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.List; + +public class GetModuleResponseMapperTest { + + @Test + public void testModuleResponseMapper() { + List modules = new ArrayList<>(); + modules.add(new Module(1L, "testModule1")); + modules.add(new Module(2L, "testModule2")); + + List responses = GetModuleResponseMapper.mapModules(modules); + Assertions.assertEquals(2L, responses.size()); + + Assertions.assertEquals("testModule1", responses.get(0).getPath()); + Assertions.assertEquals(1L, responses.get(0).getId()); + Assertions.assertEquals("testModule2", responses.get(1).getPath()); + Assertions.assertEquals(2L, responses.get(1).getId()); + } + + @Test + public void testModuleResponseSingleMapper() { + Module module = new Module(1L, "testPath1"); + GetModuleResponse response = GetModuleResponseMapper.mapModule(module); + Assertions.assertEquals("testPath1", response.getPath()); + Assertions.assertEquals(1L, response.getId()); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java index 09740ec48..df7fad899 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java @@ -3,11 +3,12 @@ import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.GetProjectResponseMapper; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; public class GetProjectResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java index f46e15c0d..8a32103c1 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java @@ -5,11 +5,12 @@ import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; public class GetTeamResponseMapperControllerTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java index 124ffea65..12c1567b5 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java @@ -1,35 +1,46 @@ package io.reflectoring.coderadar.rest.unit; -import io.reflectoring.coderadar.rest.GetUserResponseMapper; -import io.reflectoring.coderadar.rest.domain.GetUserResponse; +import io.reflectoring.coderadar.rest.GetTeamResponseMapper; +import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.List; + public class GetTeamResponseMapperTest { @Test - public void testUserResponseMapper() { + public void testTeamResponseMapper() { List users = new ArrayList<>(); - users.add(new User().setUsername("testUser1").setId(1L).setPassword("testPassword1")); - users.add(new User().setUsername("testUser2").setId(2L).setPassword("testPassword2")); + users.add(new User().setUsername("testUser1").setId(2L).setPassword("testPassword1")); + + List teams = new ArrayList<>(); + teams.add(new Team().setId(1L).setMembers(users).setName("testTeam1")); - List responses = GetUserResponseMapper.mapUsers(users); - Assertions.assertEquals(2L, responses.size()); + List responses = GetTeamResponseMapper.mapTeams(teams); + Assertions.assertEquals(1L, responses.size()); - Assertions.assertEquals("testUser1", responses.get(0).getUsername()); Assertions.assertEquals(1L, responses.get(0).getId()); - Assertions.assertEquals("testUser2", responses.get(1).getUsername()); - Assertions.assertEquals(2L, responses.get(1).getId()); + Assertions.assertEquals("testTeam1", responses.get(0).getName()); + Assertions.assertEquals(1L, responses.get(0).getMembers().size()); + Assertions.assertEquals("testUser1", responses.get(0).getMembers().get(0).getUsername()); + Assertions.assertEquals(2L, responses.get(0).getMembers().get(0).getId()); } @Test - public void testUserResponseSingleMapper() { - User user = new User().setUsername("testUser1").setId(1L).setPassword("testPassword1"); - GetUserResponse response = GetUserResponseMapper.mapUser(user); - Assertions.assertEquals("testUser1", response.getUsername()); + public void testTeamResponseSingleMapper() { + List users = new ArrayList<>(); + users.add(new User().setUsername("testUser1").setId(2L).setPassword("testPassword1")); + Team team = new Team().setId(1L).setMembers(users).setName("testTeam1"); + GetTeamResponse response = GetTeamResponseMapper.mapTeam(team); + Assertions.assertEquals(1L, response.getId()); + Assertions.assertEquals("testTeam1", response.getName()); + Assertions.assertEquals(1L, response.getMembers().size()); + Assertions.assertEquals("testUser1", response.getMembers().get(0).getUsername()); + Assertions.assertEquals(2L, response.getMembers().get(0).getId()); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java new file mode 100644 index 000000000..ba5ebb309 --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java @@ -0,0 +1,35 @@ +package io.reflectoring.coderadar.rest.unit; + +import io.reflectoring.coderadar.rest.GetUserResponseMapper; +import io.reflectoring.coderadar.rest.domain.GetUserResponse; +import io.reflectoring.coderadar.useradministration.domain.User; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.List; + +public class GetUserResponseMapperTest { + @Test + public void testUserResponseMapper() { + List users = new ArrayList<>(); + users.add(new User().setUsername("testUser1").setId(1L).setPassword("testPassword1")); + users.add(new User().setUsername("testUser2").setId(2L).setPassword("testPassword2")); + + List responses = GetUserResponseMapper.mapUsers(users); + Assertions.assertEquals(2L, responses.size()); + + Assertions.assertEquals("testUser1", responses.get(0).getUsername()); + Assertions.assertEquals(1L, responses.get(0).getId()); + Assertions.assertEquals("testUser2", responses.get(1).getUsername()); + Assertions.assertEquals(2L, responses.get(1).getId()); + } + + @Test + public void testUserResponseSingleMapper() { + User user = new User().setUsername("testUser1").setId(1L).setPassword("testPassword1"); + GetUserResponse response = GetUserResponseMapper.mapUser(user); + Assertions.assertEquals("testUser1", response.getUsername()); + Assertions.assertEquals(1L, response.getId()); + } +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java index 64ae3c075..de668d598 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.CreateAnalyzerConfigurationController; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class CreateAnalyzerConfigurationControllerTest { private final CreateAnalyzerConfigurationUseCase createAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java index 6f5e2757a..449996ca8 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.delete.DeleteAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.DeleteAnalyzerConfigurationController; import org.junit.jupiter.api.Assertions; @@ -10,6 +8,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class DeleteAnalyzerConfigurationControllerTest { private final DeleteAnalyzerConfigurationUseCase deleteAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java index b570bb511..949fb4153 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.GetAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.GetAnalyzerConfigurationController; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class GetAnalyzerConfigurationControllerTest { private final GetAnalyzerConfigurationUseCase getAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java index abf6444bb..30fe5d645 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java @@ -1,19 +1,20 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.ListAnalyzerConfigurationsUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.ListAnalyzerConfigurationsFromProjectController; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.ArrayList; +import java.util.List; + +import static org.mockito.Mockito.mock; + class ListAnalyzerConfigurationsFromProjectControllerTest { private final ListAnalyzerConfigurationsUseCase listAnalyzerConfigurationsUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java index 3f4e7f1ef..e4cafbd38 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update.UpdateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update.UpdateAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.UpdateAnalyzerConfigurationController; @@ -11,6 +9,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class UpdateAnalyzerConfigurationControllerTest { private final UpdateAnalyzerConfigurationUseCase updateAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java index 82af20990..b67413a44 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.filepattern; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternUseCase; @@ -13,6 +11,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class CreateFilePatternControllerTest { private final CreateFilePatternUseCase createFilePatternUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java index 12e2065af..533d9ba8e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.filepattern; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.delete.DeleteFilePatternFromProjectUseCase; import io.reflectoring.coderadar.rest.filepattern.DeleteFilePatternController; import org.junit.jupiter.api.Assertions; @@ -10,6 +8,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class DeleteFilePatternControllerTest { private final DeleteFilePatternFromProjectUseCase deleteFilePatternFromProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java index ee0f2431e..ef078fcd6 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.filepattern; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.GetFilePatternUseCase; @@ -13,6 +11,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class GetFilePatternControllerTest { private final GetFilePatternUseCase getFilePatternUseCase = mock(GetFilePatternUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java index fab7bce3b..a8549610e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java @@ -1,20 +1,21 @@ package io.reflectoring.coderadar.rest.unit.filepattern; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.ListFilePatternsOfProjectUseCase; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; import io.reflectoring.coderadar.rest.filepattern.ListFilePatternsOfProjectController; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.ArrayList; +import java.util.List; + +import static org.mockito.Mockito.mock; + class ListFilePatternsOfProjectControllerTest { private final ListFilePatternsOfProjectUseCase listFilePatternsOfProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java index 3a12db891..9bfb7cdaa 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.module; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ModulePathInvalidException; import io.reflectoring.coderadar.projectadministration.port.driver.module.create.CreateModuleCommand; import io.reflectoring.coderadar.projectadministration.port.driver.module.create.CreateModuleUseCase; @@ -14,6 +12,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class CreateModuleControllerTest { private final CreateModuleUseCase createModuleUseCase = mock(CreateModuleUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java index 0bd3cc6b2..e7c7d412f 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.module; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ProjectIsBeingProcessedException; import io.reflectoring.coderadar.projectadministration.port.driver.module.delete.DeleteModuleUseCase; import io.reflectoring.coderadar.rest.module.DeleteModuleController; @@ -11,6 +9,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class DeleteModuleControllerTest { private final DeleteModuleUseCase deleteModuleUseCase = mock(DeleteModuleUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java index 0829935a7..9dc398a1c 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.module; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driver.module.get.GetModuleUseCase; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class GetModuleControllerTest { private final GetModuleUseCase getModuleUseCase = mock(GetModuleUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java index 6d482ad81..69ed8933a 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java @@ -1,19 +1,20 @@ package io.reflectoring.coderadar.rest.unit.module; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driver.module.get.ListModulesOfProjectUseCase; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; import io.reflectoring.coderadar.rest.module.ListModulesOfProjectController; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.ArrayList; +import java.util.List; + +import static org.mockito.Mockito.mock; + class ListModulesOfProjectControllerTest { private final ListModulesOfProjectUseCase listModulesOfProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java index 00115130f..040ebf60e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java @@ -1,19 +1,20 @@ package io.reflectoring.coderadar.rest.unit.project; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectUseCase; import io.reflectoring.coderadar.rest.domain.IdResponse; import io.reflectoring.coderadar.rest.project.CreateProjectController; -import java.net.MalformedURLException; -import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.net.MalformedURLException; +import java.util.Date; + +import static org.mockito.Mockito.mock; + class CreateProjectControllerTest { private final CreateProjectUseCase createProjectUseCase = mock(CreateProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java index ebb29603b..15754c28c 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.project; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.port.driver.project.delete.DeleteProjectUseCase; import io.reflectoring.coderadar.rest.project.DeleteProjectController; import org.junit.jupiter.api.Assertions; @@ -10,6 +8,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class DeleteProjectControllerTest { private final DeleteProjectUseCase deleteProjectUseCase = mock(DeleteProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java index e85839372..d675c0465 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.project; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.GetProjectUseCase; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class GetProjectControllerTest { private final GetProjectUseCase getProjectUseCase = mock(GetProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java index 5c8b2f3ce..650658e24 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java @@ -1,19 +1,20 @@ package io.reflectoring.coderadar.rest.unit.project; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.ListProjectsUseCase; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.rest.project.ListProjectsController; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.ArrayList; +import java.util.List; + +import static org.mockito.Mockito.mock; + class ListProjectsControllerTest { private final ListProjectsUseCase listProjectsUseCase = mock(ListProjectsUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java index 03f92f355..d7f799b7d 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java @@ -1,18 +1,19 @@ package io.reflectoring.coderadar.rest.unit.project; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectUseCase; import io.reflectoring.coderadar.rest.project.UpdateProjectController; -import java.net.MalformedURLException; -import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.net.MalformedURLException; +import java.util.Date; + +import static org.mockito.Mockito.mock; + class UpdateProjectControllerTest { private final UpdateProjectUseCase updateProjectUseCase = mock(UpdateProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java index 1a7b6f49b..a767fb13b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.user; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.useradministration.ChangePasswordController; import io.reflectoring.coderadar.useradministration.port.driver.password.ChangePasswordCommand; import io.reflectoring.coderadar.useradministration.port.driver.password.ChangePasswordUseCase; @@ -11,6 +9,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class ChangePasswordControllerTest { private final ChangePasswordUseCase changePasswordUseCase = mock(ChangePasswordUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java index 77ea915ad..19e9e46eb 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.user; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.rest.useradministration.GetUserController; import io.reflectoring.coderadar.useradministration.domain.User; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class GetUserControllerTest { private final GetUserUseCase getUserUseCase = mock(GetUserUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListProjectsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListProjectsForUserControllerTest.java index 76f2a7af3..6c60b7996 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListProjectsForUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListProjectsForUserControllerTest.java @@ -1,20 +1,21 @@ package io.reflectoring.coderadar.rest.unit.user; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.rest.useradministration.ListProjectsForUserController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Collections; +import java.util.List; + +import static org.mockito.Mockito.mock; + public class ListProjectsForUserControllerTest { private final ListProjectsForUserUseCase listProjectsForUserUseCase = mock(ListProjectsForUserUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersControllerTest.java index ae3e8a69f..b03bc0c1c 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersControllerTest.java @@ -1,19 +1,20 @@ package io.reflectoring.coderadar.rest.unit.user; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.rest.useradministration.ListUsersController; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; -import java.util.Arrays; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Arrays; +import java.util.List; + +import static org.mockito.Mockito.mock; + public class ListUsersControllerTest { private final ListUsersUseCase listUsersUseCase = mock(ListUsersUseCase.class); private final ListUsersController testController = new ListUsersController(listUsersUseCase); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersForProjectControllerTest.java index 1799877db..2696256fe 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersForProjectControllerTest.java @@ -1,20 +1,21 @@ package io.reflectoring.coderadar.rest.unit.user; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.rest.useradministration.ListUsersForProjectController; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListUsersForProjectUseCase; -import java.util.Arrays; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Arrays; +import java.util.List; + +import static org.mockito.Mockito.mock; + public class ListUsersForProjectControllerTest { private final ListUsersForProjectUseCase listUsersForProjectUseCase = mock(ListUsersForProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java index 4aa562180..756ffca9b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.user; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.useradministration.LoginUserController; import io.reflectoring.coderadar.useradministration.port.driver.login.LoginUserCommand; import io.reflectoring.coderadar.useradministration.port.driver.login.LoginUserResponse; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class LoginUserControllerTest { private final LoginUserUseCase loginUserUseCase = mock(LoginUserUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java index f89e75d16..d05acf34b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.user; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.useradministration.RefreshTokenController; import io.reflectoring.coderadar.useradministration.port.driver.refresh.RefreshTokenCommand; import io.reflectoring.coderadar.useradministration.port.driver.refresh.RefreshTokenResponse; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class RefreshTokenControllerTest { private final RefreshTokenUseCase refreshTokenUseCase = mock(RefreshTokenUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java index 0df84737b..53e238d4b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.user; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.domain.IdResponse; import io.reflectoring.coderadar.rest.useradministration.RegisterUserController; import io.reflectoring.coderadar.useradministration.port.driver.register.RegisterUserCommand; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class RegisterUserControllerTest { private final RegisterUserUseCase registerUserUseCase = mock(RegisterUserUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RemoveUserFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RemoveUserFromProjectControllerTest.java index 3a5e28e25..56fc6236f 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RemoveUserFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RemoveUserFromProjectControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.user; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.useradministration.permissions.RemoveUserFromProjectController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + public class RemoveUserFromProjectControllerTest { private final RemoveUserFromProjectUseCase removeUserFromProjectUseCase = mock(RemoveUserFromProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectControllerTest.java index 4ae99b7dd..fdf5b8cf9 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.user; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; import io.reflectoring.coderadar.rest.useradministration.permissions.SetUserRoleForProjectController; @@ -14,6 +12,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + public class SetUserRoleForProjectControllerTest { private final SetUserRoleForProjectUseCase setUserRoleForProjectUseCase = mock(SetUserRoleForProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddTeamToProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddTeamToProjectControllerTest.java index 5053372e1..ce78801e7 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddTeamToProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddTeamToProjectControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.user.teams; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; import io.reflectoring.coderadar.rest.useradministration.teams.AddTeamToProjectController; @@ -14,6 +12,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + public class AddTeamToProjectControllerTest { private final AddTeamToProjectUseCase addTeamToProjectUseCase = mock(AddTeamToProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddUsersToTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddUsersToTeamControllerTest.java index a2d2b6a5d..6174d0c86 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddUsersToTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddUsersToTeamControllerTest.java @@ -1,21 +1,22 @@ package io.reflectoring.coderadar.rest.unit.user.teams; -import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.JsonListWrapper; import io.reflectoring.coderadar.rest.useradministration.teams.AddUsersToTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; -import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Collections; + +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; + public class AddUsersToTeamControllerTest { private final AddUsersToTeamUseCase addUsersToTeamUseCase = mock(AddUsersToTeamUseCase.class); private final AddUsersToTeamController testController = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/CreateTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/CreateTeamControllerTest.java index bedec444e..870c1e2ec 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/CreateTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/CreateTeamControllerTest.java @@ -1,20 +1,21 @@ package io.reflectoring.coderadar.rest.unit.user.teams; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.domain.IdResponse; import io.reflectoring.coderadar.rest.useradministration.teams.CreateTeamController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamUseCase; -import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Collections; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; + public class CreateTeamControllerTest { private final CreateTeamUseCase createTeamUseCase = mock(CreateTeamUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/DeleteTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/DeleteTeamControllerTest.java index acb853411..d1c0bb2ae 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/DeleteTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/DeleteTeamControllerTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.rest.unit.user.teams; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.useradministration.teams.DeleteTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteTeamUseCase; @@ -12,6 +9,9 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; + public class DeleteTeamControllerTest { private final DeleteTeamUseCase deleteTeamUseCase = mock(DeleteTeamUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamControllerTest.java index 18e445f05..045d2b9a8 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamControllerTest.java @@ -1,20 +1,21 @@ package io.reflectoring.coderadar.rest.unit.user.teams; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.GetTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.GetTeamUseCase; -import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Collections; + +import static org.mockito.Mockito.mock; + public class GetTeamControllerTest { private final GetTeamUseCase getTeamUseCase = mock(GetTeamUseCase.class); private final GetTeamController testController = new GetTeamController(getTeamUseCase); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForTeamControllerTest.java index 372d8f4d3..d5ebce101 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForTeamControllerTest.java @@ -1,20 +1,21 @@ package io.reflectoring.coderadar.rest.unit.user.teams; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListProjectsForTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Collections; +import java.util.List; + +import static org.mockito.Mockito.mock; + public class ListProjectsForTeamControllerTest { private final ListProjectsForTeamUseCase listProjectsForTeamUseCase = mock(ListProjectsForTeamUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsControllerTest.java index e91eaa39f..b0494fcf1 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsControllerTest.java @@ -1,15 +1,10 @@ package io.reflectoring.coderadar.rest.unit.user.teams; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListTeamsController; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -17,6 +12,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static org.mockito.Mockito.mock; + public class ListTeamsControllerTest { private final ListTeamsUseCase listTeamsUseCase = mock(ListTeamsUseCase.class); private final ListTeamsController testController = new ListTeamsController(listTeamsUseCase); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForProjectControllerTest.java index 66f205cf5..6c2498001 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForProjectControllerTest.java @@ -1,16 +1,11 @@ package io.reflectoring.coderadar.rest.unit.user.teams; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListTeamsForProjectController; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -18,6 +13,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static org.mockito.Mockito.mock; + public class ListTeamsForProjectControllerTest { private final ListTeamsForProjectUseCase listTeamsForProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForUserControllerTest.java index e6e289b2a..b4e8dd67c 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForUserControllerTest.java @@ -1,16 +1,11 @@ package io.reflectoring.coderadar.rest.unit.user.teams; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListTeamsForUserController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -18,6 +13,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static org.mockito.Mockito.mock; + public class ListTeamsForUserControllerTest { private final ListTeamsForUserUseCase listTeamsForUserUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveTeamFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveTeamFromProjectControllerTest.java index aede4e427..fea9d380e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveTeamFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveTeamFromProjectControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.user.teams; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.useradministration.teams.RemoveTeamFromProjectController; @@ -13,6 +11,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + public class RemoveTeamFromProjectControllerTest { private final RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase = mock(RemoveTeamFromProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveUsersFromTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveUsersFromTeamControllerTest.java index 110f583aa..72b80a613 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveUsersFromTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveUsersFromTeamControllerTest.java @@ -1,21 +1,22 @@ package io.reflectoring.coderadar.rest.unit.user.teams; -import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.JsonListWrapper; import io.reflectoring.coderadar.rest.useradministration.teams.RemoveUsersFromTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveUsersFromTeamUseCase; -import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Collections; + +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; + public class RemoveUsersFromTeamControllerTest { private final RemoveUsersFromTeamUseCase removeUsersFromTeamUseCase = mock(RemoveUsersFromTeamUseCase.class); From 84aa56651a92530fc0e6a3ed685e07269a548249 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 10 Jun 2020 12:41:14 +0200 Subject: [PATCH 35/76] change the way get requests are passed to the front-end so as to not break error handling --- .../coderadar/app/CoderadarApplication.java | 15 ++--- ...etAnalyzerConfigurationResponseMapper.java | 1 - .../rest/GetBranchResponseMapper.java | 1 - .../rest/GetCommitResponseMapper.java | 1 - .../rest/GetContributorResponseMapper.java | 1 - .../rest/GetFilePatternResponseMapper.java | 1 - .../rest/GetModuleResponseMapper.java | 1 - .../rest/GetProjectResponseMapper.java | 1 - .../coderadar/rest/GetTeamResponseMapper.java | 5 +- .../coderadar/rest/GetUserResponseMapper.java | 1 - .../coderadar/rest/JsonListWrapper.java | 3 +- .../GetAnalyzerConfigurationController.java | 4 +- ...erConfigurationsFromProjectController.java | 7 +-- .../analyzing/ListAnalyzersController.java | 3 +- .../rest/branch/ListBranchesController.java | 7 +-- .../contributor/GetContributorController.java | 4 +- .../ListContributorsController.java | 7 +-- .../FileAndCommitsForTimePeriodResponse.java | 3 +- .../rest/domain/GetContributorResponse.java | 3 +- .../rest/domain/GetProjectResponse.java | 3 +- .../rest/domain/GetTeamResponse.java | 3 +- .../filepattern/GetFilePatternController.java | 4 +- .../ListFilePatternsOfProjectController.java | 7 +-- .../rest/module/GetModuleController.java | 4 +- .../ListModulesOfProjectController.java | 7 +-- .../rest/project/CreateProjectController.java | 3 +- .../rest/project/GetProjectController.java | 4 +- .../rest/project/ListProjectsController.java | 7 +-- .../rest/project/UpdateProjectController.java | 3 +- ...etAvailableMetricsInProjectController.java | 3 +- .../rest/query/GetCommitLogController.java | 3 +- .../query/GetCommitsInProjectController.java | 3 +- .../query/GetCriticalFilesController.java | 9 ++- .../GetMetricValuesOfCommitController.java | 3 +- .../useradministration/GetUserController.java | 4 +- .../ListProjectsForUserController.java | 7 +-- .../ListUsersController.java | 7 +-- .../ListUsersForProjectController.java | 7 +-- .../teams/GetTeamController.java | 4 +- .../teams/ListProjectsForTeamController.java | 7 +-- .../teams/ListTeamsController.java | 7 +-- .../teams/ListTeamsForProjectController.java | 7 +-- .../teams/ListTeamsForUserController.java | 7 +-- ...alyzerConfigurationResponseMapperTest.java | 52 +++++++++-------- .../unit/GetBranchResponseMapperTest.java | 5 +- .../unit/GetCommitResponseMapperTest.java | 5 +- .../GetContributorResponseMapperTest.java | 5 +- .../GetFilePatternResponseMapperTest.java | 58 +++++++++---------- .../unit/GetModuleResponseMapperTest.java | 43 +++++++------- .../unit/GetProjectResponseMapperTest.java | 5 +- .../GetTeamResponseMapperControllerTest.java | 5 +- .../rest/unit/GetTeamResponseMapperTest.java | 5 +- .../rest/unit/GetUserResponseMapperTest.java | 43 +++++++------- ...teAnalyzerConfigurationControllerTest.java | 4 +- ...teAnalyzerConfigurationControllerTest.java | 4 +- ...etAnalyzerConfigurationControllerTest.java | 4 +- ...nfigurationsFromProjectControllerTest.java | 9 ++- ...teAnalyzerConfigurationControllerTest.java | 4 +- .../CreateFilePatternControllerTest.java | 4 +- .../DeleteFilePatternControllerTest.java | 4 +- .../GetFilePatternControllerTest.java | 4 +- ...stFilePatternsOfProjectControllerTest.java | 9 ++- .../module/CreateModuleControllerTest.java | 4 +- .../module/DeleteModuleControllerTest.java | 4 +- .../unit/module/GetModuleControllerTest.java | 4 +- .../ListModulesOfProjectControllerTest.java | 9 ++- .../project/CreateProjectControllerTest.java | 9 ++- .../project/DeleteProjectControllerTest.java | 4 +- .../project/GetProjectControllerTest.java | 4 +- .../project/ListProjectsControllerTest.java | 9 ++- .../project/UpdateProjectControllerTest.java | 9 ++- .../user/ChangePasswordControllerTest.java | 4 +- .../rest/unit/user/GetUserControllerTest.java | 4 +- .../ListProjectsForUserControllerTest.java | 9 ++- .../unit/user/ListUsersControllerTest.java | 9 ++- .../ListUsersForProjectControllerTest.java | 9 ++- .../unit/user/LoginUserControllerTest.java | 4 +- .../unit/user/RefreshTokenControllerTest.java | 4 +- .../unit/user/RegisterUserControllerTest.java | 4 +- .../RemoveUserFromProjectControllerTest.java | 4 +- .../SetUserRoleForProjectControllerTest.java | 4 +- .../teams/AddTeamToProjectControllerTest.java | 4 +- .../teams/AddUsersToTeamControllerTest.java | 11 ++-- .../user/teams/CreateTeamControllerTest.java | 9 ++- .../user/teams/DeleteTeamControllerTest.java | 6 +- .../user/teams/GetTeamControllerTest.java | 7 +-- .../ListProjectsForTeamControllerTest.java | 9 ++- .../user/teams/ListTeamsControllerTest.java | 11 ++-- .../ListTeamsForProjectControllerTest.java | 11 ++-- .../teams/ListTeamsForUserControllerTest.java | 11 ++-- .../RemoveTeamFromProjectControllerTest.java | 4 +- .../RemoveUsersFromTeamControllerTest.java | 11 ++-- 92 files changed, 302 insertions(+), 367 deletions(-) diff --git a/coderadar-app/src/main/java/io/reflectoring/coderadar/app/CoderadarApplication.java b/coderadar-app/src/main/java/io/reflectoring/coderadar/app/CoderadarApplication.java index 5d5cc352c..e12412ebd 100644 --- a/coderadar-app/src/main/java/io/reflectoring/coderadar/app/CoderadarApplication.java +++ b/coderadar-app/src/main/java/io/reflectoring/coderadar/app/CoderadarApplication.java @@ -5,12 +5,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.web.servlet.error.ErrorController; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.EnableTransactionManagement; -import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; @EnableScheduling @EnableAsync(proxyTargetClass = true) @@ -19,21 +18,15 @@ @EntityScan(basePackages = "io.reflectoring.coderadar") @SpringBootApplication(scanBasePackages = "io.reflectoring.coderadar") @Controller -public class CoderadarApplication implements ErrorController { +public class CoderadarApplication { public static void main(String[] args) { Locale.setDefault(Locale.US); SpringApplication.run(CoderadarApplication.class, args); } - @GetMapping(path = "/error") - public String error() { + @RequestMapping(value = "/**/{path:[^\\.]*}") + public String redirect() { return "forward:/index.html"; } - - // Forward unknown paths to index.html (angular) - @Override - public String getErrorPath() { - return "/error"; - } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java index 07887ec0d..7299bb2a7 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java index 7d1a135f6..65fd5c37e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.rest.domain.GetBranchResponse; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java index ecef5b2cf..09ed35a2b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.rest.domain.GetCommitResponse; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java index 751a12c63..2c923f88c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.contributor.domain.Contributor; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java index 5bb4030f4..c19428eeb 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java index fdd90e8db..57b0b467d 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java index 164b7abd4..d3ad95d8f 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java index 603b07ffa..eaeeb9419 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java @@ -1,13 +1,12 @@ package io.reflectoring.coderadar.rest; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.ArrayList; import java.util.List; -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; - public class GetTeamResponseMapper { private GetTeamResponseMapper() {} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java index b0b47386b..139f3329b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java index 87f5f2561..3126d9b86 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.rest; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java index 4890af7cd..16cb8f6fe 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.analyzerconfig; +import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfiguration; + import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.GetAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; @@ -12,8 +14,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfiguration; - @Transactional @RestController public class GetAnalyzerConfigurationController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java index 6bdda511d..48678362b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.analyzerconfig; +import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfigurations; + import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.ListAnalyzerConfigurationsUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfigurations; - @Transactional @RestController public class ListAnalyzerConfigurationsFromProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java index 3bde25578..ccc6b215a 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.analyzer.port.driver.ListAnalyzersUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -9,8 +10,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @Transactional @RestController public class ListAnalyzersController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java index 22ab39625..060702f2e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.branch; +import static io.reflectoring.coderadar.rest.GetBranchResponseMapper.mapBranches; + import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.projectadministration.port.driver.branch.list.ListBranchesUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetBranchResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetBranchResponseMapper.mapBranches; - @Transactional @RestController public class ListBranchesController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java index b1362eea7..9016007d7 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.contributor; +import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributor; + import io.reflectoring.coderadar.contributor.port.driver.GetContributorUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; @@ -11,8 +13,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributor; - @Transactional @RestController public class GetContributorController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java index 16fa2194a..2f2428d71 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.contributor; +import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributors; + import io.reflectoring.coderadar.contributor.port.driver.GetContributorsForPathCommand; import io.reflectoring.coderadar.contributor.port.driver.ListContributorsUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,10 +14,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributors; - @Transactional @RestController public class ListContributorsController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java index 72eb9adab..139d5ae45 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.rest.domain; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java index a274e488e..a8c5dc6bf 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.rest.domain; +import java.util.Set; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Set; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java index 29dbf5841..fb10c32db 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java @@ -1,8 +1,7 @@ package io.reflectoring.coderadar.rest.domain; -import lombok.Data; - import java.util.Date; +import lombok.Data; @Data public class GetProjectResponse { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java index 50bcc7c88..d08e0a915 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.rest.domain; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java index 29aa35d22..e99939b3c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.filepattern; +import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePattern; + import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.GetFilePatternUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; @@ -12,8 +14,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePattern; - @Transactional @RestController public class GetFilePatternController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java index faf268b96..f9d1ae26b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.filepattern; +import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePatterns; + import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.ListFilePatternsOfProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePatterns; - @Transactional @RestController public class ListFilePatternsOfProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java index 447f57ef0..02e1b742d 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.module; +import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModule; + import io.reflectoring.coderadar.projectadministration.port.driver.module.get.GetModuleUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; @@ -11,8 +13,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModule; - @Transactional @RestController public class GetModuleController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java index a6ab7a017..43c9dab41 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.module; +import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModules; + import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driver.module.get.ListModulesOfProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModules; - @Transactional @RestController public class ListModulesOfProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java index 74b848947..2074599bd 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java @@ -4,6 +4,7 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.net.MalformedURLException; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -13,8 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import java.net.MalformedURLException; - @Transactional @RestController public class CreateProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java index a6e2b145e..edbdbc9a2 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.project; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProject; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.GetProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; @@ -12,8 +14,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProject; - @Transactional @RestController public class GetProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java index fbc84a64b..cc7c13811 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.project; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.ListProjectsUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,10 +14,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; - @Transactional @RestController public class ListProjectsController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java index 8494afc8c..b47543eea 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java @@ -3,6 +3,7 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; +import java.net.MalformedURLException; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -13,8 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import java.net.MalformedURLException; - @Transactional @RestController public class UpdateProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java index e810e3e58..9edae93a7 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.query.port.driver.GetAvailableMetricsInProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -10,8 +11,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @Transactional @RestController public class GetAvailableMetricsInProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java index b6251e0c8..f5e97131f 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java @@ -3,6 +3,7 @@ import io.reflectoring.coderadar.query.domain.CommitLog; import io.reflectoring.coderadar.query.port.driver.GetCommitLogUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,8 +12,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @Transactional @RestController public class GetCommitLogController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java index a0880c9a5..3b4dc591b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java @@ -5,6 +5,7 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.GetCommitResponseMapper; import io.reflectoring.coderadar.rest.domain.GetCommitResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @Transactional @RestController public class GetCommitsInProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java index 26abd8ecd..27e19807c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.query; +import static io.reflectoring.coderadar.rest.GetCommitResponseMapper.mapCommits; + import io.reflectoring.coderadar.query.domain.ContributorsForFile; import io.reflectoring.coderadar.query.domain.FileAndCommitsForTimePeriod; import io.reflectoring.coderadar.query.port.driver.criticalfiles.GetCriticalFilesUseCase; @@ -7,6 +9,8 @@ import io.reflectoring.coderadar.query.port.driver.criticalfiles.GetFrequentlyChangedFilesCommand; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.FileAndCommitsForTimePeriodResponse; +import java.util.ArrayList; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,11 +18,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetCommitResponseMapper.mapCommits; - @Transactional @RestController public class GetCriticalFilesController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java index 29179991e..cb9c62287 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java @@ -4,6 +4,7 @@ import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitCommand; import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,8 +12,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.List; - @Transactional @RestController public class GetMetricValuesOfCommitController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java index c94ca7fe1..02cc410cc 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.useradministration; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUser; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; @@ -12,8 +14,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUser; - @RestController @Transactional public class GetUserController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java index c89228b76..c2ec50395 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; - @RestController @Transactional public class ListProjectsForUserController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java index 40f05c86c..152a5c8f5 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,10 +14,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; - @RestController @Transactional public class ListUsersController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java index ce76a515e..cec80408d 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListUsersForProjectUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; - @RestController @Transactional public class ListUsersForProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java index 065134b5e..9f1a75db7 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeam; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; @@ -12,8 +14,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeam; - @RestController @Transactional public class GetTeamController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java index e92cc7a45..c2cb83147 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; - @RestController @Transactional public class ListProjectsForTeamController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java index 2ff67e66c..010285a1c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,10 +14,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - @RestController @Transactional public class ListTeamsController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java index bce35b6f6..e30b81297 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - @RestController @Transactional public class ListTeamsForProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java index 919bbac42..7c172c950 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - @RestController @Transactional public class ListTeamsForUserController implements AbstractBaseController { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java index 8f474b7cc..c8f6f14e4 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java @@ -3,37 +3,39 @@ import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetAnalyzerConfigurationResponseMapperTest { - @Test - public void testAnalyzerConfigurationResponseMapper() { - List analyzerConfigurations = new ArrayList<>(); - analyzerConfigurations.add(new AnalyzerConfiguration(1L, "testAnalyzer1", true)); - analyzerConfigurations.add(new AnalyzerConfiguration(2L, "testAnalyzer2", false)); + @Test + public void testAnalyzerConfigurationResponseMapper() { + List analyzerConfigurations = new ArrayList<>(); + analyzerConfigurations.add(new AnalyzerConfiguration(1L, "testAnalyzer1", true)); + analyzerConfigurations.add(new AnalyzerConfiguration(2L, "testAnalyzer2", false)); - List responses = GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfigurations(analyzerConfigurations); - Assertions.assertEquals(2L, responses.size()); + List responses = + GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfigurations(analyzerConfigurations); + Assertions.assertEquals(2L, responses.size()); - Assertions.assertEquals("testAnalyzer1", responses.get(0).getAnalyzerName()); - Assertions.assertEquals(1L, responses.get(0).getId()); - Assertions.assertTrue(responses.get(0).isEnabled()); - Assertions.assertEquals("testAnalyzer2", responses.get(1).getAnalyzerName()); - Assertions.assertEquals(2L, responses.get(1).getId()); - Assertions.assertFalse(responses.get(1).isEnabled()); - } + Assertions.assertEquals("testAnalyzer1", responses.get(0).getAnalyzerName()); + Assertions.assertEquals(1L, responses.get(0).getId()); + Assertions.assertTrue(responses.get(0).isEnabled()); + Assertions.assertEquals("testAnalyzer2", responses.get(1).getAnalyzerName()); + Assertions.assertEquals(2L, responses.get(1).getId()); + Assertions.assertFalse(responses.get(1).isEnabled()); + } - @Test - public void testModuleResponseSingleMapper() { - AnalyzerConfiguration analyzerConfiguration = new AnalyzerConfiguration(1L, "testAnalyzer1", true); - GetAnalyzerConfigurationResponse response = GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfiguration(analyzerConfiguration); - Assertions.assertEquals("testAnalyzer1", response.getAnalyzerName()); - Assertions.assertEquals(1L, response.getId()); - Assertions.assertTrue(response.isEnabled()); - } + @Test + public void testModuleResponseSingleMapper() { + AnalyzerConfiguration analyzerConfiguration = + new AnalyzerConfiguration(1L, "testAnalyzer1", true); + GetAnalyzerConfigurationResponse response = + GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfiguration(analyzerConfiguration); + Assertions.assertEquals("testAnalyzer1", response.getAnalyzerName()); + Assertions.assertEquals(1L, response.getId()); + Assertions.assertTrue(response.isEnabled()); + } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java index 4f5739110..65690036a 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java @@ -3,11 +3,10 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.rest.GetBranchResponseMapper; import io.reflectoring.coderadar.rest.domain.GetBranchResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetBranchResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java index f60953267..ec24f9660 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java @@ -3,11 +3,10 @@ import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.rest.GetCommitResponseMapper; import io.reflectoring.coderadar.rest.domain.GetCommitResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetCommitResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java index ea8bc9345..dee70c868 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java @@ -3,12 +3,11 @@ import io.reflectoring.coderadar.contributor.domain.Contributor; import io.reflectoring.coderadar.rest.GetContributorResponseMapper; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetContributorResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java index 4a8475b13..98b0de8ee 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java @@ -4,38 +4,38 @@ import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.rest.GetFilePatternResponseMapper; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetFilePatternResponseMapperTest { - @Test - public void testFilePatternResponseMapper() { - List filePatterns = new ArrayList<>(); - filePatterns.add(new FilePattern(1L, "testPattern1/**.java", InclusionType.EXCLUDE)); - filePatterns.add(new FilePattern(2L, "testPattern2/**.java", InclusionType.INCLUDE)); - - List responses = GetFilePatternResponseMapper.mapFilePatterns(filePatterns); - Assertions.assertEquals(2L, responses.size()); - - Assertions.assertEquals("testPattern1/**.java", responses.get(0).getPattern()); - Assertions.assertEquals(1L, responses.get(0).getId()); - Assertions.assertEquals(InclusionType.EXCLUDE, responses.get(0).getInclusionType()); - - Assertions.assertEquals("testPattern2/**.java", responses.get(1).getPattern()); - Assertions.assertEquals(2L, responses.get(1).getId()); - Assertions.assertEquals(InclusionType.INCLUDE, responses.get(1).getInclusionType()); - } - - @Test - public void testFilePatternResponseSingleMapper() { - FilePattern filePattern = new FilePattern(1L, "testPattern1/**.java", InclusionType.EXCLUDE); - GetFilePatternResponse response = GetFilePatternResponseMapper.mapFilePattern(filePattern); - Assertions.assertEquals("testPattern1/**.java", response.getPattern()); - Assertions.assertEquals(1L, response.getId()); - Assertions.assertEquals(InclusionType.EXCLUDE, response.getInclusionType()); - } + @Test + public void testFilePatternResponseMapper() { + List filePatterns = new ArrayList<>(); + filePatterns.add(new FilePattern(1L, "testPattern1/**.java", InclusionType.EXCLUDE)); + filePatterns.add(new FilePattern(2L, "testPattern2/**.java", InclusionType.INCLUDE)); + + List responses = + GetFilePatternResponseMapper.mapFilePatterns(filePatterns); + Assertions.assertEquals(2L, responses.size()); + + Assertions.assertEquals("testPattern1/**.java", responses.get(0).getPattern()); + Assertions.assertEquals(1L, responses.get(0).getId()); + Assertions.assertEquals(InclusionType.EXCLUDE, responses.get(0).getInclusionType()); + + Assertions.assertEquals("testPattern2/**.java", responses.get(1).getPattern()); + Assertions.assertEquals(2L, responses.get(1).getId()); + Assertions.assertEquals(InclusionType.INCLUDE, responses.get(1).getInclusionType()); + } + + @Test + public void testFilePatternResponseSingleMapper() { + FilePattern filePattern = new FilePattern(1L, "testPattern1/**.java", InclusionType.EXCLUDE); + GetFilePatternResponse response = GetFilePatternResponseMapper.mapFilePattern(filePattern); + Assertions.assertEquals("testPattern1/**.java", response.getPattern()); + Assertions.assertEquals(1L, response.getId()); + Assertions.assertEquals(InclusionType.EXCLUDE, response.getInclusionType()); + } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java index 194518f9e..b966af074 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java @@ -3,34 +3,33 @@ import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.rest.GetModuleResponseMapper; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetModuleResponseMapperTest { - @Test - public void testModuleResponseMapper() { - List modules = new ArrayList<>(); - modules.add(new Module(1L, "testModule1")); - modules.add(new Module(2L, "testModule2")); + @Test + public void testModuleResponseMapper() { + List modules = new ArrayList<>(); + modules.add(new Module(1L, "testModule1")); + modules.add(new Module(2L, "testModule2")); - List responses = GetModuleResponseMapper.mapModules(modules); - Assertions.assertEquals(2L, responses.size()); + List responses = GetModuleResponseMapper.mapModules(modules); + Assertions.assertEquals(2L, responses.size()); - Assertions.assertEquals("testModule1", responses.get(0).getPath()); - Assertions.assertEquals(1L, responses.get(0).getId()); - Assertions.assertEquals("testModule2", responses.get(1).getPath()); - Assertions.assertEquals(2L, responses.get(1).getId()); - } + Assertions.assertEquals("testModule1", responses.get(0).getPath()); + Assertions.assertEquals(1L, responses.get(0).getId()); + Assertions.assertEquals("testModule2", responses.get(1).getPath()); + Assertions.assertEquals(2L, responses.get(1).getId()); + } - @Test - public void testModuleResponseSingleMapper() { - Module module = new Module(1L, "testPath1"); - GetModuleResponse response = GetModuleResponseMapper.mapModule(module); - Assertions.assertEquals("testPath1", response.getPath()); - Assertions.assertEquals(1L, response.getId()); - } + @Test + public void testModuleResponseSingleMapper() { + Module module = new Module(1L, "testPath1"); + GetModuleResponse response = GetModuleResponseMapper.mapModule(module); + Assertions.assertEquals("testPath1", response.getPath()); + Assertions.assertEquals(1L, response.getId()); + } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java index df7fad899..09740ec48 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java @@ -3,12 +3,11 @@ import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.GetProjectResponseMapper; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.Date; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetProjectResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java index 8a32103c1..f46e15c0d 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java @@ -5,12 +5,11 @@ import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetTeamResponseMapperControllerTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java index 12c1567b5..c5b07424a 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java @@ -4,11 +4,10 @@ import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetTeamResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java index ba5ebb309..34b4716e8 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java @@ -3,33 +3,32 @@ import io.reflectoring.coderadar.rest.GetUserResponseMapper; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetUserResponseMapperTest { - @Test - public void testUserResponseMapper() { - List users = new ArrayList<>(); - users.add(new User().setUsername("testUser1").setId(1L).setPassword("testPassword1")); - users.add(new User().setUsername("testUser2").setId(2L).setPassword("testPassword2")); + @Test + public void testUserResponseMapper() { + List users = new ArrayList<>(); + users.add(new User().setUsername("testUser1").setId(1L).setPassword("testPassword1")); + users.add(new User().setUsername("testUser2").setId(2L).setPassword("testPassword2")); - List responses = GetUserResponseMapper.mapUsers(users); - Assertions.assertEquals(2L, responses.size()); + List responses = GetUserResponseMapper.mapUsers(users); + Assertions.assertEquals(2L, responses.size()); - Assertions.assertEquals("testUser1", responses.get(0).getUsername()); - Assertions.assertEquals(1L, responses.get(0).getId()); - Assertions.assertEquals("testUser2", responses.get(1).getUsername()); - Assertions.assertEquals(2L, responses.get(1).getId()); - } + Assertions.assertEquals("testUser1", responses.get(0).getUsername()); + Assertions.assertEquals(1L, responses.get(0).getId()); + Assertions.assertEquals("testUser2", responses.get(1).getUsername()); + Assertions.assertEquals(2L, responses.get(1).getId()); + } - @Test - public void testUserResponseSingleMapper() { - User user = new User().setUsername("testUser1").setId(1L).setPassword("testPassword1"); - GetUserResponse response = GetUserResponseMapper.mapUser(user); - Assertions.assertEquals("testUser1", response.getUsername()); - Assertions.assertEquals(1L, response.getId()); - } + @Test + public void testUserResponseSingleMapper() { + User user = new User().setUsername("testUser1").setId(1L).setPassword("testPassword1"); + GetUserResponse response = GetUserResponseMapper.mapUser(user); + Assertions.assertEquals("testUser1", response.getUsername()); + Assertions.assertEquals(1L, response.getId()); + } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java index de668d598..64ae3c075 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.CreateAnalyzerConfigurationController; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class CreateAnalyzerConfigurationControllerTest { private final CreateAnalyzerConfigurationUseCase createAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java index 449996ca8..6f5e2757a 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.delete.DeleteAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.DeleteAnalyzerConfigurationController; import org.junit.jupiter.api.Assertions; @@ -8,8 +10,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class DeleteAnalyzerConfigurationControllerTest { private final DeleteAnalyzerConfigurationUseCase deleteAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java index 949fb4153..b570bb511 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.GetAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.GetAnalyzerConfigurationController; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class GetAnalyzerConfigurationControllerTest { private final GetAnalyzerConfigurationUseCase getAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java index 30fe5d645..abf6444bb 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java @@ -1,20 +1,19 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.ListAnalyzerConfigurationsUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.ListAnalyzerConfigurationsFromProjectController; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.ArrayList; -import java.util.List; - -import static org.mockito.Mockito.mock; - class ListAnalyzerConfigurationsFromProjectControllerTest { private final ListAnalyzerConfigurationsUseCase listAnalyzerConfigurationsUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java index e4cafbd38..3f4e7f1ef 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update.UpdateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update.UpdateAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.UpdateAnalyzerConfigurationController; @@ -9,8 +11,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class UpdateAnalyzerConfigurationControllerTest { private final UpdateAnalyzerConfigurationUseCase updateAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java index b67413a44..82af20990 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.filepattern; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternUseCase; @@ -11,8 +13,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class CreateFilePatternControllerTest { private final CreateFilePatternUseCase createFilePatternUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java index 533d9ba8e..12e2065af 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.filepattern; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.delete.DeleteFilePatternFromProjectUseCase; import io.reflectoring.coderadar.rest.filepattern.DeleteFilePatternController; import org.junit.jupiter.api.Assertions; @@ -8,8 +10,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class DeleteFilePatternControllerTest { private final DeleteFilePatternFromProjectUseCase deleteFilePatternFromProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java index ef078fcd6..ee0f2431e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.filepattern; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.GetFilePatternUseCase; @@ -11,8 +13,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class GetFilePatternControllerTest { private final GetFilePatternUseCase getFilePatternUseCase = mock(GetFilePatternUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java index a8549610e..fab7bce3b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java @@ -1,21 +1,20 @@ package io.reflectoring.coderadar.rest.unit.filepattern; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.ListFilePatternsOfProjectUseCase; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; import io.reflectoring.coderadar.rest.filepattern.ListFilePatternsOfProjectController; +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.ArrayList; -import java.util.List; - -import static org.mockito.Mockito.mock; - class ListFilePatternsOfProjectControllerTest { private final ListFilePatternsOfProjectUseCase listFilePatternsOfProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java index 9bfb7cdaa..3a12db891 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.module; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ModulePathInvalidException; import io.reflectoring.coderadar.projectadministration.port.driver.module.create.CreateModuleCommand; import io.reflectoring.coderadar.projectadministration.port.driver.module.create.CreateModuleUseCase; @@ -12,8 +14,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class CreateModuleControllerTest { private final CreateModuleUseCase createModuleUseCase = mock(CreateModuleUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java index e7c7d412f..0bd3cc6b2 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.module; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ProjectIsBeingProcessedException; import io.reflectoring.coderadar.projectadministration.port.driver.module.delete.DeleteModuleUseCase; import io.reflectoring.coderadar.rest.module.DeleteModuleController; @@ -9,8 +11,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class DeleteModuleControllerTest { private final DeleteModuleUseCase deleteModuleUseCase = mock(DeleteModuleUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java index 9dc398a1c..0829935a7 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.module; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driver.module.get.GetModuleUseCase; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class GetModuleControllerTest { private final GetModuleUseCase getModuleUseCase = mock(GetModuleUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java index 69ed8933a..6d482ad81 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java @@ -1,20 +1,19 @@ package io.reflectoring.coderadar.rest.unit.module; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driver.module.get.ListModulesOfProjectUseCase; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; import io.reflectoring.coderadar.rest.module.ListModulesOfProjectController; +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.ArrayList; -import java.util.List; - -import static org.mockito.Mockito.mock; - class ListModulesOfProjectControllerTest { private final ListModulesOfProjectUseCase listModulesOfProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java index 040ebf60e..00115130f 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java @@ -1,20 +1,19 @@ package io.reflectoring.coderadar.rest.unit.project; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectUseCase; import io.reflectoring.coderadar.rest.domain.IdResponse; import io.reflectoring.coderadar.rest.project.CreateProjectController; +import java.net.MalformedURLException; +import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.net.MalformedURLException; -import java.util.Date; - -import static org.mockito.Mockito.mock; - class CreateProjectControllerTest { private final CreateProjectUseCase createProjectUseCase = mock(CreateProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java index 15754c28c..ebb29603b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.project; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.port.driver.project.delete.DeleteProjectUseCase; import io.reflectoring.coderadar.rest.project.DeleteProjectController; import org.junit.jupiter.api.Assertions; @@ -8,8 +10,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class DeleteProjectControllerTest { private final DeleteProjectUseCase deleteProjectUseCase = mock(DeleteProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java index d675c0465..e85839372 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.project; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.GetProjectUseCase; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class GetProjectControllerTest { private final GetProjectUseCase getProjectUseCase = mock(GetProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java index 650658e24..5c8b2f3ce 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java @@ -1,20 +1,19 @@ package io.reflectoring.coderadar.rest.unit.project; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.ListProjectsUseCase; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.rest.project.ListProjectsController; +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.ArrayList; -import java.util.List; - -import static org.mockito.Mockito.mock; - class ListProjectsControllerTest { private final ListProjectsUseCase listProjectsUseCase = mock(ListProjectsUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java index d7f799b7d..03f92f355 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java @@ -1,19 +1,18 @@ package io.reflectoring.coderadar.rest.unit.project; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectUseCase; import io.reflectoring.coderadar.rest.project.UpdateProjectController; +import java.net.MalformedURLException; +import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.net.MalformedURLException; -import java.util.Date; - -import static org.mockito.Mockito.mock; - class UpdateProjectControllerTest { private final UpdateProjectUseCase updateProjectUseCase = mock(UpdateProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java index a767fb13b..1a7b6f49b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.user; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.useradministration.ChangePasswordController; import io.reflectoring.coderadar.useradministration.port.driver.password.ChangePasswordCommand; import io.reflectoring.coderadar.useradministration.port.driver.password.ChangePasswordUseCase; @@ -9,8 +11,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class ChangePasswordControllerTest { private final ChangePasswordUseCase changePasswordUseCase = mock(ChangePasswordUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java index 19e9e46eb..77ea915ad 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.user; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.rest.useradministration.GetUserController; import io.reflectoring.coderadar.useradministration.domain.User; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class GetUserControllerTest { private final GetUserUseCase getUserUseCase = mock(GetUserUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListProjectsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListProjectsForUserControllerTest.java index 6c60b7996..76f2a7af3 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListProjectsForUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListProjectsForUserControllerTest.java @@ -1,21 +1,20 @@ package io.reflectoring.coderadar.rest.unit.user; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.rest.useradministration.ListProjectsForUserController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Collections; -import java.util.List; - -import static org.mockito.Mockito.mock; - public class ListProjectsForUserControllerTest { private final ListProjectsForUserUseCase listProjectsForUserUseCase = mock(ListProjectsForUserUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersControllerTest.java index b03bc0c1c..ae3e8a69f 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersControllerTest.java @@ -1,20 +1,19 @@ package io.reflectoring.coderadar.rest.unit.user; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.rest.useradministration.ListUsersController; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; +import java.util.Arrays; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Arrays; -import java.util.List; - -import static org.mockito.Mockito.mock; - public class ListUsersControllerTest { private final ListUsersUseCase listUsersUseCase = mock(ListUsersUseCase.class); private final ListUsersController testController = new ListUsersController(listUsersUseCase); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersForProjectControllerTest.java index 2696256fe..1799877db 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersForProjectControllerTest.java @@ -1,21 +1,20 @@ package io.reflectoring.coderadar.rest.unit.user; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.rest.useradministration.ListUsersForProjectController; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListUsersForProjectUseCase; +import java.util.Arrays; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Arrays; -import java.util.List; - -import static org.mockito.Mockito.mock; - public class ListUsersForProjectControllerTest { private final ListUsersForProjectUseCase listUsersForProjectUseCase = mock(ListUsersForProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java index 756ffca9b..4aa562180 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.user; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.useradministration.LoginUserController; import io.reflectoring.coderadar.useradministration.port.driver.login.LoginUserCommand; import io.reflectoring.coderadar.useradministration.port.driver.login.LoginUserResponse; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class LoginUserControllerTest { private final LoginUserUseCase loginUserUseCase = mock(LoginUserUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java index d05acf34b..f89e75d16 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.user; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.useradministration.RefreshTokenController; import io.reflectoring.coderadar.useradministration.port.driver.refresh.RefreshTokenCommand; import io.reflectoring.coderadar.useradministration.port.driver.refresh.RefreshTokenResponse; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class RefreshTokenControllerTest { private final RefreshTokenUseCase refreshTokenUseCase = mock(RefreshTokenUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java index 53e238d4b..0df84737b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.user; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.domain.IdResponse; import io.reflectoring.coderadar.rest.useradministration.RegisterUserController; import io.reflectoring.coderadar.useradministration.port.driver.register.RegisterUserCommand; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class RegisterUserControllerTest { private final RegisterUserUseCase registerUserUseCase = mock(RegisterUserUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RemoveUserFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RemoveUserFromProjectControllerTest.java index 56fc6236f..3a5e28e25 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RemoveUserFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RemoveUserFromProjectControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.user; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.useradministration.permissions.RemoveUserFromProjectController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - public class RemoveUserFromProjectControllerTest { private final RemoveUserFromProjectUseCase removeUserFromProjectUseCase = mock(RemoveUserFromProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectControllerTest.java index fdf5b8cf9..4ae99b7dd 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.user; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; import io.reflectoring.coderadar.rest.useradministration.permissions.SetUserRoleForProjectController; @@ -12,8 +14,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - public class SetUserRoleForProjectControllerTest { private final SetUserRoleForProjectUseCase setUserRoleForProjectUseCase = mock(SetUserRoleForProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddTeamToProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddTeamToProjectControllerTest.java index ce78801e7..5053372e1 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddTeamToProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddTeamToProjectControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.user.teams; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; import io.reflectoring.coderadar.rest.useradministration.teams.AddTeamToProjectController; @@ -12,8 +14,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - public class AddTeamToProjectControllerTest { private final AddTeamToProjectUseCase addTeamToProjectUseCase = mock(AddTeamToProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddUsersToTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddUsersToTeamControllerTest.java index 6174d0c86..a2d2b6a5d 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddUsersToTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddUsersToTeamControllerTest.java @@ -1,22 +1,21 @@ package io.reflectoring.coderadar.rest.unit.user.teams; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.JsonListWrapper; import io.reflectoring.coderadar.rest.useradministration.teams.AddUsersToTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; +import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Collections; - -import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.mock; - public class AddUsersToTeamControllerTest { private final AddUsersToTeamUseCase addUsersToTeamUseCase = mock(AddUsersToTeamUseCase.class); private final AddUsersToTeamController testController = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/CreateTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/CreateTeamControllerTest.java index 870c1e2ec..bedec444e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/CreateTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/CreateTeamControllerTest.java @@ -1,21 +1,20 @@ package io.reflectoring.coderadar.rest.unit.user.teams; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.domain.IdResponse; import io.reflectoring.coderadar.rest.useradministration.teams.CreateTeamController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamUseCase; +import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Collections; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; - public class CreateTeamControllerTest { private final CreateTeamUseCase createTeamUseCase = mock(CreateTeamUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/DeleteTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/DeleteTeamControllerTest.java index d1c0bb2ae..acb853411 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/DeleteTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/DeleteTeamControllerTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.rest.unit.user.teams; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.useradministration.teams.DeleteTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteTeamUseCase; @@ -9,9 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.mock; - public class DeleteTeamControllerTest { private final DeleteTeamUseCase deleteTeamUseCase = mock(DeleteTeamUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamControllerTest.java index 045d2b9a8..18e445f05 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamControllerTest.java @@ -1,21 +1,20 @@ package io.reflectoring.coderadar.rest.unit.user.teams; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.GetTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.GetTeamUseCase; +import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Collections; - -import static org.mockito.Mockito.mock; - public class GetTeamControllerTest { private final GetTeamUseCase getTeamUseCase = mock(GetTeamUseCase.class); private final GetTeamController testController = new GetTeamController(getTeamUseCase); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForTeamControllerTest.java index d5ebce101..372d8f4d3 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForTeamControllerTest.java @@ -1,21 +1,20 @@ package io.reflectoring.coderadar.rest.unit.user.teams; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListProjectsForTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Collections; -import java.util.List; - -import static org.mockito.Mockito.mock; - public class ListProjectsForTeamControllerTest { private final ListProjectsForTeamUseCase listProjectsForTeamUseCase = mock(ListProjectsForTeamUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsControllerTest.java index b0494fcf1..e91eaa39f 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsControllerTest.java @@ -1,10 +1,15 @@ package io.reflectoring.coderadar.rest.unit.user.teams; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListTeamsController; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -12,12 +17,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import static org.mockito.Mockito.mock; - public class ListTeamsControllerTest { private final ListTeamsUseCase listTeamsUseCase = mock(ListTeamsUseCase.class); private final ListTeamsController testController = new ListTeamsController(listTeamsUseCase); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForProjectControllerTest.java index 6c2498001..66f205cf5 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForProjectControllerTest.java @@ -1,11 +1,16 @@ package io.reflectoring.coderadar.rest.unit.user.teams; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListTeamsForProjectController; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -13,12 +18,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import static org.mockito.Mockito.mock; - public class ListTeamsForProjectControllerTest { private final ListTeamsForProjectUseCase listTeamsForProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForUserControllerTest.java index b4e8dd67c..e6e289b2a 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForUserControllerTest.java @@ -1,11 +1,16 @@ package io.reflectoring.coderadar.rest.unit.user.teams; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListTeamsForUserController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -13,12 +18,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import static org.mockito.Mockito.mock; - public class ListTeamsForUserControllerTest { private final ListTeamsForUserUseCase listTeamsForUserUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveTeamFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveTeamFromProjectControllerTest.java index fea9d380e..aede4e427 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveTeamFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveTeamFromProjectControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.user.teams; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.useradministration.teams.RemoveTeamFromProjectController; @@ -11,8 +13,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - public class RemoveTeamFromProjectControllerTest { private final RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase = mock(RemoveTeamFromProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveUsersFromTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveUsersFromTeamControllerTest.java index 72b80a613..110f583aa 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveUsersFromTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveUsersFromTeamControllerTest.java @@ -1,22 +1,21 @@ package io.reflectoring.coderadar.rest.unit.user.teams; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.JsonListWrapper; import io.reflectoring.coderadar.rest.useradministration.teams.RemoveUsersFromTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveUsersFromTeamUseCase; +import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Collections; - -import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.mock; - public class RemoveUsersFromTeamControllerTest { private final RemoveUsersFromTeamUseCase removeUsersFromTeamUseCase = mock(RemoveUsersFromTeamUseCase.class); From c1e0623ef77ee736c28f32ed53772d22566429cc Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 10 Jun 2020 15:45:22 +0200 Subject: [PATCH 36/76] wrote base integration tests for the teams/users controllers (only positive tests, no asciidocs) --- .../coderadar/app/CoderadarApplication.java | 4 +- .../dependencymap/domain/CompareNode.java | 5 +- .../UserNotInTeamException.java | 7 ++ .../teams/RemoveUsersFromTeamService.java | 4 + .../teams/create/CreateTeamService.java | 8 +- .../adapter/GetCommitsInProjectAdapter.java | 10 ++- .../repository/TeamRepository.java | 8 +- .../coderadar/rest/JsonListWrapper.java | 3 +- .../teams/AddUsersToTeamController.java | 3 +- .../RemoveTeamFromProjectController.java | 4 +- .../GetFileTreeForCommitControllerTest.java | 1 - ...jectsForUserControllerIntegrationTest.java | 65 +++++++++++++++++ .../ListUsersControllerIntegrationTest.java | 46 ++++++++++++ ...sForProjectsControllerIntegrationTest.java | 64 ++++++++++++++++ ...rFromProjectControllerIntegrationTest.java | 56 ++++++++++++++ ...leForProjectControllerIntegrationTest.java | 62 ++++++++++++++++ ...eamToProjectControllerIntegrationTest.java | 60 +++++++++++++++ ...dUsersToTeamControllerIntegrationTest.java | 57 +++++++++++++++ .../CreateTeamControllerIntegrationTest.java | 73 +++++++++++++++++++ .../DeleteTeamControllerIntegrationTest.java | 64 ++++++++++++++++ .../GetTeamControllerIntegrationTest.java | 42 +++++++++++ ...jectsForTeamControllerIntegrationTest.java | 61 ++++++++++++++++ .../ListTeamsControllerIntegrationTest.java | 41 +++++++++++ ...msForProjectControllerIntegrationTest.java | 61 ++++++++++++++++ ...TeamsForUserControllerIntegrationTest.java | 55 ++++++++++++++ ...mFromProjectControllerIntegrationTest.java | 55 ++++++++++++++ ...sersFromTeamControllerIntegrationTest.java | 56 ++++++++++++++ 27 files changed, 958 insertions(+), 17 deletions(-) create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/UserNotInTeamException.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectsControllerIntegrationTest.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java diff --git a/coderadar-app/src/main/java/io/reflectoring/coderadar/app/CoderadarApplication.java b/coderadar-app/src/main/java/io/reflectoring/coderadar/app/CoderadarApplication.java index e12412ebd..ce3a90e76 100644 --- a/coderadar-app/src/main/java/io/reflectoring/coderadar/app/CoderadarApplication.java +++ b/coderadar-app/src/main/java/io/reflectoring/coderadar/app/CoderadarApplication.java @@ -9,7 +9,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.EnableTransactionManagement; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.GetMapping; @EnableScheduling @EnableAsync(proxyTargetClass = true) @@ -25,7 +25,7 @@ public static void main(String[] args) { SpringApplication.run(CoderadarApplication.class, args); } - @RequestMapping(value = "/**/{path:[^\\.]*}") + @GetMapping(value = "/**/{path:[^.]*}") public String redirect() { return "forward:/index.html"; } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java index baf2dc35d..20a049994 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java @@ -1,7 +1,10 @@ package io.reflectoring.coderadar.dependencymap.domain; import io.reflectoring.coderadar.plugin.api.ChangeType; -import java.util.*; +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.HashSet; +import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import lombok.Getter; import lombok.Setter; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/UserNotInTeamException.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/UserNotInTeamException.java new file mode 100644 index 000000000..e134cdb58 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/UserNotInTeamException.java @@ -0,0 +1,7 @@ +package io.reflectoring.coderadar.useradministration; + +public class UserNotInTeamException extends RuntimeException { + public UserNotInTeamException(Long userId, long teamId) { + super(String.format("User with id %d is not in team with id %d", userId, teamId)); + } +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveUsersFromTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveUsersFromTeamService.java index 25bbfa291..0eccc0354 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveUsersFromTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveUsersFromTeamService.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.UserNotFoundException; +import io.reflectoring.coderadar.useradministration.UserNotInTeamException; import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driven.RemoveUsersFromTeamPort; @@ -34,6 +35,9 @@ public void removeUsersFromTeam(long teamId, List userIds) { if (!getUserPort.existsById(userId)) { throw new UserNotFoundException(userId); } + if (getTeamPort.get(teamId).getMembers().stream().noneMatch(user -> user.getId() == userId)) { + throw new UserNotInTeamException(userId, teamId); + } } removeUsersFromTeamPort.removeUsersFromTeam(teamId, userIds); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java index 9cf10329d..a298121d9 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/create/CreateTeamService.java @@ -27,9 +27,11 @@ public Long createTeam(CreateTeamCommand createTeamCommand) { if (getTeamPort.existsByName(createTeamCommand.getName())) { throw new TeamAlreadyExistsException(createTeamCommand.getName()); } else { - for (Long userId : createTeamCommand.getUserIds()) { - if (!getUserPort.existsById(userId)) { - throw new UserNotFoundException(userId); + if (createTeamCommand.getUserIds() != null) { + for (Long userId : createTeamCommand.getUserIds()) { + if (!getUserPort.existsById(userId)) { + throw new UserNotFoundException(userId); + } } } return createTeamPort.createTeam(createTeamCommand); diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetCommitsInProjectAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetCommitsInProjectAdapter.java index 75a0278c8..ca2613cad 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetCommitsInProjectAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetCommitsInProjectAdapter.java @@ -3,9 +3,15 @@ import io.reflectoring.coderadar.graph.analyzer.repository.CommitRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.CommitEntity; import io.reflectoring.coderadar.graph.projectadministration.project.adapter.CommitBaseDataMapper; -import io.reflectoring.coderadar.projectadministration.domain.*; +import io.reflectoring.coderadar.projectadministration.domain.Commit; +import io.reflectoring.coderadar.projectadministration.domain.File; +import io.reflectoring.coderadar.projectadministration.domain.FilePattern; +import io.reflectoring.coderadar.projectadministration.domain.FileToCommitRelationship; import io.reflectoring.coderadar.query.port.driven.GetCommitsInProjectPort; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.springframework.data.util.Pair; import org.springframework.stereotype.Service; diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java index be292ce68..916ff447f 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/repository/TeamRepository.java @@ -31,9 +31,9 @@ public interface TeamRepository extends Neo4jRepository { void addTeamToProject(long projectId, long teamId, String role); @Query( - "MATCH (t:TeamEntity) WHERE ID(t) = {0} WITH t " + "MATCH (t) WHERE ID(t) = {0} WITH t " + "UNWIND {1} as x " - + "MATCH (u:UserEntity) WHERE ID(u) = x " + + "MATCH (u) WHERE ID(u) = x " + "MERGE (u)-[r:IS_IN]->(t)") void addUsersToTeam(long teamId, List userIds); @@ -51,7 +51,7 @@ public interface TeamRepository extends Neo4jRepository { @Query("MATCH (u)-[r:IS_IN*0..1]->(t) WHERE ID(t) = {0} RETURN t, r, u") TeamEntity findByIdWithMembers(long teamId); - @Query("MATCH (t:TeamEntity) WHERE ID(t) = {0} RETURN COUNT(t) > 0") + @Query("MATCH (t) WHERE ID(t) = {0} RETURN COUNT(t) > 0") boolean existsById(long teamId); @Query("MATCH (t:TeamEntity) WHERE t.name = {0} RETURN COUNT(t) > 0") @@ -61,7 +61,7 @@ public interface TeamRepository extends Neo4jRepository { * @param projectId The project id. * @return All teams assigned to the project along with their members. */ - @Query("MATCH (p)<-[:ASSIGNED_TO]-(t)<-[r:IS_IN]-(u) WHERE ID(p) = {0} RETURN t, r, u") + @Query("MATCH (p)<-[:ASSIGNED_TO]-(t)<-[r:IS_IN*0..1]-(u) WHERE ID(p) = {0} RETURN t, r, u") List listTeamsByProjectIdWithMembers(long projectId); /** diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java index 3126d9b86..2bb2d7f99 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.rest; import java.util.List; +import javax.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,5 +10,5 @@ @NoArgsConstructor @AllArgsConstructor public class JsonListWrapper { - private List elements; + @NotEmpty private List elements; } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java index 1ebcc9255..01112c03f 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamController.java @@ -7,6 +7,7 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -23,7 +24,7 @@ public AddUsersToTeamController(AddUsersToTeamUseCase addUsersToTeamUseCase) { @PostMapping(path = "/teams/{teamId}/users", consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity addUsersToTeam( - @PathVariable long teamId, @RequestBody JsonListWrapper userIds) { + @PathVariable long teamId, @RequestBody @Validated JsonListWrapper userIds) { addUsersToTeamUseCase.addUsersToTeam(teamId, userIds.getElements()); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java index 5668acfbf..f4eb956f5 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectController.java @@ -7,8 +7,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; @RestController @@ -21,7 +21,7 @@ public RemoveTeamFromProjectController( this.removeTeamFromProjectUseCase = removeTeamFromProjectUseCase; } - @PostMapping(path = "/projects/{projectId}/teams/{teamId}") + @DeleteMapping(path = "/projects/{projectId}/teams/{teamId}") public ResponseEntity removeTeamFromProject( @PathVariable long projectId, @PathVariable long teamId) { try { diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java index e85ef6660..bbd53960b 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java @@ -2,7 +2,6 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static org.springframework.restdocs.payload.PayloadDocumentation.*; -import static org.springframework.restdocs.payload.PayloadDocumentation.subsectionWithPath; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java new file mode 100644 index 000000000..8120ed8ee --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java @@ -0,0 +1,65 @@ +package io.reflectoring.coderadar.rest.useradministration; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + +import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; +import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; +import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import io.reflectoring.coderadar.rest.domain.GetProjectResponse; +import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; +import java.util.Collections; +import java.util.Date; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class ListProjectsForUserControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private UserRepository userRepository; + + @Autowired private ProjectRepository projectRepository; + + private ProjectEntity testProject; + private UserEntity testUser; + + @BeforeEach + public void setUp() { + projectRepository.deleteAll(); + testProject = new ProjectEntity(); + testProject.setVcsUrl("https://valid.url"); + testProject.setName("project"); + testProject.setVcsStart(new Date()); + testProject.setVcsOnline(true); + testProject.setVcsPassword("testPassword"); + testProject.setVcsUsername("testUser"); + projectRepository.save(testProject); + + userRepository.deleteAll(); + testUser = new UserEntity(); + testUser.setUsername("username"); + testUser.setPassword(PasswordUtil.hash("password1")); + testUser.setProjects(Collections.singletonList(testProject)); + userRepository.save(testUser); + } + + @Test + void listProjectsForUserSuccessfully() throws Exception { + MvcResult result = + mvc() + .perform(get("/api/users/" + testUser.getId() + "/projects")) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andReturn(); // TODO: Document + + GetProjectResponse[] projects = + fromJson(result.getResponse().getContentAsString(), GetProjectResponse[].class); + Assertions.assertEquals(1, projects.length); + Assertions.assertEquals("project", projects[0].getName()); + Assertions.assertEquals(testProject.getId(), projects[0].getId()); + } +} diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java new file mode 100644 index 000000000..74f5fa391 --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java @@ -0,0 +1,46 @@ +package io.reflectoring.coderadar.rest.useradministration; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + +import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import io.reflectoring.coderadar.rest.domain.GetUserResponse; +import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class ListUsersControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private UserRepository userRepository; + + private UserEntity testUser; + + @BeforeEach + public void setUp() { + userRepository.deleteAll(); + testUser = new UserEntity(); + testUser.setUsername("username"); + testUser.setPassword(PasswordUtil.hash("password1")); + userRepository.save(testUser); + } + + @Test + void listUsersSuccessfully() throws Exception { + MvcResult result = + mvc() + .perform(get("/api/users")) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andReturn(); // TODO: Document + + GetUserResponse[] users = + fromJson(result.getResponse().getContentAsString(), GetUserResponse[].class); + Assertions.assertEquals(1, users.length); + Assertions.assertEquals("username", users[0].getUsername()); + } +} diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectsControllerIntegrationTest.java new file mode 100644 index 000000000..16678a398 --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectsControllerIntegrationTest.java @@ -0,0 +1,64 @@ +package io.reflectoring.coderadar.rest.useradministration; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + +import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; +import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; +import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import io.reflectoring.coderadar.rest.domain.GetUserResponse; +import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; +import java.util.Collections; +import java.util.Date; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class ListUsersForProjectsControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private UserRepository userRepository; + + @Autowired private ProjectRepository projectRepository; + + private ProjectEntity testProject; + private UserEntity testUser; + + @BeforeEach + public void setUp() { + projectRepository.deleteAll(); + testProject = new ProjectEntity(); + testProject.setVcsUrl("https://valid.url"); + testProject.setName("project"); + testProject.setVcsStart(new Date()); + testProject.setVcsOnline(true); + testProject.setVcsPassword("testPassword"); + testProject.setVcsUsername("testUser"); + projectRepository.save(testProject); + + userRepository.deleteAll(); + testUser = new UserEntity(); + testUser.setUsername("username"); + testUser.setPassword(PasswordUtil.hash("password1")); + testUser.setProjects(Collections.singletonList(testProject)); + userRepository.save(testUser); + } + + @Test + void listUsersForProjectSuccessfully() throws Exception { + MvcResult result = + mvc() + .perform(get("/api/projects/" + testProject.getId() + "/users/")) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andReturn(); // TODO: Document + + GetUserResponse[] users = + fromJson(result.getResponse().getContentAsString(), GetUserResponse[].class); + Assertions.assertEquals(1, users.length); + Assertions.assertEquals("username", users[0].getUsername()); + } +} diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java new file mode 100644 index 000000000..07a2a56c8 --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java @@ -0,0 +1,56 @@ +package io.reflectoring.coderadar.rest.useradministration.permissions; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + +import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; +import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; +import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; +import java.util.Collections; +import java.util.Date; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class RemoveUserFromProjectControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private UserRepository userRepository; + + @Autowired private ProjectRepository projectRepository; + + private ProjectEntity testProject; + private UserEntity testUser; + + @BeforeEach + public void setUp() { + projectRepository.deleteAll(); + testProject = new ProjectEntity(); + testProject.setVcsUrl("https://valid.url"); + testProject.setName("project"); + testProject.setVcsStart(new Date()); + testProject.setVcsOnline(true); + testProject.setVcsPassword("testPassword"); + testProject.setVcsUsername("testUser"); + projectRepository.save(testProject); + + userRepository.deleteAll(); + testUser = new UserEntity(); + testUser.setUsername("username"); + testUser.setPassword(PasswordUtil.hash("password1")); + testUser.setProjects(Collections.singletonList(testProject)); + userRepository.save(testUser); + } + + @Test + void removeUserFromProjectSuccessfully() throws Exception { + mvc() + .perform(delete("/api/projects/" + testProject.getId() + "/users/" + testUser.getId())) + .andExpect(MockMvcResultMatchers.status().isOk()); // TODO: Document + + Assertions.assertTrue(userRepository.listUsersForProject(testProject.getId()).isEmpty()); + } +} diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java new file mode 100644 index 000000000..c5ba0d7dc --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java @@ -0,0 +1,62 @@ +package io.reflectoring.coderadar.rest.useradministration.permissions; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + +import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; +import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; +import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; +import java.util.Date; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class SetUserRoleForProjectControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private UserRepository userRepository; + + @Autowired private ProjectRepository projectRepository; + + private ProjectEntity testProject; + private UserEntity testUser; + + @BeforeEach + public void setUp() { + projectRepository.deleteAll(); + testProject = new ProjectEntity(); + testProject.setVcsUrl("https://valid.url"); + testProject.setName("project"); + testProject.setVcsStart(new Date()); + testProject.setVcsOnline(true); + testProject.setVcsPassword("testPassword"); + testProject.setVcsUsername("testUser"); + projectRepository.save(testProject); + + userRepository.deleteAll(); + testUser = new UserEntity(); + testUser.setUsername("username"); + testUser.setPassword(PasswordUtil.hash("password1")); + userRepository.save(testUser); + } + + @Test + void setUserRoleForProjectSuccessfully() throws Exception { + mvc() + .perform( + post("/api/projects/" + testProject.getId() + "/users/" + testUser.getId()) + .content(toJson(new ProjectRoleJsonWrapper(ProjectRole.ADMIN))) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(MockMvcResultMatchers.status().isOk()); // TODO: Document + + Assertions.assertEquals(1, userRepository.listUsersForProject(testProject.getId()).size()); + Assertions.assertEquals( + "username", userRepository.listUsersForProject(testProject.getId()).get(0).getUsername()); + } +} diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java new file mode 100644 index 000000000..2f8a58352 --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java @@ -0,0 +1,60 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + +import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; +import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import java.util.Date; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class AddTeamToProjectControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private TeamRepository teamRepository; + + @Autowired private ProjectRepository projectRepository; + + private TeamEntity teamEntity; + private ProjectEntity testProject; + + @BeforeEach + public void setUp() { + teamEntity = new TeamEntity(); + teamEntity.setName("testTeam"); + teamRepository.save(teamEntity, 1); + + projectRepository.deleteAll(); + testProject = new ProjectEntity(); + testProject.setVcsUrl("https://valid.url"); + testProject.setName("project"); + testProject.setVcsStart(new Date()); + testProject.setVcsOnline(true); + testProject.setVcsPassword("testPassword"); + testProject.setVcsUsername("testUser"); + projectRepository.save(testProject); + } + + @Test + public void addTeamToProjectSuccessfully() throws Exception { + mvc() + .perform( + post("/api/projects/" + testProject.getId() + "/teams/" + teamEntity.getId()) + .contentType(MediaType.APPLICATION_JSON) + .content(toJson(new ProjectRoleJsonWrapper(ProjectRole.ADMIN)))) + .andExpect(MockMvcResultMatchers.status().isOk()); // TODO: Document + + List teams = teamRepository.listTeamsByProjectIdWithMembers(testProject.getId()); + Assertions.assertEquals(1L, teams.size()); + Assertions.assertEquals("testTeam", teams.get(0).getName()); + } +} diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java new file mode 100644 index 000000000..f3064ccf5 --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java @@ -0,0 +1,57 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import io.reflectoring.coderadar.rest.JsonListWrapper; +import java.util.Collections; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class AddUsersToTeamControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private TeamRepository teamRepository; + + @Autowired private UserRepository userRepository; + + private TeamEntity teamEntity; + private UserEntity testUser; + + @BeforeEach + public void setUp() { + userRepository.deleteAll(); + testUser = new UserEntity(); + testUser.setUsername("username"); + testUser.setPassword("password1"); + userRepository.save(testUser); + + teamEntity = new TeamEntity(); + teamEntity.setName("testTeam"); + teamRepository.save(teamEntity, 1); + } + + @Test + public void addUsersToTeamSuccessfully() throws Exception { + mvc() + .perform( + post("/api/teams/" + teamEntity.getId() + "/users") + .content(toJson(new JsonListWrapper<>(Collections.singletonList(testUser.getId())))) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andReturn(); // TODO: Document + + List teams = teamRepository.findAllWithMembers(); + Assertions.assertEquals(1L, teams.size()); + Assertions.assertEquals("testTeam", teams.get(0).getName()); + Assertions.assertEquals("username", teams.get(0).getMembers().get(0).getUsername()); + } +} diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java new file mode 100644 index 000000000..08561d471 --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java @@ -0,0 +1,73 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; +import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; +import java.util.Collections; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class CreateTeamControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private UserRepository userRepository; + + @Autowired private TeamRepository teamRepository; + + private UserEntity testUser; + + @BeforeEach + public void setUp() { + userRepository.deleteAll(); + testUser = new UserEntity(); + testUser.setUsername("username"); + testUser.setPassword(PasswordUtil.hash("password1")); + userRepository.save(testUser); + } + + @Test + public void createTeamWithUsersSuccessfully() throws Exception { + CreateTeamCommand createTeamCommand = new CreateTeamCommand(); + createTeamCommand.setName("testTeam"); + createTeamCommand.setUserIds(Collections.singletonList(testUser.getId())); + + mvc() + .perform( + post("/api/teams") + .contentType(MediaType.APPLICATION_JSON) + .content(toJson(createTeamCommand))) + .andExpect(MockMvcResultMatchers.status().isCreated()); // TODO: Document + + List teams = teamRepository.findAllWithMembers(); + Assertions.assertEquals(1L, teams.size()); + Assertions.assertEquals("testTeam", teams.get(0).getName()); + Assertions.assertEquals("username", teams.get(0).getMembers().get(0).getUsername()); + } + + @Test + public void createTeamWithNoUsersSuccessfully() throws Exception { + CreateTeamCommand createTeamCommand = new CreateTeamCommand(); + createTeamCommand.setName("testTeam"); + + mvc() + .perform( + post("/api/teams") + .contentType(MediaType.APPLICATION_JSON) + .content(toJson(createTeamCommand))) + .andExpect(MockMvcResultMatchers.status().isCreated()); // TODO: Document + + List teams = teamRepository.findAllWithMembers(); + Assertions.assertEquals(1L, teams.size()); + Assertions.assertEquals("testTeam", teams.get(0).getName()); + } +} diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java new file mode 100644 index 000000000..c5ed7e087 --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java @@ -0,0 +1,64 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; +import java.util.Collections; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class DeleteTeamControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private UserRepository userRepository; + + @Autowired private TeamRepository teamRepository; + + private UserEntity testUser; + + private TeamEntity teamEntity; + + @BeforeEach + public void setUp() { + teamEntity = new TeamEntity(); + teamEntity.setName("testTeam"); + teamRepository.save(teamEntity, 1); + + userRepository.deleteAll(); + testUser = new UserEntity(); + testUser.setUsername("username"); + testUser.setPassword(PasswordUtil.hash("password1")); + userRepository.save(testUser); + } + + @Test + public void deleteTeamWithUsersSuccessfully() throws Exception { + teamEntity.setMembers(Collections.singletonList(testUser)); + teamRepository.save(teamEntity, 1); + + mvc() + .perform(delete("/api/teams/" + teamEntity.getId())) + .andExpect(MockMvcResultMatchers.status().isOk()); // TODO: Document + + List teams = teamRepository.findAllWithMembers(); + Assertions.assertTrue(teams.isEmpty()); + } + + @Test + public void deleteTeamWithNoUsersSuccessfully() throws Exception { + mvc() + .perform(delete("/api/teams/" + teamEntity.getId())) + .andExpect(MockMvcResultMatchers.status().isOk()); // TODO: Document + + List teams = teamRepository.findAllWithMembers(); + Assertions.assertTrue(teams.isEmpty()); + } +} diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java new file mode 100644 index 000000000..61bf252a5 --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java @@ -0,0 +1,42 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class GetTeamControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private TeamRepository teamRepository; + + private TeamEntity teamEntity; + + @BeforeEach + public void setUp() { + teamEntity = new TeamEntity(); + teamEntity.setName("testTeam"); + teamRepository.save(teamEntity, 1); + } + + @Test + public void getTeamSuccessfully() throws Exception { + MvcResult result = + mvc() + .perform(get("/api/teams/" + teamEntity.getId())) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andReturn(); // TODO: Document + + GetTeamResponse response = + fromJson(result.getResponse().getContentAsString(), GetTeamResponse.class); + Assertions.assertEquals("testTeam", response.getName()); + } +} diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java new file mode 100644 index 000000000..a24108d04 --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java @@ -0,0 +1,61 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + +import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; +import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import io.reflectoring.coderadar.rest.domain.GetProjectResponse; +import java.util.Collections; +import java.util.Date; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class ListProjectsForTeamControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private TeamRepository teamRepository; + + @Autowired private ProjectRepository projectRepository; + + private TeamEntity teamEntity; + private ProjectEntity testProject; + + @BeforeEach + public void setUp() { + projectRepository.deleteAll(); + testProject = new ProjectEntity(); + testProject.setVcsUrl("https://valid.url"); + testProject.setName("project"); + testProject.setVcsStart(new Date()); + testProject.setVcsOnline(true); + testProject.setVcsPassword("testPassword"); + testProject.setVcsUsername("testUser"); + projectRepository.save(testProject); + + teamEntity = new TeamEntity(); + teamEntity.setName("testTeam"); + teamEntity.setProjects(Collections.singletonList(testProject)); + teamRepository.save(teamEntity, 1); + } + + @Test + public void listProjectsForTeamSuccessfully() throws Exception { + MvcResult result = + mvc() + .perform(get("/api/teams/" + teamEntity.getId() + "/projects")) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andReturn(); // TODO: Document + + GetProjectResponse[] projects = + fromJson(result.getResponse().getContentAsString(), GetProjectResponse[].class); + Assertions.assertEquals(1L, projects.length); + Assertions.assertEquals("project", projects[0].getName()); + } +} diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java new file mode 100644 index 000000000..d5fc0f829 --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java @@ -0,0 +1,41 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class ListTeamsControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private TeamRepository teamRepository; + + @BeforeEach + public void setUp() { + TeamEntity teamEntity = new TeamEntity(); + teamEntity.setName("testTeam"); + teamRepository.save(teamEntity, 1); + } + + @Test + public void listTeamsSuccessfully() throws Exception { + MvcResult result = + mvc() + .perform(get("/api/teams/")) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andReturn(); // TODO: Document + + GetTeamResponse[] response = + fromJson(result.getResponse().getContentAsString(), GetTeamResponse[].class); + Assertions.assertEquals(1, response.length); + Assertions.assertEquals("testTeam", response[0].getName()); + } +} diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java new file mode 100644 index 000000000..49a629d48 --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java @@ -0,0 +1,61 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + +import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; +import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import java.util.Collections; +import java.util.Date; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class ListTeamsForProjectControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private TeamRepository teamRepository; + + @Autowired private ProjectRepository projectRepository; + + private TeamEntity teamEntity; + private ProjectEntity testProject; + + @BeforeEach + public void setUp() { + projectRepository.deleteAll(); + testProject = new ProjectEntity(); + testProject.setVcsUrl("https://valid.url"); + testProject.setName("project"); + testProject.setVcsStart(new Date()); + testProject.setVcsOnline(true); + testProject.setVcsPassword("testPassword"); + testProject.setVcsUsername("testUser"); + projectRepository.save(testProject); + + teamEntity = new TeamEntity(); + teamEntity.setName("testTeam"); + teamEntity.setProjects(Collections.singletonList(testProject)); + teamRepository.save(teamEntity, 1); + } + + @Test + public void listTeamsForProjectSuccessfully() throws Exception { + MvcResult result = + mvc() + .perform(get("/api/projects/" + testProject.getId() + "/teams")) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andReturn(); // TODO: Document + + GetTeamResponse[] teams = + fromJson(result.getResponse().getContentAsString(), GetTeamResponse[].class); + Assertions.assertEquals(1L, teams.length); + Assertions.assertEquals("testTeam", teams[0].getName()); + } +} diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java new file mode 100644 index 000000000..6ec4948cf --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java @@ -0,0 +1,55 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import java.util.Collections; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class ListTeamsForUserControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private TeamRepository teamRepository; + + @Autowired private UserRepository userRepository; + + private TeamEntity teamEntity; + private UserEntity testUser; + + @BeforeEach + public void setUp() { + userRepository.deleteAll(); + testUser = new UserEntity(); + testUser.setUsername("testUser"); + testUser.setPassword("password1"); + + teamEntity = new TeamEntity(); + teamEntity.setName("testTeam"); + teamEntity.setMembers(Collections.singletonList(testUser)); + teamRepository.save(teamEntity, 1); + } + + @Test + public void listTeamsForProjectSuccessfully() throws Exception { + MvcResult result = + mvc() + .perform(get("/api/users/" + testUser.getId() + "/teams")) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andReturn(); // TODO: Document + + GetTeamResponse[] teams = + fromJson(result.getResponse().getContentAsString(), GetTeamResponse[].class); + Assertions.assertEquals(1L, teams.length); + Assertions.assertEquals("testTeam", teams[0].getName()); + } +} diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java new file mode 100644 index 000000000..37a3a3cc1 --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java @@ -0,0 +1,55 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + +import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; +import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class RemoveTeamFromProjectControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private TeamRepository teamRepository; + + @Autowired private ProjectRepository projectRepository; + + private TeamEntity teamEntity; + private ProjectEntity testProject; + + @BeforeEach + public void setUp() { + projectRepository.deleteAll(); + testProject = new ProjectEntity(); + testProject.setVcsUrl("https://valid.url"); + testProject.setName("project"); + testProject.setVcsStart(new Date()); + testProject.setVcsOnline(true); + testProject.setVcsPassword("testPassword"); + testProject.setVcsUsername("testUser"); + projectRepository.save(testProject); + + teamEntity = new TeamEntity(); + teamEntity.setName("testTeam"); + teamEntity.setProjects(Collections.singletonList(testProject)); + teamRepository.save(teamEntity, 1); + } + + @Test + public void removeTeamFromProjectSuccessfully() throws Exception { + mvc() + .perform(delete("/api/projects/" + testProject.getId() + "/teams/" + teamEntity.getId())) + .andExpect(MockMvcResultMatchers.status().isOk()); // TODO: Document + + List teams = teamRepository.listTeamsByProjectIdWithMembers(testProject.getId()); + Assertions.assertTrue(teams.isEmpty()); + } +} diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java new file mode 100644 index 000000000..8a40d5680 --- /dev/null +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java @@ -0,0 +1,56 @@ +package io.reflectoring.coderadar.rest.useradministration.teams; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + +import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; +import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; +import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import io.reflectoring.coderadar.rest.JsonListWrapper; +import java.util.Collections; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; + +public class RemoveUsersFromTeamControllerIntegrationTest extends ControllerTestTemplate { + + @Autowired private TeamRepository teamRepository; + + @Autowired private UserRepository userRepository; + + private TeamEntity teamEntity; + private UserEntity testUser; + + @BeforeEach + public void setUp() { + userRepository.deleteAll(); + testUser = new UserEntity(); + testUser.setUsername("username"); + testUser.setPassword("password1"); + userRepository.save(testUser); + + teamEntity = new TeamEntity(); + teamEntity.setName("testTeam"); + teamEntity.setMembers(Collections.singletonList(testUser)); + teamRepository.save(teamEntity, 1); + } + + @Test + public void removeUsersFromTeamSuccessfully() throws Exception { + mvc() + .perform( + delete("/api/teams/" + teamEntity.getId() + "/users") + .content(toJson(new JsonListWrapper<>(Collections.singletonList(testUser.getId())))) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andReturn(); // TODO: Document + + List teams = teamRepository.listTeamsByUserId(testUser.getId()); + Assertions.assertEquals(0, teams.size()); + } +} From 37ffcd6a09d9b57a59381e0ad6bedc76b097102c Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Fri, 12 Jun 2020 10:45:07 +0200 Subject: [PATCH 37/76] added asciidocs for the new endpoints --- .../ChangePasswordControllerTest.java | 2 +- .../GetUserControllerTest.java | 2 +- .../ListProjectsForUserControllerTest.java | 2 +- .../ListUsersControllerTest.java | 2 +- .../ListUsersForProjectControllerTest.java | 2 +- .../LoginUserControllerTest.java | 2 +- .../RefreshTokenControllerTest.java | 2 +- .../RegisterUserControllerTest.java | 2 +- .../RemoveUserFromProjectControllerTest.java | 2 +- .../SetUserRoleForProjectControllerTest.java | 2 +- .../teams/AddTeamToProjectControllerTest.java | 2 +- .../teams/AddUsersToTeamControllerTest.java | 2 +- .../teams/CreateTeamControllerTest.java | 2 +- .../teams/DeleteTeamControllerTest.java | 2 +- .../teams/GetTeamControllerTest.java | 2 +- .../ListProjectsForTeamControllerTest.java | 2 +- .../teams/ListTeamsControllerTest.java | 2 +- .../ListTeamsForProjectControllerTest.java | 2 +- .../teams/ListTeamsForUserControllerTest.java | 2 +- .../RemoveTeamFromProjectControllerTest.java | 2 +- .../RemoveUsersFromTeamControllerTest.java | 2 +- coderadar-test/src/main/asciidoc/restapi.adoc | 192 ++++++++++++++++-- ...jectsForUserControllerIntegrationTest.java | 3 +- .../ListUsersControllerIntegrationTest.java | 3 +- ...sForProjectControllerIntegrationTest.java} | 5 +- ...rFromProjectControllerIntegrationTest.java | 4 +- ...leForProjectControllerIntegrationTest.java | 15 +- ...eamToProjectControllerIntegrationTest.java | 10 +- ...dUsersToTeamControllerIntegrationTest.java | 11 +- .../CreateTeamControllerIntegrationTest.java | 17 +- .../DeleteTeamControllerIntegrationTest.java | 4 +- .../GetTeamControllerIntegrationTest.java | 3 +- ...jectsForTeamControllerIntegrationTest.java | 3 +- .../ListTeamsControllerIntegrationTest.java | 3 +- ...msForProjectControllerIntegrationTest.java | 3 +- ...TeamsForUserControllerIntegrationTest.java | 3 +- ...mFromProjectControllerIntegrationTest.java | 4 +- ...sersFromTeamControllerIntegrationTest.java | 10 +- 38 files changed, 283 insertions(+), 52 deletions(-) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/ChangePasswordControllerTest.java (94%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/GetUserControllerTest.java (94%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/ListProjectsForUserControllerTest.java (96%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/ListUsersControllerTest.java (96%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/ListUsersForProjectControllerTest.java (97%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/LoginUserControllerTest.java (95%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/RefreshTokenControllerTest.java (95%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/RegisterUserControllerTest.java (95%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration/permissions}/RemoveUserFromProjectControllerTest.java (96%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration/permissions}/SetUserRoleForProjectControllerTest.java (96%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/teams/AddTeamToProjectControllerTest.java (96%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/teams/AddUsersToTeamControllerTest.java (96%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/teams/CreateTeamControllerTest.java (96%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/teams/DeleteTeamControllerTest.java (94%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/teams/GetTeamControllerTest.java (96%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/teams/ListProjectsForTeamControllerTest.java (96%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/teams/ListTeamsControllerTest.java (97%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/teams/ListTeamsForProjectControllerTest.java (97%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/teams/ListTeamsForUserControllerTest.java (97%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/teams/RemoveTeamFromProjectControllerTest.java (96%) rename coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/{user => useradministration}/teams/RemoveUsersFromTeamControllerTest.java (96%) rename coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/{ListUsersForProjectsControllerIntegrationTest.java => ListUsersForProjectControllerIntegrationTest.java} (93%) diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ChangePasswordControllerTest.java similarity index 94% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ChangePasswordControllerTest.java index 1a7b6f49b..6f6cc1795 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ChangePasswordControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ChangePasswordControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user; +package io.reflectoring.coderadar.rest.unit.useradministration; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/GetUserControllerTest.java similarity index 94% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/GetUserControllerTest.java index 77ea915ad..596536765 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/GetUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/GetUserControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user; +package io.reflectoring.coderadar.rest.unit.useradministration; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListProjectsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java similarity index 96% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListProjectsForUserControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java index 76f2a7af3..34558b2ac 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListProjectsForUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user; +package io.reflectoring.coderadar.rest.unit.useradministration; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersControllerTest.java similarity index 96% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersControllerTest.java index ae3e8a69f..27a9e6826 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user; +package io.reflectoring.coderadar.rest.unit.useradministration; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersForProjectControllerTest.java similarity index 97% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersForProjectControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersForProjectControllerTest.java index 1799877db..f48d8e266 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/ListUsersForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersForProjectControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user; +package io.reflectoring.coderadar.rest.unit.useradministration; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java similarity index 95% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java index 4aa562180..1304be2d4 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/LoginUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user; +package io.reflectoring.coderadar.rest.unit.useradministration; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RefreshTokenControllerTest.java similarity index 95% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RefreshTokenControllerTest.java index f89e75d16..a5759ce28 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RefreshTokenControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RefreshTokenControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user; +package io.reflectoring.coderadar.rest.unit.useradministration; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RegisterUserControllerTest.java similarity index 95% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RegisterUserControllerTest.java index 0df84737b..cae291eed 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RegisterUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RegisterUserControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user; +package io.reflectoring.coderadar.rest.unit.useradministration; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RemoveUserFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java similarity index 96% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RemoveUserFromProjectControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java index 3a5e28e25..6825df25d 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/RemoveUserFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user; +package io.reflectoring.coderadar.rest.unit.useradministration.permissions; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/SetUserRoleForProjectControllerTest.java similarity index 96% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/SetUserRoleForProjectControllerTest.java index 4ae99b7dd..bb4918025 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/SetUserRoleForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/SetUserRoleForProjectControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user; +package io.reflectoring.coderadar.rest.unit.useradministration.permissions; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddTeamToProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java similarity index 96% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddTeamToProjectControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java index 5053372e1..a393b5a17 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddTeamToProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user.teams; +package io.reflectoring.coderadar.rest.unit.useradministration.teams; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddUsersToTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddUsersToTeamControllerTest.java similarity index 96% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddUsersToTeamControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddUsersToTeamControllerTest.java index a2d2b6a5d..f3ae3f469 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/AddUsersToTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddUsersToTeamControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user.teams; +package io.reflectoring.coderadar.rest.unit.useradministration.teams; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.anyLong; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/CreateTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/CreateTeamControllerTest.java similarity index 96% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/CreateTeamControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/CreateTeamControllerTest.java index bedec444e..ced46b6ee 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/CreateTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/CreateTeamControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user.teams; +package io.reflectoring.coderadar.rest.unit.useradministration.teams; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/DeleteTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/DeleteTeamControllerTest.java similarity index 94% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/DeleteTeamControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/DeleteTeamControllerTest.java index acb853411..318f5f03e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/DeleteTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/DeleteTeamControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user.teams; +package io.reflectoring.coderadar.rest.unit.useradministration.teams; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/GetTeamControllerTest.java similarity index 96% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/GetTeamControllerTest.java index 18e445f05..5cf368fe4 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/GetTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/GetTeamControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user.teams; +package io.reflectoring.coderadar.rest.unit.useradministration.teams; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java similarity index 96% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForTeamControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java index 372d8f4d3..f5b06337b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListProjectsForTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user.teams; +package io.reflectoring.coderadar.rest.unit.useradministration.teams; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsControllerTest.java similarity index 97% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsControllerTest.java index e91eaa39f..5b132b93f 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user.teams; +package io.reflectoring.coderadar.rest.unit.useradministration.teams; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForProjectControllerTest.java similarity index 97% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForProjectControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForProjectControllerTest.java index 66f205cf5..12d88edd1 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForProjectControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user.teams; +package io.reflectoring.coderadar.rest.unit.useradministration.teams; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java similarity index 97% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForUserControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java index e6e289b2a..80ab9fe8b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/ListTeamsForUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user.teams; +package io.reflectoring.coderadar.rest.unit.useradministration.teams; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveTeamFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveTeamFromProjectControllerTest.java similarity index 96% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveTeamFromProjectControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveTeamFromProjectControllerTest.java index aede4e427..f9ab2048b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveTeamFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveTeamFromProjectControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user.teams; +package io.reflectoring.coderadar.rest.unit.useradministration.teams; import static org.mockito.Mockito.mock; diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveUsersFromTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java similarity index 96% rename from coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveUsersFromTeamControllerTest.java rename to coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java index 110f583aa..b4f481262 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/user/teams/RemoveUsersFromTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.rest.unit.user.teams; +package io.reflectoring.coderadar.rest.unit.useradministration.teams; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.anyLong; diff --git a/coderadar-test/src/main/asciidoc/restapi.adoc b/coderadar-test/src/main/asciidoc/restapi.adoc index d9f248814..b5d4fc037 100644 --- a/coderadar-test/src/main/asciidoc/restapi.adoc +++ b/coderadar-test/src/main/asciidoc/restapi.adoc @@ -81,7 +81,27 @@ If some unexpected error occurs during the processing of a request, the API retu anchor:chapter-configure[] This section describes the REST endpoints for managing coderadar users. -=== Users +=== Loading a User + +==== Example Request + +include::{snippets}/users/get/http-request.adoc[] + +==== Example Response + +include::{snippets}/users/get/http-response.adoc[] + +=== Listing all Users + +===== Example Request + +include::{snippets}/users/list/http-request.adoc[] + +===== Example Response + +include::{snippets}/users/list/http-response.adoc[] + +=== Authentication To access the functionality of coderadar you have to register a user. You need to define a username and a password. The password will be sent as plain text and hashed on server side for persisting. @@ -99,16 +119,6 @@ include::{snippets}/user/registration/http-request.adoc[] include::{snippets}/user/registration/http-response.adoc[] -==== Loading a User - -===== Example Request - -include::{snippets}/users/get/http-request.adoc[] - -===== Example Response - -include::{snippets}/users/get/http-response.adoc[] - ==== Login anchor:login[] A user has to log in to use other endpoints of coderadar. @@ -186,11 +196,48 @@ A typical work flow looks like this: . Client requires resources using the access token in each request . After 15 minutes client gets a 401-Response . Clients tries to get a new access token using refresh token -. Clients gets a new acess token and can request further resources +. Clients gets a new access token and can request further resources . If the client can't get a new access token using the refresh token, client has to login again with username and password. See more: https://auth0.com/docs/tokens/refresh-token and https://auth0.com/blog/refresh-tokens-what-are-they-and-when-to-use-them/ +=== User Permissions + +Users can be assigned to projects with a specific role. + +==== Set user role in a project + +include::{snippets}/user/role/project/set/request-fields.adoc[] + +===== Example Request +include::{snippets}/user/role/project/set/http-request.adoc[] + +===== Example Response +include::{snippets}/user/role/project/set/http-response.adoc[] + +==== Remove user role from a project + +===== Example Request +include::{snippets}/user/role/project/remove/http-request.adoc[] + +===== Example Response +include::{snippets}/user/role/project/remove/http-response.adoc[] + +==== List all projects for a user + +===== Example Request +include::{snippets}/user/list/projects/http-request.adoc[] + +===== Example Response +include::{snippets}/user/list/projects/http-response.adoc[] + +==== List all users for a project + +===== Example Request +include::{snippets}/project/list/users/http-request.adoc[] + +===== Example Response +include::{snippets}/project/list/users/http-response.adoc[] == Configuring a Project anchor:chapter-configure[] @@ -824,7 +871,6 @@ include::{snippets}/contributors/update/http-response.adoc[] - == Coderadar Core Metrics === Get Critical Files of a Project @@ -857,3 +903,123 @@ include::{snippets}/metrics/criticalFiles/modificationFrequency/http-request.ado ===== Example Response include::{snippets}/metrics/criticalFiles/modificationFrequency/http-response.adoc[] + +== Teams + +=== Creating a team + +include::{snippets}/teams/create/request-fields.adoc[] + +==== Example Request + +include::{snippets}/teams/create/http-request.adoc[] + +==== Example Response + +include::{snippets}/teams/create/http-response.adoc[] + +=== Deleting a team + +==== Example Request + +include::{snippets}/teams/delete/http-request.adoc[] + +==== Example Response + +include::{snippets}/teams/delete/http-response.adoc[] + +=== Add users to a team + +include::{snippets}/teams/add/user/request-fields.adoc[] + +==== Example Request + +include::{snippets}/teams/add/user/http-request.adoc[] + +==== Example Response + +include::{snippets}/teams/add/user/http-response.adoc[] + +=== Remove users from a team + +include::{snippets}/teams/remove/user/request-fields.adoc[] + +==== Example Request + +include::{snippets}/teams/remove/user/http-request.adoc[] + +==== Example Response + +include::{snippets}/teams/remove/user/http-response.adoc[] + +=== Retrieve a single team + +==== Example Request + +include::{snippets}/teams/get/http-request.adoc[] + +==== Example Response + +include::{snippets}/teams/get/http-response.adoc[] + +=== List all teams + +==== Example Request + +include::{snippets}/teams/list/http-request.adoc[] + +==== Example Response + +include::{snippets}/teams/list/http-response.adoc[] + +=== Assign a team to a project + +include::{snippets}/teams/add/project/request-fields.adoc[] + +==== Example Request + +include::{snippets}/teams/add/project/http-request.adoc[] + +==== Example Response + +include::{snippets}/teams/add/project/http-response.adoc[] + +=== Remove a team from a project + +==== Example Request + +include::{snippets}/teams/remove/project/http-request.adoc[] + +==== Example Response + +include::{snippets}/teams/remove/project/http-response.adoc[] + +=== List teams assigned to a project + +==== Example Request + +include::{snippets}/teams/list/project/http-request.adoc[] + +==== Example Response + +include::{snippets}/teams/list/project/http-response.adoc[] + +=== List teams a user is in + +==== Example Request + +include::{snippets}/teams/list/user/http-request.adoc[] + +==== Example Response + +include::{snippets}/teams/list/user/http-response.adoc[] + +=== List all projects for a team + +==== Example Request + +include::{snippets}/teams/list/projects/http-request.adoc[] + +==== Example Response + +include::{snippets}/teams/list/projects/http-response.adoc[] diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java index 8120ed8ee..662ac7c0e 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java @@ -54,7 +54,8 @@ void listProjectsForUserSuccessfully() throws Exception { mvc() .perform(get("/api/users/" + testUser.getId() + "/projects")) .andExpect(MockMvcResultMatchers.status().isOk()) - .andReturn(); // TODO: Document + .andDo(document("user/list/projects")) + .andReturn(); GetProjectResponse[] projects = fromJson(result.getResponse().getContentAsString(), GetProjectResponse[].class); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java index 74f5fa391..01df5cf69 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java @@ -36,7 +36,8 @@ void listUsersSuccessfully() throws Exception { mvc() .perform(get("/api/users")) .andExpect(MockMvcResultMatchers.status().isOk()) - .andReturn(); // TODO: Document + .andDo(document("users/list")) + .andReturn(); GetUserResponse[] users = fromJson(result.getResponse().getContentAsString(), GetUserResponse[].class); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java similarity index 93% rename from coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectsControllerIntegrationTest.java rename to coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java index 16678a398..1cdf6a77b 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java @@ -19,7 +19,7 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class ListUsersForProjectsControllerIntegrationTest extends ControllerTestTemplate { +public class ListUsersForProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; @@ -54,7 +54,8 @@ void listUsersForProjectSuccessfully() throws Exception { mvc() .perform(get("/api/projects/" + testProject.getId() + "/users/")) .andExpect(MockMvcResultMatchers.status().isOk()) - .andReturn(); // TODO: Document + .andDo(document("project/list/users")) + .andReturn(); GetUserResponse[] users = fromJson(result.getResponse().getContentAsString(), GetUserResponse[].class); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java index 07a2a56c8..184425616 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java @@ -49,7 +49,9 @@ public void setUp() { void removeUserFromProjectSuccessfully() throws Exception { mvc() .perform(delete("/api/projects/" + testProject.getId() + "/users/" + testUser.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()); // TODO: Document + .andExpect(MockMvcResultMatchers.status().isOk()) + .andDo(document("user/role/project/remove")) + .andReturn(); // TODO: Document Assertions.assertTrue(userRepository.listUsersForProject(testProject.getId()).isEmpty()); } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java index c5ba0d7dc..9d1e619f7 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java @@ -1,5 +1,6 @@ package io.reflectoring.coderadar.rest.useradministration.permissions; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -48,12 +49,24 @@ public void setUp() { @Test void setUserRoleForProjectSuccessfully() throws Exception { + + ConstrainedFields fields = fields(ProjectRoleJsonWrapper.class); + mvc() .perform( post("/api/projects/" + testProject.getId() + "/users/" + testUser.getId()) .content(toJson(new ProjectRoleJsonWrapper(ProjectRole.ADMIN))) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isOk()); // TODO: Document + .andExpect(MockMvcResultMatchers.status().isOk()) + .andDo( + document( + "user/role/project/set", + requestFields( + fields + .withPath("role") + .description( + "The role the user should have for the given project. Can be either ADMIN or MEMBER")))) + .andReturn(); Assertions.assertEquals(1, userRepository.listUsersForProject(testProject.getId()).size()); Assertions.assertEquals( diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java index 2f8a58352..8611759f9 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java @@ -1,5 +1,6 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -46,12 +47,19 @@ public void setUp() { @Test public void addTeamToProjectSuccessfully() throws Exception { + ConstrainedFields fields = fields(ProjectRoleJsonWrapper.class); + mvc() .perform( post("/api/projects/" + testProject.getId() + "/teams/" + teamEntity.getId()) .contentType(MediaType.APPLICATION_JSON) .content(toJson(new ProjectRoleJsonWrapper(ProjectRole.ADMIN)))) - .andExpect(MockMvcResultMatchers.status().isOk()); // TODO: Document + .andExpect(MockMvcResultMatchers.status().isOk()) + .andDo( + document( + "teams/add/project", + requestFields( + fields.withPath("role").description("The role of the team in the project")))); List teams = teamRepository.listTeamsByProjectIdWithMembers(testProject.getId()); Assertions.assertEquals(1L, teams.size()); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java index f3064ccf5..4ee18e1fb 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java @@ -1,5 +1,6 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; @@ -41,13 +42,21 @@ public void setUp() { @Test public void addUsersToTeamSuccessfully() throws Exception { + + ConstrainedFields fields = fields(JsonListWrapper.class); + mvc() .perform( post("/api/teams/" + teamEntity.getId() + "/users") .content(toJson(new JsonListWrapper<>(Collections.singletonList(testUser.getId())))) .contentType(MediaType.APPLICATION_JSON)) .andExpect(MockMvcResultMatchers.status().isOk()) - .andReturn(); // TODO: Document + .andDo( + document( + "teams/add/user", + requestFields( + fields.withPath("elements").description("A list containing user IDs")))) + .andReturn(); List teams = teamRepository.findAllWithMembers(); Assertions.assertEquals(1L, teams.size()); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java index 08561d471..ee734828f 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java @@ -1,5 +1,6 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; @@ -40,13 +41,23 @@ public void createTeamWithUsersSuccessfully() throws Exception { CreateTeamCommand createTeamCommand = new CreateTeamCommand(); createTeamCommand.setName("testTeam"); createTeamCommand.setUserIds(Collections.singletonList(testUser.getId())); + ConstrainedFields fields = fields(CreateTeamCommand.class); mvc() .perform( post("/api/teams") .contentType(MediaType.APPLICATION_JSON) .content(toJson(createTeamCommand))) - .andExpect(MockMvcResultMatchers.status().isCreated()); // TODO: Document + .andExpect(MockMvcResultMatchers.status().isCreated()) + .andDo( + document( + "teams/create", + requestFields( + fields.withPath("name").description("The name of the team"), + fields + .withPath("userIds") + .description("A list of user IDs to add to the newly created team")))) + .andReturn(); List teams = teamRepository.findAllWithMembers(); Assertions.assertEquals(1L, teams.size()); @@ -56,6 +67,7 @@ public void createTeamWithUsersSuccessfully() throws Exception { @Test public void createTeamWithNoUsersSuccessfully() throws Exception { + CreateTeamCommand createTeamCommand = new CreateTeamCommand(); createTeamCommand.setName("testTeam"); @@ -64,7 +76,8 @@ public void createTeamWithNoUsersSuccessfully() throws Exception { post("/api/teams") .contentType(MediaType.APPLICATION_JSON) .content(toJson(createTeamCommand))) - .andExpect(MockMvcResultMatchers.status().isCreated()); // TODO: Document + .andExpect(MockMvcResultMatchers.status().isCreated()) + .andReturn(); List teams = teamRepository.findAllWithMembers(); Assertions.assertEquals(1L, teams.size()); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java index c5ed7e087..27155e360 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java @@ -46,7 +46,9 @@ public void deleteTeamWithUsersSuccessfully() throws Exception { mvc() .perform(delete("/api/teams/" + teamEntity.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()); // TODO: Document + .andExpect(MockMvcResultMatchers.status().isOk()) + .andDo(document("teams/delete")) + .andReturn(); List teams = teamRepository.findAllWithMembers(); Assertions.assertTrue(teams.isEmpty()); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java index 61bf252a5..8e7a9771b 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java @@ -33,7 +33,8 @@ public void getTeamSuccessfully() throws Exception { mvc() .perform(get("/api/teams/" + teamEntity.getId())) .andExpect(MockMvcResultMatchers.status().isOk()) - .andReturn(); // TODO: Document + .andDo(document("teams/get")) + .andReturn(); GetTeamResponse response = fromJson(result.getResponse().getContentAsString(), GetTeamResponse.class); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java index a24108d04..b365799fe 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java @@ -51,7 +51,8 @@ public void listProjectsForTeamSuccessfully() throws Exception { mvc() .perform(get("/api/teams/" + teamEntity.getId() + "/projects")) .andExpect(MockMvcResultMatchers.status().isOk()) - .andReturn(); // TODO: Document + .andDo(document("teams/list/projects")) + .andReturn(); GetProjectResponse[] projects = fromJson(result.getResponse().getContentAsString(), GetProjectResponse[].class); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java index d5fc0f829..2d9cc5091 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java @@ -31,7 +31,8 @@ public void listTeamsSuccessfully() throws Exception { mvc() .perform(get("/api/teams/")) .andExpect(MockMvcResultMatchers.status().isOk()) - .andReturn(); // TODO: Document + .andDo(document("teams/list")) + .andReturn(); GetTeamResponse[] response = fromJson(result.getResponse().getContentAsString(), GetTeamResponse[].class); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java index 49a629d48..2cec7c92f 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java @@ -51,7 +51,8 @@ public void listTeamsForProjectSuccessfully() throws Exception { mvc() .perform(get("/api/projects/" + testProject.getId() + "/teams")) .andExpect(MockMvcResultMatchers.status().isOk()) - .andReturn(); // TODO: Document + .andDo(document("teams/list/project")) + .andReturn(); GetTeamResponse[] teams = fromJson(result.getResponse().getContentAsString(), GetTeamResponse[].class); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java index 6ec4948cf..7b5aec0fb 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java @@ -45,7 +45,8 @@ public void listTeamsForProjectSuccessfully() throws Exception { mvc() .perform(get("/api/users/" + testUser.getId() + "/teams")) .andExpect(MockMvcResultMatchers.status().isOk()) - .andReturn(); // TODO: Document + .andDo(document("teams/list/user")) + .andReturn(); GetTeamResponse[] teams = fromJson(result.getResponse().getContentAsString(), GetTeamResponse[].class); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java index 37a3a3cc1..f0670511b 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java @@ -47,7 +47,9 @@ public void setUp() { public void removeTeamFromProjectSuccessfully() throws Exception { mvc() .perform(delete("/api/projects/" + testProject.getId() + "/teams/" + teamEntity.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()); // TODO: Document + .andExpect(MockMvcResultMatchers.status().isOk()) + .andDo(document("teams/remove/project")) + .andReturn(); List teams = teamRepository.listTeamsByProjectIdWithMembers(testProject.getId()); Assertions.assertTrue(teams.isEmpty()); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java index 8a40d5680..26b01a1e0 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java @@ -1,5 +1,6 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; @@ -42,13 +43,20 @@ public void setUp() { @Test public void removeUsersFromTeamSuccessfully() throws Exception { + ConstrainedFields fields = fields(JsonListWrapper.class); + mvc() .perform( delete("/api/teams/" + teamEntity.getId() + "/users") .content(toJson(new JsonListWrapper<>(Collections.singletonList(testUser.getId())))) .contentType(MediaType.APPLICATION_JSON)) .andExpect(MockMvcResultMatchers.status().isOk()) - .andReturn(); // TODO: Document + .andDo( + document( + "teams/remove/user", + requestFields( + fields.withPath("elements").description("A list containing user IDs")))) + .andReturn(); List teams = teamRepository.listTeamsByUserId(testUser.getId()); Assertions.assertEquals(0, teams.size()); From 241a4217927abb89b94184a96d91a82409d28561 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Fri, 12 Jun 2020 12:19:22 +0200 Subject: [PATCH 38/76] added a sidenav in the main dashboard and a teams dashboard page --- .../project/get/ListProjectsUseCase.java | 2 - .../service/project/ListProjectsService.java | 5 - .../port/driver/login/LoginUserResponse.java | 1 + .../service/login/LoginUserService.java | 2 +- .../user/LoginUserServiceTest.java | 2 +- .../LoginUserControllerTest.java | 4 +- coderadar-ui/package.json | 2 +- coderadar-ui/src/app/app.module.ts | 6 +- .../main-dashboard.component.html | 105 ++++++++++-------- .../main-dashboard.component.scss | 14 ++- .../teams-dashboard.component.css | 67 +++++++++++ .../teams-dashboard.component.html | 65 +++++++++++ .../teams-dashboard.component.ts | 33 ++++++ coderadar-ui/src/styles.scss | 1 + 14 files changed, 246 insertions(+), 63 deletions(-) create mode 100644 coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.css create mode 100644 coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html create mode 100644 coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.ts diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java index 733c6d89b..ad9f07e2e 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java @@ -7,6 +7,4 @@ public interface ListProjectsUseCase { /** @return All project currently saved in the database. */ List listProjects(); - - List listProjectsForUser(long userId); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java index a577e39e1..aa9fb10d8 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java @@ -19,9 +19,4 @@ public ListProjectsService(ListProjectsPort listProjectsPort) { public List listProjects() { return listProjectsPort.getProjects(); } - - @Override - public List listProjectsForUser(long userId) { - return null; // TODO: implement - } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/login/LoginUserResponse.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/login/LoginUserResponse.java index 77afba790..43481c349 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/login/LoginUserResponse.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/login/LoginUserResponse.java @@ -8,4 +8,5 @@ public class LoginUserResponse { private String accessToken; private String refreshToken; + private Long userId; } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/login/LoginUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/login/LoginUserService.java index cf9465852..694538ad2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/login/LoginUserService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/login/LoginUserService.java @@ -45,7 +45,7 @@ public LoginUserResponse login(LoginUserCommand command) { String accessToken = tokenService.generateAccessToken(user.getId(), user.getUsername()); String refreshToken = tokenService.generateRefreshToken(user.getId(), user.getUsername()); saveRefreshToken(user, refreshToken); - return new LoginUserResponse(accessToken, refreshToken); + return new LoginUserResponse(accessToken, refreshToken, user.getId()); } /** diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/LoginUserServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/LoginUserServiceTest.java index 31211828a..03d12082d 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/LoginUserServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/LoginUserServiceTest.java @@ -53,7 +53,7 @@ void loginUserWithUsernameAndPassword() { UsernamePasswordAuthenticationToken expectedToken = new UsernamePasswordAuthenticationToken(username, password); LoginUserResponse expectedResponse = - new LoginUserResponse(expectedAccessToken, expectedRefreshToken); + new LoginUserResponse(expectedAccessToken, expectedRefreshToken, userId); RefreshToken expectedRefreshTokenEntity = new RefreshToken().setToken(expectedRefreshToken); LoginUserCommand command = new LoginUserCommand(username, password); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java index 1304be2d4..d99df0747 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java @@ -21,7 +21,7 @@ void loginUserWithUsernameAndPassword() { LoginUserController testSubject = new LoginUserController(loginUserUseCase); LoginUserCommand command = new LoginUserCommand("username", "password"); - LoginUserResponse loginUserResponse = new LoginUserResponse("accessToken", "refreshToken"); + LoginUserResponse loginUserResponse = new LoginUserResponse("accessToken", "refreshToken", 1L); Mockito.when(loginUserUseCase.login(command)).thenReturn(loginUserResponse); @@ -32,5 +32,7 @@ void loginUserWithUsernameAndPassword() { loginUserResponse.getAccessToken(), responseEntity.getBody().getAccessToken()); Assertions.assertEquals( loginUserResponse.getRefreshToken(), responseEntity.getBody().getRefreshToken()); + Assertions.assertEquals( + loginUserResponse.getUserId(), responseEntity.getBody().getUserId()); } } diff --git a/coderadar-ui/package.json b/coderadar-ui/package.json index f5187e176..e053bbd49 100644 --- a/coderadar-ui/package.json +++ b/coderadar-ui/package.json @@ -3,7 +3,7 @@ "version": "0.5.0", "scripts": { "ng": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng", - "start": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng serve --prod", + "start": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng serve", "build": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --prod", "test": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng test", "lint": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng lint", diff --git a/coderadar-ui/src/app/app.module.ts b/coderadar-ui/src/app/app.module.ts index 424b17db6..0e7de07c8 100644 --- a/coderadar-ui/src/app/app.module.ts +++ b/coderadar-ui/src/app/app.module.ts @@ -65,11 +65,13 @@ import {ScrollingModule} from '@angular/cdk/scrolling'; import { ListViewComponent } from './view/project-dashboard/list-view/list-view.component'; import { BranchViewComponent } from './view/project-dashboard/branch-view/branch-view.component'; import { FileViewComponent } from './view/file-view/file-view.component'; +import { TeamsDashboardComponent } from './view/teams-dashboard/teams-dashboard.component'; const appRoutes: Routes = [ {path: 'login', component: LoginComponent}, {path: 'register', component: RegisterComponent}, {path: 'dashboard', component: MainDashboardComponent}, + {path: 'teams', component: TeamsDashboardComponent}, {path: 'user-settings', component: UserSettingsComponent}, {path: 'add-project', component: AddProjectComponent}, {path: 'project-configure/:id', component: ConfigureProjectComponent}, @@ -97,6 +99,7 @@ const appRoutes: Routes = [ FooterComponent, UserSettingsComponent, ProjectDashboardComponent, + TeamsDashboardComponent, ViewCommitComponent, CityViewComponent, DependencyRootComponent, @@ -106,7 +109,8 @@ const appRoutes: Routes = [ CityViewHeaderComponent, ListViewComponent, BranchViewComponent, - FileViewComponent + FileViewComponent, + TeamsDashboardComponent ], imports: [ BrowserModule, diff --git a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html index 7ba42ee12..0e61a6b3e 100644 --- a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html +++ b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html @@ -2,56 +2,65 @@
+ + + + My projects + My teams + Settings + + + +
+
-
-
+ +
+ Hello there, it looks like you haven't added any projects yet.
+ Click on the plus button to add one. +
- -
- Hello there, it looks like you haven't added any projects yet.
- Click on the plus button to add one. -
- - - - - - - - {{appComponent.trimProjectName(project.name)}} - - - - - - - - - - - - -
Project URL: {{project.vcsUrl}}
-
Project start date:   {{project.startDate}}
- - - + + + + + + + {{appComponent.trimProjectName(project.name)}} + + + + + + + + + + + + +
Project URL: {{project.vcsUrl}}
+
Project start date:   {{project.startDate}}
+ + + - - - + - - - -
-
+ + + + + + +
+
+ + diff --git a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss index d58b62d50..75e29b28a 100644 --- a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss +++ b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss @@ -32,8 +32,7 @@ .card-list mat-grid-list { width: 70%; - float: right; - margin-right: 10%; + float: left; } .card-list mat-card-header a { @@ -48,7 +47,7 @@ font-size: x-large; } -.card-list mat-card-content > div { +.card-list mat-card-content> div { padding-bottom: 10px; } @@ -57,3 +56,12 @@ margin-right: 100px; margin-top: 2px; } + +.sidenav { + top: 0; + bottom: 0; + left: 0; + right: 0; + background: ghostwhite; + min-height: calc(100vh - 220px); +} diff --git a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.css b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.css new file mode 100644 index 000000000..75e29b28a --- /dev/null +++ b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.css @@ -0,0 +1,67 @@ +.grid-container { + margin: 20px; +} + +.dashboard-card { + position: absolute; + top: 15px; + left: 15px; + right: 15px; + bottom: 15px; +} + +.more-button { + position: absolute; + top: 5px; + right: 10px; +} + +.add-button { + right: 7%; + bottom: 8%; + width: 80px; + height: 80px; + font-size: large; + position: fixed; +} + +.add-icon { + margin-top: 8px; + color: #ffffff; +} + +.card-list mat-grid-list { + width: 70%; + float: left; +} + +.card-list mat-card-header a { + font-size: 18pt; +} + +.card-list mat-card-content { + padding-left: 30px; +} + +.card-list #noProjectsMessage { + font-size: x-large; +} + +.card-list mat-card-content> div { + padding-bottom: 10px; +} + +.card-list mat-error { + float: right; + margin-right: 100px; + margin-top: 2px; +} + +.sidenav { + top: 0; + bottom: 0; + left: 0; + right: 0; + background: ghostwhite; + min-height: calc(100vh - 220px); +} diff --git a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html new file mode 100644 index 000000000..a4c6d5dc0 --- /dev/null +++ b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html @@ -0,0 +1,65 @@ + +
+ +
+ + + + My projects + My teams + Settings + + + +
+
+ + +
+ You aren't in any team yet.
+ Click on the plus button to create a team. +
+ + + + + + + + {{team.name}} + + + + + + + + + + + + + Content + + + + + + + + + + + +
+
+ + + diff --git a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.ts b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.ts new file mode 100644 index 000000000..f4bb5a804 --- /dev/null +++ b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.ts @@ -0,0 +1,33 @@ +import { Component, OnInit } from '@angular/core'; +import {Team} from "../../model/team"; +import {TeamService} from "../../service/team.service"; +import {UserService} from "../../service/user.service"; +import {FORBIDDEN} from "http-status-codes"; + +@Component({ + selector: 'app-teams-dashboard', + templateUrl: './teams-dashboard.component.html', + styleUrls: ['./teams-dashboard.component.css'] +}) +export class TeamsDashboardComponent implements OnInit { + waiting = false; + + teams: Team[] = []; + + constructor(private teamService: TeamService, private userService: UserService) { } + + ngOnInit() { + this.getTeams(); + } + + private getTeams() { + this.teamService.listTeamsForUser(UserService.getLoggedInUser().userId).then(value => + this.teams = value.body + ) .catch(e => { + if (e.status && e.status === FORBIDDEN) { //TODO: UNAUTHORIZED + this.userService.refresh(() => this.getTeams()); + } + }); + } + +} diff --git a/coderadar-ui/src/styles.scss b/coderadar-ui/src/styles.scss index b4b32dfd6..332540fef 100644 --- a/coderadar-ui/src/styles.scss +++ b/coderadar-ui/src/styles.scss @@ -23,6 +23,7 @@ footer { bottom: 0; left: 0; z-index: 10; + margin-top: -20px; height: 60px; } From 3a2393192ea2270e50406fed2c885663d5f888e7 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Fri, 12 Jun 2020 12:36:40 +0200 Subject: [PATCH 39/76] fix bug that caused commits not to be returned for certain emails --- .../CoderadarConfigurationProperties.java | 13 +++++----- .../analyzer/domain/MetricValue.java | 3 ++- .../port/driver/AnalyzeCommitUseCase.java | 1 + .../service/AnalyzeCommitService.java | 3 ++- .../analyzer/service/AnalyzeFileService.java | 3 ++- .../service/AnalyzerPluginService.java | 9 ++++--- .../analyzer/service/AnalyzingService.java | 5 ++-- .../service/ListAnalyzersService.java | 3 ++- .../contributor/domain/Contributor.java | 3 ++- .../port/driven/ComputeContributorsPort.java | 1 + .../port/driven/ListContributorsPort.java | 1 + .../port/driven/SaveContributorsPort.java | 1 + .../driver/GetContributorsForPathCommand.java | 3 ++- .../port/driver/ListContributorsUseCase.java | 1 + .../port/driver/MergeContributorsCommand.java | 9 ++++--- .../port/driver/UpdateContributorCommand.java | 3 ++- .../service/ListContributorsService.java | 3 ++- .../dependencymap/domain/CompareNode.java | 5 ++-- .../coderadar/dependencymap/domain/Node.java | 5 ++-- .../projectadministration/domain/Commit.java | 3 ++- .../projectadministration/domain/File.java | 5 ++-- .../projectadministration/domain/Project.java | 3 ++- .../port/driven/analyzer/AddCommitsPort.java | 1 + .../port/driven/analyzer/SaveCommitPort.java | 1 + .../port/driven/analyzer/SaveMetricPort.java | 1 + .../ListAnalyzerConfigurationsPort.java | 1 + .../port/driven/branch/ListBranchesPort.java | 1 + .../ListFilePatternsOfProjectPort.java | 1 + .../module/ListModulesOfProjectPort.java | 1 + .../port/driven/project/ListProjectsPort.java | 1 + .../CreateAnalyzerConfigurationCommand.java | 3 ++- .../ListAnalyzerConfigurationsUseCase.java | 1 + .../UpdateAnalyzerConfigurationCommand.java | 3 ++- .../branch/list/ListBranchesUseCase.java | 1 + .../create/CreateFilePatternCommand.java | 5 ++-- .../get/ListFilePatternsOfProjectUseCase.java | 1 + .../module/create/CreateModuleCommand.java | 3 ++- .../get/ListModulesOfProjectUseCase.java | 1 + .../project/create/CreateProjectCommand.java | 9 ++++--- .../project/get/ListProjectsUseCase.java | 1 + .../project/update/UpdateProjectCommand.java | 7 +++--- .../CreateAnalyzerConfigurationService.java | 3 ++- .../ListAnalyzerConfigurationsService.java | 3 ++- .../UpdateAnalyzerConfigurationService.java | 3 ++- .../service/branch/ListBranchesService.java | 3 ++- .../ListFilePatternsOfProjectService.java | 3 ++- .../module/ListModulesOfProjectService.java | 3 ++- .../service/project/CreateProjectService.java | 7 +++--- .../service/project/DeleteProjectService.java | 3 ++- .../service/project/ListProjectsService.java | 3 ++- .../service/project/ScanProjectScheduler.java | 13 +++++----- .../service/project/UpdateProjectService.java | 7 +++--- .../coderadar/query/domain/CommitLog.java | 3 ++- .../domain/CommitProfileRatingsQuery.java | 9 ++++--- .../query/domain/ContributorsForFile.java | 3 ++- .../coderadar/query/domain/DateRange.java | 5 ++-- .../coderadar/query/domain/DeltaTree.java | 5 ++-- .../domain/FileAndCommitsForTimePeriod.java | 3 ++- .../query/domain/FileContentWithMetrics.java | 3 ++- .../coderadar/query/domain/FileTree.java | 3 ++- .../coderadar/query/domain/MetricTree.java | 5 ++-- .../query/domain/MetricWithFindings.java | 3 ++- .../query/port/driven/GetCommitLogPort.java | 1 + .../port/driven/GetCommitsInProjectPort.java | 1 + .../port/driven/GetCriticalFilesPort.java | 1 + .../driven/GetMetricValuesOfCommitPort.java | 1 + .../GetMetricsAndFindingsForFilePort.java | 1 + .../port/driver/GetCommitLogUseCase.java | 1 + .../driver/GetCommitsInProjectUseCase.java | 1 + .../GetMetricValuesOfCommitCommand.java | 7 +++--- .../GetMetricValuesOfCommitUseCase.java | 1 + .../GetCriticalFilesUseCase.java | 1 + .../GetFilesWithContributorsCommand.java | 5 ++-- .../GetFrequentlyChangedFilesCommand.java | 5 ++-- .../GetDeltaTreeForTwoCommitsCommand.java | 7 +++--- .../GetFileContentWithMetricsCommand.java | 3 ++- .../driver/filediff/GetFileDiffCommand.java | 3 ++- .../GetMetricTreeForCommitCommand.java | 7 +++--- .../GetAvailableMetricsInProjectService.java | 3 ++- .../query/service/GetCommitLogService.java | 3 ++- .../service/GetCommitsInProjectService.java | 3 ++- .../service/GetCriticalFilesService.java | 3 ++- .../GetFileContentWithMetricsService.java | 3 ++- .../GetMetricValuesOfCommitService.java | 3 ++- .../useradministration/domain/Team.java | 5 ++-- .../port/driven/ListProjectsForTeamPort.java | 1 + .../port/driven/ListProjectsForUserPort.java | 1 + .../port/driven/ListTeamsForProjectPort.java | 1 + .../port/driven/ListTeamsForUserPort.java | 1 + .../port/driven/ListTeamsPort.java | 1 + .../port/driven/ListUsersForProjectPort.java | 1 + .../port/driven/ListUsersPort.java | 1 + .../driver/CoderadarPasswordValidator.java | 5 ++-- .../port/driver/ValidPassword.java | 10 ++++---- .../get/ListProjectsForUserUseCase.java | 1 + .../port/driver/get/ListUsersUseCase.java | 1 + .../port/driver/login/LoginUserCommand.java | 3 ++- .../password/ChangePasswordCommand.java | 3 ++- .../driver/refresh/RefreshTokenCommand.java | 3 ++- .../driver/register/RegisterUserCommand.java | 3 ++- .../teams/create/CreateTeamCommand.java | 5 ++-- .../teams/get/ListProjectsForTeamUseCase.java | 1 + .../teams/get/ListTeamsForProjectUseCase.java | 1 + .../teams/get/ListTeamsForUserUseCase.java | 1 + .../driver/teams/get/ListTeamsUseCase.java | 1 + .../teams/get/ListUsersForProjectUseCase.java | 1 + .../get/ListProjectsForUserService.java | 3 ++- .../service/get/ListUsersService.java | 3 ++- .../security/AuthenticationTokenFilter.java | 11 ++++---- .../CoderadarSecurityConfiguration.java | 3 ++- .../security/CoderadarUserDetailService.java | 5 ++-- .../security/CoderadarUserDetails.java | 3 ++- .../service/security/SecretKeyService.java | 5 ++-- .../service/security/TokenService.java | 3 ++- .../service/teams/AddUsersToTeamService.java | 3 ++- .../teams/RemoveUsersFromTeamService.java | 3 ++- .../teams/get/ListProjectsForTeamService.java | 3 ++- .../teams/get/ListTeamsForProjectService.java | 3 ++- .../teams/get/ListTeamsForUserService.java | 3 ++- .../service/teams/get/ListTeamsService.java | 3 ++- .../teams/get/ListUsersForProjectService.java | 3 ++- .../driven/ExtractProjectCommitsPort.java | 1 + .../port/driven/GetAvailableBranchesPort.java | 1 + .../driven/GetDiffEntriesForCommitsPort.java | 1 + .../port/driven/GetRawCommitContentPort.java | 1 + .../driven/UpdateLocalRepositoryPort.java | 1 + .../driver/ExtractProjectCommitsUseCase.java | 1 + .../update/UpdateLocalRepositoryUseCase.java | 1 + .../service/ExtractProjectCommitsService.java | 3 ++- .../service/UpdateLocalRepositoryService.java | 3 ++- ...reateAnalyzerConfigurationServiceTest.java | 11 ++++---- ...eleteAnalyzerConfigurationServiceTest.java | 8 +++--- .../GetAnalyzerConfigurationServiceTest.java | 6 ++--- ...rConfigurationsFromProjectServiceTest.java | 13 +++++----- ...pdateAnalyzerConfigurationServiceTest.java | 7 +++--- .../CreateFilePatternServiceTest.java | 6 ++--- .../DeleteFilePatternServiceTest.java | 8 +++--- .../GetFilePatternServiceTest.java | 6 ++--- .../ListFilePatternsOfProjectServiceTest.java | 13 +++++----- .../module/CreateModuleServiceTest.java | 10 ++++---- .../module/DeleteModuleServiceTest.java | 8 +++--- .../module/GetModuleServiceTest.java | 6 ++--- .../ListModulesOfProjectServiceTest.java | 13 +++++----- .../project/GetProjectServiceTest.java | 9 ++++--- .../project/ListProjectsServiceTest.java | 11 ++++---- .../project/UpdateProjectServiceTest.java | 17 +++++++------ .../user/ChangePasswordServiceTest.java | 4 +-- .../user/GetUserServiceTest.java | 6 ++--- .../user/LoginUserServiceTest.java | 8 +++--- .../user/RefreshTokenServiceTest.java | 10 ++++---- .../user/RegisterUserServiceTest.java | 12 ++++----- ...etAnalyzerConfigurationResponseMapper.java | 1 + .../rest/GetBranchResponseMapper.java | 1 + .../rest/GetCommitResponseMapper.java | 1 + .../rest/GetContributorResponseMapper.java | 1 + .../rest/GetFilePatternResponseMapper.java | 1 + .../rest/GetModuleResponseMapper.java | 1 + .../rest/GetProjectResponseMapper.java | 1 + .../coderadar/rest/GetTeamResponseMapper.java | 5 ++-- .../coderadar/rest/GetUserResponseMapper.java | 1 + .../coderadar/rest/JsonListWrapper.java | 5 ++-- .../GetAnalyzerConfigurationController.java | 4 +-- ...erConfigurationsFromProjectController.java | 7 +++--- .../analyzing/ListAnalyzersController.java | 3 ++- .../rest/branch/ListBranchesController.java | 7 +++--- .../contributor/GetContributorController.java | 4 +-- .../ListContributorsController.java | 7 +++--- .../FileAndCommitsForTimePeriodResponse.java | 3 ++- .../rest/domain/GetContributorResponse.java | 3 ++- .../rest/domain/GetProjectResponse.java | 3 ++- .../rest/domain/GetTeamResponse.java | 3 ++- .../filepattern/GetFilePatternController.java | 4 +-- .../ListFilePatternsOfProjectController.java | 7 +++--- .../rest/module/GetModuleController.java | 4 +-- .../ListModulesOfProjectController.java | 7 +++--- .../rest/project/CreateProjectController.java | 3 ++- .../rest/project/GetProjectController.java | 4 +-- .../rest/project/ListProjectsController.java | 7 +++--- .../rest/project/UpdateProjectController.java | 3 ++- ...etAvailableMetricsInProjectController.java | 3 ++- .../rest/query/GetCommitLogController.java | 3 ++- .../query/GetCommitsInProjectController.java | 3 ++- .../query/GetCriticalFilesController.java | 9 ++++--- .../GetMetricValuesOfCommitController.java | 3 ++- .../useradministration/GetUserController.java | 4 +-- .../ListProjectsForUserController.java | 7 +++--- .../ListUsersController.java | 7 +++--- .../ListUsersForProjectController.java | 7 +++--- .../teams/GetTeamController.java | 4 +-- .../teams/ListProjectsForTeamController.java | 7 +++--- .../teams/ListTeamsController.java | 7 +++--- .../teams/ListTeamsForProjectController.java | 7 +++--- .../teams/ListTeamsForUserController.java | 7 +++--- ...alyzerConfigurationResponseMapperTest.java | 5 ++-- .../unit/GetBranchResponseMapperTest.java | 5 ++-- .../unit/GetCommitResponseMapperTest.java | 5 ++-- .../GetContributorResponseMapperTest.java | 5 ++-- .../GetFilePatternResponseMapperTest.java | 5 ++-- .../unit/GetModuleResponseMapperTest.java | 5 ++-- .../unit/GetProjectResponseMapperTest.java | 5 ++-- .../GetTeamResponseMapperControllerTest.java | 5 ++-- .../rest/unit/GetTeamResponseMapperTest.java | 5 ++-- .../rest/unit/GetUserResponseMapperTest.java | 5 ++-- ...teAnalyzerConfigurationControllerTest.java | 4 +-- ...teAnalyzerConfigurationControllerTest.java | 4 +-- ...etAnalyzerConfigurationControllerTest.java | 4 +-- ...nfigurationsFromProjectControllerTest.java | 9 ++++--- ...teAnalyzerConfigurationControllerTest.java | 4 +-- .../CreateFilePatternControllerTest.java | 4 +-- .../DeleteFilePatternControllerTest.java | 4 +-- .../GetFilePatternControllerTest.java | 4 +-- ...stFilePatternsOfProjectControllerTest.java | 9 ++++--- .../module/CreateModuleControllerTest.java | 4 +-- .../module/DeleteModuleControllerTest.java | 4 +-- .../unit/module/GetModuleControllerTest.java | 4 +-- .../ListModulesOfProjectControllerTest.java | 9 ++++--- .../project/CreateProjectControllerTest.java | 9 ++++--- .../project/DeleteProjectControllerTest.java | 4 +-- .../project/GetProjectControllerTest.java | 4 +-- .../project/ListProjectsControllerTest.java | 9 ++++--- .../project/UpdateProjectControllerTest.java | 9 ++++--- .../ChangePasswordControllerTest.java | 4 +-- .../GetUserControllerTest.java | 4 +-- .../ListProjectsForUserControllerTest.java | 9 ++++--- .../ListUsersControllerTest.java | 9 ++++--- .../ListUsersForProjectControllerTest.java | 9 ++++--- .../LoginUserControllerTest.java | 4 +-- .../RefreshTokenControllerTest.java | 4 +-- .../RegisterUserControllerTest.java | 4 +-- .../RemoveUserFromProjectControllerTest.java | 4 +-- .../SetUserRoleForProjectControllerTest.java | 4 +-- .../teams/AddTeamToProjectControllerTest.java | 4 +-- .../teams/AddUsersToTeamControllerTest.java | 11 ++++---- .../teams/CreateTeamControllerTest.java | 9 ++++--- .../teams/DeleteTeamControllerTest.java | 6 ++--- .../teams/GetTeamControllerTest.java | 7 +++--- .../ListProjectsForTeamControllerTest.java | 9 ++++--- .../teams/ListTeamsControllerTest.java | 11 ++++---- .../ListTeamsForProjectControllerTest.java | 11 ++++---- .../teams/ListTeamsForUserControllerTest.java | 11 ++++---- .../RemoveTeamFromProjectControllerTest.java | 4 +-- .../RemoveUsersFromTeamControllerTest.java | 11 ++++---- .../rest/ControllerTestTemplate.java | 9 ++++--- .../coderadar/rest/JsonHelper.java | 3 ++- .../coderadar/rest/ResultMatchers.java | 4 +-- .../PaySimProjectIntegrationTest.java | 25 ++++++++++--------- .../analysis/ResetAnalysisControllerTest.java | 21 ++++++++-------- ...alyzerConfigControllerIntegrationTest.java | 10 ++++---- ...alyzerConfigControllerIntegrationTest.java | 4 +-- ...alyzerConfigControllerIntegrationTest.java | 8 +++--- ...sFromProjectControllerIntegrationTest.java | 11 ++++---- ...alyzerConfigControllerIntegrationTest.java | 4 +-- ...ListAnalyzerControllerIntegrationTest.java | 9 ++++--- .../rest/branches/DeleteBranchTest.java | 3 ++- .../branches/ListBranchesControllerTest.java | 11 ++++---- .../branches/SaveProjectWithBranchesTest.java | 11 ++++---- ...tContributorControllerIntegrationTest.java | 21 ++++++++-------- ...ContributorsControllerIntegrationTest.java | 19 +++++++------- ...ContributorsControllerIntegrationTest.java | 17 +++++++------ ...eContributorControllerIntegrationTest.java | 13 +++++----- .../rest/dependencymap/CompareTreeTest.java | 21 ++++++++-------- .../rest/dependencymap/TreeTest.java | 23 +++++++++-------- ...eFilePatternControllerIntegrationTest.java | 6 ++--- ...eFilePatternControllerIntegrationTest.java | 4 +-- ...tFilePatternControllerIntegrationTest.java | 8 +++--- ...rnsOfProjectControllerIntegrationTest.java | 11 ++++---- ...CreateModuleControllerIntegrationTest.java | 13 +++++----- ...DeleteModuleControllerIntegrationTest.java | 4 +-- .../GetModuleControllerIntegrationTest.java | 8 +++--- ...lesOfProjectControllerIntegrationTest.java | 11 ++++---- ...reateProjectControllerIntegrationTest.java | 15 +++++------ ...eleteProjectControllerIntegrationTest.java | 15 +++++------ .../GetProjectControllerIntegrationTest.java | 11 ++++---- ...ListProjectsControllerIntegrationTest.java | 11 ++++---- ...pdateProjectControllerIntegrationTest.java | 9 ++++--- ...ailableMetricsInProjectControllerTest.java | 17 +++++++------ .../query/GetCommitLogControllerTest.java | 19 +++++++------- .../GetCommitsInProjectControllerTest.java | 19 +++++++------- .../query/GetCriticalFilesControllerTest.java | 21 ++++++++-------- ...tDeltaTreeForTwoCommitsControllerTest.java | 23 +++++++++-------- ...tFileContentWithMetricsControllerTest.java | 15 +++++------ .../rest/query/GetFileDiffControllerTest.java | 15 +++++------ .../GetFileTreeForCommitControllerTest.java | 17 +++++++------ .../GetMetricTreeForCommitControllerTest.java | 19 +++++++------- ...GetMetricValuesOfCommitControllerTest.java | 21 ++++++++-------- ...angePasswordControllerIntegrationTest.java | 6 ++--- .../GetUserControllerIntegrationTest.java | 8 +++--- ...jectsForUserControllerIntegrationTest.java | 11 ++++---- .../ListUsersControllerIntegrationTest.java | 6 ++--- ...rsForProjectControllerIntegrationTest.java | 11 ++++---- .../LoginUserControllerIntegrationTest.java | 8 +++--- ...RefreshTokenControllerIntegrationTest.java | 9 ++++--- ...RegisterUserControllerIntegrationTest.java | 6 ++--- ...rFromProjectControllerIntegrationTest.java | 9 ++++--- ...leForProjectControllerIntegrationTest.java | 9 ++++--- ...eamToProjectControllerIntegrationTest.java | 11 ++++---- ...dUsersToTeamControllerIntegrationTest.java | 11 ++++---- .../CreateTeamControllerIntegrationTest.java | 11 ++++---- .../DeleteTeamControllerIntegrationTest.java | 9 ++++--- .../GetTeamControllerIntegrationTest.java | 6 ++--- ...jectsForTeamControllerIntegrationTest.java | 11 ++++---- .../ListTeamsControllerIntegrationTest.java | 6 ++--- ...msForProjectControllerIntegrationTest.java | 11 ++++---- ...TeamsForUserControllerIntegrationTest.java | 9 ++++--- ...mFromProjectControllerIntegrationTest.java | 11 ++++---- ...sersFromTeamControllerIntegrationTest.java | 11 ++++---- .../src/app/service/project.service.ts | 2 +- 307 files changed, 1038 insertions(+), 792 deletions(-) diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/CoderadarConfigurationProperties.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/CoderadarConfigurationProperties.java index 7556046cf..20a931c82 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/CoderadarConfigurationProperties.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/CoderadarConfigurationProperties.java @@ -1,17 +1,18 @@ package io.reflectoring.coderadar; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Locale; -import javax.annotation.PostConstruct; -import javax.validation.constraints.NotNull; import lombok.Data; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; +import javax.annotation.PostConstruct; +import javax.validation.constraints.NotNull; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Locale; + /** Provides access to all configuration parameters of the coderadar application. */ @Component @ConfigurationProperties("coderadar") diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/domain/MetricValue.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/domain/MetricValue.java index 2bc24c9b3..269b9c38e 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/domain/MetricValue.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/domain/MetricValue.java @@ -1,9 +1,10 @@ package io.reflectoring.coderadar.analyzer.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; +import java.util.List; + /** A single metric for a given File and Commit. */ @Data @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/port/driver/AnalyzeCommitUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/port/driver/AnalyzeCommitUseCase.java index e3c146f0c..6c0281b19 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/port/driver/AnalyzeCommitUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/port/driver/AnalyzeCommitUseCase.java @@ -4,6 +4,7 @@ import io.reflectoring.coderadar.plugin.api.SourceCodeFileAnalyzerPlugin; import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.projectadministration.domain.Project; + import java.util.List; public interface AnalyzeCommitUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeCommitService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeCommitService.java index 54052cb93..2830ac808 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeCommitService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeCommitService.java @@ -13,11 +13,12 @@ import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.vcs.UnableToGetCommitContentException; import io.reflectoring.coderadar.vcs.port.driven.GetRawCommitContentPort; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; -import org.springframework.stereotype.Service; /** Performs analysis on a commit. */ @Service diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeFileService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeFileService.java index dab09a4d8..f1049c49b 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeFileService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeFileService.java @@ -3,11 +3,12 @@ import io.reflectoring.coderadar.plugin.api.AnalyzerFileFilter; import io.reflectoring.coderadar.plugin.api.FileMetrics; import io.reflectoring.coderadar.plugin.api.SourceCodeFileAnalyzerPlugin; -import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.util.List; + /** Combines multiple FileAnalyzerPlugins to calculate metrics for a single file. */ @Service public class AnalyzeFileService { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzerPluginService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzerPluginService.java index 186da17c0..888e86ae5 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzerPluginService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzerPluginService.java @@ -2,16 +2,17 @@ import io.reflectoring.coderadar.plugin.api.ConfigurableAnalyzerPlugin; import io.reflectoring.coderadar.plugin.api.SourceCodeFileAnalyzerPlugin; +import org.reflections.Reflections; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.lang.reflect.InvocationTargetException; import java.util.*; -import org.reflections.Reflections; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; @Service public class AnalyzerPluginService { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzingService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzingService.java index 69a41649f..56a353d0d 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzingService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzingService.java @@ -17,12 +17,13 @@ import io.reflectoring.coderadar.projectadministration.service.ProcessProjectService; import io.reflectoring.coderadar.query.port.driven.GetAvailableMetricsInProjectPort; import io.reflectoring.coderadar.query.port.driven.GetCommitsInProjectPort; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; + @Service public class AnalyzingService implements StartAnalyzingUseCase, StopAnalyzingUseCase, GetAnalyzingStatusUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/ListAnalyzersService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/ListAnalyzersService.java index c54e436bf..a2206a86f 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/ListAnalyzersService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/ListAnalyzersService.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.analyzer.service; import io.reflectoring.coderadar.analyzer.port.driver.ListAnalyzersUseCase; -import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListAnalyzersService implements ListAnalyzersUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/domain/Contributor.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/domain/Contributor.java index 529de0248..6a3de3066 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/domain/Contributor.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/domain/Contributor.java @@ -1,9 +1,10 @@ package io.reflectoring.coderadar.contributor.domain; -import java.util.Set; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Set; + @Data @NoArgsConstructor public class Contributor { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ComputeContributorsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ComputeContributorsPort.java index 927615391..fd0382eb9 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ComputeContributorsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ComputeContributorsPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.contributor.port.driven; import io.reflectoring.coderadar.contributor.domain.Contributor; + import java.util.List; public interface ComputeContributorsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ListContributorsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ListContributorsPort.java index a56aac71b..8ef96179a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ListContributorsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ListContributorsPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.contributor.port.driven; import io.reflectoring.coderadar.contributor.domain.Contributor; + import java.util.List; public interface ListContributorsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/SaveContributorsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/SaveContributorsPort.java index a223504e7..7b8d0db37 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/SaveContributorsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/SaveContributorsPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.contributor.port.driven; import io.reflectoring.coderadar.contributor.domain.Contributor; + import java.util.List; public interface SaveContributorsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/GetContributorsForPathCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/GetContributorsForPathCommand.java index b3593b688..722a70163 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/GetContributorsForPathCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/GetContributorsForPathCommand.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.contributor.port.driver; -import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/ListContributorsUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/ListContributorsUseCase.java index dd27c1a19..65271bd34 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/ListContributorsUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/ListContributorsUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.contributor.port.driver; import io.reflectoring.coderadar.contributor.domain.Contributor; + import java.util.List; public interface ListContributorsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/MergeContributorsCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/MergeContributorsCommand.java index 3967df3b7..10805f9f0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/MergeContributorsCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/MergeContributorsCommand.java @@ -1,13 +1,14 @@ package io.reflectoring.coderadar.contributor.port.driver; -import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.List; + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/UpdateContributorCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/UpdateContributorCommand.java index 79e12a2c8..9ca7b26be 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/UpdateContributorCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/UpdateContributorCommand.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.contributor.port.driver; -import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/service/ListContributorsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/service/ListContributorsService.java index 5c4c26460..6ee737271 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/service/ListContributorsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/service/ListContributorsService.java @@ -6,9 +6,10 @@ import io.reflectoring.coderadar.contributor.port.driver.ListContributorsUseCase; import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListContributorsService implements ListContributorsUseCase { private final GetProjectPort getProjectPort; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java index 20a049994..33857ab09 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java @@ -1,13 +1,14 @@ package io.reflectoring.coderadar.dependencymap.domain; import io.reflectoring.coderadar.plugin.api.ChangeType; +import lombok.Getter; +import lombok.Setter; + import java.util.ArrayDeque; import java.util.Deque; import java.util.HashSet; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import lombok.Getter; -import lombok.Setter; @Getter @Setter diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/Node.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/Node.java index af371281a..9ed836be5 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/Node.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/Node.java @@ -1,11 +1,12 @@ package io.reflectoring.coderadar.dependencymap.domain; +import lombok.Getter; +import lombok.Setter; + import java.util.HashSet; import java.util.List; import java.util.Stack; import java.util.concurrent.CopyOnWriteArrayList; -import lombok.Getter; -import lombok.Setter; @Getter @Setter diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Commit.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Commit.java index 66bf35556..b0424345a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Commit.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Commit.java @@ -1,9 +1,10 @@ package io.reflectoring.coderadar.projectadministration.domain; -import java.util.List; import lombok.Data; import lombok.ToString; +import java.util.List; + /** Metadata about a commit to a Git repository. */ @Data public class Commit { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/File.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/File.java index 005f9dfe7..56978fbbe 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/File.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/File.java @@ -1,11 +1,12 @@ package io.reflectoring.coderadar.projectadministration.domain; -import java.util.Collections; -import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import java.util.Collections; +import java.util.List; + /** Represents a file in a VCS repository. */ @NoArgsConstructor @EqualsAndHashCode diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java index 0b46dc9a5..881f983e7 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java @@ -1,9 +1,10 @@ package io.reflectoring.coderadar.projectadministration.domain; import io.reflectoring.coderadar.useradministration.domain.Team; +import lombok.Data; + import java.util.Date; import java.util.List; -import lombok.Data; /** A Coderadar project that defines the source of files that are to be analyzed. */ @Data diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/AddCommitsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/AddCommitsPort.java index f5c5f909a..d3c34cb32 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/AddCommitsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/AddCommitsPort.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.projectadministration.domain.Commit; + import java.util.List; public interface AddCommitsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveCommitPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveCommitPort.java index 649148296..879ae598f 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveCommitPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveCommitPort.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.projectadministration.domain.Commit; + import java.util.List; public interface SaveCommitPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveMetricPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveMetricPort.java index 0ad1e79cd..78eeba795 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveMetricPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveMetricPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.projectadministration.port.driven.analyzer; import io.reflectoring.coderadar.analyzer.domain.MetricValue; + import java.util.List; import java.util.Map; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzerconfig/ListAnalyzerConfigurationsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzerconfig/ListAnalyzerConfigurationsPort.java index 026675f10..abdd77c2a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzerconfig/ListAnalyzerConfigurationsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzerconfig/ListAnalyzerConfigurationsPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig; import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; + import java.util.List; public interface ListAnalyzerConfigurationsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/branch/ListBranchesPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/branch/ListBranchesPort.java index 33043e3a1..96555ea57 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/branch/ListBranchesPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/branch/ListBranchesPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.projectadministration.port.driven.branch; import io.reflectoring.coderadar.projectadministration.domain.Branch; + import java.util.List; public interface ListBranchesPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/filepattern/ListFilePatternsOfProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/filepattern/ListFilePatternsOfProjectPort.java index a319d24ea..acdbdc988 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/filepattern/ListFilePatternsOfProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/filepattern/ListFilePatternsOfProjectPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.projectadministration.port.driven.filepattern; import io.reflectoring.coderadar.projectadministration.domain.FilePattern; + import java.util.List; public interface ListFilePatternsOfProjectPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/module/ListModulesOfProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/module/ListModulesOfProjectPort.java index 2de8cb260..fc82219d3 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/module/ListModulesOfProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/module/ListModulesOfProjectPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.projectadministration.port.driven.module; import io.reflectoring.coderadar.projectadministration.domain.Module; + import java.util.List; public interface ListModulesOfProjectPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/project/ListProjectsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/project/ListProjectsPort.java index 09b42e884..9639567fe 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/project/ListProjectsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/project/ListProjectsPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.projectadministration.port.driven.project; import io.reflectoring.coderadar.projectadministration.domain.Project; + import java.util.List; public interface ListProjectsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/create/CreateAnalyzerConfigurationCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/create/CreateAnalyzerConfigurationCommand.java index dc32bd931..05d553530 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/create/CreateAnalyzerConfigurationCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/create/CreateAnalyzerConfigurationCommand.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create; -import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/get/ListAnalyzerConfigurationsUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/get/ListAnalyzerConfigurationsUseCase.java index fb7c44da3..b49ac165f 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/get/ListAnalyzerConfigurationsUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/get/ListAnalyzerConfigurationsUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get; import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; + import java.util.List; public interface ListAnalyzerConfigurationsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/update/UpdateAnalyzerConfigurationCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/update/UpdateAnalyzerConfigurationCommand.java index f6e28229a..c5797903a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/update/UpdateAnalyzerConfigurationCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/update/UpdateAnalyzerConfigurationCommand.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update; -import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/branch/list/ListBranchesUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/branch/list/ListBranchesUseCase.java index 99dfb7585..4deed86b5 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/branch/list/ListBranchesUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/branch/list/ListBranchesUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.projectadministration.port.driver.branch.list; import io.reflectoring.coderadar.projectadministration.domain.Branch; + import java.util.List; public interface ListBranchesUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/create/CreateFilePatternCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/create/CreateFilePatternCommand.java index 482b98889..64b4d32a3 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/create/CreateFilePatternCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/create/CreateFilePatternCommand.java @@ -1,12 +1,13 @@ package io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/get/ListFilePatternsOfProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/get/ListFilePatternsOfProjectUseCase.java index 3b8596f29..8e3680671 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/get/ListFilePatternsOfProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/get/ListFilePatternsOfProjectUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get; import io.reflectoring.coderadar.projectadministration.domain.FilePattern; + import java.util.List; public interface ListFilePatternsOfProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/create/CreateModuleCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/create/CreateModuleCommand.java index 93db23585..cd75fc825 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/create/CreateModuleCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/create/CreateModuleCommand.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.projectadministration.port.driver.module.create; -import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/get/ListModulesOfProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/get/ListModulesOfProjectUseCase.java index a7d197f0a..92f888cb1 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/get/ListModulesOfProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/get/ListModulesOfProjectUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.projectadministration.port.driver.module.get; import io.reflectoring.coderadar.projectadministration.domain.Module; + import java.util.List; public interface ListModulesOfProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/create/CreateProjectCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/create/CreateProjectCommand.java index 2b05fbe84..2ba55a839 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/create/CreateProjectCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/create/CreateProjectCommand.java @@ -1,14 +1,15 @@ package io.reflectoring.coderadar.projectadministration.port.driver.project.create; -import java.util.Date; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Past; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.URL; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Past; +import java.util.Date; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java index ad9f07e2e..3620c94fb 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.projectadministration.port.driver.project.get; import io.reflectoring.coderadar.projectadministration.domain.Project; + import java.util.List; public interface ListProjectsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/update/UpdateProjectCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/update/UpdateProjectCommand.java index 43f5af572..9227cbccc 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/update/UpdateProjectCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/update/UpdateProjectCommand.java @@ -1,13 +1,14 @@ package io.reflectoring.coderadar.projectadministration.port.driver.project.update; -import java.util.Date; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.URL; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/CreateAnalyzerConfigurationService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/CreateAnalyzerConfigurationService.java index c99cf3333..d34ba19b1 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/CreateAnalyzerConfigurationService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/CreateAnalyzerConfigurationService.java @@ -7,11 +7,12 @@ import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.CreateAnalyzerConfigurationPort; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationUseCase; -import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class CreateAnalyzerConfigurationService implements CreateAnalyzerConfigurationUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/ListAnalyzerConfigurationsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/ListAnalyzerConfigurationsService.java index fc25104e9..d4a51634a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/ListAnalyzerConfigurationsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/ListAnalyzerConfigurationsService.java @@ -5,9 +5,10 @@ import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.ListAnalyzerConfigurationsPort; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.ListAnalyzerConfigurationsUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListAnalyzerConfigurationsService implements ListAnalyzerConfigurationsUseCase { private final ListAnalyzerConfigurationsPort port; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/UpdateAnalyzerConfigurationService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/UpdateAnalyzerConfigurationService.java index 2765ab04a..6008d3444 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/UpdateAnalyzerConfigurationService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/UpdateAnalyzerConfigurationService.java @@ -8,11 +8,12 @@ import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.UpdateAnalyzerConfigurationPort; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update.UpdateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update.UpdateAnalyzerConfigurationUseCase; -import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class UpdateAnalyzerConfigurationService implements UpdateAnalyzerConfigurationUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/branch/ListBranchesService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/branch/ListBranchesService.java index 69ff5508b..0db637719 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/branch/ListBranchesService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/branch/ListBranchesService.java @@ -5,9 +5,10 @@ import io.reflectoring.coderadar.projectadministration.port.driven.branch.ListBranchesPort; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.port.driver.branch.list.ListBranchesUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListBranchesService implements ListBranchesUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/filepattern/ListFilePatternsOfProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/filepattern/ListFilePatternsOfProjectService.java index 263326176..dcaedfe2e 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/filepattern/ListFilePatternsOfProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/filepattern/ListFilePatternsOfProjectService.java @@ -5,9 +5,10 @@ import io.reflectoring.coderadar.projectadministration.port.driven.filepattern.ListFilePatternsOfProjectPort; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.ListFilePatternsOfProjectUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListFilePatternsOfProjectService implements ListFilePatternsOfProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/module/ListModulesOfProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/module/ListModulesOfProjectService.java index 438336008..1cac5c59c 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/module/ListModulesOfProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/module/ListModulesOfProjectService.java @@ -5,9 +5,10 @@ import io.reflectoring.coderadar.projectadministration.port.driven.module.ListModulesOfProjectPort; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.port.driver.module.get.ListModulesOfProjectUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListModulesOfProjectService implements ListModulesOfProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/CreateProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/CreateProjectService.java index 49af504d6..69c8a4196 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/CreateProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/CreateProjectService.java @@ -20,14 +20,15 @@ import io.reflectoring.coderadar.vcs.port.driver.ExtractProjectCommitsUseCase; import io.reflectoring.coderadar.vcs.port.driver.clone.CloneRepositoryCommand; import io.reflectoring.coderadar.vcs.port.driver.clone.CloneRepositoryUseCase; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + import java.time.LocalDate; import java.time.ZoneId; import java.util.Date; import java.util.List; import java.util.UUID; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; @Service public class CreateProjectService implements CreateProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/DeleteProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/DeleteProjectService.java index 6ae86c982..cbe4638a0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/DeleteProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/DeleteProjectService.java @@ -7,11 +7,12 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.delete.DeleteProjectUseCase; import io.reflectoring.coderadar.projectadministration.service.ProcessProjectService; import io.reflectoring.coderadar.vcs.port.driven.DeleteLocalRepositoryPort; -import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.io.IOException; + @Service public class DeleteProjectService implements DeleteProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java index aa9fb10d8..0492daf70 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java @@ -3,9 +3,10 @@ import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driven.project.ListProjectsPort; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.ListProjectsUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListProjectsService implements ListProjectsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ScanProjectScheduler.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ScanProjectScheduler.java index f312d210b..ee8db0327 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ScanProjectScheduler.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ScanProjectScheduler.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.projectadministration.service.project; -import static io.reflectoring.coderadar.projectadministration.service.project.CreateProjectService.getProjectDateRange; - import io.reflectoring.coderadar.CoderadarConfigurationProperties; import io.reflectoring.coderadar.projectadministration.ModuleAlreadyExistsException; import io.reflectoring.coderadar.projectadministration.ModulePathInvalidException; @@ -22,10 +20,6 @@ import io.reflectoring.coderadar.vcs.port.driver.ExtractProjectCommitsUseCase; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateLocalRepositoryUseCase; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateRepositoryCommand; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ScheduledFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.event.ContextRefreshedEvent; @@ -34,6 +28,13 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Component; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ScheduledFuture; + +import static io.reflectoring.coderadar.projectadministration.service.project.CreateProjectService.getProjectDateRange; + @Component public class ScanProjectScheduler { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/UpdateProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/UpdateProjectService.java index 3d2463437..55fbe50b3 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/UpdateProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/UpdateProjectService.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.projectadministration.service.project; -import static io.reflectoring.coderadar.projectadministration.service.project.CreateProjectService.getProjectDateRange; - import io.reflectoring.coderadar.CoderadarConfigurationProperties; import io.reflectoring.coderadar.analyzer.port.driven.ResetAnalysisPort; import io.reflectoring.coderadar.projectadministration.ModuleAlreadyExistsException; @@ -24,11 +22,14 @@ import io.reflectoring.coderadar.vcs.port.driver.ExtractProjectCommitsUseCase; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateLocalRepositoryUseCase; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateRepositoryCommand; -import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.util.List; + +import static io.reflectoring.coderadar.projectadministration.service.project.CreateProjectService.getProjectDateRange; + @Service public class UpdateProjectService implements UpdateProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitLog.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitLog.java index 542230304..8ad0de0e0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitLog.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitLog.java @@ -1,8 +1,9 @@ package io.reflectoring.coderadar.query.domain; +import lombok.Data; + import java.util.Collections; import java.util.List; -import lombok.Data; @Data public class CommitLog { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitProfileRatingsQuery.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitProfileRatingsQuery.java index 62b0d6d92..325ea5f98 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitProfileRatingsQuery.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitProfileRatingsQuery.java @@ -1,12 +1,13 @@ package io.reflectoring.coderadar.query.domain; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import lombok.Data; -import lombok.NoArgsConstructor; /** * Objects of this class provide parameters to query for quality profile ratings aggregated per diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/ContributorsForFile.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/ContributorsForFile.java index 665715a4a..926e32baf 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/ContributorsForFile.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/ContributorsForFile.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.query.domain; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Set; + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DateRange.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DateRange.java index 2d46847b4..649167cff 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DateRange.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DateRange.java @@ -4,12 +4,13 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; -import java.time.LocalDate; -import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotNull; +import java.time.LocalDate; + @AllArgsConstructor @NoArgsConstructor @Data diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DeltaTree.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DeltaTree.java index 9dcfcabca..7ecaa3b1a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DeltaTree.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DeltaTree.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.query.domain; -import java.util.ArrayList; -import java.util.List; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.ArrayList; +import java.util.List; + @Data @NoArgsConstructor public class DeltaTree { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileAndCommitsForTimePeriod.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileAndCommitsForTimePeriod.java index 4c162fbf3..b22997fa2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileAndCommitsForTimePeriod.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileAndCommitsForTimePeriod.java @@ -1,11 +1,12 @@ package io.reflectoring.coderadar.query.domain; import io.reflectoring.coderadar.projectadministration.domain.Commit; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileContentWithMetrics.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileContentWithMetrics.java index 1c0d01db6..03dd0f139 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileContentWithMetrics.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileContentWithMetrics.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.query.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileTree.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileTree.java index f1bd50acd..af9cdc989 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileTree.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileTree.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.query.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricTree.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricTree.java index 3e637f602..05e1ae449 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricTree.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricTree.java @@ -1,11 +1,12 @@ package io.reflectoring.coderadar.query.domain; -import java.util.ArrayList; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.ArrayList; +import java.util.List; + @AllArgsConstructor @NoArgsConstructor @Data diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricWithFindings.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricWithFindings.java index 3701c8612..edacfa808 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricWithFindings.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricWithFindings.java @@ -1,11 +1,12 @@ package io.reflectoring.coderadar.query.domain; import io.reflectoring.coderadar.analyzer.domain.Finding; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitLogPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitLogPort.java index a8b5e710c..ebea15cb5 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitLogPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitLogPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.query.port.driven; import io.reflectoring.coderadar.query.domain.CommitLog; + import java.util.List; public interface GetCommitLogPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitsInProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitsInProjectPort.java index b1ce10bf1..52fdb57f7 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitsInProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitsInProjectPort.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.projectadministration.domain.FilePattern; + import java.util.List; public interface GetCommitsInProjectPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCriticalFilesPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCriticalFilesPort.java index 59529c0a7..ec83d945c 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCriticalFilesPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCriticalFilesPort.java @@ -3,6 +3,7 @@ import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.query.domain.ContributorsForFile; import io.reflectoring.coderadar.query.domain.FileAndCommitsForTimePeriod; + import java.util.Date; import java.util.List; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricValuesOfCommitPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricValuesOfCommitPort.java index c3ac41957..2681b5c92 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricValuesOfCommitPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricValuesOfCommitPort.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.query.domain.MetricValueForCommit; import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitCommand; + import java.util.List; public interface GetMetricValuesOfCommitPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricsAndFindingsForFilePort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricsAndFindingsForFilePort.java index 2262200f7..ead5c807f 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricsAndFindingsForFilePort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricsAndFindingsForFilePort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.query.port.driven; import io.reflectoring.coderadar.query.domain.MetricWithFindings; + import java.util.List; public interface GetMetricsAndFindingsForFilePort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitLogUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitLogUseCase.java index e53101d01..fce0e3eed 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitLogUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitLogUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.query.port.driver; import io.reflectoring.coderadar.query.domain.CommitLog; + import java.util.List; public interface GetCommitLogUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitsInProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitsInProjectUseCase.java index afbb3775a..2f9d01ec9 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitsInProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitsInProjectUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.query.port.driver; import io.reflectoring.coderadar.projectadministration.domain.Commit; + import java.util.List; public interface GetCommitsInProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitCommand.java index 21a2ad1c6..8a5bf8a44 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitCommand.java @@ -1,12 +1,13 @@ package io.reflectoring.coderadar.query.port.driver.commitmetrics; -import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.List; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitUseCase.java index 6a8cce786..983888ee5 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.query.port.driver.commitmetrics; import io.reflectoring.coderadar.query.domain.MetricValueForCommit; + import java.util.List; public interface GetMetricValuesOfCommitUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetCriticalFilesUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetCriticalFilesUseCase.java index 7d89064d4..387430e49 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetCriticalFilesUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetCriticalFilesUseCase.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.query.domain.ContributorsForFile; import io.reflectoring.coderadar.query.domain.FileAndCommitsForTimePeriod; + import java.util.List; public interface GetCriticalFilesUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFilesWithContributorsCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFilesWithContributorsCommand.java index 50a8943fb..ab8595d9d 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFilesWithContributorsCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFilesWithContributorsCommand.java @@ -1,11 +1,12 @@ package io.reflectoring.coderadar.query.port.driver.criticalfiles; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFrequentlyChangedFilesCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFrequentlyChangedFilesCommand.java index 0a7154e3d..bb71aff17 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFrequentlyChangedFilesCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFrequentlyChangedFilesCommand.java @@ -1,11 +1,12 @@ package io.reflectoring.coderadar.query.port.driver.criticalfiles; -import java.util.Date; -import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; +import java.util.Date; + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/deltatree/GetDeltaTreeForTwoCommitsCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/deltatree/GetDeltaTreeForTwoCommitsCommand.java index 8d5f13c04..eb04ed67b 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/deltatree/GetDeltaTreeForTwoCommitsCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/deltatree/GetDeltaTreeForTwoCommitsCommand.java @@ -1,12 +1,13 @@ package io.reflectoring.coderadar.query.port.driver.deltatree; -import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.List; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filecontent/GetFileContentWithMetricsCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filecontent/GetFileContentWithMetricsCommand.java index c1da6dc6d..886afea48 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filecontent/GetFileContentWithMetricsCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filecontent/GetFileContentWithMetricsCommand.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.query.port.driver.filecontent; -import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; + @AllArgsConstructor @NoArgsConstructor @Data diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filediff/GetFileDiffCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filediff/GetFileDiffCommand.java index ecab61b69..948eef784 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filediff/GetFileDiffCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filediff/GetFileDiffCommand.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.query.port.driver.filediff; -import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; + @AllArgsConstructor @NoArgsConstructor @Data diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/metrictree/GetMetricTreeForCommitCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/metrictree/GetMetricTreeForCommitCommand.java index ce058446c..b74c1c345 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/metrictree/GetMetricTreeForCommitCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/metrictree/GetMetricTreeForCommitCommand.java @@ -1,12 +1,13 @@ package io.reflectoring.coderadar.query.port.driver.metrictree; -import java.util.List; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.List; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetAvailableMetricsInProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetAvailableMetricsInProjectService.java index 98762b3fb..940009cc1 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetAvailableMetricsInProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetAvailableMetricsInProjectService.java @@ -4,9 +4,10 @@ import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.query.port.driven.GetAvailableMetricsInProjectPort; import io.reflectoring.coderadar.query.port.driver.GetAvailableMetricsInProjectUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class GetAvailableMetricsInProjectService implements GetAvailableMetricsInProjectUseCase { private final GetAvailableMetricsInProjectPort getAvailableMetricsInProjectPort; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitLogService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitLogService.java index 6d7c08492..490a0cf74 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitLogService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitLogService.java @@ -5,9 +5,10 @@ import io.reflectoring.coderadar.query.domain.CommitLog; import io.reflectoring.coderadar.query.port.driven.GetCommitLogPort; import io.reflectoring.coderadar.query.port.driver.GetCommitLogUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class GetCommitLogService implements GetCommitLogUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitsInProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitsInProjectService.java index ba28a4cf8..f07e069f4 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitsInProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitsInProjectService.java @@ -5,9 +5,10 @@ import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.query.port.driven.GetCommitsInProjectPort; import io.reflectoring.coderadar.query.port.driver.GetCommitsInProjectUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class GetCommitsInProjectService implements GetCommitsInProjectUseCase { private final GetCommitsInProjectPort getCommitsInProjectPort; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCriticalFilesService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCriticalFilesService.java index 23c22f4b4..52a7b22dd 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCriticalFilesService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCriticalFilesService.java @@ -11,9 +11,10 @@ import io.reflectoring.coderadar.query.port.driver.criticalfiles.GetCriticalFilesUseCase; import io.reflectoring.coderadar.query.port.driver.criticalfiles.GetFilesWithContributorsCommand; import io.reflectoring.coderadar.query.port.driver.criticalfiles.GetFrequentlyChangedFilesCommand; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class GetCriticalFilesService implements GetCriticalFilesUseCase { private final GetCriticalFilesPort getCriticalFilesPort; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetFileContentWithMetricsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetFileContentWithMetricsService.java index 7ad5554e2..82bd19116 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetFileContentWithMetricsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetFileContentWithMetricsService.java @@ -9,9 +9,10 @@ import io.reflectoring.coderadar.query.port.driver.filecontent.GetFileContentWithMetricsCommand; import io.reflectoring.coderadar.query.port.driver.filecontent.GetFileContentWithMetricsUseCase; import io.reflectoring.coderadar.vcs.port.driven.GetRawCommitContentPort; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class GetFileContentWithMetricsService implements GetFileContentWithMetricsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetMetricValuesOfCommitService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetMetricValuesOfCommitService.java index 38bbf1e23..551e18d94 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetMetricValuesOfCommitService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetMetricValuesOfCommitService.java @@ -6,9 +6,10 @@ import io.reflectoring.coderadar.query.port.driven.GetMetricValuesOfCommitPort; import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitCommand; import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class GetMetricValuesOfCommitService implements GetMetricValuesOfCommitUseCase { private final GetMetricValuesOfCommitPort getMetricValuesOfCommitPort; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java index 651fd1f6c..f11796fe7 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.useradministration.domain; -import java.util.Collections; -import java.util.List; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Collections; +import java.util.List; + @Data @NoArgsConstructor public class Team { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java index 91980ca17..600f66bbc 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.projectadministration.domain.Project; + import java.util.List; public interface ListProjectsForTeamPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java index a3e4edee1..e61f56e03 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.projectadministration.domain.Project; + import java.util.List; public interface ListProjectsForUserPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java index beedfb323..dd7d9ca26 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.Team; + import java.util.List; public interface ListTeamsForProjectPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java index 7ecb1ccdf..99ce83fe2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.Team; + import java.util.List; public interface ListTeamsForUserPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java index ba093a6de..39221014c 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.Team; + import java.util.List; public interface ListTeamsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersForProjectPort.java index b302708a6..68d07ac69 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersForProjectPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.User; + import java.util.List; public interface ListUsersForProjectPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java index 039cf273c..09fb69230 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.User; + import java.util.List; public interface ListUsersPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/CoderadarPasswordValidator.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/CoderadarPasswordValidator.java index f649b02eb..48cf25067 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/CoderadarPasswordValidator.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/CoderadarPasswordValidator.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.useradministration.port.driver; import com.google.common.base.Joiner; -import java.util.Arrays; +import org.passay.*; + import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import org.passay.*; +import java.util.Arrays; /** Validator for user passwords. */ public class CoderadarPasswordValidator implements ConstraintValidator { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/ValidPassword.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/ValidPassword.java index cb4ab6dfa..25aaeab5d 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/ValidPassword.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/ValidPassword.java @@ -1,13 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driver; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - +import javax.validation.Constraint; +import javax.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; + +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Documented @Constraint(validatedBy = CoderadarPasswordValidator.class) diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java index 7e5ef22b2..fe47dab83 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.port.driver.get; import io.reflectoring.coderadar.projectadministration.domain.Project; + import java.util.List; public interface ListProjectsForUserUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java index 33efbdf78..d15ff1bd6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.port.driver.get; import io.reflectoring.coderadar.useradministration.domain.User; + import java.util.List; public interface ListUsersUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/login/LoginUserCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/login/LoginUserCommand.java index a5280e272..1bc827939 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/login/LoginUserCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/login/LoginUserCommand.java @@ -1,11 +1,12 @@ package io.reflectoring.coderadar.useradministration.port.driver.login; -import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/password/ChangePasswordCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/password/ChangePasswordCommand.java index 7b4ccf98d..70c8502ef 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/password/ChangePasswordCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/password/ChangePasswordCommand.java @@ -1,12 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driver.password; import io.reflectoring.coderadar.useradministration.port.driver.ValidPassword; -import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/refresh/RefreshTokenCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/refresh/RefreshTokenCommand.java index 44ced11f1..5fc56ddc0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/refresh/RefreshTokenCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/refresh/RefreshTokenCommand.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.useradministration.port.driver.refresh; -import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/register/RegisterUserCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/register/RegisterUserCommand.java index 9c9cfca2a..6b45e83c2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/register/RegisterUserCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/register/RegisterUserCommand.java @@ -1,12 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driver.register; import io.reflectoring.coderadar.useradministration.port.driver.ValidPassword; -import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java index 8edff6bf2..94e8e9398 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.create; -import java.util.List; -import javax.validation.constraints.NotBlank; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; +import java.util.List; + /** DTO class for creating teams. */ @Data @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java index b592245a6..af34ee78b 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.projectadministration.domain.Project; + import java.util.List; public interface ListProjectsForTeamUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java index 50bc267b6..a662677f8 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.useradministration.domain.Team; + import java.util.List; public interface ListTeamsForProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java index 93d0ad43a..07345b19d 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.useradministration.domain.Team; + import java.util.List; public interface ListTeamsForUserUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java index d5db61391..ab33a6f9e 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.useradministration.domain.Team; + import java.util.List; public interface ListTeamsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListUsersForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListUsersForProjectUseCase.java index a1e492bc4..f821296e8 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListUsersForProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListUsersForProjectUseCase.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.useradministration.domain.User; + import java.util.List; public interface ListUsersForProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java index ece517eab..aa21dda16 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java @@ -5,9 +5,10 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForUserPort; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListProjectsForUserService implements ListProjectsForUserUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java index 850467661..bfefbcf68 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java @@ -3,9 +3,10 @@ import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.ListUsersPort; import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListUsersService implements ListUsersUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationTokenFilter.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationTokenFilter.java index d773cb78a..597099bc0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationTokenFilter.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationTokenFilter.java @@ -4,17 +4,18 @@ import com.auth0.jwt.exceptions.JWTVerificationException; import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.DecodedJWT; -import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.NonNull; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.filter.OncePerRequestFilter; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + /** * Filter for authentication of requests with JSON Web Tokens. This filter reads the access token * from http-request header and validates the signature of the token. If the signature is valid, a diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java index 7a01f2c3c..c6348d8bc 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.useradministration.service.security; import io.reflectoring.coderadar.CoderadarConfigurationProperties; -import java.util.Optional; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationManager; @@ -18,6 +17,8 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.filter.CorsFilter; +import java.util.Optional; + @Configuration @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetailService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetailService.java index 87f66656d..093c54501 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetailService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetailService.java @@ -2,13 +2,14 @@ import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; -import java.util.Collections; -import java.util.List; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.List; + @Service public class CoderadarUserDetailService implements UserDetailsService { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetails.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetails.java index ed8278256..c7c8a0d64 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetails.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetails.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.useradministration.service.security; -import java.util.Collection; import lombok.Value; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; +import java.util.Collection; + @Value class CoderadarUserDetails implements UserDetails { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/SecretKeyService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/SecretKeyService.java index 07c9e85e8..fb5903152 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/SecretKeyService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/SecretKeyService.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.useradministration.service.security; -import java.security.NoSuchAlgorithmException; +import org.springframework.stereotype.Service; + import javax.annotation.PostConstruct; import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; -import org.springframework.stereotype.Service; +import java.security.NoSuchAlgorithmException; /** * Service for generation and holding a secret key. The generated key is a AES key of the length 256 diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/TokenService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/TokenService.java index 456ef26b0..eeb7410c6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/TokenService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/TokenService.java @@ -9,10 +9,11 @@ import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.DecodedJWT; import io.reflectoring.coderadar.CoderadarConfigurationProperties; -import java.util.Date; import org.joda.time.DateTime; import org.springframework.stereotype.Service; +import java.util.Date; + /** Service for generation and verification of authentication tokens. */ @Service public class TokenService { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java index 8f3409924..af6c2709f 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java @@ -6,9 +6,10 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class AddUsersToTeamService implements AddUsersToTeamUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveUsersFromTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveUsersFromTeamService.java index 0eccc0354..afb8e10cb 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveUsersFromTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveUsersFromTeamService.java @@ -7,9 +7,10 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driven.RemoveUsersFromTeamPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveUsersFromTeamUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class RemoveUsersFromTeamService implements RemoveUsersFromTeamUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java index b170b8cdd..6f43c6c5f 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java @@ -5,9 +5,10 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForTeamPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListProjectsForTeamService implements ListProjectsForTeamUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java index 171b6d26e..5dd5f5cdd 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java @@ -5,9 +5,10 @@ import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsForProjectPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListTeamsForProjectService implements ListTeamsForProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java index c40a82ee2..6c53c12e0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java @@ -5,9 +5,10 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsForUserPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListTeamsForUserService implements ListTeamsForUserUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java index d954fe628..f9d00c389 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java @@ -3,9 +3,10 @@ import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListTeamsService implements ListTeamsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListUsersForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListUsersForProjectService.java index 96a563e75..bbf414399 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListUsersForProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListUsersForProjectService.java @@ -5,9 +5,10 @@ import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.ListUsersForProjectPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListUsersForProjectUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ListUsersForProjectService implements ListUsersForProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/ExtractProjectCommitsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/ExtractProjectCommitsPort.java index aefebfb49..e5d5372d8 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/ExtractProjectCommitsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/ExtractProjectCommitsPort.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.query.domain.DateRange; + import java.util.List; public interface ExtractProjectCommitsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetAvailableBranchesPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetAvailableBranchesPort.java index 64d55636f..0d81b8486 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetAvailableBranchesPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetAvailableBranchesPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.vcs.port.driven; import io.reflectoring.coderadar.projectadministration.domain.Branch; + import java.util.List; public interface GetAvailableBranchesPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetDiffEntriesForCommitsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetDiffEntriesForCommitsPort.java index 32c8c584f..f896e82c1 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetDiffEntriesForCommitsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetDiffEntriesForCommitsPort.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.vcs.UnableToGetDiffsFromCommitsException; import io.reflectoring.coderadar.vcs.domain.DiffEntry; + import java.util.List; public interface GetDiffEntriesForCommitsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java index 8f48bf550..ab07c6b66 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.vcs.port.driven; import io.reflectoring.coderadar.vcs.UnableToGetCommitContentException; + import java.util.HashMap; import java.util.List; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/UpdateLocalRepositoryPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/UpdateLocalRepositoryPort.java index 37dc5bab6..f2adfa1f6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/UpdateLocalRepositoryPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/UpdateLocalRepositoryPort.java @@ -3,6 +3,7 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.vcs.UnableToUpdateRepositoryException; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateRepositoryCommand; + import java.util.List; public interface UpdateLocalRepositoryPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/ExtractProjectCommitsUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/ExtractProjectCommitsUseCase.java index 5a3d02867..e7695d8fd 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/ExtractProjectCommitsUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/ExtractProjectCommitsUseCase.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.query.domain.DateRange; + import java.util.List; public interface ExtractProjectCommitsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/update/UpdateLocalRepositoryUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/update/UpdateLocalRepositoryUseCase.java index cf2844ccc..1ebe9b08e 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/update/UpdateLocalRepositoryUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/update/UpdateLocalRepositoryUseCase.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.vcs.UnableToUpdateRepositoryException; + import java.util.List; public interface UpdateLocalRepositoryUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/ExtractProjectCommitsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/ExtractProjectCommitsService.java index 96bcbac7a..9eac0bca8 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/ExtractProjectCommitsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/ExtractProjectCommitsService.java @@ -4,9 +4,10 @@ import io.reflectoring.coderadar.query.domain.DateRange; import io.reflectoring.coderadar.vcs.port.driven.ExtractProjectCommitsPort; import io.reflectoring.coderadar.vcs.port.driver.ExtractProjectCommitsUseCase; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ExtractProjectCommitsService implements ExtractProjectCommitsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/UpdateLocalRepositoryService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/UpdateLocalRepositoryService.java index 92f8d3348..341bd16d0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/UpdateLocalRepositoryService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/UpdateLocalRepositoryService.java @@ -5,9 +5,10 @@ import io.reflectoring.coderadar.vcs.port.driven.UpdateLocalRepositoryPort; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateLocalRepositoryUseCase; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateRepositoryCommand; -import java.util.List; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class UpdateLocalRepositoryService implements UpdateLocalRepositoryUseCase { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/CreateAnalyzerConfigurationServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/CreateAnalyzerConfigurationServiceTest.java index dd83eaa03..e365aa9a7 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/CreateAnalyzerConfigurationServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/CreateAnalyzerConfigurationServiceTest.java @@ -1,22 +1,23 @@ package io.reflectoring.coderadar.projectadministration.analyzerconfig; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.analyzer.service.ListAnalyzersService; import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.CreateAnalyzerConfigurationPort; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.service.analyzerconfig.CreateAnalyzerConfigurationService; import io.reflectoring.coderadar.projectadministration.service.analyzerconfig.ListAnalyzerConfigurationsService; -import java.util.Collections; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import java.util.Collections; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class CreateAnalyzerConfigurationServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/DeleteAnalyzerConfigurationServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/DeleteAnalyzerConfigurationServiceTest.java index b305141c2..09863006f 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/DeleteAnalyzerConfigurationServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/DeleteAnalyzerConfigurationServiceTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.projectadministration.analyzerconfig; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.DeleteAnalyzerConfigurationPort; import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.GetAnalyzerConfigurationPort; @@ -14,6 +10,10 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class DeleteAnalyzerConfigurationServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/GetAnalyzerConfigurationServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/GetAnalyzerConfigurationServiceTest.java index ae2a8f6dd..6e90892a0 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/GetAnalyzerConfigurationServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/GetAnalyzerConfigurationServiceTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.projectadministration.analyzerconfig; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.GetAnalyzerConfigurationPort; import io.reflectoring.coderadar.projectadministration.service.analyzerconfig.GetAnalyzerConfigurationService; @@ -12,6 +9,9 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class GetAnalyzerConfigurationServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java index a6c270a81..bef2f8f31 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java @@ -1,21 +1,22 @@ package io.reflectoring.coderadar.projectadministration.analyzerconfig; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.ListAnalyzerConfigurationsPort; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.service.analyzerconfig.ListAnalyzerConfigurationsService; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import java.util.ArrayList; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class ListAnalyzerConfigurationsFromProjectServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationServiceTest.java index 0d61f8e24..a1cdd9b40 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationServiceTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.projectadministration.analyzerconfig; -import static org.mockito.Mockito.*; - import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.analyzer.service.ListAnalyzersService; import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.GetAnalyzerConfigurationPort; @@ -9,13 +7,16 @@ import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update.UpdateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.service.analyzerconfig.ListAnalyzerConfigurationsService; import io.reflectoring.coderadar.projectadministration.service.analyzerconfig.UpdateAnalyzerConfigurationService; -import java.util.Collections; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import java.util.Collections; + +import static org.mockito.Mockito.*; + @ExtendWith(MockitoExtension.class) class UpdateAnalyzerConfigurationServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/CreateFilePatternServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/CreateFilePatternServiceTest.java index d9cb79cb6..8b15bd36f 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/CreateFilePatternServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/CreateFilePatternServiceTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.projectadministration.filepattern; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driven.filepattern.CreateFilePatternPort; @@ -14,6 +11,9 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class CreateFilePatternServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/DeleteFilePatternServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/DeleteFilePatternServiceTest.java index e4b3df27b..108fe9298 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/DeleteFilePatternServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/DeleteFilePatternServiceTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.projectadministration.filepattern; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driven.filepattern.DeleteFilePatternPort; @@ -15,6 +11,10 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class DeleteFilePatternServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/GetFilePatternServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/GetFilePatternServiceTest.java index 8eba88a85..97e3401d5 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/GetFilePatternServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/GetFilePatternServiceTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.projectadministration.filepattern; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driven.filepattern.GetFilePatternPort; @@ -13,6 +10,9 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class GetFilePatternServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/ListFilePatternsOfProjectServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/ListFilePatternsOfProjectServiceTest.java index f85b8f47b..457707e5a 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/ListFilePatternsOfProjectServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/ListFilePatternsOfProjectServiceTest.java @@ -1,22 +1,23 @@ package io.reflectoring.coderadar.projectadministration.filepattern; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driven.filepattern.ListFilePatternsOfProjectPort; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.service.filepattern.ListFilePatternsOfProjectService; -import java.util.Arrays; -import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import java.util.Arrays; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class ListFilePatternsOfProjectServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/CreateModuleServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/CreateModuleServiceTest.java index 19059f3de..f3882e0c4 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/CreateModuleServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/CreateModuleServiceTest.java @@ -1,10 +1,5 @@ package io.reflectoring.coderadar.projectadministration.module; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.projectadministration.ModuleAlreadyExistsException; import io.reflectoring.coderadar.projectadministration.ModulePathInvalidException; import io.reflectoring.coderadar.projectadministration.ProjectIsBeingProcessedException; @@ -19,6 +14,11 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class CreateModuleServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/DeleteModuleServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/DeleteModuleServiceTest.java index 2f2b5a7d3..b19a7c527 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/DeleteModuleServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/DeleteModuleServiceTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.projectadministration.module; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.*; - import io.reflectoring.coderadar.projectadministration.ProjectIsBeingProcessedException; import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driven.module.DeleteModulePort; @@ -17,6 +13,10 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.stubbing.Answer; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; + @ExtendWith(MockitoExtension.class) class DeleteModuleServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/GetModuleServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/GetModuleServiceTest.java index eb29cb41d..a8517051a 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/GetModuleServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/GetModuleServiceTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.projectadministration.module; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driven.module.GetModulePort; import io.reflectoring.coderadar.projectadministration.service.module.GetModuleService; @@ -12,6 +9,9 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class GetModuleServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/ListModulesOfProjectServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/ListModulesOfProjectServiceTest.java index 012403100..7500a8cf7 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/ListModulesOfProjectServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/ListModulesOfProjectServiceTest.java @@ -1,21 +1,22 @@ package io.reflectoring.coderadar.projectadministration.module; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driven.module.ListModulesOfProjectPort; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.service.module.ListModulesOfProjectService; -import java.util.Arrays; -import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import java.util.Arrays; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class ListModulesOfProjectServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/GetProjectServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/GetProjectServiceTest.java index 6f15e7573..50507755d 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/GetProjectServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/GetProjectServiceTest.java @@ -1,18 +1,19 @@ package io.reflectoring.coderadar.projectadministration.project; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.service.project.GetProjectService; -import java.util.Date; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import java.util.Date; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class GetProjectServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/ListProjectsServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/ListProjectsServiceTest.java index 94dc5111a..b938cf1db 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/ListProjectsServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/ListProjectsServiceTest.java @@ -1,13 +1,8 @@ package io.reflectoring.coderadar.projectadministration.project; -import static org.assertj.core.api.Assertions.assertThat; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driven.project.ListProjectsPort; import io.reflectoring.coderadar.projectadministration.service.project.ListProjectsService; -import java.util.Arrays; -import java.util.Date; -import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -15,6 +10,12 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + @ExtendWith(MockitoExtension.class) class ListProjectsServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/UpdateProjectServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/UpdateProjectServiceTest.java index 4c9e5f2e7..18cda0a05 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/UpdateProjectServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/UpdateProjectServiceTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.projectadministration.project; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; - import io.reflectoring.coderadar.CoderadarConfigurationProperties; import io.reflectoring.coderadar.analyzer.port.driven.ResetAnalysisPort; import io.reflectoring.coderadar.projectadministration.ProjectAlreadyExistsException; @@ -23,10 +19,6 @@ import io.reflectoring.coderadar.vcs.port.driven.GetAvailableBranchesPort; import io.reflectoring.coderadar.vcs.port.driver.ExtractProjectCommitsUseCase; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateLocalRepositoryUseCase; -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; import org.junit.Assert; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -35,6 +27,15 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.stubbing.Answer; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + @ExtendWith(MockitoExtension.class) class UpdateProjectServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/ChangePasswordServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/ChangePasswordServiceTest.java index e2b10bf48..134fc8b40 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/ChangePasswordServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/ChangePasswordServiceTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.projectadministration.user; -import static org.mockito.Mockito.*; - import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.ChangePasswordPort; import io.reflectoring.coderadar.useradministration.port.driven.RefreshTokenPort; @@ -14,6 +12,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import static org.mockito.Mockito.*; + @ExtendWith(MockitoExtension.class) class ChangePasswordServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/GetUserServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/GetUserServiceTest.java index 48c6ac4c1..258488e60 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/GetUserServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/GetUserServiceTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.projectadministration.user; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.service.get.GetUserService; @@ -12,6 +9,9 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class GetUserServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/LoginUserServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/LoginUserServiceTest.java index 03d12082d..13bccc1aa 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/LoginUserServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/LoginUserServiceTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.projectadministration.user; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.useradministration.domain.RefreshToken; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; @@ -20,6 +16,10 @@ import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class LoginUserServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RefreshTokenServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RefreshTokenServiceTest.java index 0d9e11ef1..8f094bd46 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RefreshTokenServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RefreshTokenServiceTest.java @@ -1,10 +1,5 @@ package io.reflectoring.coderadar.projectadministration.user; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.useradministration.AccessTokenNotExpiredException; import io.reflectoring.coderadar.useradministration.RefreshTokenNotFoundException; import io.reflectoring.coderadar.useradministration.UserNotFoundException; @@ -21,6 +16,11 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class RefreshTokenServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RegisterUserServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RegisterUserServiceTest.java index ce5129b1b..d90383850 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RegisterUserServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RegisterUserServiceTest.java @@ -1,11 +1,5 @@ package io.reflectoring.coderadar.projectadministration.user; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import io.reflectoring.coderadar.useradministration.UsernameAlreadyInUseException; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; @@ -20,6 +14,12 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + @ExtendWith(MockitoExtension.class) class RegisterUserServiceTest { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java index 7299bb2a7..07887ec0d 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; + import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java index 65fd5c37e..7d1a135f6 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.rest.domain.GetBranchResponse; + import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java index 09ed35a2b..ecef5b2cf 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.rest.domain.GetCommitResponse; + import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java index 2c923f88c..751a12c63 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.contributor.domain.Contributor; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; + import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java index c19428eeb..5bb4030f4 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; + import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java index 57b0b467d..fdd90e8db 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; + import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java index d3ad95d8f..164b7abd4 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; + import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java index eaeeb9419..603b07ffa 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java @@ -1,12 +1,13 @@ package io.reflectoring.coderadar.rest; -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; - import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; + import java.util.ArrayList; import java.util.List; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + public class GetTeamResponseMapper { private GetTeamResponseMapper() {} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java index 139f3329b..b0b47386b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; + import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java index 2bb2d7f99..685ee3db5 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java @@ -1,11 +1,12 @@ package io.reflectoring.coderadar.rest; -import java.util.List; -import javax.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotEmpty; +import java.util.List; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java index 16cb8f6fe..4890af7cd 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.analyzerconfig; -import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfiguration; - import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.GetAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; @@ -14,6 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfiguration; + @Transactional @RestController public class GetAnalyzerConfigurationController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java index 48678362b..6bdda511d 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.analyzerconfig; -import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfigurations; - import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.ListAnalyzerConfigurationsUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfigurations; + @Transactional @RestController public class ListAnalyzerConfigurationsFromProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java index ccc6b215a..3bde25578 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.analyzer.port.driver.ListAnalyzersUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -10,6 +9,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Transactional @RestController public class ListAnalyzersController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java index 060702f2e..22ab39625 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.branch; -import static io.reflectoring.coderadar.rest.GetBranchResponseMapper.mapBranches; - import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.projectadministration.port.driver.branch.list.ListBranchesUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetBranchResponse; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetBranchResponseMapper.mapBranches; + @Transactional @RestController public class ListBranchesController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java index 9016007d7..b1362eea7 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.contributor; -import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributor; - import io.reflectoring.coderadar.contributor.port.driver.GetContributorUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; @@ -13,6 +11,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributor; + @Transactional @RestController public class GetContributorController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java index 2f2428d71..16fa2194a 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.contributor; -import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributors; - import io.reflectoring.coderadar.contributor.port.driver.GetContributorsForPathCommand; import io.reflectoring.coderadar.contributor.port.driver.ListContributorsUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,6 +11,10 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributors; + @Transactional @RestController public class ListContributorsController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java index 139d5ae45..72eb9adab 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.rest.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java index a8c5dc6bf..a274e488e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.rest.domain; -import java.util.Set; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Set; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java index fb10c32db..29dbf5841 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java @@ -1,8 +1,9 @@ package io.reflectoring.coderadar.rest.domain; -import java.util.Date; import lombok.Data; +import java.util.Date; + @Data public class GetProjectResponse { private long id; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java index d08e0a915..50bcc7c88 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java @@ -1,10 +1,11 @@ package io.reflectoring.coderadar.rest.domain; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java index e99939b3c..29aa35d22 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.filepattern; -import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePattern; - import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.GetFilePatternUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; @@ -14,6 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePattern; + @Transactional @RestController public class GetFilePatternController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java index f9d1ae26b..faf268b96 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.filepattern; -import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePatterns; - import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.ListFilePatternsOfProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePatterns; + @Transactional @RestController public class ListFilePatternsOfProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java index 02e1b742d..447f57ef0 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.module; -import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModule; - import io.reflectoring.coderadar.projectadministration.port.driver.module.get.GetModuleUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; @@ -13,6 +11,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModule; + @Transactional @RestController public class GetModuleController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java index 43c9dab41..a6ab7a017 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.module; -import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModules; - import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driver.module.get.ListModulesOfProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModules; + @Transactional @RestController public class ListModulesOfProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java index 2074599bd..74b848947 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java @@ -4,7 +4,6 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.MalformedURLException; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.net.MalformedURLException; + @Transactional @RestController public class CreateProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java index edbdbc9a2..a6e2b145e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.project; -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProject; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.GetProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; @@ -14,6 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProject; + @Transactional @RestController public class GetProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java index cc7c13811..fbc84a64b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.project; -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.ListProjectsUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,6 +11,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + @Transactional @RestController public class ListProjectsController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java index b47543eea..8494afc8c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java @@ -3,7 +3,6 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; -import java.net.MalformedURLException; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.net.MalformedURLException; + @Transactional @RestController public class UpdateProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java index 9edae93a7..e810e3e58 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.query.port.driver.GetAvailableMetricsInProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,6 +10,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Transactional @RestController public class GetAvailableMetricsInProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java index f5e97131f..b6251e0c8 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java @@ -3,7 +3,6 @@ import io.reflectoring.coderadar.query.domain.CommitLog; import io.reflectoring.coderadar.query.port.driver.GetCommitLogUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,6 +11,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Transactional @RestController public class GetCommitLogController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java index 3b4dc591b..a0880c9a5 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java @@ -5,7 +5,6 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.GetCommitResponseMapper; import io.reflectoring.coderadar.rest.domain.GetCommitResponse; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Transactional @RestController public class GetCommitsInProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java index 27e19807c..26abd8ecd 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.query; -import static io.reflectoring.coderadar.rest.GetCommitResponseMapper.mapCommits; - import io.reflectoring.coderadar.query.domain.ContributorsForFile; import io.reflectoring.coderadar.query.domain.FileAndCommitsForTimePeriod; import io.reflectoring.coderadar.query.port.driver.criticalfiles.GetCriticalFilesUseCase; @@ -9,8 +7,6 @@ import io.reflectoring.coderadar.query.port.driver.criticalfiles.GetFrequentlyChangedFilesCommand; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.FileAndCommitsForTimePeriodResponse; -import java.util.ArrayList; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -18,6 +14,11 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetCommitResponseMapper.mapCommits; + @Transactional @RestController public class GetCriticalFilesController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java index cb9c62287..29179991e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java @@ -4,7 +4,6 @@ import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitCommand; import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,6 +11,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; + @Transactional @RestController public class GetMetricValuesOfCommitController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java index 02cc410cc..c94ca7fe1 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration; -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUser; - import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; @@ -14,6 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUser; + @RestController @Transactional public class GetUserController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java index c2ec50395..c89228b76 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration; -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + @RestController @Transactional public class ListProjectsForUserController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java index 152a5c8f5..40f05c86c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration; -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; - import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,6 +11,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + @RestController @Transactional public class ListUsersController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java index cec80408d..ce76a515e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration; -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; - import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListUsersForProjectUseCase; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + @RestController @Transactional public class ListUsersForProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java index 9f1a75db7..065134b5e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeam; - import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; @@ -14,6 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeam; + @RestController @Transactional public class GetTeamController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java index c2cb83147..e92cc7a45 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + @RestController @Transactional public class ListProjectsForTeamController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java index 010285a1c..2ff67e66c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,6 +11,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + @RestController @Transactional public class ListTeamsController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java index e30b81297..bce35b6f6 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + @RestController @Transactional public class ListTeamsForProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java index 7c172c950..919bbac42 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java @@ -1,12 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; -import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -15,6 +12,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + @RestController @Transactional public class ListTeamsForUserController implements AbstractBaseController { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java index c8f6f14e4..7511a2d80 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java @@ -3,11 +3,12 @@ import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.List; + public class GetAnalyzerConfigurationResponseMapperTest { @Test diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java index 65690036a..4f5739110 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java @@ -3,11 +3,12 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.rest.GetBranchResponseMapper; import io.reflectoring.coderadar.rest.domain.GetBranchResponse; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.List; + public class GetBranchResponseMapperTest { @Test diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java index ec24f9660..f60953267 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java @@ -3,11 +3,12 @@ import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.rest.GetCommitResponseMapper; import io.reflectoring.coderadar.rest.domain.GetCommitResponse; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.List; + public class GetCommitResponseMapperTest { @Test diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java index dee70c868..ea8bc9345 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java @@ -3,11 +3,12 @@ import io.reflectoring.coderadar.contributor.domain.Contributor; import io.reflectoring.coderadar.rest.GetContributorResponseMapper; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; public class GetContributorResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java index 98b0de8ee..3338ff018 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java @@ -4,11 +4,12 @@ import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.rest.GetFilePatternResponseMapper; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.List; + public class GetFilePatternResponseMapperTest { @Test diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java index b966af074..5127a71f0 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java @@ -3,11 +3,12 @@ import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.rest.GetModuleResponseMapper; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.List; + public class GetModuleResponseMapperTest { @Test diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java index 09740ec48..df7fad899 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java @@ -3,11 +3,12 @@ import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.GetProjectResponseMapper; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; public class GetProjectResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java index f46e15c0d..8a32103c1 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java @@ -5,11 +5,12 @@ import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; public class GetTeamResponseMapperControllerTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java index c5b07424a..12c1567b5 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java @@ -4,11 +4,12 @@ import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.List; + public class GetTeamResponseMapperTest { @Test diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java index 34b4716e8..5d669c7bf 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java @@ -3,11 +3,12 @@ import io.reflectoring.coderadar.rest.GetUserResponseMapper; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.List; + public class GetUserResponseMapperTest { @Test public void testUserResponseMapper() { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java index 64ae3c075..de668d598 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.CreateAnalyzerConfigurationController; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class CreateAnalyzerConfigurationControllerTest { private final CreateAnalyzerConfigurationUseCase createAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java index 6f5e2757a..449996ca8 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.delete.DeleteAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.DeleteAnalyzerConfigurationController; import org.junit.jupiter.api.Assertions; @@ -10,6 +8,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class DeleteAnalyzerConfigurationControllerTest { private final DeleteAnalyzerConfigurationUseCase deleteAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java index b570bb511..949fb4153 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.GetAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.GetAnalyzerConfigurationController; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class GetAnalyzerConfigurationControllerTest { private final GetAnalyzerConfigurationUseCase getAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java index abf6444bb..30fe5d645 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java @@ -1,19 +1,20 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.ListAnalyzerConfigurationsUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.ListAnalyzerConfigurationsFromProjectController; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.ArrayList; +import java.util.List; + +import static org.mockito.Mockito.mock; + class ListAnalyzerConfigurationsFromProjectControllerTest { private final ListAnalyzerConfigurationsUseCase listAnalyzerConfigurationsUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java index 3f4e7f1ef..e4cafbd38 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update.UpdateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update.UpdateAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.UpdateAnalyzerConfigurationController; @@ -11,6 +9,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class UpdateAnalyzerConfigurationControllerTest { private final UpdateAnalyzerConfigurationUseCase updateAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java index 82af20990..b67413a44 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.filepattern; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternUseCase; @@ -13,6 +11,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class CreateFilePatternControllerTest { private final CreateFilePatternUseCase createFilePatternUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java index 12e2065af..533d9ba8e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.filepattern; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.delete.DeleteFilePatternFromProjectUseCase; import io.reflectoring.coderadar.rest.filepattern.DeleteFilePatternController; import org.junit.jupiter.api.Assertions; @@ -10,6 +8,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class DeleteFilePatternControllerTest { private final DeleteFilePatternFromProjectUseCase deleteFilePatternFromProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java index ee0f2431e..ef078fcd6 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.filepattern; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.GetFilePatternUseCase; @@ -13,6 +11,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class GetFilePatternControllerTest { private final GetFilePatternUseCase getFilePatternUseCase = mock(GetFilePatternUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java index fab7bce3b..a8549610e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java @@ -1,20 +1,21 @@ package io.reflectoring.coderadar.rest.unit.filepattern; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.ListFilePatternsOfProjectUseCase; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; import io.reflectoring.coderadar.rest.filepattern.ListFilePatternsOfProjectController; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.ArrayList; +import java.util.List; + +import static org.mockito.Mockito.mock; + class ListFilePatternsOfProjectControllerTest { private final ListFilePatternsOfProjectUseCase listFilePatternsOfProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java index 3a12db891..9bfb7cdaa 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.module; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ModulePathInvalidException; import io.reflectoring.coderadar.projectadministration.port.driver.module.create.CreateModuleCommand; import io.reflectoring.coderadar.projectadministration.port.driver.module.create.CreateModuleUseCase; @@ -14,6 +12,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class CreateModuleControllerTest { private final CreateModuleUseCase createModuleUseCase = mock(CreateModuleUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java index 0bd3cc6b2..e7c7d412f 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.module; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ProjectIsBeingProcessedException; import io.reflectoring.coderadar.projectadministration.port.driver.module.delete.DeleteModuleUseCase; import io.reflectoring.coderadar.rest.module.DeleteModuleController; @@ -11,6 +9,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class DeleteModuleControllerTest { private final DeleteModuleUseCase deleteModuleUseCase = mock(DeleteModuleUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java index 0829935a7..9dc398a1c 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.module; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driver.module.get.GetModuleUseCase; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class GetModuleControllerTest { private final GetModuleUseCase getModuleUseCase = mock(GetModuleUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java index 6d482ad81..69ed8933a 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java @@ -1,19 +1,20 @@ package io.reflectoring.coderadar.rest.unit.module; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driver.module.get.ListModulesOfProjectUseCase; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; import io.reflectoring.coderadar.rest.module.ListModulesOfProjectController; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.ArrayList; +import java.util.List; + +import static org.mockito.Mockito.mock; + class ListModulesOfProjectControllerTest { private final ListModulesOfProjectUseCase listModulesOfProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java index 00115130f..040ebf60e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java @@ -1,19 +1,20 @@ package io.reflectoring.coderadar.rest.unit.project; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectUseCase; import io.reflectoring.coderadar.rest.domain.IdResponse; import io.reflectoring.coderadar.rest.project.CreateProjectController; -import java.net.MalformedURLException; -import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.net.MalformedURLException; +import java.util.Date; + +import static org.mockito.Mockito.mock; + class CreateProjectControllerTest { private final CreateProjectUseCase createProjectUseCase = mock(CreateProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java index ebb29603b..15754c28c 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.project; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.port.driver.project.delete.DeleteProjectUseCase; import io.reflectoring.coderadar.rest.project.DeleteProjectController; import org.junit.jupiter.api.Assertions; @@ -10,6 +8,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class DeleteProjectControllerTest { private final DeleteProjectUseCase deleteProjectUseCase = mock(DeleteProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java index e85839372..d675c0465 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.project; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.GetProjectUseCase; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class GetProjectControllerTest { private final GetProjectUseCase getProjectUseCase = mock(GetProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java index 5c8b2f3ce..650658e24 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java @@ -1,19 +1,20 @@ package io.reflectoring.coderadar.rest.unit.project; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.ListProjectsUseCase; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.rest.project.ListProjectsController; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.ArrayList; +import java.util.List; + +import static org.mockito.Mockito.mock; + class ListProjectsControllerTest { private final ListProjectsUseCase listProjectsUseCase = mock(ListProjectsUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java index 03f92f355..d7f799b7d 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java @@ -1,18 +1,19 @@ package io.reflectoring.coderadar.rest.unit.project; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectUseCase; import io.reflectoring.coderadar.rest.project.UpdateProjectController; -import java.net.MalformedURLException; -import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.net.MalformedURLException; +import java.util.Date; + +import static org.mockito.Mockito.mock; + class UpdateProjectControllerTest { private final UpdateProjectUseCase updateProjectUseCase = mock(UpdateProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ChangePasswordControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ChangePasswordControllerTest.java index 6f6cc1795..4b3a12b52 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ChangePasswordControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ChangePasswordControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.useradministration; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.useradministration.ChangePasswordController; import io.reflectoring.coderadar.useradministration.port.driver.password.ChangePasswordCommand; import io.reflectoring.coderadar.useradministration.port.driver.password.ChangePasswordUseCase; @@ -11,6 +9,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class ChangePasswordControllerTest { private final ChangePasswordUseCase changePasswordUseCase = mock(ChangePasswordUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/GetUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/GetUserControllerTest.java index 596536765..e1c456e1e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/GetUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/GetUserControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.useradministration; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.rest.useradministration.GetUserController; import io.reflectoring.coderadar.useradministration.domain.User; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class GetUserControllerTest { private final GetUserUseCase getUserUseCase = mock(GetUserUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java index 34558b2ac..693115a12 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java @@ -1,20 +1,21 @@ package io.reflectoring.coderadar.rest.unit.useradministration; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.rest.useradministration.ListProjectsForUserController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Collections; +import java.util.List; + +import static org.mockito.Mockito.mock; + public class ListProjectsForUserControllerTest { private final ListProjectsForUserUseCase listProjectsForUserUseCase = mock(ListProjectsForUserUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersControllerTest.java index 27a9e6826..2fe8f7e3d 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersControllerTest.java @@ -1,19 +1,20 @@ package io.reflectoring.coderadar.rest.unit.useradministration; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.rest.useradministration.ListUsersController; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; -import java.util.Arrays; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Arrays; +import java.util.List; + +import static org.mockito.Mockito.mock; + public class ListUsersControllerTest { private final ListUsersUseCase listUsersUseCase = mock(ListUsersUseCase.class); private final ListUsersController testController = new ListUsersController(listUsersUseCase); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersForProjectControllerTest.java index f48d8e266..01876ea13 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersForProjectControllerTest.java @@ -1,20 +1,21 @@ package io.reflectoring.coderadar.rest.unit.useradministration; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.rest.useradministration.ListUsersForProjectController; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListUsersForProjectUseCase; -import java.util.Arrays; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Arrays; +import java.util.List; + +import static org.mockito.Mockito.mock; + public class ListUsersForProjectControllerTest { private final ListUsersForProjectUseCase listUsersForProjectUseCase = mock(ListUsersForProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java index d99df0747..3cd3babd0 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.useradministration; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.useradministration.LoginUserController; import io.reflectoring.coderadar.useradministration.port.driver.login.LoginUserCommand; import io.reflectoring.coderadar.useradministration.port.driver.login.LoginUserResponse; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class LoginUserControllerTest { private final LoginUserUseCase loginUserUseCase = mock(LoginUserUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RefreshTokenControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RefreshTokenControllerTest.java index a5759ce28..288f24cae 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RefreshTokenControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RefreshTokenControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.useradministration; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.useradministration.RefreshTokenController; import io.reflectoring.coderadar.useradministration.port.driver.refresh.RefreshTokenCommand; import io.reflectoring.coderadar.useradministration.port.driver.refresh.RefreshTokenResponse; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class RefreshTokenControllerTest { private final RefreshTokenUseCase refreshTokenUseCase = mock(RefreshTokenUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RegisterUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RegisterUserControllerTest.java index cae291eed..6df6acf02 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RegisterUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RegisterUserControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.useradministration; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.domain.IdResponse; import io.reflectoring.coderadar.rest.useradministration.RegisterUserController; import io.reflectoring.coderadar.useradministration.port.driver.register.RegisterUserCommand; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + class RegisterUserControllerTest { private final RegisterUserUseCase registerUserUseCase = mock(RegisterUserUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java index 6825df25d..c45d7863b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.useradministration.permissions; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.useradministration.permissions.RemoveUserFromProjectController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; @@ -12,6 +10,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + public class RemoveUserFromProjectControllerTest { private final RemoveUserFromProjectUseCase removeUserFromProjectUseCase = mock(RemoveUserFromProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/SetUserRoleForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/SetUserRoleForProjectControllerTest.java index bb4918025..594bcf628 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/SetUserRoleForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/SetUserRoleForProjectControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.useradministration.permissions; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; import io.reflectoring.coderadar.rest.useradministration.permissions.SetUserRoleForProjectController; @@ -14,6 +12,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + public class SetUserRoleForProjectControllerTest { private final SetUserRoleForProjectUseCase setUserRoleForProjectUseCase = mock(SetUserRoleForProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java index a393b5a17..bae0cb25f 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; import io.reflectoring.coderadar.rest.useradministration.teams.AddTeamToProjectController; @@ -14,6 +12,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + public class AddTeamToProjectControllerTest { private final AddTeamToProjectUseCase addTeamToProjectUseCase = mock(AddTeamToProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddUsersToTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddUsersToTeamControllerTest.java index f3ae3f469..9ef2d316e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddUsersToTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddUsersToTeamControllerTest.java @@ -1,21 +1,22 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; -import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.JsonListWrapper; import io.reflectoring.coderadar.rest.useradministration.teams.AddUsersToTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; -import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Collections; + +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; + public class AddUsersToTeamControllerTest { private final AddUsersToTeamUseCase addUsersToTeamUseCase = mock(AddUsersToTeamUseCase.class); private final AddUsersToTeamController testController = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/CreateTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/CreateTeamControllerTest.java index ced46b6ee..90416f382 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/CreateTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/CreateTeamControllerTest.java @@ -1,20 +1,21 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.domain.IdResponse; import io.reflectoring.coderadar.rest.useradministration.teams.CreateTeamController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamUseCase; -import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Collections; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; + public class CreateTeamControllerTest { private final CreateTeamUseCase createTeamUseCase = mock(CreateTeamUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/DeleteTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/DeleteTeamControllerTest.java index 318f5f03e..c199604b2 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/DeleteTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/DeleteTeamControllerTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.useradministration.teams.DeleteTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteTeamUseCase; @@ -12,6 +9,9 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; + public class DeleteTeamControllerTest { private final DeleteTeamUseCase deleteTeamUseCase = mock(DeleteTeamUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/GetTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/GetTeamControllerTest.java index 5cf368fe4..b2ea0f2fa 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/GetTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/GetTeamControllerTest.java @@ -1,20 +1,21 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.GetTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.GetTeamUseCase; -import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Collections; + +import static org.mockito.Mockito.mock; + public class GetTeamControllerTest { private final GetTeamUseCase getTeamUseCase = mock(GetTeamUseCase.class); private final GetTeamController testController = new GetTeamController(getTeamUseCase); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java index f5b06337b..efe85907c 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java @@ -1,20 +1,21 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListProjectsForTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Collections; +import java.util.List; + +import static org.mockito.Mockito.mock; + public class ListProjectsForTeamControllerTest { private final ListProjectsForTeamUseCase listProjectsForTeamUseCase = mock(ListProjectsForTeamUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsControllerTest.java index 5b132b93f..47a6be68d 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsControllerTest.java @@ -1,15 +1,10 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListTeamsController; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -17,6 +12,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static org.mockito.Mockito.mock; + public class ListTeamsControllerTest { private final ListTeamsUseCase listTeamsUseCase = mock(ListTeamsUseCase.class); private final ListTeamsController testController = new ListTeamsController(listTeamsUseCase); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForProjectControllerTest.java index 12d88edd1..10f12cc61 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForProjectControllerTest.java @@ -1,16 +1,11 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListTeamsForProjectController; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -18,6 +13,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static org.mockito.Mockito.mock; + public class ListTeamsForProjectControllerTest { private final ListTeamsForProjectUseCase listTeamsForProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java index 80ab9fe8b..0c9317771 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java @@ -1,16 +1,11 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListTeamsForUserController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -18,6 +13,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static org.mockito.Mockito.mock; + public class ListTeamsForUserControllerTest { private final ListTeamsForUserUseCase listTeamsForUserUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveTeamFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveTeamFromProjectControllerTest.java index f9ab2048b..f82202746 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveTeamFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveTeamFromProjectControllerTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.useradministration.teams.RemoveTeamFromProjectController; @@ -13,6 +11,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import static org.mockito.Mockito.mock; + public class RemoveTeamFromProjectControllerTest { private final RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase = mock(RemoveTeamFromProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java index b4f481262..5b42204e8 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java @@ -1,21 +1,22 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; -import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.mock; - import io.reflectoring.coderadar.rest.JsonListWrapper; import io.reflectoring.coderadar.rest.useradministration.teams.RemoveUsersFromTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveUsersFromTeamUseCase; -import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import java.util.Collections; + +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; + public class RemoveUsersFromTeamControllerTest { private final RemoveUsersFromTeamUseCase removeUsersFromTeamUseCase = mock(RemoveUsersFromTeamUseCase.class); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ControllerTestTemplate.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ControllerTestTemplate.java index 2e36cc52e..a84564bce 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ControllerTestTemplate.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ControllerTestTemplate.java @@ -2,10 +2,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.File; -import java.io.IOException; -import java.util.Collections; -import java.util.Properties; import org.apache.tomcat.util.http.fileupload.FileUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; @@ -28,6 +24,11 @@ import org.springframework.util.StringUtils; import org.springframework.web.context.WebApplicationContext; +import java.io.File; +import java.io.IOException; +import java.util.Collections; +import java.util.Properties; + @ExtendWith(RestDocumentationExtension.class) @Tag(ControllerTestTemplate.TAG) public abstract class ControllerTestTemplate extends IntegrationTestTemplate { diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/JsonHelper.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/JsonHelper.java index 4a2f6b714..4473def44 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/JsonHelper.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/JsonHelper.java @@ -5,9 +5,10 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.restdocs.hypermedia.Link; + import java.io.IOException; import java.util.List; -import org.springframework.restdocs.hypermedia.Link; /** Collection of utility methods to work with JSON strings. */ public class JsonHelper { diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ResultMatchers.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ResultMatchers.java index 5109ff0a9..e19b06b7d 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ResultMatchers.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ResultMatchers.java @@ -1,13 +1,13 @@ package io.reflectoring.coderadar.rest; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; - import com.fasterxml.jackson.core.type.TypeReference; import org.assertj.core.api.AssertionsForClassTypes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.test.web.servlet.ResultMatcher; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; + /** Collection of ResultMatchers to be used in MockMvc's fluent API. */ public class ResultMatchers { diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java index 0bb38b001..d0d1f678d 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.rest.analysis; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.analyzer.domain.MetricValueEntity; @@ -28,14 +24,6 @@ import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitCommand; import io.reflectoring.coderadar.query.port.driver.deltatree.GetDeltaTreeForTwoCommitsCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Collection; -import java.util.Comparator; -import java.util.List; import net.lingala.zip4j.ZipFile; import org.apache.tomcat.util.http.fileupload.FileUtils; import org.junit.jupiter.api.AfterAll; @@ -51,6 +39,19 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.List; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + class PaySimProjectIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/ResetAnalysisControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/ResetAnalysisControllerTest.java index ca6a92c54..326aa2a93 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/ResetAnalysisControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/ResetAnalysisControllerTest.java @@ -1,12 +1,5 @@ package io.reflectoring.coderadar.rest.analysis; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import io.reflectoring.coderadar.graph.analyzer.domain.MetricValueEntity; import io.reflectoring.coderadar.graph.analyzer.repository.CommitRepository; import io.reflectoring.coderadar.graph.analyzer.repository.MetricRepository; @@ -18,9 +11,6 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.URL; -import java.util.List; -import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -29,6 +19,17 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; +import java.net.URL; +import java.util.List; +import java.util.Objects; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; +import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + class ResetAnalysisControllerTest extends ControllerTestTemplate { @Autowired private CommitRepository commitRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigControllerIntegrationTest.java index fe35d45bf..b4eb258e7 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigControllerIntegrationTest.java @@ -1,10 +1,5 @@ package io.reflectoring.coderadar.rest.analyzerconfig; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.repository.AnalyzerConfigurationRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -18,6 +13,11 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + class CreateAnalyzerConfigControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigControllerIntegrationTest.java index f64cafa11..4773b3357 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigControllerIntegrationTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.analyzerconfig; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; - import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.repository.AnalyzerConfigurationRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -12,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + class DeleteAnalyzerConfigControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigControllerIntegrationTest.java index 227763086..00802eec8 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigControllerIntegrationTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.rest.analyzerconfig; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.repository.AnalyzerConfigurationRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -15,6 +11,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + class GetAnalyzerConfigControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigsFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigsFromProjectControllerIntegrationTest.java index 9ccc23385..d92fa6910 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigsFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigsFromProjectControllerIntegrationTest.java @@ -1,21 +1,22 @@ package io.reflectoring.coderadar.rest.analyzerconfig; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.repository.AnalyzerConfigurationRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; -import java.util.Arrays; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Arrays; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + class ListAnalyzerConfigsFromProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/UpdateAnalyzerConfigControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/UpdateAnalyzerConfigControllerIntegrationTest.java index ffcc7b6b0..2645c2c98 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/UpdateAnalyzerConfigControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/UpdateAnalyzerConfigControllerIntegrationTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.analyzerconfig; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.repository.AnalyzerConfigurationRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -14,6 +12,8 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + class UpdateAnalyzerConfigControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java index f9bef9fb0..751ae5db7 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java @@ -1,15 +1,16 @@ package io.reflectoring.coderadar.rest.analyzing; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.rest.ControllerTestTemplate; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.List; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + public class ListAnalyzerControllerIntegrationTest extends ControllerTestTemplate { @Test diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/DeleteBranchTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/DeleteBranchTest.java index c78fd358b..6d3aa88d1 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/DeleteBranchTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/DeleteBranchTest.java @@ -8,12 +8,13 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.projectadministration.service.project.CreateProjectService; import io.reflectoring.coderadar.rest.ControllerTestTemplate; -import java.net.URL; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.net.URL; + public class DeleteBranchTest extends ControllerTestTemplate { @Autowired private CreateProjectService createProjectService; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java index 521e7327c..68a03b6d4 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java @@ -1,20 +1,21 @@ package io.reflectoring.coderadar.rest.branches; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.projectadministration.service.project.CreateProjectService; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetBranchResponse; -import java.net.URL; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.net.URL; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + public class ListBranchesControllerTest extends ControllerTestTemplate { @Autowired private CreateProjectService createProjectService; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java index ec22d38b1..7511d7b29 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.rest.branches; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.graph.analyzer.repository.CommitRepository; import io.reflectoring.coderadar.graph.projectadministration.branch.repository.BranchRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.BranchEntity; @@ -10,14 +7,18 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.URL; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.net.URL; +import java.util.List; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + public class SaveProjectWithBranchesTest extends ControllerTestTemplate { @Autowired private CommitRepository commitRepository; @Autowired private BranchRepository branchRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/GetContributorControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/GetContributorControllerIntegrationTest.java index 2706ff7be..ce9650150 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/GetContributorControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/GetContributorControllerIntegrationTest.java @@ -1,20 +1,10 @@ package io.reflectoring.coderadar.rest.contributor; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import io.reflectoring.coderadar.graph.contributor.domain.ContributorEntity; import io.reflectoring.coderadar.graph.contributor.repository.ContributorRepository; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; -import java.net.URL; -import java.util.List; -import java.util.Objects; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.neo4j.ogm.session.SessionFactory; @@ -23,6 +13,17 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultHandler; +import java.net.URL; +import java.util.List; +import java.util.Objects; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; +import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + public class GetContributorControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ContributorRepository contributorRepository; @Autowired private SessionFactory sessionFactory; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/ListContributorsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/ListContributorsControllerIntegrationTest.java index d5f65689b..90f95d0ef 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/ListContributorsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/ListContributorsControllerIntegrationTest.java @@ -1,20 +1,11 @@ package io.reflectoring.coderadar.rest.contributor; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.contributor.port.driver.GetContributorsForPathCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.URL; -import java.util.List; -import java.util.Objects; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -22,6 +13,16 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultHandler; +import java.net.URL; +import java.util.List; +import java.util.Objects; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + public class ListContributorsControllerIntegrationTest extends ControllerTestTemplate { private long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsControllerIntegrationTest.java index 0e5e641e1..82c8414a2 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsControllerIntegrationTest.java @@ -1,24 +1,25 @@ package io.reflectoring.coderadar.rest.contributor; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import io.reflectoring.coderadar.contributor.port.driver.MergeContributorsCommand; import io.reflectoring.coderadar.graph.contributor.domain.ContributorEntity; import io.reflectoring.coderadar.graph.contributor.repository.ContributorRepository; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; -import java.net.URL; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.ResultHandler; +import java.net.URL; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + public class MergeContributorsControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ContributorRepository contributorRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorControllerIntegrationTest.java index 52a714340..60b277ace 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorControllerIntegrationTest.java @@ -1,22 +1,23 @@ package io.reflectoring.coderadar.rest.contributor; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import io.reflectoring.coderadar.contributor.port.driver.UpdateContributorCommand; import io.reflectoring.coderadar.graph.contributor.domain.ContributorEntity; import io.reflectoring.coderadar.graph.contributor.repository.ContributorRepository; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; -import java.net.URL; -import java.util.Objects; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.ResultHandler; +import java.net.URL; +import java.util.Objects; + +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + public class UpdateContributorControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ContributorRepository contributorRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java index 613cbcf3d..33f75cd05 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.rest.dependencymap; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.CoderadarConfigurationProperties; import io.reflectoring.coderadar.dependencymap.adapter.DependencyCompareTreeAdapter; import io.reflectoring.coderadar.dependencymap.domain.CompareNode; @@ -15,12 +11,6 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectUseCase; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.vcs.port.driven.DeleteLocalRepositoryPort; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -30,6 +20,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + public class CompareTreeTest extends ControllerTestTemplate { private CompareNode root; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java index 02b461bf4..d851c13f4 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.rest.dependencymap; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.CoderadarConfigurationProperties; import io.reflectoring.coderadar.dependencymap.adapter.DependencyTreeAdapter; import io.reflectoring.coderadar.dependencymap.domain.Node; @@ -14,13 +10,6 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectUseCase; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.vcs.port.driven.DeleteLocalRepositoryPort; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -30,6 +19,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + public class TreeTest extends ControllerTestTemplate { private Node root; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/CreateFilePatternControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/CreateFilePatternControllerIntegrationTest.java index e5e6ce5bd..20beaa0e8 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/CreateFilePatternControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/CreateFilePatternControllerIntegrationTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.rest.filepattern; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.graph.projectadministration.domain.FilePatternEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.filepattern.repository.FilePatternRepository; @@ -17,6 +14,9 @@ import org.springframework.test.web.servlet.ResultHandler; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + class CreateFilePatternControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/DeleteFilePatternControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/DeleteFilePatternControllerIntegrationTest.java index e62e3dd6c..95ed95b75 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/DeleteFilePatternControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/DeleteFilePatternControllerIntegrationTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.filepattern; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; - import io.reflectoring.coderadar.graph.projectadministration.domain.FilePatternEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.filepattern.repository.FilePatternRepository; @@ -13,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + class DeleteFilePatternControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternControllerIntegrationTest.java index df2b7d782..1e4a75d23 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternControllerIntegrationTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.rest.filepattern; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.projectadministration.domain.FilePatternEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.filepattern.repository.FilePatternRepository; @@ -17,6 +13,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + class GetFilePatternControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectControllerIntegrationTest.java index f4b9fdcb6..f3c28d4c3 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectControllerIntegrationTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.rest.filepattern; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.projectadministration.domain.FilePatternEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.filepattern.repository.FilePatternRepository; @@ -11,12 +7,17 @@ import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; -import java.util.Arrays; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Arrays; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + class ListFilePatternsOfProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/CreateModuleControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/CreateModuleControllerIntegrationTest.java index 5257bcd7b..43a772943 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/CreateModuleControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/CreateModuleControllerIntegrationTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.rest.module; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.graph.projectadministration.domain.FileEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ModuleEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -12,14 +8,19 @@ import io.reflectoring.coderadar.projectadministration.port.driver.module.create.CreateModuleCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.ArrayList; +import java.util.List; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + class CreateModuleControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/DeleteModuleControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/DeleteModuleControllerIntegrationTest.java index 2bf3026dd..43809cd3f 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/DeleteModuleControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/DeleteModuleControllerIntegrationTest.java @@ -1,7 +1,5 @@ package io.reflectoring.coderadar.rest.module; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; - import io.reflectoring.coderadar.graph.projectadministration.domain.ModuleEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.module.repository.ModuleRepository; @@ -12,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + class DeleteModuleControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/GetModuleControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/GetModuleControllerIntegrationTest.java index 461a21bec..05b236379 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/GetModuleControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/GetModuleControllerIntegrationTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.rest.module; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.projectadministration.domain.ModuleEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.module.repository.ModuleRepository; @@ -15,6 +11,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + class GetModuleControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectControllerIntegrationTest.java index 9c2be85b0..f4fab8297 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectControllerIntegrationTest.java @@ -1,21 +1,22 @@ package io.reflectoring.coderadar.rest.module; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.projectadministration.domain.ModuleEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.module.repository.ModuleRepository; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; -import java.util.Arrays; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Arrays; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + class ListModulesOfProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/CreateProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/CreateProjectControllerIntegrationTest.java index 871a3b189..746cc13c6 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/CreateProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/CreateProjectControllerIntegrationTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.rest.project; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.graph.analyzer.repository.CommitRepository; import io.reflectoring.coderadar.graph.analyzer.repository.FileRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.CommitEntity; @@ -13,9 +9,6 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.URL; -import java.util.Date; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -23,6 +16,14 @@ import org.springframework.test.web.servlet.ResultHandler; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.net.URL; +import java.util.Date; +import java.util.List; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + class CreateProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; @Autowired private FileRepository fileRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/DeleteProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/DeleteProjectControllerIntegrationTest.java index eb68318b5..f2bf96d3d 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/DeleteProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/DeleteProjectControllerIntegrationTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.rest.project; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import io.reflectoring.coderadar.graph.contributor.domain.ContributorEntity; import io.reflectoring.coderadar.graph.contributor.repository.ContributorRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.FilePatternEntity; @@ -13,9 +9,6 @@ import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -24,6 +17,14 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + class DeleteProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/GetProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/GetProjectControllerIntegrationTest.java index 8f1a65ff1..70c33177a 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/GetProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/GetProjectControllerIntegrationTest.java @@ -1,19 +1,20 @@ package io.reflectoring.coderadar.rest.project; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; -import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Date; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + class GetProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java index c51ab2280..f01da1a9a 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java @@ -1,20 +1,21 @@ package io.reflectoring.coderadar.rest.project; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; -import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Date; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + class ListProjectsControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/UpdateProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/UpdateProjectControllerIntegrationTest.java index 358917316..820649c12 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/UpdateProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/UpdateProjectControllerIntegrationTest.java @@ -1,19 +1,20 @@ package io.reflectoring.coderadar.rest.project; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; -import java.util.Date; -import java.util.UUID; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Date; +import java.util.UUID; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + class UpdateProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectControllerTest.java index 3bf3f8e57..f12c1e584 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectControllerTest.java @@ -1,10 +1,5 @@ package io.reflectoring.coderadar.rest.query; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; @@ -13,15 +8,21 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.URL; -import java.util.List; -import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; +import java.net.URL; +import java.util.List; +import java.util.Objects; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + class GetAvailableMetricsInProjectControllerTest extends ControllerTestTemplate { private Long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitLogControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitLogControllerTest.java index c35a66a59..aa2953b27 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitLogControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitLogControllerTest.java @@ -1,25 +1,26 @@ package io.reflectoring.coderadar.rest.query; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.query.domain.CommitLog; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.URL; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; +import java.net.URL; +import java.util.Collections; +import java.util.List; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; +import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + public class GetCommitLogControllerTest extends ControllerTestTemplate { private Long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectControllerTest.java index 3b33b9c17..7fd1b44ee 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectControllerTest.java @@ -1,26 +1,27 @@ package io.reflectoring.coderadar.rest.query; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.domain.GetCommitResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.URL; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; +import java.net.URL; +import java.util.List; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; +import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + class GetCommitsInProjectControllerTest extends ControllerTestTemplate { private Long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesControllerTest.java index 9c7e2be78..93cabe46d 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesControllerTest.java @@ -1,11 +1,5 @@ package io.reflectoring.coderadar.rest.query; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; @@ -17,10 +11,6 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.URL; -import java.util.Date; -import java.util.List; -import java.util.Objects; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -28,6 +18,17 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultHandler; +import java.net.URL; +import java.util.Date; +import java.util.List; +import java.util.Objects; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + public class GetCriticalFilesControllerTest extends ControllerTestTemplate { private long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetDeltaTreeForTwoCommitsControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetDeltaTreeForTwoCommitsControllerTest.java index 909ef3637..9f01c7004 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetDeltaTreeForTwoCommitsControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetDeltaTreeForTwoCommitsControllerTest.java @@ -1,11 +1,5 @@ package io.reflectoring.coderadar.rest.query; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; @@ -17,17 +11,24 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.URL; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; -import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; +import java.net.URL; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.Objects; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + class GetDeltaTreeForTwoCommitsControllerTest extends ControllerTestTemplate { private Long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileContentWithMetricsControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileContentWithMetricsControllerTest.java index 3da3bdf54..0b83b8017 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileContentWithMetricsControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileContentWithMetricsControllerTest.java @@ -1,10 +1,5 @@ package io.reflectoring.coderadar.rest.query; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; @@ -13,14 +8,20 @@ import io.reflectoring.coderadar.query.port.driver.filecontent.GetFileContentWithMetricsCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.URL; -import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; +import java.net.URL; +import java.util.Objects; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + public class GetFileContentWithMetricsControllerTest extends ControllerTestTemplate { long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileDiffControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileDiffControllerTest.java index 129b2712e..efa0af539 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileDiffControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileDiffControllerTest.java @@ -1,10 +1,5 @@ package io.reflectoring.coderadar.rest.query; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; @@ -13,14 +8,20 @@ import io.reflectoring.coderadar.query.port.driver.filediff.GetFileDiffCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.URL; -import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; +import java.net.URL; +import java.util.Objects; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + public class GetFileDiffControllerTest extends ControllerTestTemplate { long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java index bbd53960b..131c779d7 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java @@ -1,25 +1,26 @@ package io.reflectoring.coderadar.rest.query; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.query.domain.FileTree; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.URL; -import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; +import java.net.URL; +import java.util.Objects; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + public class GetFileTreeForCommitControllerTest extends ControllerTestTemplate { long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricTreeForCommitControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricTreeForCommitControllerTest.java index 89277303e..296def967 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricTreeForCommitControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricTreeForCommitControllerTest.java @@ -1,11 +1,5 @@ package io.reflectoring.coderadar.rest.query; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; @@ -17,9 +11,6 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.URL; -import java.util.Arrays; -import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -27,6 +18,16 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MvcResult; +import java.net.URL; +import java.util.Arrays; +import java.util.Objects; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + class GetMetricTreeForCommitControllerTest extends ControllerTestTemplate { private Long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitControllerTest.java index cbc35c10c..4023d7eea 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitControllerTest.java @@ -1,11 +1,5 @@ package io.reflectoring.coderadar.rest.query; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; @@ -16,16 +10,23 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; -import java.net.URL; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; +import java.net.URL; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + class GetMetricValuesOfCommitControllerTest extends ControllerTestTemplate { private Long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordControllerIntegrationTest.java index b4a77c99c..e48807079 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordControllerIntegrationTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.graph.useradministration.domain.RefreshTokenEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.RefreshTokenRepository; @@ -19,6 +16,9 @@ import org.springframework.test.web.servlet.ResultHandler; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + class ChangePasswordControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java index c5f3fad47..9675dbc7a 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; @@ -13,6 +9,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + class GetUserControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java index 662ac7c0e..2437265b9 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; @@ -10,8 +7,6 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; -import java.util.Collections; -import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -19,6 +14,12 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Collections; +import java.util.Date; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + public class ListProjectsForUserControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java index 01df5cf69..1a3f74bca 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; @@ -15,6 +12,9 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + public class ListUsersControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java index 1cdf6a77b..47f6464fe 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; @@ -10,8 +7,6 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; -import java.util.Collections; -import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -19,6 +14,12 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Collections; +import java.util.Date; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + public class ListUsersForProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java index b8a05b658..27c1ae3f1 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java @@ -1,9 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration; -import static org.hamcrest.Matchers.any; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; @@ -15,6 +11,10 @@ import org.springframework.test.web.servlet.ResultHandler; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static org.hamcrest.Matchers.any; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + class LoginUserControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenControllerIntegrationTest.java index 435715318..88d7db4e6 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenControllerIntegrationTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; import io.reflectoring.coderadar.graph.useradministration.domain.RefreshTokenEntity; @@ -15,7 +12,6 @@ import io.reflectoring.coderadar.useradministration.service.security.SecretKeyService; import io.reflectoring.coderadar.useradministration.service.security.TokenService; import io.reflectoring.coderadar.useradministration.service.security.TokenType; -import java.util.Date; import org.joda.time.DateTime; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -23,6 +19,11 @@ import org.springframework.test.web.servlet.ResultHandler; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Date; + +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + class RefreshTokenControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserControllerIntegrationTest.java index 9bf9a105a..436cf0623 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserControllerIntegrationTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; @@ -13,6 +10,9 @@ import org.springframework.test.web.servlet.ResultHandler; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + class RegisterUserControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java index 184425616..6640e9af2 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java @@ -1,21 +1,22 @@ package io.reflectoring.coderadar.rest.useradministration.permissions; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; - import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; -import java.util.Collections; -import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Collections; +import java.util.Date; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + public class RemoveUserFromProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java index 9d1e619f7..fe4be47d9 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration.permissions; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; @@ -11,7 +8,6 @@ import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; import io.reflectoring.coderadar.useradministration.domain.ProjectRole; import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; -import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -19,6 +15,11 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Date; + +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + public class SetUserRoleForProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java index 8611759f9..b929cfd53 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; @@ -10,8 +7,6 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; import io.reflectoring.coderadar.useradministration.domain.ProjectRole; -import java.util.Date; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -19,6 +14,12 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Date; +import java.util.List; + +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + public class AddTeamToProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java index 4ee18e1fb..ccd67cecc 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java @@ -1,16 +1,11 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.JsonListWrapper; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -18,6 +13,12 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Collections; +import java.util.List; + +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + public class AddUsersToTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java index ee734828f..13dc091ea 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; @@ -10,8 +7,6 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -19,6 +14,12 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Collections; +import java.util.List; + +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + public class CreateTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java index 27155e360..b1330a4bb 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java @@ -1,21 +1,22 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; - import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Collections; +import java.util.List; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + public class DeleteTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java index 8e7a9771b..7494b5ea9 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; @@ -14,6 +11,9 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + public class GetTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java index b365799fe..53c6e7d2c 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java @@ -1,16 +1,11 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; -import java.util.Collections; -import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -18,6 +13,12 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Collections; +import java.util.Date; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + public class ListProjectsForTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java index 2d9cc5091..a79ba49ca 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java @@ -1,8 +1,5 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; @@ -14,6 +11,9 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + public class ListTeamsControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java index 2cec7c92f..7ca368dac 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java @@ -1,16 +1,11 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; -import java.util.Collections; -import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -18,6 +13,12 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Collections; +import java.util.Date; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + public class ListTeamsForProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java index 7b5aec0fb..87b578343 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java @@ -1,15 +1,11 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; -import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -17,6 +13,11 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Collections; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + public class ListTeamsForUserControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java index f0670511b..bb3d9df68 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java @@ -1,21 +1,22 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; - import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; -import java.util.Collections; -import java.util.Date; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + public class RemoveTeamFromProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java index 26b01a1e0..061b6cb2f 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java @@ -1,16 +1,11 @@ package io.reflectoring.coderadar.rest.useradministration.teams; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; - import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.JsonListWrapper; -import java.util.Collections; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -18,6 +13,12 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import java.util.Collections; +import java.util.List; + +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + public class RemoveUsersFromTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-ui/src/app/service/project.service.ts b/coderadar-ui/src/app/service/project.service.ts index f4d7f48c0..42f37a1d3 100644 --- a/coderadar-ui/src/app/service/project.service.ts +++ b/coderadar-ui/src/app/service/project.service.ts @@ -205,7 +205,7 @@ export class ProjectService { * @param branch The branch to use for getting the commits. */ public getCommitsForContributor(id: number, branch: string, email: string): Promise> { - return this.httpClient.get(this.apiURL + 'projects/' + id + '/' + branch + '/commits?email='+email, + return this.httpClient.get(this.apiURL + 'projects/' + id + '/' + branch + '/commits?email='+email.replace("+", "%2B"), {observe: 'response'}).toPromise(); } From f128dfcb07b20592ee57cf3c490d76daedf593c9 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Fri, 12 Jun 2020 12:37:27 +0200 Subject: [PATCH 40/76] apply spotless --- .../CoderadarConfigurationProperties.java | 13 +++++----- .../analyzer/domain/MetricValue.java | 3 +-- .../port/driver/AnalyzeCommitUseCase.java | 1 - .../service/AnalyzeCommitService.java | 3 +-- .../analyzer/service/AnalyzeFileService.java | 3 +-- .../service/AnalyzerPluginService.java | 9 +++---- .../analyzer/service/AnalyzingService.java | 5 ++-- .../service/ListAnalyzersService.java | 3 +-- .../contributor/domain/Contributor.java | 3 +-- .../port/driven/ComputeContributorsPort.java | 1 - .../port/driven/ListContributorsPort.java | 1 - .../port/driven/SaveContributorsPort.java | 1 - .../driver/GetContributorsForPathCommand.java | 3 +-- .../port/driver/ListContributorsUseCase.java | 1 - .../port/driver/MergeContributorsCommand.java | 9 +++---- .../port/driver/UpdateContributorCommand.java | 3 +-- .../service/ListContributorsService.java | 3 +-- .../dependencymap/domain/CompareNode.java | 5 ++-- .../coderadar/dependencymap/domain/Node.java | 5 ++-- .../projectadministration/domain/Commit.java | 3 +-- .../projectadministration/domain/File.java | 5 ++-- .../projectadministration/domain/Project.java | 3 +-- .../port/driven/analyzer/AddCommitsPort.java | 1 - .../port/driven/analyzer/SaveCommitPort.java | 1 - .../port/driven/analyzer/SaveMetricPort.java | 1 - .../ListAnalyzerConfigurationsPort.java | 1 - .../port/driven/branch/ListBranchesPort.java | 1 - .../ListFilePatternsOfProjectPort.java | 1 - .../module/ListModulesOfProjectPort.java | 1 - .../port/driven/project/ListProjectsPort.java | 1 - .../CreateAnalyzerConfigurationCommand.java | 3 +-- .../ListAnalyzerConfigurationsUseCase.java | 1 - .../UpdateAnalyzerConfigurationCommand.java | 3 +-- .../branch/list/ListBranchesUseCase.java | 1 - .../create/CreateFilePatternCommand.java | 5 ++-- .../get/ListFilePatternsOfProjectUseCase.java | 1 - .../module/create/CreateModuleCommand.java | 3 +-- .../get/ListModulesOfProjectUseCase.java | 1 - .../project/create/CreateProjectCommand.java | 9 +++---- .../project/get/ListProjectsUseCase.java | 1 - .../project/update/UpdateProjectCommand.java | 7 +++--- .../CreateAnalyzerConfigurationService.java | 3 +-- .../ListAnalyzerConfigurationsService.java | 3 +-- .../UpdateAnalyzerConfigurationService.java | 3 +-- .../service/branch/ListBranchesService.java | 3 +-- .../ListFilePatternsOfProjectService.java | 3 +-- .../module/ListModulesOfProjectService.java | 3 +-- .../service/project/CreateProjectService.java | 7 +++--- .../service/project/DeleteProjectService.java | 3 +-- .../service/project/ListProjectsService.java | 3 +-- .../service/project/ScanProjectScheduler.java | 13 +++++----- .../service/project/UpdateProjectService.java | 7 +++--- .../coderadar/query/domain/CommitLog.java | 3 +-- .../domain/CommitProfileRatingsQuery.java | 9 +++---- .../query/domain/ContributorsForFile.java | 3 +-- .../coderadar/query/domain/DateRange.java | 5 ++-- .../coderadar/query/domain/DeltaTree.java | 5 ++-- .../domain/FileAndCommitsForTimePeriod.java | 3 +-- .../query/domain/FileContentWithMetrics.java | 3 +-- .../coderadar/query/domain/FileTree.java | 3 +-- .../coderadar/query/domain/MetricTree.java | 5 ++-- .../query/domain/MetricWithFindings.java | 3 +-- .../query/port/driven/GetCommitLogPort.java | 1 - .../port/driven/GetCommitsInProjectPort.java | 1 - .../port/driven/GetCriticalFilesPort.java | 1 - .../driven/GetMetricValuesOfCommitPort.java | 1 - .../GetMetricsAndFindingsForFilePort.java | 1 - .../port/driver/GetCommitLogUseCase.java | 1 - .../driver/GetCommitsInProjectUseCase.java | 1 - .../GetMetricValuesOfCommitCommand.java | 7 +++--- .../GetMetricValuesOfCommitUseCase.java | 1 - .../GetCriticalFilesUseCase.java | 1 - .../GetFilesWithContributorsCommand.java | 5 ++-- .../GetFrequentlyChangedFilesCommand.java | 5 ++-- .../GetDeltaTreeForTwoCommitsCommand.java | 7 +++--- .../GetFileContentWithMetricsCommand.java | 3 +-- .../driver/filediff/GetFileDiffCommand.java | 3 +-- .../GetMetricTreeForCommitCommand.java | 7 +++--- .../GetAvailableMetricsInProjectService.java | 3 +-- .../query/service/GetCommitLogService.java | 3 +-- .../service/GetCommitsInProjectService.java | 3 +-- .../service/GetCriticalFilesService.java | 3 +-- .../GetFileContentWithMetricsService.java | 3 +-- .../GetMetricValuesOfCommitService.java | 3 +-- .../useradministration/domain/Team.java | 5 ++-- .../port/driven/ListProjectsForTeamPort.java | 1 - .../port/driven/ListProjectsForUserPort.java | 1 - .../port/driven/ListTeamsForProjectPort.java | 1 - .../port/driven/ListTeamsForUserPort.java | 1 - .../port/driven/ListTeamsPort.java | 1 - .../port/driven/ListUsersForProjectPort.java | 1 - .../port/driven/ListUsersPort.java | 1 - .../driver/CoderadarPasswordValidator.java | 5 ++-- .../port/driver/ValidPassword.java | 10 ++++---- .../get/ListProjectsForUserUseCase.java | 1 - .../port/driver/get/ListUsersUseCase.java | 1 - .../port/driver/login/LoginUserCommand.java | 3 +-- .../password/ChangePasswordCommand.java | 3 +-- .../driver/refresh/RefreshTokenCommand.java | 3 +-- .../driver/register/RegisterUserCommand.java | 3 +-- .../teams/create/CreateTeamCommand.java | 5 ++-- .../teams/get/ListProjectsForTeamUseCase.java | 1 - .../teams/get/ListTeamsForProjectUseCase.java | 1 - .../teams/get/ListTeamsForUserUseCase.java | 1 - .../driver/teams/get/ListTeamsUseCase.java | 1 - .../teams/get/ListUsersForProjectUseCase.java | 1 - .../get/ListProjectsForUserService.java | 3 +-- .../service/get/ListUsersService.java | 3 +-- .../security/AuthenticationTokenFilter.java | 11 ++++---- .../CoderadarSecurityConfiguration.java | 3 +-- .../security/CoderadarUserDetailService.java | 5 ++-- .../security/CoderadarUserDetails.java | 3 +-- .../service/security/SecretKeyService.java | 5 ++-- .../service/security/TokenService.java | 3 +-- .../service/teams/AddUsersToTeamService.java | 3 +-- .../teams/RemoveUsersFromTeamService.java | 3 +-- .../teams/get/ListProjectsForTeamService.java | 3 +-- .../teams/get/ListTeamsForProjectService.java | 3 +-- .../teams/get/ListTeamsForUserService.java | 3 +-- .../service/teams/get/ListTeamsService.java | 3 +-- .../teams/get/ListUsersForProjectService.java | 3 +-- .../driven/ExtractProjectCommitsPort.java | 1 - .../port/driven/GetAvailableBranchesPort.java | 1 - .../driven/GetDiffEntriesForCommitsPort.java | 1 - .../port/driven/GetRawCommitContentPort.java | 1 - .../driven/UpdateLocalRepositoryPort.java | 1 - .../driver/ExtractProjectCommitsUseCase.java | 1 - .../update/UpdateLocalRepositoryUseCase.java | 1 - .../service/ExtractProjectCommitsService.java | 3 +-- .../service/UpdateLocalRepositoryService.java | 3 +-- ...reateAnalyzerConfigurationServiceTest.java | 11 ++++---- ...eleteAnalyzerConfigurationServiceTest.java | 8 +++--- .../GetAnalyzerConfigurationServiceTest.java | 6 ++--- ...rConfigurationsFromProjectServiceTest.java | 13 +++++----- ...pdateAnalyzerConfigurationServiceTest.java | 7 +++--- .../CreateFilePatternServiceTest.java | 6 ++--- .../DeleteFilePatternServiceTest.java | 8 +++--- .../GetFilePatternServiceTest.java | 6 ++--- .../ListFilePatternsOfProjectServiceTest.java | 13 +++++----- .../module/CreateModuleServiceTest.java | 10 ++++---- .../module/DeleteModuleServiceTest.java | 8 +++--- .../module/GetModuleServiceTest.java | 6 ++--- .../ListModulesOfProjectServiceTest.java | 13 +++++----- .../project/GetProjectServiceTest.java | 9 +++---- .../project/ListProjectsServiceTest.java | 11 ++++---- .../project/UpdateProjectServiceTest.java | 17 ++++++------- .../user/ChangePasswordServiceTest.java | 4 +-- .../user/GetUserServiceTest.java | 6 ++--- .../user/LoginUserServiceTest.java | 8 +++--- .../user/RefreshTokenServiceTest.java | 10 ++++---- .../user/RegisterUserServiceTest.java | 12 ++++----- ...etAnalyzerConfigurationResponseMapper.java | 1 - .../rest/GetBranchResponseMapper.java | 1 - .../rest/GetCommitResponseMapper.java | 1 - .../rest/GetContributorResponseMapper.java | 1 - .../rest/GetFilePatternResponseMapper.java | 1 - .../rest/GetModuleResponseMapper.java | 1 - .../rest/GetProjectResponseMapper.java | 1 - .../coderadar/rest/GetTeamResponseMapper.java | 5 ++-- .../coderadar/rest/GetUserResponseMapper.java | 1 - .../coderadar/rest/JsonListWrapper.java | 5 ++-- .../GetAnalyzerConfigurationController.java | 4 +-- ...erConfigurationsFromProjectController.java | 7 +++--- .../analyzing/ListAnalyzersController.java | 3 +-- .../rest/branch/ListBranchesController.java | 7 +++--- .../contributor/GetContributorController.java | 4 +-- .../ListContributorsController.java | 7 +++--- .../FileAndCommitsForTimePeriodResponse.java | 3 +-- .../rest/domain/GetContributorResponse.java | 3 +-- .../rest/domain/GetProjectResponse.java | 3 +-- .../rest/domain/GetTeamResponse.java | 3 +-- .../filepattern/GetFilePatternController.java | 4 +-- .../ListFilePatternsOfProjectController.java | 7 +++--- .../rest/module/GetModuleController.java | 4 +-- .../ListModulesOfProjectController.java | 7 +++--- .../rest/project/CreateProjectController.java | 3 +-- .../rest/project/GetProjectController.java | 4 +-- .../rest/project/ListProjectsController.java | 7 +++--- .../rest/project/UpdateProjectController.java | 3 +-- ...etAvailableMetricsInProjectController.java | 3 +-- .../rest/query/GetCommitLogController.java | 3 +-- .../query/GetCommitsInProjectController.java | 3 +-- .../query/GetCriticalFilesController.java | 9 +++---- .../GetMetricValuesOfCommitController.java | 3 +-- .../useradministration/GetUserController.java | 4 +-- .../ListProjectsForUserController.java | 7 +++--- .../ListUsersController.java | 7 +++--- .../ListUsersForProjectController.java | 7 +++--- .../teams/GetTeamController.java | 4 +-- .../teams/ListProjectsForTeamController.java | 7 +++--- .../teams/ListTeamsController.java | 7 +++--- .../teams/ListTeamsForProjectController.java | 7 +++--- .../teams/ListTeamsForUserController.java | 7 +++--- ...alyzerConfigurationResponseMapperTest.java | 5 ++-- .../unit/GetBranchResponseMapperTest.java | 5 ++-- .../unit/GetCommitResponseMapperTest.java | 5 ++-- .../GetContributorResponseMapperTest.java | 5 ++-- .../GetFilePatternResponseMapperTest.java | 5 ++-- .../unit/GetModuleResponseMapperTest.java | 5 ++-- .../unit/GetProjectResponseMapperTest.java | 5 ++-- .../GetTeamResponseMapperControllerTest.java | 5 ++-- .../rest/unit/GetTeamResponseMapperTest.java | 5 ++-- .../rest/unit/GetUserResponseMapperTest.java | 5 ++-- ...teAnalyzerConfigurationControllerTest.java | 4 +-- ...teAnalyzerConfigurationControllerTest.java | 4 +-- ...etAnalyzerConfigurationControllerTest.java | 4 +-- ...nfigurationsFromProjectControllerTest.java | 9 +++---- ...teAnalyzerConfigurationControllerTest.java | 4 +-- .../CreateFilePatternControllerTest.java | 4 +-- .../DeleteFilePatternControllerTest.java | 4 +-- .../GetFilePatternControllerTest.java | 4 +-- ...stFilePatternsOfProjectControllerTest.java | 9 +++---- .../module/CreateModuleControllerTest.java | 4 +-- .../module/DeleteModuleControllerTest.java | 4 +-- .../unit/module/GetModuleControllerTest.java | 4 +-- .../ListModulesOfProjectControllerTest.java | 9 +++---- .../project/CreateProjectControllerTest.java | 9 +++---- .../project/DeleteProjectControllerTest.java | 4 +-- .../project/GetProjectControllerTest.java | 4 +-- .../project/ListProjectsControllerTest.java | 9 +++---- .../project/UpdateProjectControllerTest.java | 9 +++---- .../ChangePasswordControllerTest.java | 4 +-- .../GetUserControllerTest.java | 4 +-- .../ListProjectsForUserControllerTest.java | 9 +++---- .../ListUsersControllerTest.java | 9 +++---- .../ListUsersForProjectControllerTest.java | 9 +++---- .../LoginUserControllerTest.java | 7 +++--- .../RefreshTokenControllerTest.java | 4 +-- .../RegisterUserControllerTest.java | 4 +-- .../RemoveUserFromProjectControllerTest.java | 4 +-- .../SetUserRoleForProjectControllerTest.java | 4 +-- .../teams/AddTeamToProjectControllerTest.java | 4 +-- .../teams/AddUsersToTeamControllerTest.java | 11 ++++---- .../teams/CreateTeamControllerTest.java | 9 +++---- .../teams/DeleteTeamControllerTest.java | 6 ++--- .../teams/GetTeamControllerTest.java | 7 +++--- .../ListProjectsForTeamControllerTest.java | 9 +++---- .../teams/ListTeamsControllerTest.java | 11 ++++---- .../ListTeamsForProjectControllerTest.java | 11 ++++---- .../teams/ListTeamsForUserControllerTest.java | 11 ++++---- .../RemoveTeamFromProjectControllerTest.java | 4 +-- .../RemoveUsersFromTeamControllerTest.java | 11 ++++---- .../rest/ControllerTestTemplate.java | 9 +++---- .../coderadar/rest/JsonHelper.java | 3 +-- .../coderadar/rest/ResultMatchers.java | 4 +-- .../PaySimProjectIntegrationTest.java | 25 +++++++++---------- .../analysis/ResetAnalysisControllerTest.java | 21 ++++++++-------- ...alyzerConfigControllerIntegrationTest.java | 10 ++++---- ...alyzerConfigControllerIntegrationTest.java | 4 +-- ...alyzerConfigControllerIntegrationTest.java | 8 +++--- ...sFromProjectControllerIntegrationTest.java | 11 ++++---- ...alyzerConfigControllerIntegrationTest.java | 4 +-- ...ListAnalyzerControllerIntegrationTest.java | 9 +++---- .../rest/branches/DeleteBranchTest.java | 3 +-- .../branches/ListBranchesControllerTest.java | 11 ++++---- .../branches/SaveProjectWithBranchesTest.java | 11 ++++---- ...tContributorControllerIntegrationTest.java | 21 ++++++++-------- ...ContributorsControllerIntegrationTest.java | 19 +++++++------- ...ContributorsControllerIntegrationTest.java | 17 ++++++------- ...eContributorControllerIntegrationTest.java | 13 +++++----- .../rest/dependencymap/CompareTreeTest.java | 21 ++++++++-------- .../rest/dependencymap/TreeTest.java | 23 ++++++++--------- ...eFilePatternControllerIntegrationTest.java | 6 ++--- ...eFilePatternControllerIntegrationTest.java | 4 +-- ...tFilePatternControllerIntegrationTest.java | 8 +++--- ...rnsOfProjectControllerIntegrationTest.java | 11 ++++---- ...CreateModuleControllerIntegrationTest.java | 13 +++++----- ...DeleteModuleControllerIntegrationTest.java | 4 +-- .../GetModuleControllerIntegrationTest.java | 8 +++--- ...lesOfProjectControllerIntegrationTest.java | 11 ++++---- ...reateProjectControllerIntegrationTest.java | 15 ++++++----- ...eleteProjectControllerIntegrationTest.java | 15 ++++++----- .../GetProjectControllerIntegrationTest.java | 11 ++++---- ...ListProjectsControllerIntegrationTest.java | 11 ++++---- ...pdateProjectControllerIntegrationTest.java | 9 +++---- ...ailableMetricsInProjectControllerTest.java | 17 ++++++------- .../query/GetCommitLogControllerTest.java | 19 +++++++------- .../GetCommitsInProjectControllerTest.java | 19 +++++++------- .../query/GetCriticalFilesControllerTest.java | 21 ++++++++-------- ...tDeltaTreeForTwoCommitsControllerTest.java | 23 ++++++++--------- ...tFileContentWithMetricsControllerTest.java | 15 ++++++----- .../rest/query/GetFileDiffControllerTest.java | 15 ++++++----- .../GetFileTreeForCommitControllerTest.java | 17 ++++++------- .../GetMetricTreeForCommitControllerTest.java | 19 +++++++------- ...GetMetricValuesOfCommitControllerTest.java | 21 ++++++++-------- ...angePasswordControllerIntegrationTest.java | 6 ++--- .../GetUserControllerIntegrationTest.java | 8 +++--- ...jectsForUserControllerIntegrationTest.java | 11 ++++---- .../ListUsersControllerIntegrationTest.java | 6 ++--- ...rsForProjectControllerIntegrationTest.java | 11 ++++---- .../LoginUserControllerIntegrationTest.java | 8 +++--- ...RefreshTokenControllerIntegrationTest.java | 9 +++---- ...RegisterUserControllerIntegrationTest.java | 6 ++--- ...rFromProjectControllerIntegrationTest.java | 9 +++---- ...leForProjectControllerIntegrationTest.java | 9 +++---- ...eamToProjectControllerIntegrationTest.java | 11 ++++---- ...dUsersToTeamControllerIntegrationTest.java | 11 ++++---- .../CreateTeamControllerIntegrationTest.java | 11 ++++---- .../DeleteTeamControllerIntegrationTest.java | 9 +++---- .../GetTeamControllerIntegrationTest.java | 6 ++--- ...jectsForTeamControllerIntegrationTest.java | 11 ++++---- .../ListTeamsControllerIntegrationTest.java | 6 ++--- ...msForProjectControllerIntegrationTest.java | 11 ++++---- ...TeamsForUserControllerIntegrationTest.java | 9 +++---- ...mFromProjectControllerIntegrationTest.java | 11 ++++---- ...sersFromTeamControllerIntegrationTest.java | 11 ++++---- 306 files changed, 792 insertions(+), 1039 deletions(-) diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/CoderadarConfigurationProperties.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/CoderadarConfigurationProperties.java index 20a931c82..7556046cf 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/CoderadarConfigurationProperties.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/CoderadarConfigurationProperties.java @@ -1,18 +1,17 @@ package io.reflectoring.coderadar; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Locale; +import javax.annotation.PostConstruct; +import javax.validation.constraints.NotNull; import lombok.Data; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; -import javax.validation.constraints.NotNull; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Locale; - /** Provides access to all configuration parameters of the coderadar application. */ @Component @ConfigurationProperties("coderadar") diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/domain/MetricValue.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/domain/MetricValue.java index 269b9c38e..2bc24c9b3 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/domain/MetricValue.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/domain/MetricValue.java @@ -1,10 +1,9 @@ package io.reflectoring.coderadar.analyzer.domain; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; -import java.util.List; - /** A single metric for a given File and Commit. */ @Data @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/port/driver/AnalyzeCommitUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/port/driver/AnalyzeCommitUseCase.java index 6c0281b19..e3c146f0c 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/port/driver/AnalyzeCommitUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/port/driver/AnalyzeCommitUseCase.java @@ -4,7 +4,6 @@ import io.reflectoring.coderadar.plugin.api.SourceCodeFileAnalyzerPlugin; import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.projectadministration.domain.Project; - import java.util.List; public interface AnalyzeCommitUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeCommitService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeCommitService.java index 2830ac808..54052cb93 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeCommitService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeCommitService.java @@ -13,12 +13,11 @@ import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.vcs.UnableToGetCommitContentException; import io.reflectoring.coderadar.vcs.port.driven.GetRawCommitContentPort; -import org.springframework.stereotype.Service; - import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; +import org.springframework.stereotype.Service; /** Performs analysis on a commit. */ @Service diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeFileService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeFileService.java index f1049c49b..dab09a4d8 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeFileService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzeFileService.java @@ -3,12 +3,11 @@ import io.reflectoring.coderadar.plugin.api.AnalyzerFileFilter; import io.reflectoring.coderadar.plugin.api.FileMetrics; import io.reflectoring.coderadar.plugin.api.SourceCodeFileAnalyzerPlugin; +import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import java.util.List; - /** Combines multiple FileAnalyzerPlugins to calculate metrics for a single file. */ @Service public class AnalyzeFileService { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzerPluginService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzerPluginService.java index 888e86ae5..186da17c0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzerPluginService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzerPluginService.java @@ -2,17 +2,16 @@ import io.reflectoring.coderadar.plugin.api.ConfigurableAnalyzerPlugin; import io.reflectoring.coderadar.plugin.api.SourceCodeFileAnalyzerPlugin; -import org.reflections.Reflections; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.lang.reflect.InvocationTargetException; import java.util.*; +import org.reflections.Reflections; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; @Service public class AnalyzerPluginService { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzingService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzingService.java index 56a353d0d..69a41649f 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzingService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzingService.java @@ -17,13 +17,12 @@ import io.reflectoring.coderadar.projectadministration.service.ProcessProjectService; import io.reflectoring.coderadar.query.port.driven.GetAvailableMetricsInProjectPort; import io.reflectoring.coderadar.query.port.driven.GetCommitsInProjectPort; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; - @Service public class AnalyzingService implements StartAnalyzingUseCase, StopAnalyzingUseCase, GetAnalyzingStatusUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/ListAnalyzersService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/ListAnalyzersService.java index a2206a86f..c54e436bf 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/ListAnalyzersService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/ListAnalyzersService.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.analyzer.service; import io.reflectoring.coderadar.analyzer.port.driver.ListAnalyzersUseCase; +import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; - @Service public class ListAnalyzersService implements ListAnalyzersUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/domain/Contributor.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/domain/Contributor.java index 6a3de3066..529de0248 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/domain/Contributor.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/domain/Contributor.java @@ -1,10 +1,9 @@ package io.reflectoring.coderadar.contributor.domain; +import java.util.Set; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Set; - @Data @NoArgsConstructor public class Contributor { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ComputeContributorsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ComputeContributorsPort.java index fd0382eb9..927615391 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ComputeContributorsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ComputeContributorsPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.contributor.port.driven; import io.reflectoring.coderadar.contributor.domain.Contributor; - import java.util.List; public interface ComputeContributorsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ListContributorsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ListContributorsPort.java index 8ef96179a..a56aac71b 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ListContributorsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/ListContributorsPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.contributor.port.driven; import io.reflectoring.coderadar.contributor.domain.Contributor; - import java.util.List; public interface ListContributorsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/SaveContributorsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/SaveContributorsPort.java index 7b8d0db37..a223504e7 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/SaveContributorsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driven/SaveContributorsPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.contributor.port.driven; import io.reflectoring.coderadar.contributor.domain.Contributor; - import java.util.List; public interface SaveContributorsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/GetContributorsForPathCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/GetContributorsForPathCommand.java index 722a70163..b3593b688 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/GetContributorsForPathCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/GetContributorsForPathCommand.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.contributor.port.driver; +import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/ListContributorsUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/ListContributorsUseCase.java index 65271bd34..dd27c1a19 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/ListContributorsUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/ListContributorsUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.contributor.port.driver; import io.reflectoring.coderadar.contributor.domain.Contributor; - import java.util.List; public interface ListContributorsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/MergeContributorsCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/MergeContributorsCommand.java index 10805f9f0..3967df3b7 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/MergeContributorsCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/MergeContributorsCommand.java @@ -1,13 +1,12 @@ package io.reflectoring.coderadar.contributor.port.driver; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - +import java.util.List; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; @Data @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/UpdateContributorCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/UpdateContributorCommand.java index 9ca7b26be..79e12a2c8 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/UpdateContributorCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/port/driver/UpdateContributorCommand.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.contributor.port.driver; +import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; - @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/service/ListContributorsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/service/ListContributorsService.java index 6ee737271..5c4c26460 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/service/ListContributorsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/contributor/service/ListContributorsService.java @@ -6,9 +6,8 @@ import io.reflectoring.coderadar.contributor.port.driver.ListContributorsUseCase; import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListContributorsService implements ListContributorsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java index 33857ab09..20a049994 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/CompareNode.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.dependencymap.domain; import io.reflectoring.coderadar.plugin.api.ChangeType; -import lombok.Getter; -import lombok.Setter; - import java.util.ArrayDeque; import java.util.Deque; import java.util.HashSet; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import lombok.Getter; +import lombok.Setter; @Getter @Setter diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/Node.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/Node.java index 9ed836be5..af371281a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/Node.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/Node.java @@ -1,12 +1,11 @@ package io.reflectoring.coderadar.dependencymap.domain; -import lombok.Getter; -import lombok.Setter; - import java.util.HashSet; import java.util.List; import java.util.Stack; import java.util.concurrent.CopyOnWriteArrayList; +import lombok.Getter; +import lombok.Setter; @Getter @Setter diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Commit.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Commit.java index b0424345a..66bf35556 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Commit.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Commit.java @@ -1,10 +1,9 @@ package io.reflectoring.coderadar.projectadministration.domain; +import java.util.List; import lombok.Data; import lombok.ToString; -import java.util.List; - /** Metadata about a commit to a Git repository. */ @Data public class Commit { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/File.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/File.java index 56978fbbe..005f9dfe7 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/File.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/File.java @@ -1,12 +1,11 @@ package io.reflectoring.coderadar.projectadministration.domain; +import java.util.Collections; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import java.util.Collections; -import java.util.List; - /** Represents a file in a VCS repository. */ @NoArgsConstructor @EqualsAndHashCode diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java index 881f983e7..0b46dc9a5 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/domain/Project.java @@ -1,10 +1,9 @@ package io.reflectoring.coderadar.projectadministration.domain; import io.reflectoring.coderadar.useradministration.domain.Team; -import lombok.Data; - import java.util.Date; import java.util.List; +import lombok.Data; /** A Coderadar project that defines the source of files that are to be analyzed. */ @Data diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/AddCommitsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/AddCommitsPort.java index d3c34cb32..f5c5f909a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/AddCommitsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/AddCommitsPort.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.projectadministration.domain.Commit; - import java.util.List; public interface AddCommitsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveCommitPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveCommitPort.java index 879ae598f..649148296 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveCommitPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveCommitPort.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.projectadministration.domain.Commit; - import java.util.List; public interface SaveCommitPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveMetricPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveMetricPort.java index 78eeba795..0ad1e79cd 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveMetricPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzer/SaveMetricPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.projectadministration.port.driven.analyzer; import io.reflectoring.coderadar.analyzer.domain.MetricValue; - import java.util.List; import java.util.Map; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzerconfig/ListAnalyzerConfigurationsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzerconfig/ListAnalyzerConfigurationsPort.java index abdd77c2a..026675f10 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzerconfig/ListAnalyzerConfigurationsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/analyzerconfig/ListAnalyzerConfigurationsPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig; import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; - import java.util.List; public interface ListAnalyzerConfigurationsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/branch/ListBranchesPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/branch/ListBranchesPort.java index 96555ea57..33043e3a1 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/branch/ListBranchesPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/branch/ListBranchesPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.projectadministration.port.driven.branch; import io.reflectoring.coderadar.projectadministration.domain.Branch; - import java.util.List; public interface ListBranchesPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/filepattern/ListFilePatternsOfProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/filepattern/ListFilePatternsOfProjectPort.java index acdbdc988..a319d24ea 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/filepattern/ListFilePatternsOfProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/filepattern/ListFilePatternsOfProjectPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.projectadministration.port.driven.filepattern; import io.reflectoring.coderadar.projectadministration.domain.FilePattern; - import java.util.List; public interface ListFilePatternsOfProjectPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/module/ListModulesOfProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/module/ListModulesOfProjectPort.java index fc82219d3..2de8cb260 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/module/ListModulesOfProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/module/ListModulesOfProjectPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.projectadministration.port.driven.module; import io.reflectoring.coderadar.projectadministration.domain.Module; - import java.util.List; public interface ListModulesOfProjectPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/project/ListProjectsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/project/ListProjectsPort.java index 9639567fe..09b42e884 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/project/ListProjectsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driven/project/ListProjectsPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.projectadministration.port.driven.project; import io.reflectoring.coderadar.projectadministration.domain.Project; - import java.util.List; public interface ListProjectsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/create/CreateAnalyzerConfigurationCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/create/CreateAnalyzerConfigurationCommand.java index 05d553530..dc32bd931 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/create/CreateAnalyzerConfigurationCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/create/CreateAnalyzerConfigurationCommand.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create; +import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; - @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/get/ListAnalyzerConfigurationsUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/get/ListAnalyzerConfigurationsUseCase.java index b49ac165f..fb7c44da3 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/get/ListAnalyzerConfigurationsUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/get/ListAnalyzerConfigurationsUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get; import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; - import java.util.List; public interface ListAnalyzerConfigurationsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/update/UpdateAnalyzerConfigurationCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/update/UpdateAnalyzerConfigurationCommand.java index c5797903a..f6e28229a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/update/UpdateAnalyzerConfigurationCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/analyzerconfig/update/UpdateAnalyzerConfigurationCommand.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update; +import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/branch/list/ListBranchesUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/branch/list/ListBranchesUseCase.java index 4deed86b5..99dfb7585 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/branch/list/ListBranchesUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/branch/list/ListBranchesUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.projectadministration.port.driver.branch.list; import io.reflectoring.coderadar.projectadministration.domain.Branch; - import java.util.List; public interface ListBranchesUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/create/CreateFilePatternCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/create/CreateFilePatternCommand.java index 64b4d32a3..482b98889 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/create/CreateFilePatternCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/create/CreateFilePatternCommand.java @@ -1,13 +1,12 @@ package io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/get/ListFilePatternsOfProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/get/ListFilePatternsOfProjectUseCase.java index 8e3680671..3b8596f29 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/get/ListFilePatternsOfProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/filepattern/get/ListFilePatternsOfProjectUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get; import io.reflectoring.coderadar.projectadministration.domain.FilePattern; - import java.util.List; public interface ListFilePatternsOfProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/create/CreateModuleCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/create/CreateModuleCommand.java index cd75fc825..93db23585 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/create/CreateModuleCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/create/CreateModuleCommand.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.projectadministration.port.driver.module.create; +import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; - @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/get/ListModulesOfProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/get/ListModulesOfProjectUseCase.java index 92f888cb1..a7d197f0a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/get/ListModulesOfProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/module/get/ListModulesOfProjectUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.projectadministration.port.driver.module.get; import io.reflectoring.coderadar.projectadministration.domain.Module; - import java.util.List; public interface ListModulesOfProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/create/CreateProjectCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/create/CreateProjectCommand.java index 2ba55a839..2b05fbe84 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/create/CreateProjectCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/create/CreateProjectCommand.java @@ -1,15 +1,14 @@ package io.reflectoring.coderadar.projectadministration.port.driver.project.create; +import java.util.Date; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Past; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.URL; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Past; -import java.util.Date; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java index 3620c94fb..ad9f07e2e 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/get/ListProjectsUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.projectadministration.port.driver.project.get; import io.reflectoring.coderadar.projectadministration.domain.Project; - import java.util.List; public interface ListProjectsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/update/UpdateProjectCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/update/UpdateProjectCommand.java index 9227cbccc..43f5af572 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/update/UpdateProjectCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/port/driver/project/update/UpdateProjectCommand.java @@ -1,14 +1,13 @@ package io.reflectoring.coderadar.projectadministration.port.driver.project.update; +import java.util.Date; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.URL; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.Date; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/CreateAnalyzerConfigurationService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/CreateAnalyzerConfigurationService.java index d34ba19b1..c99cf3333 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/CreateAnalyzerConfigurationService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/CreateAnalyzerConfigurationService.java @@ -7,12 +7,11 @@ import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.CreateAnalyzerConfigurationPort; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationUseCase; +import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import java.util.List; - @Service public class CreateAnalyzerConfigurationService implements CreateAnalyzerConfigurationUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/ListAnalyzerConfigurationsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/ListAnalyzerConfigurationsService.java index d4a51634a..fc25104e9 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/ListAnalyzerConfigurationsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/ListAnalyzerConfigurationsService.java @@ -5,9 +5,8 @@ import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.ListAnalyzerConfigurationsPort; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.ListAnalyzerConfigurationsUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListAnalyzerConfigurationsService implements ListAnalyzerConfigurationsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/UpdateAnalyzerConfigurationService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/UpdateAnalyzerConfigurationService.java index 6008d3444..2765ab04a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/UpdateAnalyzerConfigurationService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/UpdateAnalyzerConfigurationService.java @@ -8,12 +8,11 @@ import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.UpdateAnalyzerConfigurationPort; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update.UpdateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update.UpdateAnalyzerConfigurationUseCase; +import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import java.util.List; - @Service public class UpdateAnalyzerConfigurationService implements UpdateAnalyzerConfigurationUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/branch/ListBranchesService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/branch/ListBranchesService.java index 0db637719..69ff5508b 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/branch/ListBranchesService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/branch/ListBranchesService.java @@ -5,9 +5,8 @@ import io.reflectoring.coderadar.projectadministration.port.driven.branch.ListBranchesPort; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.port.driver.branch.list.ListBranchesUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListBranchesService implements ListBranchesUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/filepattern/ListFilePatternsOfProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/filepattern/ListFilePatternsOfProjectService.java index dcaedfe2e..263326176 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/filepattern/ListFilePatternsOfProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/filepattern/ListFilePatternsOfProjectService.java @@ -5,9 +5,8 @@ import io.reflectoring.coderadar.projectadministration.port.driven.filepattern.ListFilePatternsOfProjectPort; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.ListFilePatternsOfProjectUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListFilePatternsOfProjectService implements ListFilePatternsOfProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/module/ListModulesOfProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/module/ListModulesOfProjectService.java index 1cac5c59c..438336008 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/module/ListModulesOfProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/module/ListModulesOfProjectService.java @@ -5,9 +5,8 @@ import io.reflectoring.coderadar.projectadministration.port.driven.module.ListModulesOfProjectPort; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.port.driver.module.get.ListModulesOfProjectUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListModulesOfProjectService implements ListModulesOfProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/CreateProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/CreateProjectService.java index 69c8a4196..49af504d6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/CreateProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/CreateProjectService.java @@ -20,15 +20,14 @@ import io.reflectoring.coderadar.vcs.port.driver.ExtractProjectCommitsUseCase; import io.reflectoring.coderadar.vcs.port.driver.clone.CloneRepositoryCommand; import io.reflectoring.coderadar.vcs.port.driver.clone.CloneRepositoryUseCase; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - import java.time.LocalDate; import java.time.ZoneId; import java.util.Date; import java.util.List; import java.util.UUID; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; @Service public class CreateProjectService implements CreateProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/DeleteProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/DeleteProjectService.java index cbe4638a0..6ae86c982 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/DeleteProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/DeleteProjectService.java @@ -7,12 +7,11 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.delete.DeleteProjectUseCase; import io.reflectoring.coderadar.projectadministration.service.ProcessProjectService; import io.reflectoring.coderadar.vcs.port.driven.DeleteLocalRepositoryPort; +import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import java.io.IOException; - @Service public class DeleteProjectService implements DeleteProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java index 0492daf70..aa9fb10d8 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ListProjectsService.java @@ -3,9 +3,8 @@ import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driven.project.ListProjectsPort; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.ListProjectsUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListProjectsService implements ListProjectsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ScanProjectScheduler.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ScanProjectScheduler.java index ee8db0327..f312d210b 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ScanProjectScheduler.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/ScanProjectScheduler.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.projectadministration.service.project; +import static io.reflectoring.coderadar.projectadministration.service.project.CreateProjectService.getProjectDateRange; + import io.reflectoring.coderadar.CoderadarConfigurationProperties; import io.reflectoring.coderadar.projectadministration.ModuleAlreadyExistsException; import io.reflectoring.coderadar.projectadministration.ModulePathInvalidException; @@ -20,6 +22,10 @@ import io.reflectoring.coderadar.vcs.port.driver.ExtractProjectCommitsUseCase; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateLocalRepositoryUseCase; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateRepositoryCommand; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ScheduledFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.event.ContextRefreshedEvent; @@ -28,13 +34,6 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.stereotype.Component; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ScheduledFuture; - -import static io.reflectoring.coderadar.projectadministration.service.project.CreateProjectService.getProjectDateRange; - @Component public class ScanProjectScheduler { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/UpdateProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/UpdateProjectService.java index 55fbe50b3..3d2463437 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/UpdateProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/UpdateProjectService.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.projectadministration.service.project; +import static io.reflectoring.coderadar.projectadministration.service.project.CreateProjectService.getProjectDateRange; + import io.reflectoring.coderadar.CoderadarConfigurationProperties; import io.reflectoring.coderadar.analyzer.port.driven.ResetAnalysisPort; import io.reflectoring.coderadar.projectadministration.ModuleAlreadyExistsException; @@ -22,14 +24,11 @@ import io.reflectoring.coderadar.vcs.port.driver.ExtractProjectCommitsUseCase; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateLocalRepositoryUseCase; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateRepositoryCommand; +import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import java.util.List; - -import static io.reflectoring.coderadar.projectadministration.service.project.CreateProjectService.getProjectDateRange; - @Service public class UpdateProjectService implements UpdateProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitLog.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitLog.java index 8ad0de0e0..542230304 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitLog.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitLog.java @@ -1,9 +1,8 @@ package io.reflectoring.coderadar.query.domain; -import lombok.Data; - import java.util.Collections; import java.util.List; +import lombok.Data; @Data public class CommitLog { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitProfileRatingsQuery.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitProfileRatingsQuery.java index 325ea5f98..62b0d6d92 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitProfileRatingsQuery.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/CommitProfileRatingsQuery.java @@ -1,13 +1,12 @@ package io.reflectoring.coderadar.query.domain; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import lombok.Data; +import lombok.NoArgsConstructor; /** * Objects of this class provide parameters to query for quality profile ratings aggregated per diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/ContributorsForFile.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/ContributorsForFile.java index 926e32baf..665715a4a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/ContributorsForFile.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/ContributorsForFile.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.query.domain; +import java.util.Set; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Set; - @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DateRange.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DateRange.java index 649167cff..2d46847b4 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DateRange.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DateRange.java @@ -4,13 +4,12 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; +import java.time.LocalDate; +import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; -import java.time.LocalDate; - @AllArgsConstructor @NoArgsConstructor @Data diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DeltaTree.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DeltaTree.java index 7ecaa3b1a..9dcfcabca 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DeltaTree.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/DeltaTree.java @@ -1,10 +1,9 @@ package io.reflectoring.coderadar.query.domain; -import lombok.Data; -import lombok.NoArgsConstructor; - import java.util.ArrayList; import java.util.List; +import lombok.Data; +import lombok.NoArgsConstructor; @Data @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileAndCommitsForTimePeriod.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileAndCommitsForTimePeriod.java index b22997fa2..4c162fbf3 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileAndCommitsForTimePeriod.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileAndCommitsForTimePeriod.java @@ -1,12 +1,11 @@ package io.reflectoring.coderadar.query.domain; import io.reflectoring.coderadar.projectadministration.domain.Commit; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileContentWithMetrics.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileContentWithMetrics.java index 03dd0f139..1c0d01db6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileContentWithMetrics.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileContentWithMetrics.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.query.domain; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileTree.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileTree.java index af9cdc989..f1bd50acd 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileTree.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/FileTree.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.query.domain; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricTree.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricTree.java index 05e1ae449..3e637f602 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricTree.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricTree.java @@ -1,12 +1,11 @@ package io.reflectoring.coderadar.query.domain; +import java.util.ArrayList; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.ArrayList; -import java.util.List; - @AllArgsConstructor @NoArgsConstructor @Data diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricWithFindings.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricWithFindings.java index edacfa808..3701c8612 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricWithFindings.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/domain/MetricWithFindings.java @@ -1,12 +1,11 @@ package io.reflectoring.coderadar.query.domain; import io.reflectoring.coderadar.analyzer.domain.Finding; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitLogPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitLogPort.java index ebea15cb5..a8b5e710c 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitLogPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitLogPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.query.port.driven; import io.reflectoring.coderadar.query.domain.CommitLog; - import java.util.List; public interface GetCommitLogPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitsInProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitsInProjectPort.java index 52fdb57f7..b1ce10bf1 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitsInProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCommitsInProjectPort.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.projectadministration.domain.FilePattern; - import java.util.List; public interface GetCommitsInProjectPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCriticalFilesPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCriticalFilesPort.java index ec83d945c..59529c0a7 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCriticalFilesPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetCriticalFilesPort.java @@ -3,7 +3,6 @@ import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.query.domain.ContributorsForFile; import io.reflectoring.coderadar.query.domain.FileAndCommitsForTimePeriod; - import java.util.Date; import java.util.List; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricValuesOfCommitPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricValuesOfCommitPort.java index 2681b5c92..c3ac41957 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricValuesOfCommitPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricValuesOfCommitPort.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.query.domain.MetricValueForCommit; import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitCommand; - import java.util.List; public interface GetMetricValuesOfCommitPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricsAndFindingsForFilePort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricsAndFindingsForFilePort.java index ead5c807f..2262200f7 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricsAndFindingsForFilePort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driven/GetMetricsAndFindingsForFilePort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.query.port.driven; import io.reflectoring.coderadar.query.domain.MetricWithFindings; - import java.util.List; public interface GetMetricsAndFindingsForFilePort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitLogUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitLogUseCase.java index fce0e3eed..e53101d01 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitLogUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitLogUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.query.port.driver; import io.reflectoring.coderadar.query.domain.CommitLog; - import java.util.List; public interface GetCommitLogUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitsInProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitsInProjectUseCase.java index 2f9d01ec9..afbb3775a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitsInProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/GetCommitsInProjectUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.query.port.driver; import io.reflectoring.coderadar.projectadministration.domain.Commit; - import java.util.List; public interface GetCommitsInProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitCommand.java index 8a5bf8a44..21a2ad1c6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitCommand.java @@ -1,13 +1,12 @@ package io.reflectoring.coderadar.query.port.driver.commitmetrics; +import java.util.List; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.List; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitUseCase.java index 983888ee5..6a8cce786 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/commitmetrics/GetMetricValuesOfCommitUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.query.port.driver.commitmetrics; import io.reflectoring.coderadar.query.domain.MetricValueForCommit; - import java.util.List; public interface GetMetricValuesOfCommitUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetCriticalFilesUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetCriticalFilesUseCase.java index 387430e49..7d89064d4 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetCriticalFilesUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetCriticalFilesUseCase.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.query.domain.ContributorsForFile; import io.reflectoring.coderadar.query.domain.FileAndCommitsForTimePeriod; - import java.util.List; public interface GetCriticalFilesUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFilesWithContributorsCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFilesWithContributorsCommand.java index ab8595d9d..50a8943fb 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFilesWithContributorsCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFilesWithContributorsCommand.java @@ -1,12 +1,11 @@ package io.reflectoring.coderadar.query.port.driver.criticalfiles; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; - @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFrequentlyChangedFilesCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFrequentlyChangedFilesCommand.java index bb71aff17..0a7154e3d 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFrequentlyChangedFilesCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/criticalfiles/GetFrequentlyChangedFilesCommand.java @@ -1,12 +1,11 @@ package io.reflectoring.coderadar.query.port.driver.criticalfiles; +import java.util.Date; +import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; -import java.util.Date; - @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/deltatree/GetDeltaTreeForTwoCommitsCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/deltatree/GetDeltaTreeForTwoCommitsCommand.java index eb04ed67b..8d5f13c04 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/deltatree/GetDeltaTreeForTwoCommitsCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/deltatree/GetDeltaTreeForTwoCommitsCommand.java @@ -1,13 +1,12 @@ package io.reflectoring.coderadar.query.port.driver.deltatree; +import java.util.List; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.List; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filecontent/GetFileContentWithMetricsCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filecontent/GetFileContentWithMetricsCommand.java index 886afea48..c1da6dc6d 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filecontent/GetFileContentWithMetricsCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filecontent/GetFileContentWithMetricsCommand.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.query.port.driver.filecontent; +import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; - @AllArgsConstructor @NoArgsConstructor @Data diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filediff/GetFileDiffCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filediff/GetFileDiffCommand.java index 948eef784..ecab61b69 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filediff/GetFileDiffCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/filediff/GetFileDiffCommand.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.query.port.driver.filediff; +import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; - @AllArgsConstructor @NoArgsConstructor @Data diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/metrictree/GetMetricTreeForCommitCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/metrictree/GetMetricTreeForCommitCommand.java index b74c1c345..ce058446c 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/metrictree/GetMetricTreeForCommitCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/port/driver/metrictree/GetMetricTreeForCommitCommand.java @@ -1,13 +1,12 @@ package io.reflectoring.coderadar.query.port.driver.metrictree; +import java.util.List; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.List; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetAvailableMetricsInProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetAvailableMetricsInProjectService.java index 940009cc1..98762b3fb 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetAvailableMetricsInProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetAvailableMetricsInProjectService.java @@ -4,9 +4,8 @@ import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.query.port.driven.GetAvailableMetricsInProjectPort; import io.reflectoring.coderadar.query.port.driver.GetAvailableMetricsInProjectUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class GetAvailableMetricsInProjectService implements GetAvailableMetricsInProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitLogService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitLogService.java index 490a0cf74..6d7c08492 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitLogService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitLogService.java @@ -5,9 +5,8 @@ import io.reflectoring.coderadar.query.domain.CommitLog; import io.reflectoring.coderadar.query.port.driven.GetCommitLogPort; import io.reflectoring.coderadar.query.port.driver.GetCommitLogUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class GetCommitLogService implements GetCommitLogUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitsInProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitsInProjectService.java index f07e069f4..ba28a4cf8 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitsInProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCommitsInProjectService.java @@ -5,9 +5,8 @@ import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.query.port.driven.GetCommitsInProjectPort; import io.reflectoring.coderadar.query.port.driver.GetCommitsInProjectUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class GetCommitsInProjectService implements GetCommitsInProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCriticalFilesService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCriticalFilesService.java index 52a7b22dd..23c22f4b4 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCriticalFilesService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetCriticalFilesService.java @@ -11,9 +11,8 @@ import io.reflectoring.coderadar.query.port.driver.criticalfiles.GetCriticalFilesUseCase; import io.reflectoring.coderadar.query.port.driver.criticalfiles.GetFilesWithContributorsCommand; import io.reflectoring.coderadar.query.port.driver.criticalfiles.GetFrequentlyChangedFilesCommand; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class GetCriticalFilesService implements GetCriticalFilesUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetFileContentWithMetricsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetFileContentWithMetricsService.java index 82bd19116..7ad5554e2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetFileContentWithMetricsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetFileContentWithMetricsService.java @@ -9,9 +9,8 @@ import io.reflectoring.coderadar.query.port.driver.filecontent.GetFileContentWithMetricsCommand; import io.reflectoring.coderadar.query.port.driver.filecontent.GetFileContentWithMetricsUseCase; import io.reflectoring.coderadar.vcs.port.driven.GetRawCommitContentPort; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class GetFileContentWithMetricsService implements GetFileContentWithMetricsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetMetricValuesOfCommitService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetMetricValuesOfCommitService.java index 551e18d94..38bbf1e23 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetMetricValuesOfCommitService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetMetricValuesOfCommitService.java @@ -6,9 +6,8 @@ import io.reflectoring.coderadar.query.port.driven.GetMetricValuesOfCommitPort; import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitCommand; import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class GetMetricValuesOfCommitService implements GetMetricValuesOfCommitUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java index f11796fe7..651fd1f6c 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/Team.java @@ -1,10 +1,9 @@ package io.reflectoring.coderadar.useradministration.domain; -import lombok.Data; -import lombok.NoArgsConstructor; - import java.util.Collections; import java.util.List; +import lombok.Data; +import lombok.NoArgsConstructor; @Data @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java index 600f66bbc..91980ca17 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForTeamPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.projectadministration.domain.Project; - import java.util.List; public interface ListProjectsForTeamPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java index e61f56e03..a3e4edee1 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListProjectsForUserPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.projectadministration.domain.Project; - import java.util.List; public interface ListProjectsForUserPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java index dd7d9ca26..beedfb323 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForProjectPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsForProjectPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java index 99ce83fe2..7ecb1ccdf 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsForUserPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsForUserPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java index 39221014c..ba093a6de 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListTeamsPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersForProjectPort.java index 68d07ac69..b302708a6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersForProjectPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.User; - import java.util.List; public interface ListUsersForProjectPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java index 09fb69230..039cf273c 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/ListUsersPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driven; import io.reflectoring.coderadar.useradministration.domain.User; - import java.util.List; public interface ListUsersPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/CoderadarPasswordValidator.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/CoderadarPasswordValidator.java index 48cf25067..f649b02eb 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/CoderadarPasswordValidator.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/CoderadarPasswordValidator.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.useradministration.port.driver; import com.google.common.base.Joiner; -import org.passay.*; - +import java.util.Arrays; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import java.util.Arrays; +import org.passay.*; /** Validator for user passwords. */ public class CoderadarPasswordValidator implements ConstraintValidator { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/ValidPassword.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/ValidPassword.java index 25aaeab5d..cb4ab6dfa 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/ValidPassword.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/ValidPassword.java @@ -1,13 +1,13 @@ package io.reflectoring.coderadar.useradministration.port.driver; -import javax.validation.Constraint; -import javax.validation.Payload; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import javax.validation.Constraint; +import javax.validation.Payload; @Documented @Constraint(validatedBy = CoderadarPasswordValidator.class) diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java index fe47dab83..7e5ef22b2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListProjectsForUserUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driver.get; import io.reflectoring.coderadar.projectadministration.domain.Project; - import java.util.List; public interface ListProjectsForUserUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java index d15ff1bd6..33efbdf78 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/get/ListUsersUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driver.get; import io.reflectoring.coderadar.useradministration.domain.User; - import java.util.List; public interface ListUsersUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/login/LoginUserCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/login/LoginUserCommand.java index 1bc827939..a5280e272 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/login/LoginUserCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/login/LoginUserCommand.java @@ -1,12 +1,11 @@ package io.reflectoring.coderadar.useradministration.port.driver.login; +import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/password/ChangePasswordCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/password/ChangePasswordCommand.java index 70c8502ef..7b4ccf98d 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/password/ChangePasswordCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/password/ChangePasswordCommand.java @@ -1,13 +1,12 @@ package io.reflectoring.coderadar.useradministration.port.driver.password; import io.reflectoring.coderadar.useradministration.port.driver.ValidPassword; +import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/refresh/RefreshTokenCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/refresh/RefreshTokenCommand.java index 5fc56ddc0..44ced11f1 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/refresh/RefreshTokenCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/refresh/RefreshTokenCommand.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.useradministration.port.driver.refresh; +import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; - @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/register/RegisterUserCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/register/RegisterUserCommand.java index 6b45e83c2..9c9cfca2a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/register/RegisterUserCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/register/RegisterUserCommand.java @@ -1,13 +1,12 @@ package io.reflectoring.coderadar.useradministration.port.driver.register; import io.reflectoring.coderadar.useradministration.port.driver.ValidPassword; +import javax.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java index 94e8e9398..8edff6bf2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/create/CreateTeamCommand.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.create; +import java.util.List; +import javax.validation.constraints.NotBlank; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; -import java.util.List; - /** DTO class for creating teams. */ @Data @NoArgsConstructor diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java index af34ee78b..b592245a6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListProjectsForTeamUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.projectadministration.domain.Project; - import java.util.List; public interface ListProjectsForTeamUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java index a662677f8..50bc267b6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForProjectUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsForProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java index 07345b19d..93d0ad43a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsForUserUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsForUserUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java index ab33a6f9e..d5db61391 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListTeamsUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.List; public interface ListTeamsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListUsersForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListUsersForProjectUseCase.java index f821296e8..a1e492bc4 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListUsersForProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/get/ListUsersForProjectUseCase.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.useradministration.port.driver.teams.get; import io.reflectoring.coderadar.useradministration.domain.User; - import java.util.List; public interface ListUsersForProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java index aa21dda16..ece517eab 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListProjectsForUserService.java @@ -5,9 +5,8 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForUserPort; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListProjectsForUserService implements ListProjectsForUserUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java index bfefbcf68..850467661 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/get/ListUsersService.java @@ -3,9 +3,8 @@ import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.ListUsersPort; import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListUsersService implements ListUsersUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationTokenFilter.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationTokenFilter.java index 597099bc0..d773cb78a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationTokenFilter.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationTokenFilter.java @@ -4,18 +4,17 @@ import com.auth0.jwt.exceptions.JWTVerificationException; import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.DecodedJWT; +import java.io.IOException; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.NonNull; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - /** * Filter for authentication of requests with JSON Web Tokens. This filter reads the access token * from http-request header and validates the signature of the token. If the signature is valid, a diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java index c6348d8bc..7a01f2c3c 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.useradministration.service.security; import io.reflectoring.coderadar.CoderadarConfigurationProperties; +import java.util.Optional; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationManager; @@ -17,8 +18,6 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.filter.CorsFilter; -import java.util.Optional; - @Configuration @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetailService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetailService.java index 093c54501..87f66656d 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetailService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetailService.java @@ -2,14 +2,13 @@ import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; +import java.util.Collections; +import java.util.List; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Service; -import java.util.Collections; -import java.util.List; - @Service public class CoderadarUserDetailService implements UserDetailsService { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetails.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetails.java index c7c8a0d64..ed8278256 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetails.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarUserDetails.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.useradministration.service.security; +import java.util.Collection; import lombok.Value; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; -import java.util.Collection; - @Value class CoderadarUserDetails implements UserDetails { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/SecretKeyService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/SecretKeyService.java index fb5903152..07c9e85e8 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/SecretKeyService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/SecretKeyService.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.useradministration.service.security; -import org.springframework.stereotype.Service; - +import java.security.NoSuchAlgorithmException; import javax.annotation.PostConstruct; import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; -import java.security.NoSuchAlgorithmException; +import org.springframework.stereotype.Service; /** * Service for generation and holding a secret key. The generated key is a AES key of the length 256 diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/TokenService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/TokenService.java index eeb7410c6..456ef26b0 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/TokenService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/TokenService.java @@ -9,11 +9,10 @@ import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.DecodedJWT; import io.reflectoring.coderadar.CoderadarConfigurationProperties; +import java.util.Date; import org.joda.time.DateTime; import org.springframework.stereotype.Service; -import java.util.Date; - /** Service for generation and verification of authentication tokens. */ @Service public class TokenService { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java index af6c2709f..8f3409924 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/AddUsersToTeamService.java @@ -6,9 +6,8 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class AddUsersToTeamService implements AddUsersToTeamUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveUsersFromTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveUsersFromTeamService.java index afb8e10cb..0eccc0354 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveUsersFromTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/RemoveUsersFromTeamService.java @@ -7,9 +7,8 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driven.RemoveUsersFromTeamPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveUsersFromTeamUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class RemoveUsersFromTeamService implements RemoveUsersFromTeamUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java index 6f43c6c5f..b170b8cdd 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListProjectsForTeamService.java @@ -5,9 +5,8 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetTeamPort; import io.reflectoring.coderadar.useradministration.port.driven.ListProjectsForTeamPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListProjectsForTeamService implements ListProjectsForTeamUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java index 5dd5f5cdd..171b6d26e 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForProjectService.java @@ -5,9 +5,8 @@ import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsForProjectPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListTeamsForProjectService implements ListTeamsForProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java index 6c53c12e0..c40a82ee2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsForUserService.java @@ -5,9 +5,8 @@ import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsForUserPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListTeamsForUserService implements ListTeamsForUserUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java index f9d00c389..d954fe628 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListTeamsService.java @@ -3,9 +3,8 @@ import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driven.ListTeamsPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListTeamsService implements ListTeamsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListUsersForProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListUsersForProjectService.java index bbf414399..96a563e75 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListUsersForProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/teams/get/ListUsersForProjectService.java @@ -5,9 +5,8 @@ import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.ListUsersForProjectPort; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListUsersForProjectUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ListUsersForProjectService implements ListUsersForProjectUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/ExtractProjectCommitsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/ExtractProjectCommitsPort.java index e5d5372d8..aefebfb49 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/ExtractProjectCommitsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/ExtractProjectCommitsPort.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.query.domain.DateRange; - import java.util.List; public interface ExtractProjectCommitsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetAvailableBranchesPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetAvailableBranchesPort.java index 0d81b8486..64d55636f 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetAvailableBranchesPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetAvailableBranchesPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.vcs.port.driven; import io.reflectoring.coderadar.projectadministration.domain.Branch; - import java.util.List; public interface GetAvailableBranchesPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetDiffEntriesForCommitsPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetDiffEntriesForCommitsPort.java index f896e82c1..32c8c584f 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetDiffEntriesForCommitsPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetDiffEntriesForCommitsPort.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.vcs.UnableToGetDiffsFromCommitsException; import io.reflectoring.coderadar.vcs.domain.DiffEntry; - import java.util.List; public interface GetDiffEntriesForCommitsPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java index ab07c6b66..8f48bf550 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.vcs.port.driven; import io.reflectoring.coderadar.vcs.UnableToGetCommitContentException; - import java.util.HashMap; import java.util.List; diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/UpdateLocalRepositoryPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/UpdateLocalRepositoryPort.java index f2adfa1f6..37dc5bab6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/UpdateLocalRepositoryPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/UpdateLocalRepositoryPort.java @@ -3,7 +3,6 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.vcs.UnableToUpdateRepositoryException; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateRepositoryCommand; - import java.util.List; public interface UpdateLocalRepositoryPort { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/ExtractProjectCommitsUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/ExtractProjectCommitsUseCase.java index e7695d8fd..5a3d02867 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/ExtractProjectCommitsUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/ExtractProjectCommitsUseCase.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.query.domain.DateRange; - import java.util.List; public interface ExtractProjectCommitsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/update/UpdateLocalRepositoryUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/update/UpdateLocalRepositoryUseCase.java index 1ebe9b08e..cf2844ccc 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/update/UpdateLocalRepositoryUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driver/update/UpdateLocalRepositoryUseCase.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.vcs.UnableToUpdateRepositoryException; - import java.util.List; public interface UpdateLocalRepositoryUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/ExtractProjectCommitsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/ExtractProjectCommitsService.java index 9eac0bca8..96bcbac7a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/ExtractProjectCommitsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/ExtractProjectCommitsService.java @@ -4,9 +4,8 @@ import io.reflectoring.coderadar.query.domain.DateRange; import io.reflectoring.coderadar.vcs.port.driven.ExtractProjectCommitsPort; import io.reflectoring.coderadar.vcs.port.driver.ExtractProjectCommitsUseCase; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class ExtractProjectCommitsService implements ExtractProjectCommitsUseCase { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/UpdateLocalRepositoryService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/UpdateLocalRepositoryService.java index 341bd16d0..92f8d3348 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/UpdateLocalRepositoryService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/service/UpdateLocalRepositoryService.java @@ -5,9 +5,8 @@ import io.reflectoring.coderadar.vcs.port.driven.UpdateLocalRepositoryPort; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateLocalRepositoryUseCase; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateRepositoryCommand; -import org.springframework.stereotype.Service; - import java.util.List; +import org.springframework.stereotype.Service; @Service public class UpdateLocalRepositoryService implements UpdateLocalRepositoryUseCase { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/CreateAnalyzerConfigurationServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/CreateAnalyzerConfigurationServiceTest.java index e365aa9a7..dd83eaa03 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/CreateAnalyzerConfigurationServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/CreateAnalyzerConfigurationServiceTest.java @@ -1,23 +1,22 @@ package io.reflectoring.coderadar.projectadministration.analyzerconfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.analyzer.service.ListAnalyzersService; import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.CreateAnalyzerConfigurationPort; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.service.analyzerconfig.CreateAnalyzerConfigurationService; import io.reflectoring.coderadar.projectadministration.service.analyzerconfig.ListAnalyzerConfigurationsService; +import java.util.Collections; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.Collections; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class CreateAnalyzerConfigurationServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/DeleteAnalyzerConfigurationServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/DeleteAnalyzerConfigurationServiceTest.java index 09863006f..b305141c2 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/DeleteAnalyzerConfigurationServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/DeleteAnalyzerConfigurationServiceTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.projectadministration.analyzerconfig; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.DeleteAnalyzerConfigurationPort; import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.GetAnalyzerConfigurationPort; @@ -10,10 +14,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class DeleteAnalyzerConfigurationServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/GetAnalyzerConfigurationServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/GetAnalyzerConfigurationServiceTest.java index 6e90892a0..ae2a8f6dd 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/GetAnalyzerConfigurationServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/GetAnalyzerConfigurationServiceTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.projectadministration.analyzerconfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.GetAnalyzerConfigurationPort; import io.reflectoring.coderadar.projectadministration.service.analyzerconfig.GetAnalyzerConfigurationService; @@ -9,9 +12,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class GetAnalyzerConfigurationServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java index bef2f8f31..a6c270a81 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java @@ -1,22 +1,21 @@ package io.reflectoring.coderadar.projectadministration.analyzerconfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.ListAnalyzerConfigurationsPort; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.service.analyzerconfig.ListAnalyzerConfigurationsService; +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.ArrayList; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class ListAnalyzerConfigurationsFromProjectServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationServiceTest.java index a1cdd9b40..0d61f8e24 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationServiceTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.projectadministration.analyzerconfig; +import static org.mockito.Mockito.*; + import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.analyzer.service.ListAnalyzersService; import io.reflectoring.coderadar.projectadministration.port.driven.analyzerconfig.GetAnalyzerConfigurationPort; @@ -7,16 +9,13 @@ import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update.UpdateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.service.analyzerconfig.ListAnalyzerConfigurationsService; import io.reflectoring.coderadar.projectadministration.service.analyzerconfig.UpdateAnalyzerConfigurationService; +import java.util.Collections; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.Collections; - -import static org.mockito.Mockito.*; - @ExtendWith(MockitoExtension.class) class UpdateAnalyzerConfigurationServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/CreateFilePatternServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/CreateFilePatternServiceTest.java index 8b15bd36f..d9cb79cb6 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/CreateFilePatternServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/CreateFilePatternServiceTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.projectadministration.filepattern; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driven.filepattern.CreateFilePatternPort; @@ -11,9 +14,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class CreateFilePatternServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/DeleteFilePatternServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/DeleteFilePatternServiceTest.java index 108fe9298..e4b3df27b 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/DeleteFilePatternServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/DeleteFilePatternServiceTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.projectadministration.filepattern; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driven.filepattern.DeleteFilePatternPort; @@ -11,10 +15,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class DeleteFilePatternServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/GetFilePatternServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/GetFilePatternServiceTest.java index 97e3401d5..8eba88a85 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/GetFilePatternServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/GetFilePatternServiceTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.projectadministration.filepattern; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driven.filepattern.GetFilePatternPort; @@ -10,9 +13,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class GetFilePatternServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/ListFilePatternsOfProjectServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/ListFilePatternsOfProjectServiceTest.java index 457707e5a..f85b8f47b 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/ListFilePatternsOfProjectServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/filepattern/ListFilePatternsOfProjectServiceTest.java @@ -1,23 +1,22 @@ package io.reflectoring.coderadar.projectadministration.filepattern; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driven.filepattern.ListFilePatternsOfProjectPort; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.service.filepattern.ListFilePatternsOfProjectService; +import java.util.Arrays; +import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.Arrays; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class ListFilePatternsOfProjectServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/CreateModuleServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/CreateModuleServiceTest.java index f3882e0c4..19059f3de 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/CreateModuleServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/CreateModuleServiceTest.java @@ -1,5 +1,10 @@ package io.reflectoring.coderadar.projectadministration.module; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.projectadministration.ModuleAlreadyExistsException; import io.reflectoring.coderadar.projectadministration.ModulePathInvalidException; import io.reflectoring.coderadar.projectadministration.ProjectIsBeingProcessedException; @@ -14,11 +19,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class CreateModuleServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/DeleteModuleServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/DeleteModuleServiceTest.java index b19a7c527..2f2b5a7d3 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/DeleteModuleServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/DeleteModuleServiceTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.projectadministration.module; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.*; + import io.reflectoring.coderadar.projectadministration.ProjectIsBeingProcessedException; import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driven.module.DeleteModulePort; @@ -13,10 +17,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.stubbing.Answer; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.*; - @ExtendWith(MockitoExtension.class) class DeleteModuleServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/GetModuleServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/GetModuleServiceTest.java index a8517051a..eb29cb41d 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/GetModuleServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/GetModuleServiceTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.projectadministration.module; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driven.module.GetModulePort; import io.reflectoring.coderadar.projectadministration.service.module.GetModuleService; @@ -9,9 +12,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class GetModuleServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/ListModulesOfProjectServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/ListModulesOfProjectServiceTest.java index 7500a8cf7..012403100 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/ListModulesOfProjectServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/module/ListModulesOfProjectServiceTest.java @@ -1,22 +1,21 @@ package io.reflectoring.coderadar.projectadministration.module; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driven.module.ListModulesOfProjectPort; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.service.module.ListModulesOfProjectService; +import java.util.Arrays; +import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.Arrays; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class ListModulesOfProjectServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/GetProjectServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/GetProjectServiceTest.java index 50507755d..6f15e7573 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/GetProjectServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/GetProjectServiceTest.java @@ -1,19 +1,18 @@ package io.reflectoring.coderadar.projectadministration.project; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort; import io.reflectoring.coderadar.projectadministration.service.project.GetProjectService; +import java.util.Date; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.Date; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class GetProjectServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/ListProjectsServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/ListProjectsServiceTest.java index b938cf1db..94dc5111a 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/ListProjectsServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/ListProjectsServiceTest.java @@ -1,8 +1,13 @@ package io.reflectoring.coderadar.projectadministration.project; +import static org.assertj.core.api.Assertions.assertThat; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driven.project.ListProjectsPort; import io.reflectoring.coderadar.projectadministration.service.project.ListProjectsService; +import java.util.Arrays; +import java.util.Date; +import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -10,12 +15,6 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.Arrays; -import java.util.Date; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; - @ExtendWith(MockitoExtension.class) class ListProjectsServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/UpdateProjectServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/UpdateProjectServiceTest.java index 18cda0a05..4c9e5f2e7 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/UpdateProjectServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/project/UpdateProjectServiceTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.projectadministration.project; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + import io.reflectoring.coderadar.CoderadarConfigurationProperties; import io.reflectoring.coderadar.analyzer.port.driven.ResetAnalysisPort; import io.reflectoring.coderadar.projectadministration.ProjectAlreadyExistsException; @@ -19,6 +23,10 @@ import io.reflectoring.coderadar.vcs.port.driven.GetAvailableBranchesPort; import io.reflectoring.coderadar.vcs.port.driver.ExtractProjectCommitsUseCase; import io.reflectoring.coderadar.vcs.port.driver.update.UpdateLocalRepositoryUseCase; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; import org.junit.Assert; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -27,15 +35,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.stubbing.Answer; -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; - -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; - @ExtendWith(MockitoExtension.class) class UpdateProjectServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/ChangePasswordServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/ChangePasswordServiceTest.java index 134fc8b40..e2b10bf48 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/ChangePasswordServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/ChangePasswordServiceTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.projectadministration.user; +import static org.mockito.Mockito.*; + import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.ChangePasswordPort; import io.reflectoring.coderadar.useradministration.port.driven.RefreshTokenPort; @@ -12,8 +14,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.mockito.Mockito.*; - @ExtendWith(MockitoExtension.class) class ChangePasswordServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/GetUserServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/GetUserServiceTest.java index 258488e60..48c6ac4c1 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/GetUserServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/GetUserServiceTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.projectadministration.user; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.service.get.GetUserService; @@ -9,9 +12,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class GetUserServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/LoginUserServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/LoginUserServiceTest.java index 13bccc1aa..03d12082d 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/LoginUserServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/LoginUserServiceTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.projectadministration.user; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.useradministration.domain.RefreshToken; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; @@ -16,10 +20,6 @@ import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class LoginUserServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RefreshTokenServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RefreshTokenServiceTest.java index 8f094bd46..0d9e11ef1 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RefreshTokenServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RefreshTokenServiceTest.java @@ -1,5 +1,10 @@ package io.reflectoring.coderadar.projectadministration.user; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.useradministration.AccessTokenNotExpiredException; import io.reflectoring.coderadar.useradministration.RefreshTokenNotFoundException; import io.reflectoring.coderadar.useradministration.UserNotFoundException; @@ -16,11 +21,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class RefreshTokenServiceTest { diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RegisterUserServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RegisterUserServiceTest.java index d90383850..ce5129b1b 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RegisterUserServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RegisterUserServiceTest.java @@ -1,5 +1,11 @@ package io.reflectoring.coderadar.projectadministration.user; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import io.reflectoring.coderadar.useradministration.UsernameAlreadyInUseException; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; @@ -14,12 +20,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) class RegisterUserServiceTest { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java index 07887ec0d..7299bb2a7 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetAnalyzerConfigurationResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java index 7d1a135f6..65fd5c37e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetBranchResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.rest.domain.GetBranchResponse; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java index ecef5b2cf..09ed35a2b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetCommitResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.rest.domain.GetCommitResponse; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java index 751a12c63..2c923f88c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetContributorResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.contributor.domain.Contributor; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java index 5bb4030f4..c19428eeb 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetFilePatternResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java index fdd90e8db..57b0b467d 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetModuleResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java index 164b7abd4..d3ad95d8f 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetProjectResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java index 603b07ffa..eaeeb9419 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetTeamResponseMapper.java @@ -1,13 +1,12 @@ package io.reflectoring.coderadar.rest; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; - import java.util.ArrayList; import java.util.List; -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; - public class GetTeamResponseMapper { private GetTeamResponseMapper() {} diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java index b0b47386b..139f3329b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/GetUserResponseMapper.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; - import java.util.ArrayList; import java.util.List; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java index 685ee3db5..2bb2d7f99 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/JsonListWrapper.java @@ -1,12 +1,11 @@ package io.reflectoring.coderadar.rest; +import java.util.List; +import javax.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotEmpty; -import java.util.List; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java index 4890af7cd..16cb8f6fe 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigurationController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.analyzerconfig; +import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfiguration; + import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.GetAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; @@ -12,8 +14,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfiguration; - @Transactional @RestController public class GetAnalyzerConfigurationController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java index 6bdda511d..48678362b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigurationsFromProjectController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.analyzerconfig; +import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfigurations; + import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.ListAnalyzerConfigurationsUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper.mapAnalyzerConfigurations; - @Transactional @RestController public class ListAnalyzerConfigurationsFromProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java index 3bde25578..ccc6b215a 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzersController.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.analyzer.port.driver.ListAnalyzersUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -9,8 +10,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @Transactional @RestController public class ListAnalyzersController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java index 22ab39625..060702f2e 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/branch/ListBranchesController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.branch; +import static io.reflectoring.coderadar.rest.GetBranchResponseMapper.mapBranches; + import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.projectadministration.port.driver.branch.list.ListBranchesUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetBranchResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetBranchResponseMapper.mapBranches; - @Transactional @RestController public class ListBranchesController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java index b1362eea7..9016007d7 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/GetContributorController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.contributor; +import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributor; + import io.reflectoring.coderadar.contributor.port.driver.GetContributorUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; @@ -11,8 +13,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributor; - @Transactional @RestController public class GetContributorController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java index 16fa2194a..2f2428d71 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/contributor/ListContributorsController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.contributor; +import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributors; + import io.reflectoring.coderadar.contributor.port.driver.GetContributorsForPathCommand; import io.reflectoring.coderadar.contributor.port.driver.ListContributorsUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,10 +14,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetContributorResponseMapper.mapContributors; - @Transactional @RestController public class ListContributorsController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java index 72eb9adab..139d5ae45 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/FileAndCommitsForTimePeriodResponse.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.rest.domain; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data @AllArgsConstructor @NoArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java index a274e488e..a8c5dc6bf 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetContributorResponse.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.rest.domain; +import java.util.Set; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Set; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java index 29dbf5841..fb10c32db 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetProjectResponse.java @@ -1,8 +1,7 @@ package io.reflectoring.coderadar.rest.domain; -import lombok.Data; - import java.util.Date; +import lombok.Data; @Data public class GetProjectResponse { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java index 50bcc7c88..d08e0a915 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/domain/GetTeamResponse.java @@ -1,11 +1,10 @@ package io.reflectoring.coderadar.rest.domain; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - @Data @NoArgsConstructor @AllArgsConstructor diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java index 29aa35d22..e99939b3c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.filepattern; +import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePattern; + import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.GetFilePatternUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; @@ -12,8 +14,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePattern; - @Transactional @RestController public class GetFilePatternController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java index faf268b96..f9d1ae26b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.filepattern; +import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePatterns; + import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.ListFilePatternsOfProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetFilePatternResponseMapper.mapFilePatterns; - @Transactional @RestController public class ListFilePatternsOfProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java index 447f57ef0..02e1b742d 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/GetModuleController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.module; +import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModule; + import io.reflectoring.coderadar.projectadministration.port.driver.module.get.GetModuleUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; @@ -11,8 +13,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModule; - @Transactional @RestController public class GetModuleController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java index a6ab7a017..43c9dab41 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.module; +import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModules; + import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driver.module.get.ListModulesOfProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetModuleResponseMapper.mapModules; - @Transactional @RestController public class ListModulesOfProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java index 74b848947..2074599bd 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/CreateProjectController.java @@ -4,6 +4,7 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.net.MalformedURLException; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -13,8 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import java.net.MalformedURLException; - @Transactional @RestController public class CreateProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java index a6e2b145e..edbdbc9a2 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/GetProjectController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.project; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProject; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.GetProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; @@ -12,8 +14,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProject; - @Transactional @RestController public class GetProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java index fbc84a64b..cc7c13811 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/ListProjectsController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.project; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.ListProjectsUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,10 +14,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; - @Transactional @RestController public class ListProjectsController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java index 8494afc8c..b47543eea 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/project/UpdateProjectController.java @@ -3,6 +3,7 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; +import java.net.MalformedURLException; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -13,8 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import java.net.MalformedURLException; - @Transactional @RestController public class UpdateProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java index e810e3e58..9edae93a7 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectController.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.query.port.driver.GetAvailableMetricsInProjectUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -10,8 +11,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @Transactional @RestController public class GetAvailableMetricsInProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java index b6251e0c8..f5e97131f 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitLogController.java @@ -3,6 +3,7 @@ import io.reflectoring.coderadar.query.domain.CommitLog; import io.reflectoring.coderadar.query.port.driver.GetCommitLogUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,8 +12,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @Transactional @RestController public class GetCommitLogController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java index a0880c9a5..3b4dc591b 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectController.java @@ -5,6 +5,7 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.GetCommitResponseMapper; import io.reflectoring.coderadar.rest.domain.GetCommitResponse; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @Transactional @RestController public class GetCommitsInProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java index 26abd8ecd..27e19807c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.query; +import static io.reflectoring.coderadar.rest.GetCommitResponseMapper.mapCommits; + import io.reflectoring.coderadar.query.domain.ContributorsForFile; import io.reflectoring.coderadar.query.domain.FileAndCommitsForTimePeriod; import io.reflectoring.coderadar.query.port.driver.criticalfiles.GetCriticalFilesUseCase; @@ -7,6 +9,8 @@ import io.reflectoring.coderadar.query.port.driver.criticalfiles.GetFrequentlyChangedFilesCommand; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.FileAndCommitsForTimePeriodResponse; +import java.util.ArrayList; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -14,11 +18,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetCommitResponseMapper.mapCommits; - @Transactional @RestController public class GetCriticalFilesController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java index 29179991e..cb9c62287 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitController.java @@ -4,6 +4,7 @@ import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitCommand; import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitUseCase; import io.reflectoring.coderadar.rest.AbstractBaseController; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,8 +12,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.List; - @Transactional @RestController public class GetMetricValuesOfCommitController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java index c94ca7fe1..02cc410cc 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/GetUserController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.useradministration; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUser; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; @@ -12,8 +14,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUser; - @RestController @Transactional public class GetUserController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java index c89228b76..c2ec50395 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; - @RestController @Transactional public class ListProjectsForUserController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java index 40f05c86c..152a5c8f5 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,10 +14,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; - @RestController @Transactional public class ListUsersController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java index ce76a515e..cec80408d 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration; +import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListUsersForProjectUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetUserResponseMapper.mapUsers; - @RestController @Transactional public class ListUsersForProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java index 065134b5e..9f1a75db7 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamController.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeam; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; @@ -12,8 +14,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeam; - @RestController @Transactional public class GetTeamController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java index e92cc7a45..c2cb83147 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetProjectResponseMapper.mapProjects; - @RestController @Transactional public class ListProjectsForTeamController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java index 2ff67e66c..010285a1c 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -11,10 +14,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - @RestController @Transactional public class ListTeamsController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java index bce35b6f6..e30b81297 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - @RestController @Transactional public class ListTeamsForProjectController implements AbstractBaseController { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java index 919bbac42..7c172c950 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserController.java @@ -1,9 +1,12 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; + import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; +import java.util.List; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -import static io.reflectoring.coderadar.rest.GetTeamResponseMapper.mapTeams; - @RestController @Transactional public class ListTeamsForUserController implements AbstractBaseController { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java index 7511a2d80..c8f6f14e4 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java @@ -3,11 +3,10 @@ import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.rest.GetAnalyzerConfigurationResponseMapper; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetAnalyzerConfigurationResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java index 4f5739110..65690036a 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java @@ -3,11 +3,10 @@ import io.reflectoring.coderadar.projectadministration.domain.Branch; import io.reflectoring.coderadar.rest.GetBranchResponseMapper; import io.reflectoring.coderadar.rest.domain.GetBranchResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetBranchResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java index f60953267..ec24f9660 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java @@ -3,11 +3,10 @@ import io.reflectoring.coderadar.projectadministration.domain.Commit; import io.reflectoring.coderadar.rest.GetCommitResponseMapper; import io.reflectoring.coderadar.rest.domain.GetCommitResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetCommitResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java index ea8bc9345..dee70c868 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java @@ -3,12 +3,11 @@ import io.reflectoring.coderadar.contributor.domain.Contributor; import io.reflectoring.coderadar.rest.GetContributorResponseMapper; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetContributorResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java index 3338ff018..98b0de8ee 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java @@ -4,11 +4,10 @@ import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.rest.GetFilePatternResponseMapper; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetFilePatternResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java index 5127a71f0..b966af074 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java @@ -3,11 +3,10 @@ import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.rest.GetModuleResponseMapper; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetModuleResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java index df7fad899..09740ec48 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java @@ -3,12 +3,11 @@ import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.GetProjectResponseMapper; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.Date; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetProjectResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java index 8a32103c1..f46e15c0d 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java @@ -5,12 +5,11 @@ import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetTeamResponseMapperControllerTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java index 12c1567b5..c5b07424a 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java @@ -4,11 +4,10 @@ import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetTeamResponseMapperTest { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java index 5d669c7bf..34b4716e8 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java @@ -3,11 +3,10 @@ import io.reflectoring.coderadar.rest.GetUserResponseMapper; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.domain.User; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class GetUserResponseMapperTest { @Test diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java index de668d598..64ae3c075 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/CreateAnalyzerConfigurationControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.CreateAnalyzerConfigurationController; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class CreateAnalyzerConfigurationControllerTest { private final CreateAnalyzerConfigurationUseCase createAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java index 449996ca8..6f5e2757a 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/DeleteAnalyzerConfigurationControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.delete.DeleteAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.DeleteAnalyzerConfigurationController; import org.junit.jupiter.api.Assertions; @@ -8,8 +10,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class DeleteAnalyzerConfigurationControllerTest { private final DeleteAnalyzerConfigurationUseCase deleteAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java index 949fb4153..b570bb511 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/GetAnalyzerConfigurationControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.GetAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.GetAnalyzerConfigurationController; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class GetAnalyzerConfigurationControllerTest { private final GetAnalyzerConfigurationUseCase getAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java index 30fe5d645..abf6444bb 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/ListAnalyzerConfigurationsFromProjectControllerTest.java @@ -1,20 +1,19 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.analyzer.domain.AnalyzerConfiguration; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.get.ListAnalyzerConfigurationsUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.ListAnalyzerConfigurationsFromProjectController; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.ArrayList; -import java.util.List; - -import static org.mockito.Mockito.mock; - class ListAnalyzerConfigurationsFromProjectControllerTest { private final ListAnalyzerConfigurationsUseCase listAnalyzerConfigurationsUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java index e4cafbd38..3f4e7f1ef 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/analyzerconfig/UpdateAnalyzerConfigurationControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.analyzerconfig; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update.UpdateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.update.UpdateAnalyzerConfigurationUseCase; import io.reflectoring.coderadar.rest.analyzerconfig.UpdateAnalyzerConfigurationController; @@ -9,8 +11,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class UpdateAnalyzerConfigurationControllerTest { private final UpdateAnalyzerConfigurationUseCase updateAnalyzerConfigurationUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java index b67413a44..82af20990 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/CreateFilePatternControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.filepattern; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternUseCase; @@ -11,8 +13,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class CreateFilePatternControllerTest { private final CreateFilePatternUseCase createFilePatternUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java index 533d9ba8e..12e2065af 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/DeleteFilePatternControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.filepattern; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.delete.DeleteFilePatternFromProjectUseCase; import io.reflectoring.coderadar.rest.filepattern.DeleteFilePatternController; import org.junit.jupiter.api.Assertions; @@ -8,8 +10,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class DeleteFilePatternControllerTest { private final DeleteFilePatternFromProjectUseCase deleteFilePatternFromProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java index ef078fcd6..ee0f2431e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/GetFilePatternControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.filepattern; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.GetFilePatternUseCase; @@ -11,8 +13,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class GetFilePatternControllerTest { private final GetFilePatternUseCase getFilePatternUseCase = mock(GetFilePatternUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java index a8549610e..fab7bce3b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/filepattern/ListFilePatternsOfProjectControllerTest.java @@ -1,21 +1,20 @@ package io.reflectoring.coderadar.rest.unit.filepattern; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.FilePattern; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.get.ListFilePatternsOfProjectUseCase; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; import io.reflectoring.coderadar.rest.filepattern.ListFilePatternsOfProjectController; +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.ArrayList; -import java.util.List; - -import static org.mockito.Mockito.mock; - class ListFilePatternsOfProjectControllerTest { private final ListFilePatternsOfProjectUseCase listFilePatternsOfProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java index 9bfb7cdaa..3a12db891 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/CreateModuleControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.module; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ModulePathInvalidException; import io.reflectoring.coderadar.projectadministration.port.driver.module.create.CreateModuleCommand; import io.reflectoring.coderadar.projectadministration.port.driver.module.create.CreateModuleUseCase; @@ -12,8 +14,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class CreateModuleControllerTest { private final CreateModuleUseCase createModuleUseCase = mock(CreateModuleUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java index e7c7d412f..0bd3cc6b2 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/DeleteModuleControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.module; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ProjectIsBeingProcessedException; import io.reflectoring.coderadar.projectadministration.port.driver.module.delete.DeleteModuleUseCase; import io.reflectoring.coderadar.rest.module.DeleteModuleController; @@ -9,8 +11,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class DeleteModuleControllerTest { private final DeleteModuleUseCase deleteModuleUseCase = mock(DeleteModuleUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java index 9dc398a1c..0829935a7 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/GetModuleControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.module; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driver.module.get.GetModuleUseCase; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class GetModuleControllerTest { private final GetModuleUseCase getModuleUseCase = mock(GetModuleUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java index 69ed8933a..6d482ad81 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/module/ListModulesOfProjectControllerTest.java @@ -1,20 +1,19 @@ package io.reflectoring.coderadar.rest.unit.module; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.Module; import io.reflectoring.coderadar.projectadministration.port.driver.module.get.ListModulesOfProjectUseCase; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; import io.reflectoring.coderadar.rest.module.ListModulesOfProjectController; +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.ArrayList; -import java.util.List; - -import static org.mockito.Mockito.mock; - class ListModulesOfProjectControllerTest { private final ListModulesOfProjectUseCase listModulesOfProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java index 040ebf60e..00115130f 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/CreateProjectControllerTest.java @@ -1,20 +1,19 @@ package io.reflectoring.coderadar.rest.unit.project; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectUseCase; import io.reflectoring.coderadar.rest.domain.IdResponse; import io.reflectoring.coderadar.rest.project.CreateProjectController; +import java.net.MalformedURLException; +import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.net.MalformedURLException; -import java.util.Date; - -import static org.mockito.Mockito.mock; - class CreateProjectControllerTest { private final CreateProjectUseCase createProjectUseCase = mock(CreateProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java index 15754c28c..ebb29603b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/DeleteProjectControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.project; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.port.driver.project.delete.DeleteProjectUseCase; import io.reflectoring.coderadar.rest.project.DeleteProjectController; import org.junit.jupiter.api.Assertions; @@ -8,8 +10,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class DeleteProjectControllerTest { private final DeleteProjectUseCase deleteProjectUseCase = mock(DeleteProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java index d675c0465..e85839372 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/GetProjectControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.project; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.GetProjectUseCase; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class GetProjectControllerTest { private final GetProjectUseCase getProjectUseCase = mock(GetProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java index 650658e24..5c8b2f3ce 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/ListProjectsControllerTest.java @@ -1,20 +1,19 @@ package io.reflectoring.coderadar.rest.unit.project; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.projectadministration.port.driver.project.get.ListProjectsUseCase; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.rest.project.ListProjectsController; +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.ArrayList; -import java.util.List; - -import static org.mockito.Mockito.mock; - class ListProjectsControllerTest { private final ListProjectsUseCase listProjectsUseCase = mock(ListProjectsUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java index d7f799b7d..03f92f355 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/project/UpdateProjectControllerTest.java @@ -1,19 +1,18 @@ package io.reflectoring.coderadar.rest.unit.project; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectUseCase; import io.reflectoring.coderadar.rest.project.UpdateProjectController; +import java.net.MalformedURLException; +import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.net.MalformedURLException; -import java.util.Date; - -import static org.mockito.Mockito.mock; - class UpdateProjectControllerTest { private final UpdateProjectUseCase updateProjectUseCase = mock(UpdateProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ChangePasswordControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ChangePasswordControllerTest.java index 4b3a12b52..6f6cc1795 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ChangePasswordControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ChangePasswordControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.useradministration; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.useradministration.ChangePasswordController; import io.reflectoring.coderadar.useradministration.port.driver.password.ChangePasswordCommand; import io.reflectoring.coderadar.useradministration.port.driver.password.ChangePasswordUseCase; @@ -9,8 +11,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class ChangePasswordControllerTest { private final ChangePasswordUseCase changePasswordUseCase = mock(ChangePasswordUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/GetUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/GetUserControllerTest.java index e1c456e1e..596536765 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/GetUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/GetUserControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.useradministration; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.rest.useradministration.GetUserController; import io.reflectoring.coderadar.useradministration.domain.User; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class GetUserControllerTest { private final GetUserUseCase getUserUseCase = mock(GetUserUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java index 693115a12..34558b2ac 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java @@ -1,21 +1,20 @@ package io.reflectoring.coderadar.rest.unit.useradministration; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.rest.useradministration.ListProjectsForUserController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.get.ListProjectsForUserUseCase; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Collections; -import java.util.List; - -import static org.mockito.Mockito.mock; - public class ListProjectsForUserControllerTest { private final ListProjectsForUserUseCase listProjectsForUserUseCase = mock(ListProjectsForUserUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersControllerTest.java index 2fe8f7e3d..27a9e6826 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersControllerTest.java @@ -1,20 +1,19 @@ package io.reflectoring.coderadar.rest.unit.useradministration; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.rest.useradministration.ListUsersController; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.get.ListUsersUseCase; +import java.util.Arrays; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Arrays; -import java.util.List; - -import static org.mockito.Mockito.mock; - public class ListUsersControllerTest { private final ListUsersUseCase listUsersUseCase = mock(ListUsersUseCase.class); private final ListUsersController testController = new ListUsersController(listUsersUseCase); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersForProjectControllerTest.java index 01876ea13..f48d8e266 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersForProjectControllerTest.java @@ -1,21 +1,20 @@ package io.reflectoring.coderadar.rest.unit.useradministration; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.rest.useradministration.ListUsersForProjectController; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListUsersForProjectUseCase; +import java.util.Arrays; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Arrays; -import java.util.List; - -import static org.mockito.Mockito.mock; - public class ListUsersForProjectControllerTest { private final ListUsersForProjectUseCase listUsersForProjectUseCase = mock(ListUsersForProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java index 3cd3babd0..a2ae23c9b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.useradministration; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.useradministration.LoginUserController; import io.reflectoring.coderadar.useradministration.port.driver.login.LoginUserCommand; import io.reflectoring.coderadar.useradministration.port.driver.login.LoginUserResponse; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class LoginUserControllerTest { private final LoginUserUseCase loginUserUseCase = mock(LoginUserUseCase.class); @@ -32,7 +32,6 @@ void loginUserWithUsernameAndPassword() { loginUserResponse.getAccessToken(), responseEntity.getBody().getAccessToken()); Assertions.assertEquals( loginUserResponse.getRefreshToken(), responseEntity.getBody().getRefreshToken()); - Assertions.assertEquals( - loginUserResponse.getUserId(), responseEntity.getBody().getUserId()); + Assertions.assertEquals(loginUserResponse.getUserId(), responseEntity.getBody().getUserId()); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RefreshTokenControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RefreshTokenControllerTest.java index 288f24cae..a5759ce28 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RefreshTokenControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RefreshTokenControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.useradministration; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.useradministration.RefreshTokenController; import io.reflectoring.coderadar.useradministration.port.driver.refresh.RefreshTokenCommand; import io.reflectoring.coderadar.useradministration.port.driver.refresh.RefreshTokenResponse; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class RefreshTokenControllerTest { private final RefreshTokenUseCase refreshTokenUseCase = mock(RefreshTokenUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RegisterUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RegisterUserControllerTest.java index 6df6acf02..cae291eed 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RegisterUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RegisterUserControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.useradministration; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.domain.IdResponse; import io.reflectoring.coderadar.rest.useradministration.RegisterUserController; import io.reflectoring.coderadar.useradministration.port.driver.register.RegisterUserCommand; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - class RegisterUserControllerTest { private final RegisterUserUseCase registerUserUseCase = mock(RegisterUserUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java index c45d7863b..6825df25d 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.useradministration.permissions; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.useradministration.permissions.RemoveUserFromProjectController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; @@ -10,8 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - public class RemoveUserFromProjectControllerTest { private final RemoveUserFromProjectUseCase removeUserFromProjectUseCase = mock(RemoveUserFromProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/SetUserRoleForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/SetUserRoleForProjectControllerTest.java index 594bcf628..bb4918025 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/SetUserRoleForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/SetUserRoleForProjectControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.useradministration.permissions; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; import io.reflectoring.coderadar.rest.useradministration.permissions.SetUserRoleForProjectController; @@ -12,8 +14,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - public class SetUserRoleForProjectControllerTest { private final SetUserRoleForProjectUseCase setUserRoleForProjectUseCase = mock(SetUserRoleForProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java index bae0cb25f..a393b5a17 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; import io.reflectoring.coderadar.rest.useradministration.teams.AddTeamToProjectController; @@ -12,8 +14,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - public class AddTeamToProjectControllerTest { private final AddTeamToProjectUseCase addTeamToProjectUseCase = mock(AddTeamToProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddUsersToTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddUsersToTeamControllerTest.java index 9ef2d316e..f3ae3f469 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddUsersToTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddUsersToTeamControllerTest.java @@ -1,22 +1,21 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.JsonListWrapper; import io.reflectoring.coderadar.rest.useradministration.teams.AddUsersToTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.AddUsersToTeamUseCase; +import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Collections; - -import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.mock; - public class AddUsersToTeamControllerTest { private final AddUsersToTeamUseCase addUsersToTeamUseCase = mock(AddUsersToTeamUseCase.class); private final AddUsersToTeamController testController = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/CreateTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/CreateTeamControllerTest.java index 90416f382..ced46b6ee 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/CreateTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/CreateTeamControllerTest.java @@ -1,21 +1,20 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.domain.IdResponse; import io.reflectoring.coderadar.rest.useradministration.teams.CreateTeamController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamUseCase; +import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Collections; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; - public class CreateTeamControllerTest { private final CreateTeamUseCase createTeamUseCase = mock(CreateTeamUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/DeleteTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/DeleteTeamControllerTest.java index c199604b2..318f5f03e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/DeleteTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/DeleteTeamControllerTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.useradministration.teams.DeleteTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.DeleteTeamUseCase; @@ -9,9 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.mock; - public class DeleteTeamControllerTest { private final DeleteTeamUseCase deleteTeamUseCase = mock(DeleteTeamUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/GetTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/GetTeamControllerTest.java index b2ea0f2fa..5cf368fe4 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/GetTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/GetTeamControllerTest.java @@ -1,21 +1,20 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.GetTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.GetTeamUseCase; +import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Collections; - -import static org.mockito.Mockito.mock; - public class GetTeamControllerTest { private final GetTeamUseCase getTeamUseCase = mock(GetTeamUseCase.class); private final GetTeamController testController = new GetTeamController(getTeamUseCase); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java index efe85907c..f5b06337b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java @@ -1,21 +1,20 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.domain.Project; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListProjectsForTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListProjectsForTeamUseCase; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Collections; -import java.util.List; - -import static org.mockito.Mockito.mock; - public class ListProjectsForTeamControllerTest { private final ListProjectsForTeamUseCase listProjectsForTeamUseCase = mock(ListProjectsForTeamUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsControllerTest.java index 47a6be68d..5b132b93f 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsControllerTest.java @@ -1,10 +1,15 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListTeamsController; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsUseCase; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -12,12 +17,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import static org.mockito.Mockito.mock; - public class ListTeamsControllerTest { private final ListTeamsUseCase listTeamsUseCase = mock(ListTeamsUseCase.class); private final ListTeamsController testController = new ListTeamsController(listTeamsUseCase); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForProjectControllerTest.java index 10f12cc61..12d88edd1 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForProjectControllerTest.java @@ -1,11 +1,16 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListTeamsForProjectController; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForProjectUseCase; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -13,12 +18,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import static org.mockito.Mockito.mock; - public class ListTeamsForProjectControllerTest { private final ListTeamsForProjectUseCase listTeamsForProjectUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java index 0c9317771..80ab9fe8b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java @@ -1,11 +1,16 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import io.reflectoring.coderadar.rest.useradministration.teams.ListTeamsForUserController; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.domain.Team; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driver.teams.get.ListTeamsForUserUseCase; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -13,12 +18,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import static org.mockito.Mockito.mock; - public class ListTeamsForUserControllerTest { private final ListTeamsForUserUseCase listTeamsForUserUseCase = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveTeamFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveTeamFromProjectControllerTest.java index f82202746..f9ab2048b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveTeamFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveTeamFromProjectControllerTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.useradministration.teams.RemoveTeamFromProjectController; @@ -11,8 +13,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import static org.mockito.Mockito.mock; - public class RemoveTeamFromProjectControllerTest { private final RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase = mock(RemoveTeamFromProjectUseCase.class); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java index 5b42204e8..b4f481262 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java @@ -1,22 +1,21 @@ package io.reflectoring.coderadar.rest.unit.useradministration.teams; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; + import io.reflectoring.coderadar.rest.JsonListWrapper; import io.reflectoring.coderadar.rest.useradministration.teams.RemoveUsersFromTeamController; import io.reflectoring.coderadar.useradministration.TeamNotFoundException; import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveUsersFromTeamUseCase; +import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import java.util.Collections; - -import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.mock; - public class RemoveUsersFromTeamControllerTest { private final RemoveUsersFromTeamUseCase removeUsersFromTeamUseCase = mock(RemoveUsersFromTeamUseCase.class); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ControllerTestTemplate.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ControllerTestTemplate.java index a84564bce..2e36cc52e 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ControllerTestTemplate.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ControllerTestTemplate.java @@ -2,6 +2,10 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.File; +import java.io.IOException; +import java.util.Collections; +import java.util.Properties; import org.apache.tomcat.util.http.fileupload.FileUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; @@ -24,11 +28,6 @@ import org.springframework.util.StringUtils; import org.springframework.web.context.WebApplicationContext; -import java.io.File; -import java.io.IOException; -import java.util.Collections; -import java.util.Properties; - @ExtendWith(RestDocumentationExtension.class) @Tag(ControllerTestTemplate.TAG) public abstract class ControllerTestTemplate extends IntegrationTestTemplate { diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/JsonHelper.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/JsonHelper.java index 4473def44..4a2f6b714 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/JsonHelper.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/JsonHelper.java @@ -5,10 +5,9 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.restdocs.hypermedia.Link; - import java.io.IOException; import java.util.List; +import org.springframework.restdocs.hypermedia.Link; /** Collection of utility methods to work with JSON strings. */ public class JsonHelper { diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ResultMatchers.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ResultMatchers.java index e19b06b7d..5109ff0a9 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ResultMatchers.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/ResultMatchers.java @@ -1,13 +1,13 @@ package io.reflectoring.coderadar.rest; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; + import com.fasterxml.jackson.core.type.TypeReference; import org.assertj.core.api.AssertionsForClassTypes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.test.web.servlet.ResultMatcher; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; - /** Collection of ResultMatchers to be used in MockMvc's fluent API. */ public class ResultMatchers { diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java index d0d1f678d..0bb38b001 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.rest.analysis; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.analyzer.domain.MetricValueEntity; @@ -24,6 +28,14 @@ import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitCommand; import io.reflectoring.coderadar.query.port.driver.deltatree.GetDeltaTreeForTwoCommitsCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.List; import net.lingala.zip4j.ZipFile; import org.apache.tomcat.util.http.fileupload.FileUtils; import org.junit.jupiter.api.AfterAll; @@ -39,19 +51,6 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Collection; -import java.util.Comparator; -import java.util.List; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - class PaySimProjectIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/ResetAnalysisControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/ResetAnalysisControllerTest.java index 326aa2a93..ca6a92c54 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/ResetAnalysisControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/ResetAnalysisControllerTest.java @@ -1,5 +1,12 @@ package io.reflectoring.coderadar.rest.analysis; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; +import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import io.reflectoring.coderadar.graph.analyzer.domain.MetricValueEntity; import io.reflectoring.coderadar.graph.analyzer.repository.CommitRepository; import io.reflectoring.coderadar.graph.analyzer.repository.MetricRepository; @@ -11,6 +18,9 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.net.URL; +import java.util.List; +import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -19,17 +29,6 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; -import java.net.URL; -import java.util.List; -import java.util.Objects; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - class ResetAnalysisControllerTest extends ControllerTestTemplate { @Autowired private CommitRepository commitRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigControllerIntegrationTest.java index b4eb258e7..fe35d45bf 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigControllerIntegrationTest.java @@ -1,5 +1,10 @@ package io.reflectoring.coderadar.rest.analyzerconfig; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.repository.AnalyzerConfigurationRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -13,11 +18,6 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - class CreateAnalyzerConfigControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigControllerIntegrationTest.java index 4773b3357..f64cafa11 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigControllerIntegrationTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.analyzerconfig; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.repository.AnalyzerConfigurationRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -10,8 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; - class DeleteAnalyzerConfigControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigControllerIntegrationTest.java index 00802eec8..227763086 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigControllerIntegrationTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.rest.analyzerconfig; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.repository.AnalyzerConfigurationRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -11,10 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - class GetAnalyzerConfigControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigsFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigsFromProjectControllerIntegrationTest.java index d92fa6910..9ccc23385 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigsFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigsFromProjectControllerIntegrationTest.java @@ -1,22 +1,21 @@ package io.reflectoring.coderadar.rest.analyzerconfig; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.repository.AnalyzerConfigurationRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetAnalyzerConfigurationResponse; +import java.util.Arrays; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Arrays; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - class ListAnalyzerConfigsFromProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/UpdateAnalyzerConfigControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/UpdateAnalyzerConfigControllerIntegrationTest.java index 2645c2c98..ffcc7b6b0 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/UpdateAnalyzerConfigControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/UpdateAnalyzerConfigControllerIntegrationTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.analyzerconfig; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.repository.AnalyzerConfigurationRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -12,8 +14,6 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - class UpdateAnalyzerConfigControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java index 751ae5db7..f9bef9fb0 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java @@ -1,16 +1,15 @@ package io.reflectoring.coderadar.rest.analyzing; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.List; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - public class ListAnalyzerControllerIntegrationTest extends ControllerTestTemplate { @Test diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/DeleteBranchTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/DeleteBranchTest.java index 6d3aa88d1..c78fd358b 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/DeleteBranchTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/DeleteBranchTest.java @@ -8,13 +8,12 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.projectadministration.service.project.CreateProjectService; import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import java.net.URL; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import java.net.URL; - public class DeleteBranchTest extends ControllerTestTemplate { @Autowired private CreateProjectService createProjectService; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java index 68a03b6d4..521e7327c 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java @@ -1,21 +1,20 @@ package io.reflectoring.coderadar.rest.branches; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.projectadministration.service.project.CreateProjectService; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetBranchResponse; +import java.net.URL; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.net.URL; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - public class ListBranchesControllerTest extends ControllerTestTemplate { @Autowired private CreateProjectService createProjectService; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java index 7511d7b29..ec22d38b1 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.rest.branches; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.graph.analyzer.repository.CommitRepository; import io.reflectoring.coderadar.graph.projectadministration.branch.repository.BranchRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.BranchEntity; @@ -7,18 +10,14 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.net.URL; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.net.URL; -import java.util.List; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - public class SaveProjectWithBranchesTest extends ControllerTestTemplate { @Autowired private CommitRepository commitRepository; @Autowired private BranchRepository branchRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/GetContributorControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/GetContributorControllerIntegrationTest.java index ce9650150..2706ff7be 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/GetContributorControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/GetContributorControllerIntegrationTest.java @@ -1,10 +1,20 @@ package io.reflectoring.coderadar.rest.contributor; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; +import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import io.reflectoring.coderadar.graph.contributor.domain.ContributorEntity; import io.reflectoring.coderadar.graph.contributor.repository.ContributorRepository; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; +import java.net.URL; +import java.util.List; +import java.util.Objects; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.neo4j.ogm.session.SessionFactory; @@ -13,17 +23,6 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultHandler; -import java.net.URL; -import java.util.List; -import java.util.Objects; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - public class GetContributorControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ContributorRepository contributorRepository; @Autowired private SessionFactory sessionFactory; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/ListContributorsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/ListContributorsControllerIntegrationTest.java index 90f95d0ef..d5f65689b 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/ListContributorsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/ListContributorsControllerIntegrationTest.java @@ -1,11 +1,20 @@ package io.reflectoring.coderadar.rest.contributor; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.contributor.port.driver.GetContributorsForPathCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetContributorResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.net.URL; +import java.util.List; +import java.util.Objects; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -13,16 +22,6 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultHandler; -import java.net.URL; -import java.util.List; -import java.util.Objects; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - public class ListContributorsControllerIntegrationTest extends ControllerTestTemplate { private long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsControllerIntegrationTest.java index 82c8414a2..0e5e641e1 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsControllerIntegrationTest.java @@ -1,25 +1,24 @@ package io.reflectoring.coderadar.rest.contributor; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import io.reflectoring.coderadar.contributor.port.driver.MergeContributorsCommand; import io.reflectoring.coderadar.graph.contributor.domain.ContributorEntity; import io.reflectoring.coderadar.graph.contributor.repository.ContributorRepository; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import java.net.URL; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.ResultHandler; -import java.net.URL; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; - -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - public class MergeContributorsControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ContributorRepository contributorRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorControllerIntegrationTest.java index 60b277ace..52a714340 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorControllerIntegrationTest.java @@ -1,23 +1,22 @@ package io.reflectoring.coderadar.rest.contributor; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import io.reflectoring.coderadar.contributor.port.driver.UpdateContributorCommand; import io.reflectoring.coderadar.graph.contributor.domain.ContributorEntity; import io.reflectoring.coderadar.graph.contributor.repository.ContributorRepository; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import java.net.URL; +import java.util.Objects; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.ResultHandler; -import java.net.URL; -import java.util.Objects; - -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - public class UpdateContributorControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ContributorRepository contributorRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java index 33f75cd05..613cbcf3d 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.rest.dependencymap; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.CoderadarConfigurationProperties; import io.reflectoring.coderadar.dependencymap.adapter.DependencyCompareTreeAdapter; import io.reflectoring.coderadar.dependencymap.domain.CompareNode; @@ -11,6 +15,12 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectUseCase; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.vcs.port.driven.DeleteLocalRepositoryPort; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -20,17 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - public class CompareTreeTest extends ControllerTestTemplate { private CompareNode root; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java index d851c13f4..02b461bf4 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.rest.dependencymap; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.CoderadarConfigurationProperties; import io.reflectoring.coderadar.dependencymap.adapter.DependencyTreeAdapter; import io.reflectoring.coderadar.dependencymap.domain.Node; @@ -10,6 +14,13 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectUseCase; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.vcs.port.driven.DeleteLocalRepositoryPort; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -19,18 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - public class TreeTest extends ControllerTestTemplate { private Node root; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/CreateFilePatternControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/CreateFilePatternControllerIntegrationTest.java index 20beaa0e8..e5e6ce5bd 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/CreateFilePatternControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/CreateFilePatternControllerIntegrationTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.rest.filepattern; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.graph.projectadministration.domain.FilePatternEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.filepattern.repository.FilePatternRepository; @@ -14,9 +17,6 @@ import org.springframework.test.web.servlet.ResultHandler; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - class CreateFilePatternControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/DeleteFilePatternControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/DeleteFilePatternControllerIntegrationTest.java index 95ed95b75..e62e3dd6c 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/DeleteFilePatternControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/DeleteFilePatternControllerIntegrationTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.filepattern; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + import io.reflectoring.coderadar.graph.projectadministration.domain.FilePatternEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.filepattern.repository.FilePatternRepository; @@ -11,8 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; - class DeleteFilePatternControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternControllerIntegrationTest.java index 1e4a75d23..df2b7d782 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternControllerIntegrationTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.rest.filepattern; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.projectadministration.domain.FilePatternEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.filepattern.repository.FilePatternRepository; @@ -13,10 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - class GetFilePatternControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectControllerIntegrationTest.java index f3c28d4c3..f4b9fdcb6 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectControllerIntegrationTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.rest.filepattern; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.projectadministration.domain.FilePatternEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.filepattern.repository.FilePatternRepository; @@ -7,17 +11,12 @@ import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetFilePatternResponse; +import java.util.Arrays; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Arrays; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - class ListFilePatternsOfProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/CreateModuleControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/CreateModuleControllerIntegrationTest.java index 43a772943..5257bcd7b 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/CreateModuleControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/CreateModuleControllerIntegrationTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.rest.module; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.graph.projectadministration.domain.FileEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ModuleEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -8,19 +12,14 @@ import io.reflectoring.coderadar.projectadministration.port.driver.module.create.CreateModuleCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.ArrayList; -import java.util.List; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - class CreateModuleControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/DeleteModuleControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/DeleteModuleControllerIntegrationTest.java index 43809cd3f..2bf3026dd 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/DeleteModuleControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/DeleteModuleControllerIntegrationTest.java @@ -1,5 +1,7 @@ package io.reflectoring.coderadar.rest.module; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + import io.reflectoring.coderadar.graph.projectadministration.domain.ModuleEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.module.repository.ModuleRepository; @@ -10,8 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; - class DeleteModuleControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/GetModuleControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/GetModuleControllerIntegrationTest.java index 05b236379..461a21bec 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/GetModuleControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/GetModuleControllerIntegrationTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.rest.module; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.projectadministration.domain.ModuleEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.module.repository.ModuleRepository; @@ -11,10 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - class GetModuleControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectControllerIntegrationTest.java index f4fab8297..9c2be85b0 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectControllerIntegrationTest.java @@ -1,22 +1,21 @@ package io.reflectoring.coderadar.rest.module; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.projectadministration.domain.ModuleEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.module.repository.ModuleRepository; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetModuleResponse; +import java.util.Arrays; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Arrays; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - class ListModulesOfProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/CreateProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/CreateProjectControllerIntegrationTest.java index 746cc13c6..871a3b189 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/CreateProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/CreateProjectControllerIntegrationTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.rest.project; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.graph.analyzer.repository.CommitRepository; import io.reflectoring.coderadar.graph.analyzer.repository.FileRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.CommitEntity; @@ -9,6 +13,9 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.net.URL; +import java.util.Date; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -16,14 +23,6 @@ import org.springframework.test.web.servlet.ResultHandler; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.net.URL; -import java.util.Date; -import java.util.List; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - class CreateProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; @Autowired private FileRepository fileRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/DeleteProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/DeleteProjectControllerIntegrationTest.java index f2bf96d3d..eb68318b5 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/DeleteProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/DeleteProjectControllerIntegrationTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.rest.project; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import io.reflectoring.coderadar.graph.contributor.domain.ContributorEntity; import io.reflectoring.coderadar.graph.contributor.repository.ContributorRepository; import io.reflectoring.coderadar.graph.projectadministration.domain.FilePatternEntity; @@ -9,6 +13,9 @@ import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -17,14 +24,6 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - class DeleteProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/GetProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/GetProjectControllerIntegrationTest.java index 70c33177a..8f1a65ff1 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/GetProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/GetProjectControllerIntegrationTest.java @@ -1,20 +1,19 @@ package io.reflectoring.coderadar.rest.project; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; +import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Date; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - class GetProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java index f01da1a9a..c51ab2280 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java @@ -1,21 +1,20 @@ package io.reflectoring.coderadar.rest.project; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; +import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Date; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - class ListProjectsControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/UpdateProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/UpdateProjectControllerIntegrationTest.java index 820649c12..358917316 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/UpdateProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/UpdateProjectControllerIntegrationTest.java @@ -1,20 +1,19 @@ package io.reflectoring.coderadar.rest.project; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.projectadministration.port.driver.project.update.UpdateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import java.util.Date; +import java.util.UUID; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Date; -import java.util.UUID; - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - class UpdateProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectControllerTest.java index f12c1e584..3bf3f8e57 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectControllerTest.java @@ -1,5 +1,10 @@ package io.reflectoring.coderadar.rest.query; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; @@ -8,21 +13,15 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.net.URL; +import java.util.List; +import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; -import java.net.URL; -import java.util.List; -import java.util.Objects; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - class GetAvailableMetricsInProjectControllerTest extends ControllerTestTemplate { private Long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitLogControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitLogControllerTest.java index aa2953b27..c35a66a59 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitLogControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitLogControllerTest.java @@ -1,26 +1,25 @@ package io.reflectoring.coderadar.rest.query; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; +import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.query.domain.CommitLog; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.net.URL; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; -import java.net.URL; -import java.util.Collections; -import java.util.List; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - public class GetCommitLogControllerTest extends ControllerTestTemplate { private Long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectControllerTest.java index 7fd1b44ee..3b33b9c17 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitsInProjectControllerTest.java @@ -1,27 +1,26 @@ package io.reflectoring.coderadar.rest.query; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; +import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.domain.GetCommitResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.net.URL; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; -import java.net.URL; -import java.util.List; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - class GetCommitsInProjectControllerTest extends ControllerTestTemplate { private Long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesControllerTest.java index 93cabe46d..9c7e2be78 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesControllerTest.java @@ -1,5 +1,11 @@ package io.reflectoring.coderadar.rest.query; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; @@ -11,6 +17,10 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.net.URL; +import java.util.Date; +import java.util.List; +import java.util.Objects; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -18,17 +28,6 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultHandler; -import java.net.URL; -import java.util.Date; -import java.util.List; -import java.util.Objects; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - public class GetCriticalFilesControllerTest extends ControllerTestTemplate { private long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetDeltaTreeForTwoCommitsControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetDeltaTreeForTwoCommitsControllerTest.java index 9f01c7004..909ef3637 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetDeltaTreeForTwoCommitsControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetDeltaTreeForTwoCommitsControllerTest.java @@ -1,5 +1,11 @@ package io.reflectoring.coderadar.rest.query; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; @@ -11,23 +17,16 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.http.MediaType; -import org.springframework.test.web.servlet.MvcResult; - import java.net.URL; import java.util.Arrays; import java.util.Comparator; import java.util.List; import java.util.Objects; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MvcResult; class GetDeltaTreeForTwoCommitsControllerTest extends ControllerTestTemplate { diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileContentWithMetricsControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileContentWithMetricsControllerTest.java index 0b83b8017..3da3bdf54 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileContentWithMetricsControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileContentWithMetricsControllerTest.java @@ -1,5 +1,10 @@ package io.reflectoring.coderadar.rest.query; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; @@ -8,20 +13,14 @@ import io.reflectoring.coderadar.query.port.driver.filecontent.GetFileContentWithMetricsCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.net.URL; +import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; -import java.net.URL; -import java.util.Objects; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - public class GetFileContentWithMetricsControllerTest extends ControllerTestTemplate { long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileDiffControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileDiffControllerTest.java index efa0af539..129b2712e 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileDiffControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileDiffControllerTest.java @@ -1,5 +1,10 @@ package io.reflectoring.coderadar.rest.query; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; @@ -8,20 +13,14 @@ import io.reflectoring.coderadar.query.port.driver.filediff.GetFileDiffCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.net.URL; +import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; -import java.net.URL; -import java.util.Objects; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - public class GetFileDiffControllerTest extends ControllerTestTemplate { long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java index 131c779d7..bbd53960b 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java @@ -1,26 +1,25 @@ package io.reflectoring.coderadar.rest.query; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.query.domain.FileTree; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.net.URL; +import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; -import java.net.URL; -import java.util.Objects; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - public class GetFileTreeForCommitControllerTest extends ControllerTestTemplate { long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricTreeForCommitControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricTreeForCommitControllerTest.java index 296def967..89277303e 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricTreeForCommitControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricTreeForCommitControllerTest.java @@ -1,5 +1,11 @@ package io.reflectoring.coderadar.rest.query; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; import io.reflectoring.coderadar.projectadministration.port.driver.filepattern.create.CreateFilePatternCommand; @@ -11,6 +17,9 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.net.URL; +import java.util.Arrays; +import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -18,16 +27,6 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MvcResult; -import java.net.URL; -import java.util.Arrays; -import java.util.Objects; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - class GetMetricTreeForCommitControllerTest extends ControllerTestTemplate { private Long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitControllerTest.java index 4023d7eea..cbc35c10c 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetMetricValuesOfCommitControllerTest.java @@ -1,5 +1,11 @@ package io.reflectoring.coderadar.rest.query; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.projectadministration.domain.InclusionType; import io.reflectoring.coderadar.projectadministration.port.driver.analyzerconfig.create.CreateAnalyzerConfigurationCommand; @@ -10,23 +16,16 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse; import io.reflectoring.coderadar.rest.domain.IdResponse; +import java.net.URL; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; -import java.net.URL; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - class GetMetricValuesOfCommitControllerTest extends ControllerTestTemplate { private Long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordControllerIntegrationTest.java index e48807079..b4a77c99c 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordControllerIntegrationTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.rest.useradministration; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.graph.useradministration.domain.RefreshTokenEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.RefreshTokenRepository; @@ -16,9 +19,6 @@ import org.springframework.test.web.servlet.ResultHandler; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - class ChangePasswordControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java index 9675dbc7a..c5f3fad47 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; @@ -9,10 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - class GetUserControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java index 2437265b9..662ac7c0e 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.rest.useradministration; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; @@ -7,6 +10,8 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; +import java.util.Collections; +import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -14,12 +19,6 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Collections; -import java.util.Date; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - public class ListProjectsForUserControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java index 1a3f74bca..01df5cf69 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.rest.useradministration; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; @@ -12,9 +15,6 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - public class ListUsersControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java index 47f6464fe..1cdf6a77b 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.rest.useradministration; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; @@ -7,6 +10,8 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetUserResponse; import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; +import java.util.Collections; +import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -14,12 +19,6 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Collections; -import java.util.Date; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - public class ListUsersForProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java index 27c1ae3f1..b8a05b658 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java @@ -1,5 +1,9 @@ package io.reflectoring.coderadar.rest.useradministration; +import static org.hamcrest.Matchers.any; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; @@ -11,10 +15,6 @@ import org.springframework.test.web.servlet.ResultHandler; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static org.hamcrest.Matchers.any; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - class LoginUserControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenControllerIntegrationTest.java index 88d7db4e6..435715318 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenControllerIntegrationTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.rest.useradministration; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; import io.reflectoring.coderadar.graph.useradministration.domain.RefreshTokenEntity; @@ -12,6 +15,7 @@ import io.reflectoring.coderadar.useradministration.service.security.SecretKeyService; import io.reflectoring.coderadar.useradministration.service.security.TokenService; import io.reflectoring.coderadar.useradministration.service.security.TokenType; +import java.util.Date; import org.joda.time.DateTime; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -19,11 +23,6 @@ import org.springframework.test.web.servlet.ResultHandler; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Date; - -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - class RefreshTokenControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserControllerIntegrationTest.java index 436cf0623..9bf9a105a 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserControllerIntegrationTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.rest.useradministration; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; @@ -10,9 +13,6 @@ import org.springframework.test.web.servlet.ResultHandler; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - class RegisterUserControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java index 6640e9af2..184425616 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java @@ -1,22 +1,21 @@ package io.reflectoring.coderadar.rest.useradministration.permissions; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; +import java.util.Collections; +import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Collections; -import java.util.Date; - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; - public class RemoveUserFromProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java index fe4be47d9..9d1e619f7 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.rest.useradministration.permissions; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; @@ -8,6 +11,7 @@ import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; import io.reflectoring.coderadar.useradministration.domain.ProjectRole; import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; +import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -15,11 +19,6 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Date; - -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - public class SetUserRoleForProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java index b929cfd53..8611759f9 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; @@ -7,6 +10,8 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper; import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import java.util.Date; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -14,12 +19,6 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Date; -import java.util.List; - -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - public class AddTeamToProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java index ccd67cecc..4ee18e1fb 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java @@ -1,11 +1,16 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.JsonListWrapper; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -13,12 +18,6 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Collections; -import java.util.List; - -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - public class AddUsersToTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java index 13dc091ea..ee734828f 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; + import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; @@ -7,6 +10,8 @@ import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand; import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -14,12 +19,6 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Collections; -import java.util.List; - -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; - public class CreateTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java index b1330a4bb..27155e360 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java @@ -1,22 +1,21 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Collections; -import java.util.List; - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; - public class DeleteTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java index 7494b5ea9..8e7a9771b 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; @@ -11,9 +14,6 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - public class GetTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java index 53c6e7d2c..b365799fe 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java @@ -1,11 +1,16 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetProjectResponse; +import java.util.Collections; +import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -13,12 +18,6 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Collections; -import java.util.Date; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - public class ListProjectsForTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java index a79ba49ca..2d9cc5091 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java @@ -1,5 +1,8 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; @@ -11,9 +14,6 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - public class ListTeamsControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java index 7ca368dac..2cec7c92f 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java @@ -1,11 +1,16 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import java.util.Collections; +import java.util.Date; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -13,12 +18,6 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Collections; -import java.util.Date; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - public class ListTeamsForProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java index 87b578343..7b5aec0fb 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java @@ -1,11 +1,15 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; + import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; +import java.util.Collections; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -13,11 +17,6 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Collections; - -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; - public class ListTeamsForUserControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java index bb3d9df68..f0670511b 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java @@ -1,22 +1,21 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; +import java.util.Collections; +import java.util.Date; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Collections; -import java.util.Date; -import java.util.List; - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; - public class RemoveTeamFromProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java index 061b6cb2f..26b01a1e0 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java @@ -1,11 +1,16 @@ package io.reflectoring.coderadar.rest.useradministration.teams; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; + import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.JsonListWrapper; +import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -13,12 +18,6 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import java.util.Collections; -import java.util.List; - -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; - public class RemoveUsersFromTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; From 3a0e3a25f2751b68bedb7e8f0fd0fe1eedb8fe98 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Fri, 12 Jun 2020 13:55:59 +0200 Subject: [PATCH 41/76] added an add-team page --- .../CoderadarSecurityConfiguration.java | 2 + coderadar-ui/package.json | 2 +- coderadar-ui/src/app/app.module.ts | 7 ++- .../app/view/add-team/add-team.component.css | 8 +++ .../app/view/add-team/add-team.component.html | 48 +++++++++++++++++ .../app/view/add-team/add-team.component.ts | 54 +++++++++++++++++++ .../main-dashboard.component.html | 6 +-- .../sidenav-content.component.css | 0 .../sidenav-content.component.html | 5 ++ .../sidenav-content.component.spec.ts | 25 +++++++++ .../sidenav-content.component.ts | 15 ++++++ .../teams-dashboard.component.html | 8 +-- 12 files changed, 167 insertions(+), 13 deletions(-) create mode 100644 coderadar-ui/src/app/view/add-team/add-team.component.css create mode 100644 coderadar-ui/src/app/view/add-team/add-team.component.html create mode 100644 coderadar-ui/src/app/view/add-team/add-team.component.ts create mode 100644 coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.css create mode 100644 coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.html create mode 100644 coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.spec.ts create mode 100644 coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.ts diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java index 7a01f2c3c..c3c6581d2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java @@ -74,6 +74,8 @@ protected void configure(HttpSecurity http) throws Exception { "/api/user/registration", "/api/user/refresh", "/login", + "/teams", + "/add-team", "/**/*.js", "/**/*.css", "/**/*.map", diff --git a/coderadar-ui/package.json b/coderadar-ui/package.json index e053bbd49..f5187e176 100644 --- a/coderadar-ui/package.json +++ b/coderadar-ui/package.json @@ -3,7 +3,7 @@ "version": "0.5.0", "scripts": { "ng": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng", - "start": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng serve", + "start": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng serve --prod", "build": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --prod", "test": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng test", "lint": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng lint", diff --git a/coderadar-ui/src/app/app.module.ts b/coderadar-ui/src/app/app.module.ts index 0e7de07c8..149fd1227 100644 --- a/coderadar-ui/src/app/app.module.ts +++ b/coderadar-ui/src/app/app.module.ts @@ -66,12 +66,15 @@ import { ListViewComponent } from './view/project-dashboard/list-view/list-view. import { BranchViewComponent } from './view/project-dashboard/branch-view/branch-view.component'; import { FileViewComponent } from './view/file-view/file-view.component'; import { TeamsDashboardComponent } from './view/teams-dashboard/teams-dashboard.component'; +import { AddTeamComponent } from './view/add-team/add-team.component'; +import { SidenavContentComponent } from './view/sidenav-content/sidenav-content.component'; const appRoutes: Routes = [ {path: 'login', component: LoginComponent}, {path: 'register', component: RegisterComponent}, {path: 'dashboard', component: MainDashboardComponent}, {path: 'teams', component: TeamsDashboardComponent}, + {path: 'add-team', component: AddTeamComponent}, {path: 'user-settings', component: UserSettingsComponent}, {path: 'add-project', component: AddProjectComponent}, {path: 'project-configure/:id', component: ConfigureProjectComponent}, @@ -110,7 +113,9 @@ const appRoutes: Routes = [ ListViewComponent, BranchViewComponent, FileViewComponent, - TeamsDashboardComponent + TeamsDashboardComponent, + AddTeamComponent, + SidenavContentComponent, ], imports: [ BrowserModule, diff --git a/coderadar-ui/src/app/view/add-team/add-team.component.css b/coderadar-ui/src/app/view/add-team/add-team.component.css new file mode 100644 index 000000000..f90c2c684 --- /dev/null +++ b/coderadar-ui/src/app/view/add-team/add-team.component.css @@ -0,0 +1,8 @@ +.sidenav { + top: 0; + bottom: 0; + left: 0; + right: 0; + background: ghostwhite; + min-height: calc(100vh - 220px); +} diff --git a/coderadar-ui/src/app/view/add-team/add-team.component.html b/coderadar-ui/src/app/view/add-team/add-team.component.html new file mode 100644 index 000000000..3944f21da --- /dev/null +++ b/coderadar-ui/src/app/view/add-team/add-team.component.html @@ -0,0 +1,48 @@ + + + + + +
+
+
+
+
+ + + + + + Add team + + + + + + + + + + Select users + + {{user.username}} + + + + The team name must not be empty! + +
+ + +
+ + + +
+
+
+
+
+ + diff --git a/coderadar-ui/src/app/view/add-team/add-team.component.ts b/coderadar-ui/src/app/view/add-team/add-team.component.ts new file mode 100644 index 000000000..161f94f6d --- /dev/null +++ b/coderadar-ui/src/app/view/add-team/add-team.component.ts @@ -0,0 +1,54 @@ +import { Component, OnInit } from '@angular/core'; +import {FormControl} from "@angular/forms"; +import {Team} from "../../model/team"; +import {User} from "../../model/user"; +import {UserService} from "../../service/user.service"; +import {TeamService} from "../../service/team.service"; +import {FORBIDDEN, NOT_FOUND} from "http-status-codes"; +import {Router} from "@angular/router"; + +@Component({ + selector: 'app-add-team', + templateUrl: './add-team.component.html', + styleUrls: ['./add-team.component.css'] +}) +export class AddTeamComponent implements OnInit { + + usersFormControl = new FormControl(); + team: Team = new Team(); + users: User[] = []; + nameEmpty = false; + + constructor(private userService: UserService, private teamService: TeamService, private router: Router) { } + + ngOnInit() { + this.getAllUsers(); + } + + private getAllUsers() { + this.userService.listUsers().then(value => { + this.users = value.body; + }).catch(error => { + if (error.status && error.status === FORBIDDEN) { + this.userService.refresh(() => this.getAllUsers()); + } else if (error.status && error.status === NOT_FOUND) { + this.router.navigate(['/dashboard']); + } + }); + } + + submitForm() { + this.nameEmpty = this.team.name == undefined || this.team.name.length === 0; + if(!this.nameEmpty) { + this.teamService.createTeam(this.team.name, this.usersFormControl.value).then(() => + this.router.navigate(['/teams'] + )).catch(error => { + if (error.status && error.status === FORBIDDEN) { + this.userService.refresh(() => this.getAllUsers()); + } else if (error.status && error.status === NOT_FOUND) { + this.router.navigate(['/dashboard']); + } + }); //TODO: Identical team names + } + } +} diff --git a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html index 0e61a6b3e..29711e4e3 100644 --- a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html +++ b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html @@ -4,11 +4,7 @@ - - My projects - My teams - Settings - +
diff --git a/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.css b/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.css new file mode 100644 index 000000000..e69de29bb diff --git a/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.html b/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.html new file mode 100644 index 000000000..c02256022 --- /dev/null +++ b/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.html @@ -0,0 +1,5 @@ + + Projects + Teams + Settings + diff --git a/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.spec.ts b/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.spec.ts new file mode 100644 index 000000000..c33ec6991 --- /dev/null +++ b/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SidenavContentComponent } from './sidenav-content.component'; + +describe('SidenavContentComponent', () => { + let component: SidenavContentComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SidenavContentComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SidenavContentComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.ts b/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.ts new file mode 100644 index 000000000..ba03cf359 --- /dev/null +++ b/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-sidenav-content', + templateUrl: './sidenav-content.component.html', + styleUrls: ['./sidenav-content.component.css'] +}) +export class SidenavContentComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html index a4c6d5dc0..b95f8df4c 100644 --- a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html +++ b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html @@ -4,11 +4,7 @@ - - My projects - My teams - Settings - +
@@ -53,7 +49,7 @@ - + + From 1b38183b3a9a05c447a32cd1b21f1c16e7798a21 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Mon, 15 Jun 2020 14:58:40 +0200 Subject: [PATCH 42/76] set admin role when creating a project. Project dashboard only displays projects that a user should have access to. Added a dropdown for selecting a team and a modal window to add a project to a team --- .../service/project/CreateProjectService.java | 26 +++++- .../project/repository/ProjectRepository.java | 8 +- .../rest/ProjectRoleJsonWrapper.java | 3 +- coderadar-ui/src/app/app.module.ts | 10 ++- .../src/app/service/project.service.ts | 5 ++ coderadar-ui/src/app/service/team.service.ts | 7 +- coderadar-ui/src/app/service/user.service.ts | 5 -- .../app/view/add-team/add-team.component.html | 1 + .../app/view/add-team/add-team.component.ts | 7 +- .../add-project-to-team-dialog.html | 24 ++++++ .../main-dashboard.component.html | 16 +++- .../main-dashboard.component.scss | 2 +- .../main-dashboard.component.ts | 84 ++++++++++++++++++- .../teams-dashboard.component.html | 21 ++--- .../teams-dashboard.component.ts | 11 +++ 15 files changed, 195 insertions(+), 35 deletions(-) create mode 100644 coderadar-ui/src/app/view/main-dashboard/add-project-to-team-dialog.html diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/CreateProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/CreateProjectService.java index 49af504d6..23a459bce 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/CreateProjectService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/project/CreateProjectService.java @@ -16,6 +16,9 @@ import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectUseCase; import io.reflectoring.coderadar.projectadministration.service.ProcessProjectService; import io.reflectoring.coderadar.query.domain.DateRange; +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; +import io.reflectoring.coderadar.useradministration.port.driven.SetUserRoleForProjectPort; import io.reflectoring.coderadar.vcs.port.driven.GetAvailableBranchesPort; import io.reflectoring.coderadar.vcs.port.driver.ExtractProjectCommitsUseCase; import io.reflectoring.coderadar.vcs.port.driver.clone.CloneRepositoryCommand; @@ -27,6 +30,8 @@ import java.util.UUID; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; @Service @@ -54,6 +59,10 @@ public class CreateProjectService implements CreateProjectUseCase { private final ListContributorsPort listContributorsPort; + private final SetUserRoleForProjectPort setUserRoleForProjectPort; + + private final GetUserPort getUserPort; + private static final Logger logger = LoggerFactory.getLogger(CreateProjectService.class); public CreateProjectService( @@ -67,7 +76,9 @@ public CreateProjectService( SaveCommitPort saveCommitPort, ComputeContributorsPort computeContributorsPort, SaveContributorsPort saveContributorsPort, - ListContributorsPort listContributorsPort) { + ListContributorsPort listContributorsPort, + SetUserRoleForProjectPort setUserRoleForProjectPort, + GetUserPort getUserPort) { this.getAvailableBranchesPort = getAvailableBranchesPort; this.createProjectPort = createProjectPort; this.getProjectPort = getProjectPort; @@ -79,6 +90,8 @@ public CreateProjectService( this.computeContributorsPort = computeContributorsPort; this.saveContributorsPort = saveContributorsPort; this.listContributorsPort = listContributorsPort; + this.setUserRoleForProjectPort = setUserRoleForProjectPort; + this.getUserPort = getUserPort; } @Override @@ -87,6 +100,7 @@ public Long createProject(CreateProjectCommand command) { throw new ProjectAlreadyExistsException(command.getName()); } Project project = saveProject(command); + setAdminRoleForCurrentUser(project.getId()); processProjectService.executeTask( () -> { String localDir = @@ -121,6 +135,16 @@ public Long createProject(CreateProjectCommand command) { return project.getId(); } + private void setAdminRoleForCurrentUser(Long projectId) { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication != null && authentication.getPrincipal() instanceof String) { + setUserRoleForProjectPort.setRole( + projectId, + getUserPort.getUserByUsername(((String) authentication.getPrincipal())).getId(), + ProjectRole.ADMIN); + } + } + private synchronized void saveContributors(Project project) { List contributors = listContributorsPort.listAll(); contributors = diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java index d6c9f6d19..f0d12e0a3 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java @@ -159,7 +159,7 @@ public interface ProjectRepository extends Neo4jRepository + "CREATE (p)-[r:CONTAINS_COMMIT]->(c)") void attachCommitsWithIds(long projectId, @NonNull List commitIds); - /** @param projectId */ + /** @param projectId The id of the project */ @Query("MATCH (p)<-[r:WORKS_ON]-() WHERE ID(p) = {0} DELETE r") void deleteContributorRelationships(long projectId); @@ -167,7 +167,11 @@ public interface ProjectRepository extends Neo4jRepository * @param userId The user id. * @return All the project a user is assigned to. */ - @Query("MATCH (u)-[:ASSIGNED_TO]->(p) WHERE ID(u) = {0} RETURN p") + @Query( + "MATCH (u)-[:ASSIGNED_TO*0..1]->(p1:ProjectEntity) WHERE ID(u) = {0} " + + "WITH p1, u " + + "MATCH (p2:ProjectEntity)<-[:ASSIGNED_TO*0..1]-(t)<-[:IS_IN*0..1]-(u) WITH collect(p1) + collect(p2) as list " + + "UNWIND list AS p RETURN DISTINCT p ORDER BY p.name") List findProjectsByUsedId(long userId); /** diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java index 5571fadf4..a848f1b71 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.rest; import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,5 +10,5 @@ @NoArgsConstructor @AllArgsConstructor public class ProjectRoleJsonWrapper { // TODO: create validator for input validation in controllers - private ProjectRole role; + @NotNull private ProjectRole role; } diff --git a/coderadar-ui/src/app/app.module.ts b/coderadar-ui/src/app/app.module.ts index 149fd1227..c0cb760a1 100644 --- a/coderadar-ui/src/app/app.module.ts +++ b/coderadar-ui/src/app/app.module.ts @@ -9,7 +9,11 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {AddProjectComponent} from './view/add-project/add-project.component'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {FlexLayoutModule} from '@angular/flex-layout'; -import {MainDashboardComponent, ConfirmDeleteProjectDialogComponent} from './view/main-dashboard/main-dashboard.component'; +import { + MainDashboardComponent, + ConfirmDeleteProjectDialogComponent, + AddProjectToTeamDialogComponent +} from './view/main-dashboard/main-dashboard.component'; import {LayoutModule} from '@angular/cdk/layout'; import {AuthInterceptor} from './auth.interceptor'; import {ConfigureProjectComponent, MergeDialogComponent} from './view/configure-project/configure-project.component'; @@ -114,6 +118,7 @@ const appRoutes: Routes = [ BranchViewComponent, FileViewComponent, TeamsDashboardComponent, + AddProjectToTeamDialogComponent, AddTeamComponent, SidenavContentComponent, ], @@ -184,7 +189,8 @@ const appRoutes: Routes = [ bootstrap: [AppComponent], entryComponents: [ MergeDialogComponent, - ConfirmDeleteProjectDialogComponent + ConfirmDeleteProjectDialogComponent, + AddProjectToTeamDialogComponent ] }) export class AppModule { diff --git a/coderadar-ui/src/app/service/project.service.ts b/coderadar-ui/src/app/service/project.service.ts index 42f37a1d3..1c80a4271 100644 --- a/coderadar-ui/src/app/service/project.service.ts +++ b/coderadar-ui/src/app/service/project.service.ts @@ -318,4 +318,9 @@ export class ProjectService { return this.httpClient.post(this.apiURL + 'projects/' + projectId + '/files/diff', {commitHash, filepath}, {observe: 'response'}).toPromise(); } + + public listProjectsForUser(userId: number): Promise> { + return this.httpClient.get(this.apiURL + 'users/'+userId+'/projects', + {observe: 'response'}).toPromise(); + } } diff --git a/coderadar-ui/src/app/service/team.service.ts b/coderadar-ui/src/app/service/team.service.ts index f59efc8af..0dac592b2 100644 --- a/coderadar-ui/src/app/service/team.service.ts +++ b/coderadar-ui/src/app/service/team.service.ts @@ -69,7 +69,12 @@ export class TeamService { } public removeTeamFromProject(projectId:number, teamId: number): Promise> { - return this.httpClient.get(this.apiURL + 'projects/'+projectId+'/teams/'+teamId, + return this.httpClient.delete(this.apiURL + 'projects/'+projectId+'/teams/'+teamId, + {observe: 'response'}).toPromise(); + } + + public removeTeam(id: number) { + return this.httpClient.delete(this.apiURL + 'teams/'+id, {observe: 'response'}).toPromise(); } } diff --git a/coderadar-ui/src/app/service/user.service.ts b/coderadar-ui/src/app/service/user.service.ts index bd897aa9c..a8061ec21 100644 --- a/coderadar-ui/src/app/service/user.service.ts +++ b/coderadar-ui/src/app/service/user.service.ts @@ -114,11 +114,6 @@ export class UserService { {refreshToken: UserService.getLoggedInUser().refreshToken, newPassword: password}, {observe: 'response'}).toPromise(); } - public listProjectsForUser(userId: number): Promise> { - return this.httpClient.get(this.apiURL + 'users/'+userId+'/projects', - {observe: 'response'}).toPromise(); - } - public listUsersForProject(projectId: number): Promise>{ return this.httpClient.get(this.apiURL + 'projects/'+projectId+'/users', {observe: 'response'}).toPromise(); diff --git a/coderadar-ui/src/app/view/add-team/add-team.component.html b/coderadar-ui/src/app/view/add-team/add-team.component.html index 3944f21da..dc20cf9d0 100644 --- a/coderadar-ui/src/app/view/add-team/add-team.component.html +++ b/coderadar-ui/src/app/view/add-team/add-team.component.html @@ -31,6 +31,7 @@ The team name must not be empty! + A team with this name already exists!
diff --git a/coderadar-ui/src/app/view/add-team/add-team.component.ts b/coderadar-ui/src/app/view/add-team/add-team.component.ts index 161f94f6d..e9804301d 100644 --- a/coderadar-ui/src/app/view/add-team/add-team.component.ts +++ b/coderadar-ui/src/app/view/add-team/add-team.component.ts @@ -4,7 +4,7 @@ import {Team} from "../../model/team"; import {User} from "../../model/user"; import {UserService} from "../../service/user.service"; import {TeamService} from "../../service/team.service"; -import {FORBIDDEN, NOT_FOUND} from "http-status-codes"; +import {CONFLICT, FORBIDDEN, NOT_FOUND} from "http-status-codes"; import {Router} from "@angular/router"; @Component({ @@ -18,6 +18,7 @@ export class AddTeamComponent implements OnInit { team: Team = new Team(); users: User[] = []; nameEmpty = false; + teamNameTaken = false; constructor(private userService: UserService, private teamService: TeamService, private router: Router) { } @@ -45,8 +46,8 @@ export class AddTeamComponent implements OnInit { )).catch(error => { if (error.status && error.status === FORBIDDEN) { this.userService.refresh(() => this.getAllUsers()); - } else if (error.status && error.status === NOT_FOUND) { - this.router.navigate(['/dashboard']); + } else if (error.status && error.status === CONFLICT) { + this.teamNameTaken = true; } }); //TODO: Identical team names } diff --git a/coderadar-ui/src/app/view/main-dashboard/add-project-to-team-dialog.html b/coderadar-ui/src/app/view/main-dashboard/add-project-to-team-dialog.html new file mode 100644 index 000000000..41ce47edd --- /dev/null +++ b/coderadar-ui/src/app/view/main-dashboard/add-project-to-team-dialog.html @@ -0,0 +1,24 @@ +
+ + Select teams + + {{team.name}} + + + + + Select role + + + Admin + + + Member + + + +
+ + + + diff --git a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html index 29711e4e3..55b24f5c0 100644 --- a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html +++ b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html @@ -11,12 +11,25 @@
-
+
Hello there, it looks like you haven't added any projects yet.
Click on the plus button to add one.
+
+ No projects available in the selected team +
+ + Team + + All + + {{team.name}} + + + + @@ -38,6 +51,7 @@ + diff --git a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss index 75e29b28a..3905e650f 100644 --- a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss +++ b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss @@ -43,7 +43,7 @@ padding-left: 30px; } -.card-list #noProjectsMessage { +.card-list .noProjectsMessage { font-size: x-large; } diff --git a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts index 0cd440f7c..87b357680 100644 --- a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts +++ b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts @@ -8,6 +8,11 @@ import {Title} from '@angular/platform-browser'; import {AppComponent} from '../../app.component'; import {MatDialog, MatSnackBar} from '@angular/material'; import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {Team} from "../../model/team"; +import {TeamService} from "../../service/team.service"; +import {HttpResponse} from "@angular/common/http"; +import {ProjectRole} from "../../model/project-role"; +import {FormControl} from "@angular/forms"; @Component({ selector: 'app-main-dashboard', @@ -17,18 +22,24 @@ import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; export class MainDashboardComponent implements OnInit { projects: Project[] = []; + teams: Team[] = []; dialogRef: MatDialogRef; + teamDialogRef: MatDialogRef; + appComponent = AppComponent; waiting = false; + selectedTeam: Team; constructor(private snackBar: MatSnackBar, private titleService: Title, private userService: UserService, - private router: Router, private projectService: ProjectService, private dialog: MatDialog) { + private router: Router, private projectService: ProjectService, private dialog: MatDialog, + private teamService: TeamService) { titleService.setTitle('Coderadar - Dashboard'); } ngOnInit(): void { this.getProjects(); + this.getTeams(); } /** @@ -67,14 +78,37 @@ export class MainDashboardComponent implements OnInit { }); } + openAddToTeamDialog(project: Project): void { + const dialogRef = this.dialog.open(AddProjectToTeamDialogComponent, { + width: '300px', + data: {teams: this.teams, project: project} + }); + + dialogRef.afterClosed().subscribe(result => { + if (result !== undefined) { + for(let team of result.teams) { //TODO: Check if project is already in team + this.teamService.addTeamToProject(project.id, team.id, result.role); + } + } + }); + } + /** * Gets all projects from the project service and constructs a new array of Project objects * from the returned JSON. Sends a refresh token if access is denied. */ - private getProjects(): void { + getProjects(): void { this.waiting = true; - this.projectService.getProjects() - .then(response => {response.body.forEach(project => { + let promise: Promise>; + if(this.selectedTeam == undefined) { + promise = this.projectService.listProjectsForUser(UserService.getLoggedInUser().userId); + } else { + promise = this.teamService.listProjectsForTeam(this.selectedTeam.id); + } + promise + .then(response => { + this.projects = []; + response.body.forEach(project => { const newProject = new Project(project); this.projects.push(newProject); }); @@ -88,6 +122,16 @@ export class MainDashboardComponent implements OnInit { }); } + private getTeams() { + this.teamService.listTeamsForUser(UserService.getLoggedInUser().userId).then(value => + this.teams = value.body + ) .catch(e => { + if (e.status && e.status === FORBIDDEN) { //TODO: UNAUTHORIZED + this.userService.refresh(() => this.getTeams()); + } + }); + } + startAnalysis(id: number) { this.projectService.startAnalyzingJob(id, 'master').then(() => { this.openSnackBar('Analysis started!', '🞩'); @@ -159,3 +203,35 @@ export class ConfirmDeleteProjectDialogComponent{ } } + + +class AddProjectToTeamDialogData { + project: Project; + teams: Team[]; + role: ProjectRole; +} + +@Component({ + selector: 'app-add-project-to-team-dialog', + templateUrl: 'add-project-to-team-dialog.html' +}) +export class AddProjectToTeamDialogComponent { + + selectedTeams: FormControl = new FormControl(); + + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: AddProjectToTeamDialogData + ) { + + } + + onNoClick(): void { + this.dialogRef.close(); + } + + onAddClick(): void { + this.data.teams = this.selectedTeams.value; + } + +} diff --git a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html index b95f8df4c..3b5c9d7ab 100644 --- a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html +++ b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html @@ -22,28 +22,21 @@ - {{team.name}} - - - + {{team.name}} - - - + + - Content + Team members: + + {{" " + member.username}} + diff --git a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.ts b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.ts index f4bb5a804..913ccbd6d 100644 --- a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.ts +++ b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.ts @@ -30,4 +30,15 @@ export class TeamsDashboardComponent implements OnInit { }); } + removeTeam(id: number) { + this.teamService.removeTeam(id) + .then(() => { + this.teams = this.teams.filter(value => value.id != id); + }) + .catch(e => { + if (e.status && e.status === FORBIDDEN) { //TODO: UNAUTHORIZED + this.userService.refresh(() => this.getTeams()); + } + }); + } } From b61bf8408cd1e8aa63f5f8642c42b7d7b90a9aeb Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Tue, 16 Jun 2020 16:33:07 +0200 Subject: [PATCH 43/76] add back-end authentication --- .../port/driven/GetUserRoleForProjectPort.java | 15 +++++++++++++++ .../service/UserUnauthenticatedException.java | 4 ++++ .../service/UserUnauthorizedException.java | 4 ++++ .../service/security/AuthenticationService.java | 4 ++++ .../adapter/GetUserRoleForProjectAdapter.java | 4 ++++ .../coderadar/rest/unit/UnitTestTemplate.java | 4 ++++ 6 files changed, 35 insertions(+) create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetUserRoleForProjectPort.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/UserUnauthenticatedException.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/UserUnauthorizedException.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationService.java create mode 100644 coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/GetUserRoleForProjectAdapter.java create mode 100644 coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/UnitTestTemplate.java diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetUserRoleForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetUserRoleForProjectPort.java new file mode 100644 index 000000000..ba0fa7140 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/GetUserRoleForProjectPort.java @@ -0,0 +1,15 @@ +package io.reflectoring.coderadar.useradministration.port.driven; + +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; + +public interface SetUserRoleForProjectPort { + + /** + * Gives a user a role in the project. + * + * @param projectId The id of the project. + * @param userId The id of the user. + * @param role The role to set. + */ + void setRole(long projectId, long userId, ProjectRole role); +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/UserUnauthenticatedException.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/UserUnauthenticatedException.java new file mode 100644 index 000000000..208d6ce05 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/UserUnauthenticatedException.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.useradministration.service; + +public class UserUnauthenticatedException { +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/UserUnauthorizedException.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/UserUnauthorizedException.java new file mode 100644 index 000000000..c18c00510 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/UserUnauthorizedException.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.useradministration.service; + +public class UserUnauthenticatedException extends RuntimeException{ +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationService.java new file mode 100644 index 000000000..2ffbb1b1c --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationService.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.useradministration.service.security; + +public class AuthenticationService { +} diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/GetUserRoleForProjectAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/GetUserRoleForProjectAdapter.java new file mode 100644 index 000000000..14e2c6a30 --- /dev/null +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/GetUserRoleForProjectAdapter.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.graph.useradministration.adapter; + +public class GetUserRoleForProjectAdapter { +} diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/UnitTestTemplate.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/UnitTestTemplate.java new file mode 100644 index 000000000..903a9c0da --- /dev/null +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/UnitTestTemplate.java @@ -0,0 +1,4 @@ +package io.reflectoring.coderadar.rest.unit; + +public class UnitTestTemplate { +} From f5098413ac920c89be67783b874207e87db971fa Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Tue, 16 Jun 2020 17:31:37 +0200 Subject: [PATCH 44/76] fix sonarcloud code smells --- .../CoderadarConfigurationProperties.java | 2 +- .../security/AuthenticationService.java | 14 ++++++------- .../CoderadarSecurityConfiguration.java | 2 +- .../graph/useradministration/TeamMapper.java | 4 +--- .../AnalyzerConfigurationMapperTest.java | 6 +++--- .../coderadar/graph/BranchMapperTest.java | 6 +++--- .../graph/ContributorMapperTest.java | 6 +++--- .../graph/FilePatternMapperTest.java | 6 +++--- .../coderadar/graph/FindingsMapperTest.java | 10 ++++----- .../coderadar/graph/ModuleMapperTest.java | 6 +++--- .../coderadar/graph/ProjectMapperTest.java | 6 +++--- .../coderadar/graph/TeamMapperTest.java | 6 +++--- .../coderadar/graph/UserMapperTest.java | 6 +++--- ...CreateAnalyzerConfigurationController.java | 1 + .../ChangePasswordController.java | 3 ++- .../LoginUserController.java | 2 +- .../RefreshTokenController.java | 2 +- .../RegisterUserController.java | 2 +- ...alyzerConfigurationResponseMapperTest.java | 6 +++--- .../unit/GetBranchResponseMapperTest.java | 4 ++-- .../unit/GetCommitResponseMapperTest.java | 4 ++-- .../GetContributorResponseMapperTest.java | 4 ++-- .../GetFilePatternResponseMapperTest.java | 6 +++--- .../unit/GetModuleResponseMapperTest.java | 6 +++--- .../unit/GetProjectResponseMapperTest.java | 6 +++--- .../GetTeamResponseMapperControllerTest.java | 6 +++--- .../rest/unit/GetTeamResponseMapperTest.java | 6 +++--- .../rest/unit/GetUserResponseMapperTest.java | 6 +++--- .../ChangePasswordControllerTest.java | 2 +- .../ListProjectsForUserControllerTest.java | 6 +++--- .../ListUsersControllerTest.java | 4 ++-- .../ListUsersForProjectControllerTest.java | 6 +++--- .../LoginUserControllerTest.java | 12 +++++------ .../RefreshTokenControllerTest.java | 6 ++++-- .../RegisterUserControllerTest.java | 6 ++++-- .../RemoveUserFromProjectControllerTest.java | 8 +++---- .../SetUserRoleForProjectControllerTest.java | 18 +++++++--------- .../teams/AddTeamToProjectControllerTest.java | 18 ++++++++-------- .../teams/AddUsersToTeamControllerTest.java | 21 ++++++++----------- .../teams/CreateTeamControllerTest.java | 10 ++++----- .../teams/DeleteTeamControllerTest.java | 6 +++--- .../teams/GetTeamControllerTest.java | 6 +++--- .../ListProjectsForTeamControllerTest.java | 6 +++--- .../teams/ListTeamsControllerTest.java | 6 +++--- .../ListTeamsForProjectControllerTest.java | 8 +++---- .../teams/ListTeamsForUserControllerTest.java | 8 +++---- .../RemoveTeamFromProjectControllerTest.java | 8 +++---- .../RemoveUsersFromTeamControllerTest.java | 20 +++++++----------- 48 files changed, 161 insertions(+), 168 deletions(-) diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/CoderadarConfigurationProperties.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/CoderadarConfigurationProperties.java index 7556046cf..6eec4c881 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/CoderadarConfigurationProperties.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/CoderadarConfigurationProperties.java @@ -74,7 +74,7 @@ public static class Authentication { @NotNull private Integer accessTokenDurationInMinutes = 15; - @NotNull private Boolean enabled = Boolean.TRUE; + private boolean enabled = Boolean.TRUE; @NotNull private Integer refreshTokenDurationInMinutes = 86400; } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationService.java index 1890285b1..5e306f42e 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/AuthenticationService.java @@ -27,18 +27,16 @@ public AuthenticationService( } public void authenticateMember(long projectId) { - if (coderadarConfigurationProperties.getAuthentication().getEnabled()) { - if (getUserRole(projectId) == null) { - throw new UserUnauthorizedException(); - } + if (coderadarConfigurationProperties.getAuthentication().isEnabled() + && getUserRole(projectId) == null) { + throw new UserUnauthorizedException(); } } public void authenticateAdmin(long projectId) { - if (coderadarConfigurationProperties.getAuthentication().getEnabled()) { - if (getUserRole(projectId) != ProjectRole.ADMIN) { - throw new UserUnauthorizedException(); - } + if (coderadarConfigurationProperties.getAuthentication().isEnabled() + && getUserRole(projectId) != ProjectRole.ADMIN) { + throw new UserUnauthorizedException(); } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java index c3c6581d2..d01c479b5 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/security/CoderadarSecurityConfiguration.java @@ -62,7 +62,7 @@ public PasswordEncoder getPasswordEncoder() { @Override protected void configure(HttpSecurity http) throws Exception { http.csrf().disable(); - if (coderadarConfiguration.getAuthentication().getEnabled()) { + if (coderadarConfiguration.getAuthentication().isEnabled()) { http.sessionManagement() .sessionCreationPolicy(SessionCreationPolicy.STATELESS) .and() diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/TeamMapper.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/TeamMapper.java index 7a5245c28..13c2a8fa9 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/TeamMapper.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/TeamMapper.java @@ -21,9 +21,7 @@ public Team mapGraphObject(TeamEntity nodeEntity) { public TeamEntity mapDomainObject(Team domainObject) { TeamEntity teamEntity = new TeamEntity(); teamEntity.setName(domainObject.getName()); - teamEntity.setMembers( - userMapper.mapDomainObjects( - domainObject.getMembers())); // TODO: I don't think we should be doing this. + teamEntity.setMembers(userMapper.mapDomainObjects(domainObject.getMembers())); return teamEntity; } } diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/AnalyzerConfigurationMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/AnalyzerConfigurationMapperTest.java index 58afb2922..983dde79d 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/AnalyzerConfigurationMapperTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/AnalyzerConfigurationMapperTest.java @@ -6,11 +6,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class AnalyzerConfigurationMapperTest { +class AnalyzerConfigurationMapperTest { private final AnalyzerConfigurationMapper configurationMapper = new AnalyzerConfigurationMapper(); @Test - public void testMapDomainObject() { + void testMapDomainObject() { AnalyzerConfiguration testBranch = new AnalyzerConfiguration().setEnabled(true).setId(1L).setAnalyzerName("testName"); @@ -21,7 +21,7 @@ public void testMapDomainObject() { } @Test - public void testMapGraphObject() { + void testMapGraphObject() { AnalyzerConfigurationEntity testBranch = new AnalyzerConfigurationEntity().setEnabled(true).setId(1L).setAnalyzerName("testName"); diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/BranchMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/BranchMapperTest.java index 6d1414036..10c8b54bc 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/BranchMapperTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/BranchMapperTest.java @@ -6,11 +6,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class BranchMapperTest { +class BranchMapperTest { private final BranchMapper branchMapper = new BranchMapper(); @Test - public void testMapDomainObject() { + void testMapDomainObject() { Branch testBranch = new Branch().setCommitHash("testHash").setName("testName"); BranchEntity result = branchMapper.mapDomainObject(testBranch); @@ -20,7 +20,7 @@ public void testMapDomainObject() { } @Test - public void testMapGraphObject() { + void testMapGraphObject() { BranchEntity testBranch = new BranchEntity().setId(1L).setCommitHash("testHash").setName("testName"); diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ContributorMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ContributorMapperTest.java index 934d129da..8fee4b62a 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ContributorMapperTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ContributorMapperTest.java @@ -7,11 +7,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class ContributorMapperTest { +class ContributorMapperTest { private final ContributorMapper contributorMapper = new ContributorMapper(); @Test - public void testMapDomainObject() { + void testMapDomainObject() { Contributor testContributor = new Contributor() .setDisplayName("testDisplayName") @@ -27,7 +27,7 @@ public void testMapDomainObject() { } @Test - public void testMapGraphObject() { + void testMapGraphObject() { ContributorEntity testContributor = new ContributorEntity() .setDisplayName("testDisplayName") diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FilePatternMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FilePatternMapperTest.java index c6d115e17..73c154068 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FilePatternMapperTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FilePatternMapperTest.java @@ -7,11 +7,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class FilePatternMapperTest { +class FilePatternMapperTest { private final FilePatternMapper filePatternMapper = new FilePatternMapper(); @Test - public void testMapDomainObject() { + void testMapDomainObject() { FilePattern testPattern = new FilePattern() .setId(1L) @@ -25,7 +25,7 @@ public void testMapDomainObject() { } @Test - public void testMapGraphObject() { + void testMapGraphObject() { FilePatternEntity testPattern = new FilePatternEntity() .setId(1L) diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FindingsMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FindingsMapperTest.java index 795e93864..58af4908a 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FindingsMapperTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/FindingsMapperTest.java @@ -5,11 +5,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class FindingsMapperTest { +class FindingsMapperTest { private final FindingsMapper findingsMapper = new FindingsMapper(); @Test - public void testMapFindingDomainWithMessage() { + void testMapFindingDomainWithMessage() { Finding testFinding = new Finding(1, 2, 3, 4, "message"); String result = findingsMapper.mapDomainObject(testFinding); @@ -17,7 +17,7 @@ public void testMapFindingDomainWithMessage() { } @Test - public void testMapFindingDomainWithMessageDash() { + void testMapFindingDomainWithMessageDash() { Finding testFinding = new Finding(1, 2, 3, 4, "message-2"); String result = findingsMapper.mapDomainObject(testFinding); @@ -25,7 +25,7 @@ public void testMapFindingDomainWithMessageDash() { } @Test - public void testMapFindingGraphWithMessage() { + void testMapFindingGraphWithMessage() { String testFinding = "1-2-3-4-message"; Finding result = findingsMapper.mapGraphObject(testFinding); @@ -37,7 +37,7 @@ public void testMapFindingGraphWithMessage() { } @Test - public void testMapFindingGraphWithMessageDash() { + void testMapFindingGraphWithMessageDash() { String testFinding = "1-2-3-4-message-2"; Finding result = findingsMapper.mapGraphObject(testFinding); diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ModuleMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ModuleMapperTest.java index 0b0d7b37e..f0e6cf614 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ModuleMapperTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ModuleMapperTest.java @@ -6,11 +6,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class ModuleMapperTest { +class ModuleMapperTest { private final ModuleMapper moduleMapper = new ModuleMapper(); @Test - public void testMapDomainObject() { + void testMapDomainObject() { Module testModule = new Module(2L, "testPath"); ModuleEntity result = moduleMapper.mapDomainObject(testModule); @@ -19,7 +19,7 @@ public void testMapDomainObject() { } @Test - public void testMapGraphObject() { + void testMapGraphObject() { ModuleEntity testModule = new ModuleEntity().setId(1L).setPath("testPath"); Module result = moduleMapper.mapGraphObject(testModule); diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ProjectMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ProjectMapperTest.java index 1dcdb6ea5..5a7194f22 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ProjectMapperTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/ProjectMapperTest.java @@ -7,11 +7,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class ProjectMapperTest { +class ProjectMapperTest { private final ProjectMapper projectMapper = new ProjectMapper(); @Test - public void testMapDomainObject() { + void testMapDomainObject() { Project testProject = new Project() .setId(1L) @@ -35,7 +35,7 @@ public void testMapDomainObject() { } @Test - public void testMapGraphObject() { + void testMapGraphObject() { ProjectEntity testProject = new ProjectEntity() .setId(1L) diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/TeamMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/TeamMapperTest.java index c4d682342..9129c4a95 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/TeamMapperTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/TeamMapperTest.java @@ -8,11 +8,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class TeamMapperTest { +class TeamMapperTest { private final TeamMapper teamMapper = new TeamMapper(); @Test - public void testMapDomainObject() { + void testMapDomainObject() { Team testTeam = new Team().setId(1L).setName("testTeam"); TeamEntity result = teamMapper.mapDomainObject(testTeam); @@ -21,7 +21,7 @@ public void testMapDomainObject() { } @Test - public void testMapGraphObject() { + void testMapGraphObject() { TeamEntity testModule = new TeamEntity() .setId(1L) diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/UserMapperTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/UserMapperTest.java index e1819e47f..2a152df42 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/UserMapperTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/UserMapperTest.java @@ -6,11 +6,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class UserMapperTest { +class UserMapperTest { private final UserMapper userMapper = new UserMapper(); @Test - public void testMapDomainObject() { + void testMapDomainObject() { User testUser = new User().setId(1L).setUsername("testUsername").setPassword("testPassword"); UserEntity result = userMapper.mapDomainObject(testUser); @@ -20,7 +20,7 @@ public void testMapDomainObject() { } @Test - public void testMapGraphObject() { + void testMapGraphObject() { UserEntity testUser = new UserEntity().setId(1L).setUsername("testUsername").setPassword("testPassword"); diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigurationController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigurationController.java index baed324b2..a6c0f925f 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigurationController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigurationController.java @@ -37,6 +37,7 @@ public CreateAnalyzerConfigurationController( public ResponseEntity addAnalyzerConfiguration( @RequestBody @Validated CreateAnalyzerConfigurationCommand command, @PathVariable long projectId) { + authenticationService.authenticateAdmin(projectId); try { return new ResponseEntity<>( new IdResponse(createAnalyzerConfigurationUseCase.create(command, projectId)), diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordController.java index 7f73cc7d4..329fa1eeb 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordController.java @@ -28,7 +28,8 @@ public ChangePasswordController(ChangePasswordUseCase changePasswordUseCase) { path = "/user/password/change", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity changePassword(@RequestBody @Validated ChangePasswordCommand command) { + public ResponseEntity changePassword( + @RequestBody @Validated ChangePasswordCommand command) { try { changePasswordUseCase.changePassword(command); return new ResponseEntity<>(HttpStatus.OK); diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/LoginUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/LoginUserController.java index d48225fcd..e0b09e037 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/LoginUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/LoginUserController.java @@ -27,7 +27,7 @@ public LoginUserController(LoginUserUseCase loginUserUseCase) { path = "/user/auth", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity login(@RequestBody @Validated LoginUserCommand command) { + public ResponseEntity login(@RequestBody @Validated LoginUserCommand command) { try { return new ResponseEntity<>(loginUserUseCase.login(command), HttpStatus.OK); } catch (AuthenticationException e) { diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenController.java index 210429971..875fcdee8 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenController.java @@ -30,7 +30,7 @@ public RefreshTokenController(RefreshTokenUseCase refreshTokenUseCase) { path = "/user/refresh", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity refreshToken(@RequestBody @Validated RefreshTokenCommand command) { + public ResponseEntity refreshToken(@RequestBody @Validated RefreshTokenCommand command) { try { return new ResponseEntity<>( new RefreshTokenResponse(refreshTokenUseCase.refreshToken(command)), HttpStatus.OK); diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserController.java index 78daf8ba3..f1927d815 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserController.java @@ -28,7 +28,7 @@ public RegisterUserController(RegisterUserUseCase registerUserUseCase) { path = "/user/registration", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity register(@RequestBody @Validated RegisterUserCommand command) { + public ResponseEntity register(@RequestBody @Validated RegisterUserCommand command) { try { return new ResponseEntity<>( new IdResponse(registerUserUseCase.register(command)), HttpStatus.CREATED); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java index c8f6f14e4..5f97e054b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetAnalyzerConfigurationResponseMapperTest.java @@ -8,10 +8,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class GetAnalyzerConfigurationResponseMapperTest { +class GetAnalyzerConfigurationResponseMapperTest { @Test - public void testAnalyzerConfigurationResponseMapper() { + void testAnalyzerConfigurationResponseMapper() { List analyzerConfigurations = new ArrayList<>(); analyzerConfigurations.add(new AnalyzerConfiguration(1L, "testAnalyzer1", true)); analyzerConfigurations.add(new AnalyzerConfiguration(2L, "testAnalyzer2", false)); @@ -29,7 +29,7 @@ public void testAnalyzerConfigurationResponseMapper() { } @Test - public void testModuleResponseSingleMapper() { + void testModuleResponseSingleMapper() { AnalyzerConfiguration analyzerConfiguration = new AnalyzerConfiguration(1L, "testAnalyzer1", true); GetAnalyzerConfigurationResponse response = diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java index 65690036a..e09298c45 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetBranchResponseMapperTest.java @@ -8,10 +8,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class GetBranchResponseMapperTest { +class GetBranchResponseMapperTest { @Test - public void testBranchResponseMapper() { + void testBranchResponseMapper() { List branches = new ArrayList<>(); branches.add(new Branch("testBranch1", "testHash1")); branches.add(new Branch("testBranch2", "testHash2")); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java index ec24f9660..a7c4ea52b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetCommitResponseMapperTest.java @@ -8,10 +8,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class GetCommitResponseMapperTest { +class GetCommitResponseMapperTest { @Test - public void testCommitResponseMapper() { + void testCommitResponseMapper() { List commits = new ArrayList<>(); commits.add( new Commit() diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java index dee70c868..e73926e58 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetContributorResponseMapperTest.java @@ -9,10 +9,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class GetContributorResponseMapperTest { +class GetContributorResponseMapperTest { @Test - public void testContributorResponseMapper() { + void testContributorResponseMapper() { List contributors = new ArrayList<>(); contributors.add( new Contributor() diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java index 98b0de8ee..5a991d441 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetFilePatternResponseMapperTest.java @@ -9,10 +9,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class GetFilePatternResponseMapperTest { +class GetFilePatternResponseMapperTest { @Test - public void testFilePatternResponseMapper() { + void testFilePatternResponseMapper() { List filePatterns = new ArrayList<>(); filePatterns.add(new FilePattern(1L, "testPattern1/**.java", InclusionType.EXCLUDE)); filePatterns.add(new FilePattern(2L, "testPattern2/**.java", InclusionType.INCLUDE)); @@ -31,7 +31,7 @@ public void testFilePatternResponseMapper() { } @Test - public void testFilePatternResponseSingleMapper() { + void testFilePatternResponseSingleMapper() { FilePattern filePattern = new FilePattern(1L, "testPattern1/**.java", InclusionType.EXCLUDE); GetFilePatternResponse response = GetFilePatternResponseMapper.mapFilePattern(filePattern); Assertions.assertEquals("testPattern1/**.java", response.getPattern()); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java index b966af074..aff57eaea 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetModuleResponseMapperTest.java @@ -8,10 +8,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class GetModuleResponseMapperTest { +class GetModuleResponseMapperTest { @Test - public void testModuleResponseMapper() { + void testModuleResponseMapper() { List modules = new ArrayList<>(); modules.add(new Module(1L, "testModule1")); modules.add(new Module(2L, "testModule2")); @@ -26,7 +26,7 @@ public void testModuleResponseMapper() { } @Test - public void testModuleResponseSingleMapper() { + void testModuleResponseSingleMapper() { Module module = new Module(1L, "testPath1"); GetModuleResponse response = GetModuleResponseMapper.mapModule(module); Assertions.assertEquals("testPath1", response.getPath()); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java index 09740ec48..6d8ea4253 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetProjectResponseMapperTest.java @@ -9,10 +9,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class GetProjectResponseMapperTest { +class GetProjectResponseMapperTest { @Test - public void testProjectResponseMapper() { + void testProjectResponseMapper() { List projects = new ArrayList<>(); projects.add( new Project() @@ -55,7 +55,7 @@ public void testProjectResponseMapper() { } @Test - public void testSingleProjectResponseMapper() { + void testSingleProjectResponseMapper() { Project testProject = new Project() .setName("testProject1") diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java index 5784e7708..9f10ae74a 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperControllerTest.java @@ -11,10 +11,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class GetTeamResponseMapperControllerTest extends UnitTestTemplate { +class GetTeamResponseMapperControllerTest extends UnitTestTemplate { @Test - public void testTeamResponseMapper() { + void testTeamResponseMapper() { List teams = new ArrayList<>(); teams.add( new Team() @@ -55,7 +55,7 @@ public void testTeamResponseMapper() { } @Test - public void testTeamResponseSingleMapper() { + void testTeamResponseSingleMapper() { Team team = new Team() .setName("testTeam1") diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java index c5b07424a..3b57bd6f8 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetTeamResponseMapperTest.java @@ -9,10 +9,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class GetTeamResponseMapperTest { +class GetTeamResponseMapperTest { @Test - public void testTeamResponseMapper() { + void testTeamResponseMapper() { List users = new ArrayList<>(); users.add(new User().setUsername("testUser1").setId(2L).setPassword("testPassword1")); @@ -30,7 +30,7 @@ public void testTeamResponseMapper() { } @Test - public void testTeamResponseSingleMapper() { + void testTeamResponseSingleMapper() { List users = new ArrayList<>(); users.add(new User().setUsername("testUser1").setId(2L).setPassword("testPassword1")); Team team = new Team().setId(1L).setMembers(users).setName("testTeam1"); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java index 34b4716e8..5fcbe6049 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/GetUserResponseMapperTest.java @@ -8,9 +8,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class GetUserResponseMapperTest { +class GetUserResponseMapperTest { @Test - public void testUserResponseMapper() { + void testUserResponseMapper() { List users = new ArrayList<>(); users.add(new User().setUsername("testUser1").setId(1L).setPassword("testPassword1")); users.add(new User().setUsername("testUser2").setId(2L).setPassword("testPassword2")); @@ -25,7 +25,7 @@ public void testUserResponseMapper() { } @Test - public void testUserResponseSingleMapper() { + void testUserResponseSingleMapper() { User user = new User().setUsername("testUser1").setId(1L).setPassword("testPassword1"); GetUserResponse response = GetUserResponseMapper.mapUser(user); Assertions.assertEquals("testUser1", response.getUsername()); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ChangePasswordControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ChangePasswordControllerTest.java index 3b88e99e0..7bc110713 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ChangePasswordControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ChangePasswordControllerTest.java @@ -21,7 +21,7 @@ void changePasswordSuccessfully() { ChangePasswordController testSubject = new ChangePasswordController(changePasswordUseCase); ChangePasswordCommand command = new ChangePasswordCommand("refreshToken", "newPassword"); - ResponseEntity responseEntity = testSubject.changePassword(command); + ResponseEntity responseEntity = testSubject.changePassword(command); Mockito.verify(changePasswordUseCase, Mockito.times(1)).changePassword(command); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java index 3e414bc43..a09cd84f5 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java @@ -16,7 +16,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class ListProjectsForUserControllerTest extends UnitTestTemplate { +class ListProjectsForUserControllerTest extends UnitTestTemplate { private final ListProjectsForUserUseCase listProjectsForUserUseCase = mock(ListProjectsForUserUseCase.class); @@ -24,7 +24,7 @@ public class ListProjectsForUserControllerTest extends UnitTestTemplate { new ListProjectsForUserController(listProjectsForUserUseCase); @Test - public void testListProjectsForUser() { + void testListProjectsForUser() { // Set up Mockito.when(listProjectsForUserUseCase.listProjects(1L)) .thenReturn(Collections.singletonList(new Project().setName("TestProject1").setId(2L))); @@ -38,7 +38,7 @@ public void testListProjectsForUser() { } @Test - public void testListProjectsForUserThrowsWhenUserNotFound() { // TODO: Exception is caught by the + void testListProjectsForUserThrowsWhenUserNotFound() { // TODO: Exception is caught by the // ExceptionHandler, is this test needed? Mockito.when(listProjectsForUserUseCase.listProjects(1L)) .thenThrow(new UserNotFoundException(1L)); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersControllerTest.java index e5bff27a3..b88ce4dc7 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersControllerTest.java @@ -15,12 +15,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class ListUsersControllerTest extends UnitTestTemplate { +class ListUsersControllerTest extends UnitTestTemplate { private final ListUsersUseCase listUsersUseCase = mock(ListUsersUseCase.class); private final ListUsersController testController = new ListUsersController(listUsersUseCase); @Test - public void testListUsers() { + void testListUsers() { Mockito.when(listUsersUseCase.listUsers()) .thenReturn( Arrays.asList( diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersForProjectControllerTest.java index 76f1891a6..5861fb85d 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListUsersForProjectControllerTest.java @@ -16,14 +16,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class ListUsersForProjectControllerTest extends UnitTestTemplate { +class ListUsersForProjectControllerTest extends UnitTestTemplate { private final ListUsersForProjectUseCase listUsersForProjectUseCase = mock(ListUsersForProjectUseCase.class); private final ListUsersForProjectController testController = new ListUsersForProjectController(listUsersForProjectUseCase, authenticationService); @Test - public void testListUsersForProject() { + void testListUsersForProject() { Mockito.when(listUsersForProjectUseCase.listUsers(1L)) .thenReturn( Arrays.asList( @@ -41,7 +41,7 @@ public void testListUsersForProject() { } @Test - public void testListUsersForProjectThrowsExceptionWhenProjectNotFound() { + void testListUsersForProjectThrowsExceptionWhenProjectNotFound() { Mockito.doThrow(ProjectNotFoundException.class).when(listUsersForProjectUseCase).listUsers(1L); Assertions.assertThrows( ProjectNotFoundException.class, () -> testController.listTeamsForUser(1L)); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java index 13b32683b..65d9a33c4 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/LoginUserControllerTest.java @@ -26,13 +26,13 @@ void loginUserWithUsernameAndPassword() { Mockito.when(loginUserUseCase.login(command)).thenReturn(loginUserResponse); - ResponseEntity responseEntity = testSubject.login(command); + ResponseEntity responseEntity = testSubject.login(command); + Assertions.assertTrue(responseEntity.getBody() instanceof LoginUserResponse); + LoginUserResponse responseBody = (LoginUserResponse) responseEntity.getBody(); Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); - Assertions.assertEquals( - loginUserResponse.getAccessToken(), responseEntity.getBody().getAccessToken()); - Assertions.assertEquals( - loginUserResponse.getRefreshToken(), responseEntity.getBody().getRefreshToken()); - Assertions.assertEquals(loginUserResponse.getUserId(), responseEntity.getBody().getUserId()); + Assertions.assertEquals(loginUserResponse.getAccessToken(), responseBody.getAccessToken()); + Assertions.assertEquals(loginUserResponse.getRefreshToken(), responseBody.getRefreshToken()); + Assertions.assertEquals(loginUserResponse.getUserId(), responseBody.getUserId()); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RefreshTokenControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RefreshTokenControllerTest.java index 12fdfe043..f0c073b24 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RefreshTokenControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RefreshTokenControllerTest.java @@ -23,9 +23,11 @@ void refreshTokenSuccessfully() { RefreshTokenCommand command = new RefreshTokenCommand("accessToken", "refreshToken"); Mockito.when(refreshTokenUseCase.refreshToken(command)).thenReturn("newAccessToken"); - ResponseEntity responseEntity = testSubject.refreshToken(command); + ResponseEntity responseEntity = testSubject.refreshToken(command); + Assertions.assertTrue(responseEntity.getBody() instanceof RefreshTokenResponse); + RefreshTokenResponse responseBody = (RefreshTokenResponse) responseEntity.getBody(); Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); - Assertions.assertEquals("newAccessToken", responseEntity.getBody().getToken()); + Assertions.assertEquals("newAccessToken", responseBody.getToken()); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RegisterUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RegisterUserControllerTest.java index a2907e843..4d94b430b 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RegisterUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/RegisterUserControllerTest.java @@ -25,9 +25,11 @@ void registerUserWithIdOne() { Mockito.when(registerUserUseCase.register(command)).thenReturn(1L); - ResponseEntity responseEntity = testSubject.register(command); + ResponseEntity responseEntity = testSubject.register(command); + Assertions.assertTrue(responseEntity.getBody() instanceof IdResponse); + IdResponse responseBody = (IdResponse) responseEntity.getBody(); Assertions.assertEquals(HttpStatus.CREATED, responseEntity.getStatusCode()); - Assertions.assertEquals(1L, responseEntity.getBody().getId()); + Assertions.assertEquals(1L, responseBody.getId()); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java index 0e7ab98dd..4db4f702e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java @@ -13,20 +13,20 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class RemoveUserFromProjectControllerTest extends UnitTestTemplate { +class RemoveUserFromProjectControllerTest extends UnitTestTemplate { private final RemoveUserFromProjectUseCase removeUserFromProjectUseCase = mock(RemoveUserFromProjectUseCase.class); private final RemoveUserFromProjectController testController = new RemoveUserFromProjectController(removeUserFromProjectUseCase); @Test - public void testRemoveUserFromProjectController() { + void testRemoveUserFromProjectController() { ResponseEntity response = testController.removeUserRoleFromProject(1L, 2L); Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); } @Test - public void testRemoveUserFromProjectControllerThrowsExceptionWhenUserNotFound() { + void testRemoveUserFromProjectControllerThrowsExceptionWhenUserNotFound() { Mockito.doThrow(UserNotFoundException.class) .when(removeUserFromProjectUseCase) .removeUserFromProject(1L, 2L); @@ -35,7 +35,7 @@ public void testRemoveUserFromProjectControllerThrowsExceptionWhenUserNotFound() } @Test - public void testRemoveUserFromProjectControllerThrowsExceptionWhenProjectNotFound() { + void testRemoveUserFromProjectControllerThrowsExceptionWhenProjectNotFound() { Mockito.doThrow(ProjectNotFoundException.class) .when(removeUserFromProjectUseCase) .removeUserFromProject(1L, 2L); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/SetUserRoleForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/SetUserRoleForProjectControllerTest.java index 4c81f4689..a8febfa33 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/SetUserRoleForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/SetUserRoleForProjectControllerTest.java @@ -15,40 +15,38 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class SetUserRoleForProjectControllerTest extends UnitTestTemplate { +class SetUserRoleForProjectControllerTest extends UnitTestTemplate { private final SetUserRoleForProjectUseCase setUserRoleForProjectUseCase = mock(SetUserRoleForProjectUseCase.class); private final SetUserRoleForProjectController testController = new SetUserRoleForProjectController(setUserRoleForProjectUseCase); @Test - public void testSetUserRoleForProject() { + void testSetUserRoleForProject() { ResponseEntity response = testController.setUserRoleForProject(1L, 2L, new ProjectRoleJsonWrapper(ProjectRole.ADMIN)); Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); } @Test - public void testSetUserRoleForProjectThrowsExceptionWhenUserNotFound() { + void testSetUserRoleForProjectThrowsExceptionWhenUserNotFound() { Mockito.doThrow(UserNotFoundException.class) .when(setUserRoleForProjectUseCase) .setRole(1L, 2L, ProjectRole.ADMIN); + ProjectRoleJsonWrapper jsonWrapper = new ProjectRoleJsonWrapper(ProjectRole.ADMIN); Assertions.assertThrows( UserNotFoundException.class, - () -> - testController.setUserRoleForProject( - 1L, 2L, new ProjectRoleJsonWrapper(ProjectRole.ADMIN))); + () -> testController.setUserRoleForProject(1L, 2L, jsonWrapper)); } @Test - public void testSetUserRoleForProjectThrowsExceptionWhenProjectNotFound() { + void testSetUserRoleForProjectThrowsExceptionWhenProjectNotFound() { Mockito.doThrow(ProjectNotFoundException.class) .when(setUserRoleForProjectUseCase) .setRole(1L, 2L, ProjectRole.ADMIN); + ProjectRoleJsonWrapper jsonWrapper = new ProjectRoleJsonWrapper(ProjectRole.ADMIN); Assertions.assertThrows( ProjectNotFoundException.class, - () -> - testController.setUserRoleForProject( - 1L, 2L, new ProjectRoleJsonWrapper(ProjectRole.ADMIN))); + () -> testController.setUserRoleForProject(1L, 2L, jsonWrapper)); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java index e0a54e090..3d40db9f3 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java @@ -22,31 +22,31 @@ public class AddTeamToProjectControllerTest extends UnitTestTemplate { new AddTeamToProjectController(addTeamToProjectUseCase, authenticationService); @Test - public void testAddTeamToProject() { + void testAddTeamToProject() { ResponseEntity response = testController.addTeamToProject(1L, 2L, new ProjectRoleJsonWrapper(ProjectRole.ADMIN)); Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); } @Test - public void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { + void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { Mockito.doThrow(TeamNotFoundException.class) .when(addTeamToProjectUseCase) .addTeamToProject(1L, 2L, ProjectRole.ADMIN); + ProjectRoleJsonWrapper jsonWrapper = new ProjectRoleJsonWrapper(ProjectRole.ADMIN); + Assertions.assertThrows( - TeamNotFoundException.class, - () -> - testController.addTeamToProject(1L, 2L, new ProjectRoleJsonWrapper(ProjectRole.ADMIN))); + TeamNotFoundException.class, () -> testController.addTeamToProject(1L, 2L, jsonWrapper)); } @Test - public void testRemoveTeamFromProjectThrowsExceptionWhenProjectNotFound() { + void testRemoveTeamFromProjectThrowsExceptionWhenProjectNotFound() { Mockito.doThrow(ProjectNotFoundException.class) .when(addTeamToProjectUseCase) .addTeamToProject(1L, 2L, ProjectRole.ADMIN); + ProjectRoleJsonWrapper jsonWrapper = new ProjectRoleJsonWrapper(ProjectRole.ADMIN); + Assertions.assertThrows( - ProjectNotFoundException.class, - () -> - testController.addTeamToProject(1L, 2L, new ProjectRoleJsonWrapper(ProjectRole.ADMIN))); + ProjectNotFoundException.class, () -> testController.addTeamToProject(1L, 2L, jsonWrapper)); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddUsersToTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddUsersToTeamControllerTest.java index 050d7db7d..dc70799bd 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddUsersToTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddUsersToTeamControllerTest.java @@ -17,39 +17,36 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class AddUsersToTeamControllerTest extends UnitTestTemplate { +class AddUsersToTeamControllerTest extends UnitTestTemplate { private final AddUsersToTeamUseCase addUsersToTeamUseCase = mock(AddUsersToTeamUseCase.class); private final AddUsersToTeamController testController = new AddUsersToTeamController(addUsersToTeamUseCase); @Test - public void testAddUsersToTeamController() { + void testAddUsersToTeamController() { ResponseEntity response = testController.addUsersToTeam(1L, new JsonListWrapper<>(Collections.singletonList(2L))); Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); } @Test - public void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { + void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { Mockito.doThrow(TeamNotFoundException.class) .when(addUsersToTeamUseCase) .addUsersToTeam(anyLong(), anyList()); + JsonListWrapper jsonListWrapper = new JsonListWrapper<>(Collections.singletonList(2L)); Assertions.assertThrows( - TeamNotFoundException.class, - () -> - testController.addUsersToTeam( - 1L, new JsonListWrapper<>(Collections.singletonList(2L)))); + TeamNotFoundException.class, () -> testController.addUsersToTeam(1L, jsonListWrapper)); } @Test - public void testRemoveTeamFromProjectThrowsExceptionWhenUserNotFound() { + void testRemoveTeamFromProjectThrowsExceptionWhenUserNotFound() { Mockito.doThrow(UserNotFoundException.class) .when(addUsersToTeamUseCase) .addUsersToTeam(anyLong(), anyList()); + JsonListWrapper jsonListWrapper = new JsonListWrapper<>(Collections.singletonList(2L)); + Assertions.assertThrows( - UserNotFoundException.class, - () -> - testController.addUsersToTeam( - 1L, new JsonListWrapper<>(Collections.singletonList(2L)))); + UserNotFoundException.class, () -> testController.addUsersToTeam(1L, jsonListWrapper)); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/CreateTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/CreateTeamControllerTest.java index d23ed55e7..a496e82b0 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/CreateTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/CreateTeamControllerTest.java @@ -16,13 +16,13 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class CreateTeamControllerTest extends UnitTestTemplate { +class CreateTeamControllerTest extends UnitTestTemplate { private final CreateTeamUseCase createTeamUseCase = mock(CreateTeamUseCase.class); private final CreateTeamController testController = new CreateTeamController(createTeamUseCase); @Test - public void testCreateTeam() { + void testCreateTeam() { // Set up CreateTeamCommand testCommand = new CreateTeamCommand(); @@ -39,9 +39,9 @@ public void testCreateTeam() { } @Test - public void testCreateTeamThrowsExceptionWhenUserNotFound() { + void testCreateTeamThrowsExceptionWhenUserNotFound() { Mockito.when(createTeamUseCase.createTeam(any())).thenThrow(new UserNotFoundException(1L)); - Assertions.assertThrows( - UserNotFoundException.class, () -> testController.createTeam(new CreateTeamCommand())); + CreateTeamCommand command = new CreateTeamCommand(); + Assertions.assertThrows(UserNotFoundException.class, () -> testController.createTeam(command)); } } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/DeleteTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/DeleteTeamControllerTest.java index 9f9bdb51e..6d5acc682 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/DeleteTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/DeleteTeamControllerTest.java @@ -13,19 +13,19 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class DeleteTeamControllerTest extends UnitTestTemplate { +class DeleteTeamControllerTest extends UnitTestTemplate { private final DeleteTeamUseCase deleteTeamUseCase = mock(DeleteTeamUseCase.class); private final DeleteTeamController testController = new DeleteTeamController(deleteTeamUseCase); @Test - public void testDeleteTeam() { + void testDeleteTeam() { ResponseEntity response = testController.deleteTeam(1L); Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); } @Test - public void testDeleteTeamThrowsExceptionIfTeamNotFound() { + void testDeleteTeamThrowsExceptionIfTeamNotFound() { Mockito.doThrow(TeamNotFoundException.class).when(deleteTeamUseCase).deleteTeam(anyLong()); Assertions.assertThrows(TeamNotFoundException.class, () -> testController.deleteTeam(1L)); } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/GetTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/GetTeamControllerTest.java index 0bb6cd0eb..a96b21846 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/GetTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/GetTeamControllerTest.java @@ -16,12 +16,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class GetTeamControllerTest extends UnitTestTemplate { +class GetTeamControllerTest extends UnitTestTemplate { private final GetTeamUseCase getTeamUseCase = mock(GetTeamUseCase.class); private final GetTeamController testController = new GetTeamController(getTeamUseCase); @Test - public void testGetTeam() { + void testGetTeam() { // Set up Mockito.when(getTeamUseCase.get(1L)) .thenReturn( @@ -47,7 +47,7 @@ public void testGetTeam() { } @Test - public void testGetTeamReturnsErrorWhenTeamNotFound() { + void testGetTeamReturnsErrorWhenTeamNotFound() { Mockito.when(getTeamUseCase.get(1L)).thenThrow(new TeamNotFoundException(1L)); Assertions.assertThrows(TeamNotFoundException.class, () -> testController.getTeam(1L)); } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java index 640518405..18df7c88e 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java @@ -16,14 +16,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class ListProjectsForTeamControllerTest extends UnitTestTemplate { +class ListProjectsForTeamControllerTest extends UnitTestTemplate { private final ListProjectsForTeamUseCase listProjectsForTeamUseCase = mock(ListProjectsForTeamUseCase.class); private final ListProjectsForTeamController testController = new ListProjectsForTeamController(listProjectsForTeamUseCase); @Test - public void testListProjectsForTeam() { + void testListProjectsForTeam() { // Set up Mockito.when(listProjectsForTeamUseCase.listProjects(1L)) .thenReturn(Collections.singletonList(new Project().setName("TestProject1").setId(2L))); @@ -37,7 +37,7 @@ public void testListProjectsForTeam() { } @Test - public void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { + void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { Mockito.doThrow(TeamNotFoundException.class).when(listProjectsForTeamUseCase).listProjects(1L); Assertions.assertThrows( TeamNotFoundException.class, () -> testController.listProjectsForTeam(1L)); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsControllerTest.java index da9522219..7cba2b043 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsControllerTest.java @@ -18,12 +18,12 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class ListTeamsControllerTest extends UnitTestTemplate { +class ListTeamsControllerTest extends UnitTestTemplate { private final ListTeamsUseCase listTeamsUseCase = mock(ListTeamsUseCase.class); private final ListTeamsController testController = new ListTeamsController(listTeamsUseCase); @BeforeEach - public void setUp() { + void setUp() { Mockito.when(listTeamsUseCase.listTeams()) .thenReturn( Arrays.asList( @@ -36,7 +36,7 @@ public void setUp() { } @Test - public void testListTeams() { + void testListTeams() { ResponseEntity> responseEntity = testController.listTeams(); Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForProjectControllerTest.java index 761ceaa2a..ab827554c 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForProjectControllerTest.java @@ -19,7 +19,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class ListTeamsForProjectControllerTest extends UnitTestTemplate { +class ListTeamsForProjectControllerTest extends UnitTestTemplate { private final ListTeamsForProjectUseCase listTeamsForProjectUseCase = mock(ListTeamsForProjectUseCase.class); @@ -27,7 +27,7 @@ public class ListTeamsForProjectControllerTest extends UnitTestTemplate { new ListTeamsForProjectController(listTeamsForProjectUseCase, authenticationService); @BeforeEach - public void setUp() { + void setUp() { Mockito.when(listTeamsForProjectUseCase.listTeamsForProject(5L)) .thenReturn( Arrays.asList( @@ -40,7 +40,7 @@ public void setUp() { } @Test - public void testListTeams() { + void testListTeams() { ResponseEntity> responseEntity = testController.listTeamsForProject(5L); Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); @@ -60,7 +60,7 @@ public void testListTeams() { } @Test - public void testListProjectsForUserThrowsWhenProjectNotFound() { + void testListProjectsForUserThrowsWhenProjectNotFound() { Mockito.when(listTeamsForProjectUseCase.listTeamsForProject(8L)) .thenThrow(new ProjectNotFoundException(1L)); Assertions.assertThrows( diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java index 79a1ee639..c65e818bc 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java @@ -19,7 +19,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class ListTeamsForUserControllerTest extends UnitTestTemplate { +class ListTeamsForUserControllerTest extends UnitTestTemplate { private final ListTeamsForUserUseCase listTeamsForUserUseCase = mock(ListTeamsForUserUseCase.class); @@ -27,7 +27,7 @@ public class ListTeamsForUserControllerTest extends UnitTestTemplate { new ListTeamsForUserController(listTeamsForUserUseCase); @BeforeEach - public void setUp() { + void setUp() { Mockito.when(listTeamsForUserUseCase.listTeamsForUser(5L)) .thenReturn( Arrays.asList( @@ -40,7 +40,7 @@ public void setUp() { } @Test - public void testListTeamsForUser() { + void testListTeamsForUser() { ResponseEntity> responseEntity = testController.listTeamsForUser(5L); Assertions.assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); @@ -60,7 +60,7 @@ public void testListTeamsForUser() { } @Test - public void testListProjectsForUserThrowsWhenUserNotFound() { + void testListProjectsForUserThrowsWhenUserNotFound() { Mockito.when(listTeamsForUserUseCase.listTeamsForUser(8L)) .thenThrow(new UserNotFoundException(1L)); Assertions.assertThrows(UserNotFoundException.class, () -> testController.listTeamsForUser(8L)); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveTeamFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveTeamFromProjectControllerTest.java index 875aecab8..bd163355c 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveTeamFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveTeamFromProjectControllerTest.java @@ -14,20 +14,20 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class RemoveTeamFromProjectControllerTest extends UnitTestTemplate { +class RemoveTeamFromProjectControllerTest extends UnitTestTemplate { private final RemoveTeamFromProjectUseCase removeTeamFromProjectUseCase = mock(RemoveTeamFromProjectUseCase.class); private final RemoveTeamFromProjectController testController = new RemoveTeamFromProjectController(removeTeamFromProjectUseCase, authenticationService); @Test - public void testRemoveTeamFromProject() { + void testRemoveTeamFromProject() { ResponseEntity response = testController.removeTeamFromProject(1L, 2L); Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); } @Test - public void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { + void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { Mockito.doThrow(TeamNotFoundException.class) .when(removeTeamFromProjectUseCase) .removeTeam(1L, 2L); @@ -36,7 +36,7 @@ public void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { } @Test - public void testRemoveTeamFromProjectThrowsExceptionWhenProjectNotFound() { + void testRemoveTeamFromProjectThrowsExceptionWhenProjectNotFound() { Mockito.doThrow(ProjectNotFoundException.class) .when(removeTeamFromProjectUseCase) .removeTeam(1L, 2L); diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java index 1b04dce2d..662ffd444 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java @@ -17,14 +17,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class RemoveUsersFromTeamControllerTest extends UnitTestTemplate { +class RemoveUsersFromTeamControllerTest extends UnitTestTemplate { private final RemoveUsersFromTeamUseCase removeUsersFromTeamUseCase = mock(RemoveUsersFromTeamUseCase.class); private final RemoveUsersFromTeamController testController = new RemoveUsersFromTeamController(removeUsersFromTeamUseCase); @Test - public void testRemoveUsersFromTeam() { + void testRemoveUsersFromTeam() { ResponseEntity response = testController.removeUsersFromTeam( 1L, new JsonListWrapper<>(Collections.singletonList(2L))); @@ -32,26 +32,22 @@ public void testRemoveUsersFromTeam() { } @Test - public void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { + void testRemoveTeamFromProjectThrowsExceptionWhenTeamNotFound() { Mockito.doThrow(TeamNotFoundException.class) .when(removeUsersFromTeamUseCase) .removeUsersFromTeam(anyLong(), anyList()); + JsonListWrapper jsonListWrapper = new JsonListWrapper<>(Collections.singletonList(2L)); Assertions.assertThrows( - TeamNotFoundException.class, - () -> - testController.removeUsersFromTeam( - 1L, new JsonListWrapper<>(Collections.singletonList(2L)))); + TeamNotFoundException.class, () -> testController.removeUsersFromTeam(1L, jsonListWrapper)); } @Test - public void testRemoveTeamFromProjectThrowsExceptionWhenUserNotFound() { + void testRemoveTeamFromProjectThrowsExceptionWhenUserNotFound() { Mockito.doThrow(UserNotFoundException.class) .when(removeUsersFromTeamUseCase) .removeUsersFromTeam(anyLong(), anyList()); + JsonListWrapper jsonListWrapper = new JsonListWrapper<>(Collections.singletonList(2L)); Assertions.assertThrows( - UserNotFoundException.class, - () -> - testController.removeUsersFromTeam( - 1L, new JsonListWrapper<>(Collections.singletonList(2L)))); + UserNotFoundException.class, () -> testController.removeUsersFromTeam(1L, jsonListWrapper)); } } From 597ea4e9e82f36fbcf2746db30b81dd7dae97c7b Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 17 Jun 2020 08:36:40 +0200 Subject: [PATCH 45/76] fix sonarcloud code smells --- .../teams/AddTeamToProjectControllerTest.java | 2 +- ...jectsForUserControllerIntegrationTest.java | 4 ++-- .../ListUsersControllerIntegrationTest.java | 4 ++-- ...rsForProjectControllerIntegrationTest.java | 4 ++-- ...rFromProjectControllerIntegrationTest.java | 4 ++-- ...leForProjectControllerIntegrationTest.java | 4 ++-- ...eamToProjectControllerIntegrationTest.java | 6 ++--- ...dUsersToTeamControllerIntegrationTest.java | 6 ++--- .../CreateTeamControllerIntegrationTest.java | 8 +++---- .../DeleteTeamControllerIntegrationTest.java | 8 +++---- .../GetTeamControllerIntegrationTest.java | 6 ++--- ...jectsForTeamControllerIntegrationTest.java | 6 ++--- .../ListTeamsControllerIntegrationTest.java | 6 ++--- ...msForProjectControllerIntegrationTest.java | 6 ++--- ...TeamsForUserControllerIntegrationTest.java | 6 ++--- ...mFromProjectControllerIntegrationTest.java | 6 ++--- ...sersFromTeamControllerIntegrationTest.java | 6 ++--- coderadar-ui/src/app/service/user.service.ts | 1 - .../add-project/add-project.component.html | 2 +- .../app/view/add-team/add-team.component.html | 8 +++---- .../src/app/view/login/login.component.html | 2 +- .../main-dashboard.component.html | 4 ++-- .../main-dashboard.component.scss | 1 + .../app/view/register/register.component.html | 2 +- .../sidenav-content.component.css | 0 .../sidenav-content.component.ts | 3 +-- .../teams-dashboard.component.css | 3 ++- .../teams-dashboard.component.html | 4 ++-- coderadar-ui/src/styles.scss | 23 +++++++++++++++---- 29 files changed, 80 insertions(+), 65 deletions(-) delete mode 100644 coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.css diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java index 3d40db9f3..d9b8b5f90 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/AddTeamToProjectControllerTest.java @@ -15,7 +15,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -public class AddTeamToProjectControllerTest extends UnitTestTemplate { +class AddTeamToProjectControllerTest extends UnitTestTemplate { private final AddTeamToProjectUseCase addTeamToProjectUseCase = mock(AddTeamToProjectUseCase.class); private final AddTeamToProjectController testController = diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java index 662ac7c0e..75c9c8b3b 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java @@ -19,7 +19,7 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class ListProjectsForUserControllerIntegrationTest extends ControllerTestTemplate { +class ListProjectsForUserControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; @@ -29,7 +29,7 @@ public class ListProjectsForUserControllerIntegrationTest extends ControllerTest private UserEntity testUser; @BeforeEach - public void setUp() { + void setUp() { projectRepository.deleteAll(); testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java index 01df5cf69..4fb832967 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java @@ -15,14 +15,14 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class ListUsersControllerIntegrationTest extends ControllerTestTemplate { +class ListUsersControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; private UserEntity testUser; @BeforeEach - public void setUp() { + void setUp() { userRepository.deleteAll(); testUser = new UserEntity(); testUser.setUsername("username"); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java index 1cdf6a77b..949010d63 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java @@ -19,7 +19,7 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class ListUsersForProjectControllerIntegrationTest extends ControllerTestTemplate { +class ListUsersForProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; @@ -29,7 +29,7 @@ public class ListUsersForProjectControllerIntegrationTest extends ControllerTest private UserEntity testUser; @BeforeEach - public void setUp() { + void setUp() { projectRepository.deleteAll(); testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java index 184425616..8d26be6d9 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java @@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class RemoveUserFromProjectControllerIntegrationTest extends ControllerTestTemplate { +class RemoveUserFromProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; @@ -26,7 +26,7 @@ public class RemoveUserFromProjectControllerIntegrationTest extends ControllerTe private UserEntity testUser; @BeforeEach - public void setUp() { + void setUp() { projectRepository.deleteAll(); testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java index 9d1e619f7..b11369cec 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java @@ -19,7 +19,7 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class SetUserRoleForProjectControllerIntegrationTest extends ControllerTestTemplate { +class SetUserRoleForProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; @@ -29,7 +29,7 @@ public class SetUserRoleForProjectControllerIntegrationTest extends ControllerTe private UserEntity testUser; @BeforeEach - public void setUp() { + void setUp() { projectRepository.deleteAll(); testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java index 8611759f9..d62e54c65 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java @@ -19,7 +19,7 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class AddTeamToProjectControllerIntegrationTest extends ControllerTestTemplate { +class AddTeamToProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; @@ -29,7 +29,7 @@ public class AddTeamToProjectControllerIntegrationTest extends ControllerTestTem private ProjectEntity testProject; @BeforeEach - public void setUp() { + void setUp() { teamEntity = new TeamEntity(); teamEntity.setName("testTeam"); teamRepository.save(teamEntity, 1); @@ -46,7 +46,7 @@ public void setUp() { } @Test - public void addTeamToProjectSuccessfully() throws Exception { + void addTeamToProjectSuccessfully() throws Exception { ConstrainedFields fields = fields(ProjectRoleJsonWrapper.class); mvc() diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java index 4ee18e1fb..f9b0a245a 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java @@ -18,7 +18,7 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class AddUsersToTeamControllerIntegrationTest extends ControllerTestTemplate { +class AddUsersToTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; @@ -28,7 +28,7 @@ public class AddUsersToTeamControllerIntegrationTest extends ControllerTestTempl private UserEntity testUser; @BeforeEach - public void setUp() { + void setUp() { userRepository.deleteAll(); testUser = new UserEntity(); testUser.setUsername("username"); @@ -41,7 +41,7 @@ public void setUp() { } @Test - public void addUsersToTeamSuccessfully() throws Exception { + void addUsersToTeamSuccessfully() throws Exception { ConstrainedFields fields = fields(JsonListWrapper.class); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java index ee734828f..c215aaf36 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java @@ -19,7 +19,7 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class CreateTeamControllerIntegrationTest extends ControllerTestTemplate { +class CreateTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; @@ -28,7 +28,7 @@ public class CreateTeamControllerIntegrationTest extends ControllerTestTemplate private UserEntity testUser; @BeforeEach - public void setUp() { + void setUp() { userRepository.deleteAll(); testUser = new UserEntity(); testUser.setUsername("username"); @@ -37,7 +37,7 @@ public void setUp() { } @Test - public void createTeamWithUsersSuccessfully() throws Exception { + void createTeamWithUsersSuccessfully() throws Exception { CreateTeamCommand createTeamCommand = new CreateTeamCommand(); createTeamCommand.setName("testTeam"); createTeamCommand.setUserIds(Collections.singletonList(testUser.getId())); @@ -66,7 +66,7 @@ public void createTeamWithUsersSuccessfully() throws Exception { } @Test - public void createTeamWithNoUsersSuccessfully() throws Exception { + void createTeamWithNoUsersSuccessfully() throws Exception { CreateTeamCommand createTeamCommand = new CreateTeamCommand(); createTeamCommand.setName("testTeam"); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java index 27155e360..1089eedfb 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java @@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class DeleteTeamControllerIntegrationTest extends ControllerTestTemplate { +class DeleteTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private UserRepository userRepository; @@ -27,7 +27,7 @@ public class DeleteTeamControllerIntegrationTest extends ControllerTestTemplate private TeamEntity teamEntity; @BeforeEach - public void setUp() { + void setUp() { teamEntity = new TeamEntity(); teamEntity.setName("testTeam"); teamRepository.save(teamEntity, 1); @@ -40,7 +40,7 @@ public void setUp() { } @Test - public void deleteTeamWithUsersSuccessfully() throws Exception { + void deleteTeamWithUsersSuccessfully() throws Exception { teamEntity.setMembers(Collections.singletonList(testUser)); teamRepository.save(teamEntity, 1); @@ -55,7 +55,7 @@ public void deleteTeamWithUsersSuccessfully() throws Exception { } @Test - public void deleteTeamWithNoUsersSuccessfully() throws Exception { + void deleteTeamWithNoUsersSuccessfully() throws Exception { mvc() .perform(delete("/api/teams/" + teamEntity.getId())) .andExpect(MockMvcResultMatchers.status().isOk()); // TODO: Document diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java index 8e7a9771b..ac482d48d 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java @@ -14,21 +14,21 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class GetTeamControllerIntegrationTest extends ControllerTestTemplate { +class GetTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; private TeamEntity teamEntity; @BeforeEach - public void setUp() { + void setUp() { teamEntity = new TeamEntity(); teamEntity.setName("testTeam"); teamRepository.save(teamEntity, 1); } @Test - public void getTeamSuccessfully() throws Exception { + void getTeamSuccessfully() throws Exception { MvcResult result = mvc() .perform(get("/api/teams/" + teamEntity.getId())) diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java index b365799fe..da2db458f 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java @@ -18,7 +18,7 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class ListProjectsForTeamControllerIntegrationTest extends ControllerTestTemplate { +class ListProjectsForTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; @@ -28,7 +28,7 @@ public class ListProjectsForTeamControllerIntegrationTest extends ControllerTest private ProjectEntity testProject; @BeforeEach - public void setUp() { + void setUp() { projectRepository.deleteAll(); testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); @@ -46,7 +46,7 @@ public void setUp() { } @Test - public void listProjectsForTeamSuccessfully() throws Exception { + void listProjectsForTeamSuccessfully() throws Exception { MvcResult result = mvc() .perform(get("/api/teams/" + teamEntity.getId() + "/projects")) diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java index 2d9cc5091..7e6ee241a 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java @@ -14,19 +14,19 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class ListTeamsControllerIntegrationTest extends ControllerTestTemplate { +class ListTeamsControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; @BeforeEach - public void setUp() { + void setUp() { TeamEntity teamEntity = new TeamEntity(); teamEntity.setName("testTeam"); teamRepository.save(teamEntity, 1); } @Test - public void listTeamsSuccessfully() throws Exception { + void listTeamsSuccessfully() throws Exception { MvcResult result = mvc() .perform(get("/api/teams/")) diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java index 2cec7c92f..f09b52615 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java @@ -18,7 +18,7 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class ListTeamsForProjectControllerIntegrationTest extends ControllerTestTemplate { +class ListTeamsForProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; @@ -28,7 +28,7 @@ public class ListTeamsForProjectControllerIntegrationTest extends ControllerTest private ProjectEntity testProject; @BeforeEach - public void setUp() { + void setUp() { projectRepository.deleteAll(); testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); @@ -46,7 +46,7 @@ public void setUp() { } @Test - public void listTeamsForProjectSuccessfully() throws Exception { + void listTeamsForProjectSuccessfully() throws Exception { MvcResult result = mvc() .perform(get("/api/projects/" + testProject.getId() + "/teams")) diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java index 7b5aec0fb..5f75df6d5 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java @@ -17,7 +17,7 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class ListTeamsForUserControllerIntegrationTest extends ControllerTestTemplate { +class ListTeamsForUserControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; @@ -27,7 +27,7 @@ public class ListTeamsForUserControllerIntegrationTest extends ControllerTestTem private UserEntity testUser; @BeforeEach - public void setUp() { + void setUp() { userRepository.deleteAll(); testUser = new UserEntity(); testUser.setUsername("testUser"); @@ -40,7 +40,7 @@ public void setUp() { } @Test - public void listTeamsForProjectSuccessfully() throws Exception { + void listTeamsForProjectSuccessfully() throws Exception { MvcResult result = mvc() .perform(get("/api/users/" + testUser.getId() + "/teams")) diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java index f0670511b..6470702d7 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java @@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class RemoveTeamFromProjectControllerIntegrationTest extends ControllerTestTemplate { +class RemoveTeamFromProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; @@ -26,7 +26,7 @@ public class RemoveTeamFromProjectControllerIntegrationTest extends ControllerTe private ProjectEntity testProject; @BeforeEach - public void setUp() { + void setUp() { projectRepository.deleteAll(); testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); @@ -44,7 +44,7 @@ public void setUp() { } @Test - public void removeTeamFromProjectSuccessfully() throws Exception { + void removeTeamFromProjectSuccessfully() throws Exception { mvc() .perform(delete("/api/projects/" + testProject.getId() + "/teams/" + teamEntity.getId())) .andExpect(MockMvcResultMatchers.status().isOk()) diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java index 26b01a1e0..62e03a29d 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java @@ -18,7 +18,7 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class RemoveUsersFromTeamControllerIntegrationTest extends ControllerTestTemplate { +class RemoveUsersFromTeamControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; @@ -28,7 +28,7 @@ public class RemoveUsersFromTeamControllerIntegrationTest extends ControllerTest private UserEntity testUser; @BeforeEach - public void setUp() { + void setUp() { userRepository.deleteAll(); testUser = new UserEntity(); testUser.setUsername("username"); @@ -42,7 +42,7 @@ public void setUp() { } @Test - public void removeUsersFromTeamSuccessfully() throws Exception { + void removeUsersFromTeamSuccessfully() throws Exception { ConstrainedFields fields = fields(JsonListWrapper.class); mvc() diff --git a/coderadar-ui/src/app/service/user.service.ts b/coderadar-ui/src/app/service/user.service.ts index a8061ec21..874f19c17 100644 --- a/coderadar-ui/src/app/service/user.service.ts +++ b/coderadar-ui/src/app/service/user.service.ts @@ -2,7 +2,6 @@ import {Injectable} from '@angular/core'; import {HttpClient, HttpResponse} from '@angular/common/http'; import {Router} from '@angular/router'; import {AppComponent} from '../app.component'; -import {Project} from "../model/project"; import {User} from "../model/user"; diff --git a/coderadar-ui/src/app/view/add-project/add-project.component.html b/coderadar-ui/src/app/view/add-project/add-project.component.html index 9196d8619..0ef33b563 100644 --- a/coderadar-ui/src/app/view/add-project/add-project.component.html +++ b/coderadar-ui/src/app/view/add-project/add-project.component.html @@ -43,7 +43,7 @@ The VCS URL is invalid! -
+
diff --git a/coderadar-ui/src/app/view/add-team/add-team.component.html b/coderadar-ui/src/app/view/add-team/add-team.component.html index dc20cf9d0..f22917f45 100644 --- a/coderadar-ui/src/app/view/add-team/add-team.component.html +++ b/coderadar-ui/src/app/view/add-team/add-team.component.html @@ -4,7 +4,7 @@
-
+
@@ -33,9 +33,9 @@ The team name must not be empty! A team with this name already exists! -
- - +
+ +
diff --git a/coderadar-ui/src/app/view/login/login.component.html b/coderadar-ui/src/app/view/login/login.component.html index fd7739eed..31deaced2 100644 --- a/coderadar-ui/src/app/view/login/login.component.html +++ b/coderadar-ui/src/app/view/login/login.component.html @@ -25,7 +25,7 @@ -
+
diff --git a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html index 55b24f5c0..17d5644fc 100644 --- a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html +++ b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html @@ -11,11 +11,11 @@
-
+
Hello there, it looks like you haven't added any projects yet.
Click on the plus button to add one.
-
+
No projects available in the selected team
diff --git a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss index 3905e650f..e53f34d22 100644 --- a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss +++ b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss @@ -45,6 +45,7 @@ .card-list .noProjectsMessage { font-size: x-large; + text-align:center; } .card-list mat-card-content> div { diff --git a/coderadar-ui/src/app/view/register/register.component.html b/coderadar-ui/src/app/view/register/register.component.html index 8e90457d8..3a3391327 100644 --- a/coderadar-ui/src/app/view/register/register.component.html +++ b/coderadar-ui/src/app/view/register/register.component.html @@ -31,7 +31,7 @@ Passwords do not match! -
+
diff --git a/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.css b/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.css deleted file mode 100644 index e69de29bb..000000000 diff --git a/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.ts b/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.ts index ba03cf359..240f33ecd 100644 --- a/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.ts +++ b/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.ts @@ -2,8 +2,7 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'app-sidenav-content', - templateUrl: './sidenav-content.component.html', - styleUrls: ['./sidenav-content.component.css'] + templateUrl: './sidenav-content.component.html' }) export class SidenavContentComponent implements OnInit { diff --git a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.css b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.css index 75e29b28a..d33b79c20 100644 --- a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.css +++ b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.css @@ -43,8 +43,9 @@ padding-left: 30px; } -.card-list #noProjectsMessage { +.card-list #noTeamsMessage { font-size: x-large; + text-align: center; } .card-list mat-card-content> div { diff --git a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html index 3b5c9d7ab..4b7eedfae 100644 --- a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html +++ b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html @@ -11,7 +11,7 @@
-
+
You aren't in any team yet.
Click on the plus button to create a team.
@@ -28,7 +28,7 @@ - + diff --git a/coderadar-ui/src/styles.scss b/coderadar-ui/src/styles.scss index 332540fef..648d7edec 100644 --- a/coderadar-ui/src/styles.scss +++ b/coderadar-ui/src/styles.scss @@ -51,11 +51,18 @@ Styles for most forms in the app font-size: 20pt; } +.mat-card-form #cardButtons { + display: flex; + align-items: center; + justify-content: center; +} + .mat-card-form #cardButtons button { width: 25%; margin: 10px; } + .waitingIndicator { position: absolute !important; margin-top: 20%; @@ -87,16 +94,23 @@ Styles for the login and register forms font-size: 30pt; } -.login-card-form #cardButtons button { - margin: 10px; -} - .login-card-form mat-card { position: fixed; top: 20%; min-width: 22%; } +.login-card-form #cardButtons { + display: flex; + align-items: center; + justify-content: center; +} + +.login-card-form #cardButtons button { + margin: 10px; +} + + .login-card-form form { min-width: 22%; } @@ -207,3 +221,4 @@ Styles for the login and register forms } } } + From 0d92dbff56c9d016dc7b4831cbee3357409c5506 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 17 Jun 2020 08:56:35 +0200 Subject: [PATCH 46/76] attempt adding code coverage report for sonarcloud --- build.gradle | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/build.gradle b/build.gradle index d3b0446db..1447421af 100644 --- a/build.gradle +++ b/build.gradle @@ -36,12 +36,14 @@ sonarqube { property "sonar.sources", "src/main/java, coderadar-ui/src" property "sonar.tests", "src/test/java" property "sonar.exclusions", "coderadar-app/workdir" + property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacoco/test/jacocoTestReport.xml" } } subprojects { apply plugin: "idea" apply plugin: "java" + apply plugin: "jacoco" buildscript { repositories { @@ -79,8 +81,22 @@ subprojects { testLogging { events "passed", "skipped", "failed" } + finalizedBy jacocoTestReport } + jacocoTestReport { + dependsOn test + } + + jacocoTestReport { + reports { + xml.enabled true + csv.enabled false + html.destination file("${buildDir}/jacocoHtml") + } + } + + dependencies { testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: version_junit testCompile group: 'org.mockito', name: 'mockito-junit-jupiter', version: version_mockito_junit From 1b3437791c3c76617a2b1713db3f235be0afb700 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 17 Jun 2020 11:09:24 +0200 Subject: [PATCH 47/76] attempt adding code coverage report for sonarcloud --- build.gradle | 66 ++++++++++++++++++++++++++++++------- coderadar-test/build.gradle | 2 +- lombok.config | 1 + 3 files changed, 56 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 1447421af..6952c2359 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ buildscript { repositories { mavenLocal() + mavenCentral() jcenter() maven { url "https://plugins.gradle.org/m2/" @@ -13,6 +14,7 @@ plugins { } apply plugin: 'idea' +apply plugin: "jacoco" ext { majorVersion = '0' @@ -28,17 +30,6 @@ file('gradle.d').listFiles().sort().each { } } -sonarqube { - properties { - property "sonar.projectKey", "adessoAG_coderadar" - property "sonar.organization", "adesso-ag" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.sources", "src/main/java, coderadar-ui/src" - property "sonar.tests", "src/test/java" - property "sonar.exclusions", "coderadar-app/workdir" - property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacoco/test/jacocoTestReport.xml" - } -} subprojects { apply plugin: "idea" @@ -96,7 +87,6 @@ subprojects { } } - dependencies { testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: version_junit testCompile group: 'org.mockito', name: 'mockito-junit-jupiter', version: version_mockito_junit @@ -105,6 +95,18 @@ subprojects { compileOnly("org.projectlombok:lombok:$lombok_version") } + sonarqube { + properties { + property "sonar.projectKey", "adessoAG_coderadar" + property "sonar.organization", "adesso-ag" + property "sonar.host.url", "https://sonarcloud.io" + property "sonar.sources", "src/main/java, coderadar-ui/src" + property "sonar.tests", "src/test/java" + property "sonar.exclusions", "coderadar-app/workdir" + property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacoco/test/jacocoTestReport.xml" + } + } + } idea { @@ -112,3 +114,43 @@ idea { vcs = 'Git' } } + + + +// task to gather code coverage from multiple subprojects +// NOTE: the `JacocoReport` tasks do *not* depend on the `test` task by default. Meaning you have to ensure +// that `test` (or other tasks generating code coverage) run before generating the report. +// You can achieve this by calling the `test` lifecycle task manually +// $ ./gradlew test codeCoverageReport +tasks.register("codeCoverageReport", JacocoReport) { + // If a subproject applies the 'jacoco' plugin, add the result it to the report + subprojects { subproject -> + subproject.plugins.withType(JacocoPlugin).configureEach { + subproject.tasks.matching({ t -> t.extensions.findByType(JacocoTaskExtension) }).configureEach { testTask -> + sourceSets subproject.sourceSets.main + executionData(testTask) + } + + // To automatically run `test` every time `./gradlew codeCoverageReport` is called, + // you may want to set up a task dependency between them as shown below. + // Note that this requires the `test` tasks to be resolved eagerly (see `forEach`) which + // may have a negative effect on the configuration time of your build. + subproject.tasks.matching({ t -> t.extensions.findByType(JacocoTaskExtension) }).forEach { + rootProject.tasks.codeCoverageReport.dependsOn(it) + } + } + } + + // enable the different report types (html, xml, csv) + reports { + // xml is usually used to integrate code coverage with + // other tools like SonarQube, Coveralls or Codecov + xml.enabled true + + // HTML reports can be used to see code coverage + // without any external tools + html.enabled true + } +} + + diff --git a/coderadar-test/build.gradle b/coderadar-test/build.gradle index 1ca463f66..d40e64f7f 100644 --- a/coderadar-test/build.gradle +++ b/coderadar-test/build.gradle @@ -8,7 +8,7 @@ ext { snippetsDir = file("build/generated-snippets") } -sourceCompatibility = 1.8 +sourceCompatibility = 11 repositories { mavenCentral() diff --git a/lombok.config b/lombok.config index 5115acb53..d0bdfc50c 100644 --- a/lombok.config +++ b/lombok.config @@ -1,2 +1,3 @@ # make setters return the object reference instead of void lombok.accessors.chain=true +lombok.addLombokGeneratedAnnotation = true From 545da0ac49059bb6e03c1c8ba5d17b94837e8b4e Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 17 Jun 2020 11:21:26 +0200 Subject: [PATCH 48/76] attempt adding code coverage report for sonarcloud --- build.gradle | 62 +++++++++++----------------------------------------- 1 file changed, 13 insertions(+), 49 deletions(-) diff --git a/build.gradle b/build.gradle index 6952c2359..bbf2e8b8e 100644 --- a/build.gradle +++ b/build.gradle @@ -13,9 +13,12 @@ plugins { id "org.sonarqube" version "2.8" } + apply plugin: 'idea' apply plugin: "jacoco" + + ext { majorVersion = '0' minorVersion = '5' @@ -93,20 +96,8 @@ subprojects { testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: version_junit annotationProcessor("org.projectlombok:lombok:$lombok_version") compileOnly("org.projectlombok:lombok:$lombok_version") + testCompile group: 'org.jacoco', name: 'org.jacoco.ant', version: '0.8.5' } - - sonarqube { - properties { - property "sonar.projectKey", "adessoAG_coderadar" - property "sonar.organization", "adesso-ag" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.sources", "src/main/java, coderadar-ui/src" - property "sonar.tests", "src/test/java" - property "sonar.exclusions", "coderadar-app/workdir" - property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacoco/test/jacocoTestReport.xml" - } - } - } idea { @@ -115,42 +106,15 @@ idea { } } - - -// task to gather code coverage from multiple subprojects -// NOTE: the `JacocoReport` tasks do *not* depend on the `test` task by default. Meaning you have to ensure -// that `test` (or other tasks generating code coverage) run before generating the report. -// You can achieve this by calling the `test` lifecycle task manually -// $ ./gradlew test codeCoverageReport -tasks.register("codeCoverageReport", JacocoReport) { - // If a subproject applies the 'jacoco' plugin, add the result it to the report - subprojects { subproject -> - subproject.plugins.withType(JacocoPlugin).configureEach { - subproject.tasks.matching({ t -> t.extensions.findByType(JacocoTaskExtension) }).configureEach { testTask -> - sourceSets subproject.sourceSets.main - executionData(testTask) - } - - // To automatically run `test` every time `./gradlew codeCoverageReport` is called, - // you may want to set up a task dependency between them as shown below. - // Note that this requires the `test` tasks to be resolved eagerly (see `forEach`) which - // may have a negative effect on the configuration time of your build. - subproject.tasks.matching({ t -> t.extensions.findByType(JacocoTaskExtension) }).forEach { - rootProject.tasks.codeCoverageReport.dependsOn(it) - } - } - } - - // enable the different report types (html, xml, csv) - reports { - // xml is usually used to integrate code coverage with - // other tools like SonarQube, Coveralls or Codecov - xml.enabled true - - // HTML reports can be used to see code coverage - // without any external tools - html.enabled true +sonarqube { + properties { + property "sonar.projectKey", "adessoAG_coderadar" + property "sonar.organization", "adesso-ag" + property "sonar.host.url", "https://sonarcloud.io" + property "sonar.sources", "src/main/java, coderadar-ui/src" + property "sonar.tests", "src/test/java" + property "sonar.exclusions", "coderadar-app/workdir" + property "sonar.coverage.jacoco.xmlReportPaths", "./**/build/reports/jacoco/test/jacocoTestReport.xml" } } - From d3d85dbecfca188a5fe14595857d581245e3c9f5 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 17 Jun 2020 11:47:32 +0200 Subject: [PATCH 49/76] attempt adding code coverage report for sonarcloud --- build.gradle | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index bbf2e8b8e..dfed99c43 100644 --- a/build.gradle +++ b/build.gradle @@ -13,9 +13,26 @@ plugins { id "org.sonarqube" version "2.8" } - apply plugin: 'idea' apply plugin: "jacoco" +apply plugin: "java" + +task codeCoverageReport(type: JacocoReport) { + + // Gather execution data from all subprojects + executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec") + + // Add all relevant sourcesets from the subprojects + subprojects.each { + sourceSets it.sourceSets.main + } + + reports { + xml.enabled true + html.enabled true + csv.enabled false + } +} @@ -34,6 +51,8 @@ file('gradle.d').listFiles().sort().each { } + + subprojects { apply plugin: "idea" apply plugin: "java" @@ -80,6 +99,7 @@ subprojects { jacocoTestReport { dependsOn test + finalizedBy codeCoverageReport } jacocoTestReport { @@ -114,7 +134,23 @@ sonarqube { property "sonar.sources", "src/main/java, coderadar-ui/src" property "sonar.tests", "src/test/java" property "sonar.exclusions", "coderadar-app/workdir" - property "sonar.coverage.jacoco.xmlReportPaths", "./**/build/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacoco/codeCoverageReport/codeCoverageReport.xml" } } + +allprojects { + repositories { + mavenLocal() + mavenCentral() + jcenter() + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + testCompile group: 'org.jacoco', name: 'org.jacoco.ant', version: '0.8.5' + } +} + + From a23ca3bbe139d7899be9cb5270173b2fe4bfe602 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Wed, 17 Jun 2020 12:11:16 +0200 Subject: [PATCH 50/76] attempt adding code coverage report for sonarcloud --- .github/workflows/sonarcloud.yml | 4 ++-- build.gradle | 38 +++++++++++++------------------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 65e147938..b895bed2a 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -26,6 +26,6 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: analyze on sonarcloud - run: gradle build sonarqube -Dsonar.login=${{ secrets.SONAR_TOKEN }} + run: gradle test codeCoverageReport sonarqube -Dsonar.login=${{ secrets.SONAR_TOKEN }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.gradle b/build.gradle index dfed99c43..a6114db11 100644 --- a/build.gradle +++ b/build.gradle @@ -17,25 +17,6 @@ apply plugin: 'idea' apply plugin: "jacoco" apply plugin: "java" -task codeCoverageReport(type: JacocoReport) { - - // Gather execution data from all subprojects - executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec") - - // Add all relevant sourcesets from the subprojects - subprojects.each { - sourceSets it.sourceSets.main - } - - reports { - xml.enabled true - html.enabled true - csv.enabled false - } -} - - - ext { majorVersion = '0' minorVersion = '5' @@ -51,8 +32,6 @@ file('gradle.d').listFiles().sort().each { } - - subprojects { apply plugin: "idea" apply plugin: "java" @@ -99,7 +78,6 @@ subprojects { jacocoTestReport { dependsOn test - finalizedBy codeCoverageReport } jacocoTestReport { @@ -138,7 +116,6 @@ sonarqube { } } - allprojects { repositories { mavenLocal() @@ -153,4 +130,19 @@ allprojects { } } +task codeCoverageReport(type: JacocoReport) { + + // Gather execution data from all subprojects + executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec") + + // Add all relevant sourcesets from the subprojects + subprojects.each { + sourceSets it.sourceSets.main + } + reports { + xml.enabled true + html.enabled true + csv.enabled false + } +} From 51a4930c852f287f36898b350029ddf0759c39d1 Mon Sep 17 00:00:00 2001 From: Kilian Krause Date: Wed, 17 Jun 2020 14:56:24 +0200 Subject: [PATCH 51/76] add ProjectRoleValidator for validating the ProjectRole enum --- .../src/main/resources/application.properties | 2 +- .../domain/ProjectRolePattern.java | 22 ++++++++++ .../domain/ProjectRoleValidator.java | 19 +++++++++ .../ChangePasswordServiceTest.java | 2 +- .../GetUserServiceTest.java | 2 +- .../LoginUserServiceTest.java | 2 +- .../ProjectRoleValidatorTest.java | 40 +++++++++++++++++++ .../RefreshTokenServiceTest.java | 2 +- .../RegisterUserServiceTest.java | 2 +- .../rest/ProjectRoleJsonWrapper.java | 5 ++- ...leForProjectControllerIntegrationTest.java | 2 +- ...eamToProjectControllerIntegrationTest.java | 4 +- 12 files changed, 94 insertions(+), 10 deletions(-) create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRolePattern.java create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRoleValidator.java rename coderadar-core/src/test/java/io/reflectoring/coderadar/{projectadministration/user => useradministration}/ChangePasswordServiceTest.java (96%) rename coderadar-core/src/test/java/io/reflectoring/coderadar/{projectadministration/user => useradministration}/GetUserServiceTest.java (95%) rename coderadar-core/src/test/java/io/reflectoring/coderadar/{projectadministration/user => useradministration}/LoginUserServiceTest.java (97%) create mode 100644 coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java rename coderadar-core/src/test/java/io/reflectoring/coderadar/{projectadministration/user => useradministration}/RefreshTokenServiceTest.java (99%) rename coderadar-core/src/test/java/io/reflectoring/coderadar/{projectadministration/user => useradministration}/RegisterUserServiceTest.java (97%) diff --git a/coderadar-app/src/main/resources/application.properties b/coderadar-app/src/main/resources/application.properties index 4a161ea99..f5cf01808 100644 --- a/coderadar-app/src/main/resources/application.properties +++ b/coderadar-app/src/main/resources/application.properties @@ -6,7 +6,7 @@ coderadar.workdir=coderadar-workdir coderadar.dateLocale=de_DE coderadar.authentication.accessToken.durationInMinutes=15 coderadar.authentication.refreshToken.durationInMinutes=86400 -coderadar.authentication.enabled=true +coderadar.authentication.enabled=false coderadar.cors.enabled=true logging.level.io.reflectoring.coderadar=DEBUG diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRolePattern.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRolePattern.java new file mode 100644 index 000000000..5bfc8c1dd --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRolePattern.java @@ -0,0 +1,22 @@ +package io.reflectoring.coderadar.useradministration.domain; + +import static java.lang.annotation.ElementType.*; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import javax.validation.Constraint; +import javax.validation.Payload; + +@Target({FIELD}) +@Retention(RetentionPolicy.RUNTIME) +@Constraint(validatedBy = ProjectRoleValidator.class) +public @interface ProjectRolePattern { + ProjectRole[] anyOf() default {ProjectRole.ADMIN, ProjectRole.MEMBER}; + + String message() default "must be any of {anyOf}"; + + Class[] groups() default {}; + + Class[] payload() default {}; +} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRoleValidator.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRoleValidator.java new file mode 100644 index 000000000..ef4f99ed6 --- /dev/null +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRoleValidator.java @@ -0,0 +1,19 @@ +package io.reflectoring.coderadar.useradministration.domain; + +import java.util.Arrays; +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; + +public class ProjectRoleValidator implements ConstraintValidator { + private ProjectRole[] projectRoles; + + @Override + public void initialize(ProjectRolePattern constraintAnnotation) { + this.projectRoles = constraintAnnotation.anyOf(); + } + + @Override + public boolean isValid(ProjectRole value, ConstraintValidatorContext context) { + return value == null || Arrays.asList(projectRoles).contains(value); + } +} diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/ChangePasswordServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ChangePasswordServiceTest.java similarity index 96% rename from coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/ChangePasswordServiceTest.java rename to coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ChangePasswordServiceTest.java index e2b10bf48..3246e05af 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/ChangePasswordServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ChangePasswordServiceTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.projectadministration.user; +package io.reflectoring.coderadar.useradministration; import static org.mockito.Mockito.*; diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/GetUserServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/GetUserServiceTest.java similarity index 95% rename from coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/GetUserServiceTest.java rename to coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/GetUserServiceTest.java index 48c6ac4c1..5276480a5 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/GetUserServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/GetUserServiceTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.projectadministration.user; +package io.reflectoring.coderadar.useradministration; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/LoginUserServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/LoginUserServiceTest.java similarity index 97% rename from coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/LoginUserServiceTest.java rename to coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/LoginUserServiceTest.java index 03d12082d..ad1b38a81 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/LoginUserServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/LoginUserServiceTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.projectadministration.user; +package io.reflectoring.coderadar.useradministration; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java new file mode 100644 index 000000000..437e66aca --- /dev/null +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java @@ -0,0 +1,40 @@ +package io.reflectoring.coderadar.useradministration; + +import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import io.reflectoring.coderadar.useradministration.domain.ProjectRolePattern; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; + +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import java.util.Set; + +public class ProjectRoleValidatorTest { + private final Validator validator = Validation.buildDefaultValidatorFactory().getValidator(); + + @Test + void acceptAdminRole() { + TestDto testDto = new TestDto(ProjectRole.ADMIN); + + Set> result = validator.validate(testDto); + Assertions.assertThat(result).isEmpty(); + } + + @Test + void acceptMemberRole() { + TestDto testDto = new TestDto(ProjectRole.MEMBER); + + Set> result = validator.validate(testDto); + Assertions.assertThat(result).isEmpty(); + } + + static class TestDto { + @ProjectRolePattern + private final ProjectRole projectRole; + + TestDto(ProjectRole role) { + this.projectRole = role; + } + } +} diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RefreshTokenServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/RefreshTokenServiceTest.java similarity index 99% rename from coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RefreshTokenServiceTest.java rename to coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/RefreshTokenServiceTest.java index 0d9e11ef1..a9347ff09 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RefreshTokenServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/RefreshTokenServiceTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.projectadministration.user; +package io.reflectoring.coderadar.useradministration; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RegisterUserServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/RegisterUserServiceTest.java similarity index 97% rename from coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RegisterUserServiceTest.java rename to coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/RegisterUserServiceTest.java index ce5129b1b..b7a5d42e1 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/projectadministration/user/RegisterUserServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/RegisterUserServiceTest.java @@ -1,4 +1,4 @@ -package io.reflectoring.coderadar.projectadministration.user; +package io.reflectoring.coderadar.useradministration; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java index a848f1b71..3e03315ca 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.rest; import io.reflectoring.coderadar.useradministration.domain.ProjectRole; +import io.reflectoring.coderadar.useradministration.domain.ProjectRolePattern; import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; @@ -9,6 +10,6 @@ @Data @NoArgsConstructor @AllArgsConstructor -public class ProjectRoleJsonWrapper { // TODO: create validator for input validation in controllers - @NotNull private ProjectRole role; +public class ProjectRoleJsonWrapper { + @NotNull @ProjectRolePattern private ProjectRole role; } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java index b11369cec..bf515af6b 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java @@ -63,7 +63,7 @@ void setUserRoleForProjectSuccessfully() throws Exception { "user/role/project/set", requestFields( fields - .withPath("role") + .withCustomPath("role") .description( "The role the user should have for the given project. Can be either ADMIN or MEMBER")))) .andReturn(); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java index d62e54c65..0feaa81db 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java @@ -59,7 +59,9 @@ void addTeamToProjectSuccessfully() throws Exception { document( "teams/add/project", requestFields( - fields.withPath("role").description("The role of the team in the project")))); + fields + .withCustomPath("role") + .description("The role of the team in the project")))); List teams = teamRepository.listTeamsByProjectIdWithMembers(testProject.getId()); Assertions.assertEquals(1L, teams.size()); From 59e4d3ce3e88e63fcd95cc4d7cbd8867910abd08 Mon Sep 17 00:00:00 2001 From: Kilian Krause Date: Wed, 17 Jun 2020 15:03:16 +0200 Subject: [PATCH 52/76] spotless --- .../ProjectRoleValidatorTest.java | 44 +++++++++---------- .../RefreshTokenServiceTest.java | 3 -- .../RegisterUserServiceTest.java | 1 - 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java index 437e66aca..60b61f33a 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java @@ -2,39 +2,37 @@ import io.reflectoring.coderadar.useradministration.domain.ProjectRole; import io.reflectoring.coderadar.useradministration.domain.ProjectRolePattern; -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Test; - +import java.util.Set; import javax.validation.ConstraintViolation; import javax.validation.Validation; import javax.validation.Validator; -import java.util.Set; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; public class ProjectRoleValidatorTest { - private final Validator validator = Validation.buildDefaultValidatorFactory().getValidator(); + private final Validator validator = Validation.buildDefaultValidatorFactory().getValidator(); - @Test - void acceptAdminRole() { - TestDto testDto = new TestDto(ProjectRole.ADMIN); + @Test + void acceptAdminRole() { + TestDto testDto = new TestDto(ProjectRole.ADMIN); - Set> result = validator.validate(testDto); - Assertions.assertThat(result).isEmpty(); - } + Set> result = validator.validate(testDto); + Assertions.assertThat(result).isEmpty(); + } - @Test - void acceptMemberRole() { - TestDto testDto = new TestDto(ProjectRole.MEMBER); + @Test + void acceptMemberRole() { + TestDto testDto = new TestDto(ProjectRole.MEMBER); - Set> result = validator.validate(testDto); - Assertions.assertThat(result).isEmpty(); - } + Set> result = validator.validate(testDto); + Assertions.assertThat(result).isEmpty(); + } - static class TestDto { - @ProjectRolePattern - private final ProjectRole projectRole; + static class TestDto { + @ProjectRolePattern private final ProjectRole projectRole; - TestDto(ProjectRole role) { - this.projectRole = role; - } + TestDto(ProjectRole role) { + this.projectRole = role; } + } } diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/RefreshTokenServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/RefreshTokenServiceTest.java index a9347ff09..908ffa504 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/RefreshTokenServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/RefreshTokenServiceTest.java @@ -5,9 +5,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.reflectoring.coderadar.useradministration.AccessTokenNotExpiredException; -import io.reflectoring.coderadar.useradministration.RefreshTokenNotFoundException; -import io.reflectoring.coderadar.useradministration.UserNotFoundException; import io.reflectoring.coderadar.useradministration.domain.RefreshToken; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/RegisterUserServiceTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/RegisterUserServiceTest.java index b7a5d42e1..bc2940c59 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/RegisterUserServiceTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/RegisterUserServiceTest.java @@ -6,7 +6,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import io.reflectoring.coderadar.useradministration.UsernameAlreadyInUseException; import io.reflectoring.coderadar.useradministration.domain.User; import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort; import io.reflectoring.coderadar.useradministration.port.driven.RegisterUserPort; From a89b34ff6933bfe9e4bd55e8e501f8c419e4624a Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Fri, 3 Jul 2020 13:32:52 +0200 Subject: [PATCH 53/76] fix sonarqube code coverage --- .github/workflows/sonarcloud.yml | 2 +- build.gradle | 43 ++++++++++++++----- coderadar-core/build.gradle | 1 + coderadar-dependency-map/build.gradle | 1 + coderadar-graph/build.gradle | 1 + .../checkstyle-analyzer-plugin/build.gradle | 3 +- .../loc-analyzer-plugin/build.gradle | 1 + coderadar-rest/build.gradle | 1 + coderadar-test/build.gradle | 1 + coderadar-vcs/build.gradle | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- 11 files changed, 43 insertions(+), 14 deletions(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index b895bed2a..73f55e1ef 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -26,6 +26,6 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: analyze on sonarcloud - run: gradle test codeCoverageReport sonarqube -Dsonar.login=${{ secrets.SONAR_TOKEN }} + run: gradle codeCoverageReport sonarqube -Dsonar.login=${{ secrets.SONAR_TOKEN }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.gradle b/build.gradle index a6114db11..a39de6b10 100644 --- a/build.gradle +++ b/build.gradle @@ -11,11 +11,13 @@ buildscript { plugins { id "org.sonarqube" version "2.8" + id "jacoco" } apply plugin: 'idea' apply plugin: "jacoco" apply plugin: "java" +apply plugin: "org.sonarqube" ext { majorVersion = '0' @@ -35,7 +37,7 @@ file('gradle.d').listFiles().sort().each { subprojects { apply plugin: "idea" apply plugin: "java" - apply plugin: "jacoco" + apply plugin: "org.sonarqube" buildscript { repositories { @@ -84,7 +86,7 @@ subprojects { reports { xml.enabled true csv.enabled false - html.destination file("${buildDir}/jacocoHtml") + html.enabled true } } @@ -96,6 +98,8 @@ subprojects { compileOnly("org.projectlombok:lombok:$lombok_version") testCompile group: 'org.jacoco', name: 'org.jacoco.ant', version: '0.8.5' } + + } idea { @@ -112,7 +116,8 @@ sonarqube { property "sonar.sources", "src/main/java, coderadar-ui/src" property "sonar.tests", "src/test/java" property "sonar.exclusions", "coderadar-app/workdir" - property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacoco/codeCoverageReport/codeCoverageReport.xml" + property 'sonar.core.codeCoveragePlugin', 'jacoco' + property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/codeCoverageReport/codeCoverageReport.xml" } } @@ -130,19 +135,35 @@ allprojects { } } -task codeCoverageReport(type: JacocoReport) { - - // Gather execution data from all subprojects - executionData fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec") +tasks.register("codeCoverageReport", JacocoReport) { + // If a subproject applies the 'jacoco' plugin, add the result it to the report + subprojects { subproject -> + subproject.plugins.withType(JacocoPlugin).configureEach { + subproject.tasks.matching({ t -> t.extensions.findByType(JacocoTaskExtension) }).configureEach { testTask -> + sourceSets subproject.sourceSets.main + executionData(testTask) + } - // Add all relevant sourcesets from the subprojects - subprojects.each { - sourceSets it.sourceSets.main + // To automatically run `test` every time `./gradlew codeCoverageReport` is called, + // you may want to set up a task dependency between them as shown below. + // Note that this requires the `test` tasks to be resolved eagerly (see `forEach`) which + // may have a negative effect on the configuration time of your build. + subproject.tasks.matching({ t -> t.extensions.findByType(JacocoTaskExtension) }).forEach { + rootProject.tasks.codeCoverageReport.dependsOn(it) + } + } } + // enable the different report types (html, xml, csv) reports { + // xml is usually used to integrate code coverage with + // other tools like SonarQube, Coveralls or Codecov xml.enabled true + + // HTML reports can be used to see code coverage + // without any external tools html.enabled true - csv.enabled false } } + + diff --git a/coderadar-core/build.gradle b/coderadar-core/build.gradle index a6dd421d3..026e791cf 100644 --- a/coderadar-core/build.gradle +++ b/coderadar-core/build.gradle @@ -1,4 +1,5 @@ apply plugin: "com.diffplug.gradle.spotless" +apply plugin: "jacoco" dependencies { compile project(':coderadar-plugin-api') diff --git a/coderadar-dependency-map/build.gradle b/coderadar-dependency-map/build.gradle index c2045fe18..143ea6817 100644 --- a/coderadar-dependency-map/build.gradle +++ b/coderadar-dependency-map/build.gradle @@ -1,4 +1,5 @@ apply plugin: "com.diffplug.gradle.spotless" +apply plugin: "jacoco" spotless { java { diff --git a/coderadar-graph/build.gradle b/coderadar-graph/build.gradle index 43c2388ba..cbbdb6448 100644 --- a/coderadar-graph/build.gradle +++ b/coderadar-graph/build.gradle @@ -1,4 +1,5 @@ apply plugin: "com.diffplug.gradle.spotless" +apply plugin: "jacoco" spotless { java { diff --git a/coderadar-plugins/checkstyle-analyzer-plugin/build.gradle b/coderadar-plugins/checkstyle-analyzer-plugin/build.gradle index 50634ec66..00da24840 100644 --- a/coderadar-plugins/checkstyle-analyzer-plugin/build.gradle +++ b/coderadar-plugins/checkstyle-analyzer-plugin/build.gradle @@ -1,4 +1,5 @@ apply plugin: "com.diffplug.gradle.spotless" +apply plugin: "jacoco" spotless { java { @@ -13,4 +14,4 @@ dependencies { compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.12' testCompile group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.7' compile project(":coderadar-plugin-api") -} \ No newline at end of file +} diff --git a/coderadar-plugins/loc-analyzer-plugin/build.gradle b/coderadar-plugins/loc-analyzer-plugin/build.gradle index 6ef0e1935..8327cd76e 100644 --- a/coderadar-plugins/loc-analyzer-plugin/build.gradle +++ b/coderadar-plugins/loc-analyzer-plugin/build.gradle @@ -1,4 +1,5 @@ apply plugin: "com.diffplug.gradle.spotless" +apply plugin: "jacoco" spotless { java { diff --git a/coderadar-rest/build.gradle b/coderadar-rest/build.gradle index f1c254b36..ee8e902d7 100644 --- a/coderadar-rest/build.gradle +++ b/coderadar-rest/build.gradle @@ -1,4 +1,5 @@ apply plugin: "com.diffplug.gradle.spotless" +apply plugin: "jacoco" spotless { java { diff --git a/coderadar-test/build.gradle b/coderadar-test/build.gradle index d40e64f7f..5976b9c94 100644 --- a/coderadar-test/build.gradle +++ b/coderadar-test/build.gradle @@ -3,6 +3,7 @@ import java.text.SimpleDateFormat apply plugin: "com.diffplug.gradle.spotless" apply plugin: "org.asciidoctor.convert" apply plugin: "org.ajoberstar.git-publish" +apply plugin: "jacoco" ext { snippetsDir = file("build/generated-snippets") diff --git a/coderadar-vcs/build.gradle b/coderadar-vcs/build.gradle index 223275dcc..873356d0a 100644 --- a/coderadar-vcs/build.gradle +++ b/coderadar-vcs/build.gradle @@ -1,4 +1,5 @@ apply plugin: "com.diffplug.gradle.spotless" +apply plugin: "jacoco" dependencies { compile project(':coderadar-plugin-api') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9fe9d68ec..45ee9fdcb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip From 6e59a31d5b98a550c30204e5b791595126644847 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov <32562426+maximAtanasov@users.noreply.github.com> Date: Fri, 3 Jul 2020 13:53:39 +0200 Subject: [PATCH 54/76] Update sonarcloud.yml --- .github/workflows/sonarcloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 73f55e1ef..d37727cd4 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -26,6 +26,6 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: analyze on sonarcloud - run: gradle codeCoverageReport sonarqube -Dsonar.login=${{ secrets.SONAR_TOKEN }} + run: gradle codeCoverageReport sonarqube -Dsonar.login=${{ secrets.SONAR_TOKEN }} -Dsonar.java.binaries=build/classes env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 100b6da48a86340c471fc6b64c192f2604261649 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Fri, 3 Jul 2020 15:08:21 +0200 Subject: [PATCH 55/76] fix a bug that caused deleted projects to show up --- coderadar-app/src/main/resources/application.properties | 2 +- .../graph/analyzer/adapter/ResetAnalysisAdapter.java | 1 - .../graph/contributor/adapter/GetContributorAdapter.java | 9 +++------ .../project/repository/ProjectRepository.java | 6 +++--- .../coderadar/rest/ProjectRoleJsonWrapper.java | 3 +-- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/coderadar-app/src/main/resources/application.properties b/coderadar-app/src/main/resources/application.properties index f5cf01808..4a161ea99 100644 --- a/coderadar-app/src/main/resources/application.properties +++ b/coderadar-app/src/main/resources/application.properties @@ -6,7 +6,7 @@ coderadar.workdir=coderadar-workdir coderadar.dateLocale=de_DE coderadar.authentication.accessToken.durationInMinutes=15 coderadar.authentication.refreshToken.durationInMinutes=86400 -coderadar.authentication.enabled=false +coderadar.authentication.enabled=true coderadar.cors.enabled=true logging.level.io.reflectoring.coderadar=DEBUG diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/analyzer/adapter/ResetAnalysisAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/analyzer/adapter/ResetAnalysisAdapter.java index 38d2bc269..2dba72d36 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/analyzer/adapter/ResetAnalysisAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/analyzer/adapter/ResetAnalysisAdapter.java @@ -22,7 +22,6 @@ public void resetAnalysis(long projectId) { /* * The empty while loops are necessary because only 10000 entities can be deleted at a time. - * @see ProjectRepository#deleteProjectFindings(Long) * @see ProjectRepository#deleteProjectMetrics(Long) */ while (projectRepository.deleteProjectMetrics(projectId) > 0) ; diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/contributor/adapter/GetContributorAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/contributor/adapter/GetContributorAdapter.java index 922d0ac4d..5093b0165 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/contributor/adapter/GetContributorAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/contributor/adapter/GetContributorAdapter.java @@ -6,7 +6,6 @@ import io.reflectoring.coderadar.graph.contributor.ContributorMapper; import io.reflectoring.coderadar.graph.contributor.domain.ContributorEntity; import io.reflectoring.coderadar.graph.contributor.repository.ContributorRepository; -import java.util.Optional; import org.springframework.stereotype.Service; @Service @@ -20,10 +19,8 @@ public GetContributorAdapter(ContributorRepository contributorRepository) { @Override public Contributor get(long id) { - Optional entity = contributorRepository.findById(id); - if (entity.isEmpty()) { - throw new ContributorNotFoundException(id); - } - return mapper.mapGraphObject(entity.get()); + ContributorEntity entity = + contributorRepository.findById(id).orElseThrow(() -> new ContributorNotFoundException(id)); + return mapper.mapGraphObject(entity); } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java index 99fa9f3ec..bbedb42e6 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java @@ -169,9 +169,9 @@ public interface ProjectRepository extends Neo4jRepository */ @Query( "MATCH (u:UserEntity) WHERE ID(u) = {0} WITH u " - + "OPTIONAL MATCH (u)-[:ASSIGNED_TO*0..1]->(p1:ProjectEntity) " + + "OPTIONAL MATCH (u)-[:ASSIGNED_TO*0..1]->(p1:ProjectEntity) WHERE p1.isBeingDeleted = FALSE " + "WITH p1, u " - + "MATCH (p2:ProjectEntity)<-[:ASSIGNED_TO*0..1]-(t)<-[:IS_IN*0..1]-(u) WITH collect(p1) + collect(p2) as list " + + "MATCH (p2:ProjectEntity)<-[:ASSIGNED_TO*0..1]-(t)<-[:IS_IN*0..1]-(u) WHERE p2.isBeingDeleted = FALSE WITH collect(p1) + collect(p2) as list " + "UNWIND list AS p RETURN DISTINCT p ORDER BY p.name") List findProjectsByUsedId(long userId); @@ -179,6 +179,6 @@ public interface ProjectRepository extends Neo4jRepository * @param teamId The team id. * @return All the project a team is assigned to. */ - @Query("MATCH (t)-[:ASSIGNED_TO]->(p) WHERE ID(t) = {0} RETURN p") + @Query("MATCH (t)-[:ASSIGNED_TO]->(p) WHERE ID(t) = {0} AND p.isBeingDeleted = FALSE RETURN p") List listProjectByTeamId(long teamId); } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java index 3e03315ca..91d75c885 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ProjectRoleJsonWrapper.java @@ -1,7 +1,6 @@ package io.reflectoring.coderadar.rest; import io.reflectoring.coderadar.useradministration.domain.ProjectRole; -import io.reflectoring.coderadar.useradministration.domain.ProjectRolePattern; import javax.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; @@ -11,5 +10,5 @@ @NoArgsConstructor @AllArgsConstructor public class ProjectRoleJsonWrapper { - @NotNull @ProjectRolePattern private ProjectRole role; + @NotNull private ProjectRole role; } From c20d8d337d840d8024270d6fc78d55aec4c33434 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Mon, 6 Jul 2020 07:35:09 +0200 Subject: [PATCH 56/76] update checkstyle to 8.0 --- .../ProjectRoleValidatorTest.java | 2 +- .../adapter/GetFileTreeForCommitAdapter.java | 13 +++--- .../checkstyle-analyzer-plugin/build.gradle | 2 +- ...heckstyleSourceCodeFileAnalyzerPlugin.java | 2 +- .../checkstyle/CoderadarAuditListener.java | 2 +- .../checkstyle/MetricCountExtractor.java | 14 +++--- .../src/main/resources/checkstyle.xml | 21 +++++---- .../src/test/resources/checkstyle.xml | 16 +++---- ...ailableMetricsInProjectControllerTest.java | 18 ++------ coderadar-ui/package-lock.json | 22 +++++++--- .../coderadar/vcs/ChangeTypeMapper.java | 2 + .../adapter/GetAvailableBranchesAdapter.java | 2 +- .../GetDiffEntriesForCommitsAdapter.java | 43 +++++++++---------- 13 files changed, 74 insertions(+), 85 deletions(-) diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java index 60b61f33a..325c6b096 100644 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java +++ b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java @@ -9,7 +9,7 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -public class ProjectRoleValidatorTest { +class ProjectRoleValidatorTest { private final Validator validator = Validation.buildDefaultValidatorFactory().getValidator(); @Test diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetFileTreeForCommitAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetFileTreeForCommitAdapter.java index 959633205..c95b37627 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetFileTreeForCommitAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetFileTreeForCommitAdapter.java @@ -67,21 +67,18 @@ private void mergeSinglePaths(FileTree fileTree) { } private void addToTree(FileTree tree, List path) { - boolean found = false; if (tree.getChildren() == null) { - tree.setChildren(new ArrayList<>()); + tree.setChildren(new ArrayList<>(8)); } for (FileTree child : tree.getChildren()) { if (child.getPath().equals(path.get(0))) { - found = true; addToTree(child, path.subList(1, path.size())); + return; } } - if (!found) { - tree.getChildren().add(new FileTree(path.get(0), null)); - if (path.size() > 1) { - addToTree(tree, path); - } + tree.getChildren().add(new FileTree(path.get(0), null)); + if (path.size() > 1) { + addToTree(tree, path); } } } diff --git a/coderadar-plugins/checkstyle-analyzer-plugin/build.gradle b/coderadar-plugins/checkstyle-analyzer-plugin/build.gradle index 00da24840..92190f721 100644 --- a/coderadar-plugins/checkstyle-analyzer-plugin/build.gradle +++ b/coderadar-plugins/checkstyle-analyzer-plugin/build.gradle @@ -9,7 +9,7 @@ spotless { dependencies { compile group: 'commons-lang', name: 'commons-lang', version: '2.6' - compile group: 'com.puppycrawl.tools', name: 'checkstyle', version: '7.0' + compile group: 'com.puppycrawl.tools', name: 'checkstyle', version: '8.34' compile group: 'commons-io', name: 'commons-io', version: '2.4' compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.12' testCompile group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.7' diff --git a/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java b/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java index 7526fbfbf..99e8480de 100644 --- a/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java +++ b/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java @@ -93,7 +93,7 @@ private Configuration getConfigurationFromStream(InputStream in) throws Checksty return ConfigurationLoader.loadConfiguration( new InputSource(in), new CheckstylePropertiesResolver(new Properties()), // TODO: pass real properties - true); + null); } @Override diff --git a/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CoderadarAuditListener.java b/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CoderadarAuditListener.java index 8d7c55b8d..5686e4418 100644 --- a/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CoderadarAuditListener.java +++ b/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CoderadarAuditListener.java @@ -15,7 +15,7 @@ public class CoderadarAuditListener implements AuditListener { private FileMetrics metrics = new FileMetrics(); - private MetricCountExtractor metricCountExtractor = new MetricCountExtractor(); + private final MetricCountExtractor metricCountExtractor = new MetricCountExtractor(); @Override public void auditStarted(AuditEvent evt) { diff --git a/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/MetricCountExtractor.java b/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/MetricCountExtractor.java index 6761ac15e..a56efe84d 100644 --- a/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/MetricCountExtractor.java +++ b/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/MetricCountExtractor.java @@ -30,15 +30,11 @@ public class MetricCountExtractor { public Long extractMetricCount(AuditEvent event) { try { - if (event.getSourceName().equals(CyclomaticComplexityCheck.class.getName())) { - return extractLongArgument(event, 0); - } else if (event.getSourceName().equals(ReturnCountCheck.class.getName())) { - return extractLongArgument(event, 0); - } else if (event.getSourceName().equals(JavaNCSSCheck.class.getName())) { - return extractLongArgument(event, 0); - } else if (event.getSourceName().equals(NPathComplexityCheck.class.getName())) { - return extractLongArgument(event, 0); - } else if (event.getSourceName().equals(ExecutableStatementCountCheck.class.getName())) { + if (event.getSourceName().equals(CyclomaticComplexityCheck.class.getName()) + || event.getSourceName().equals(ReturnCountCheck.class.getName()) + || event.getSourceName().equals(JavaNCSSCheck.class.getName()) + || event.getSourceName().equals(NPathComplexityCheck.class.getName()) + || event.getSourceName().equals(ExecutableStatementCountCheck.class.getName())) { return extractLongArgument(event, 0); } diff --git a/coderadar-plugins/checkstyle-analyzer-plugin/src/main/resources/checkstyle.xml b/coderadar-plugins/checkstyle-analyzer-plugin/src/main/resources/checkstyle.xml index f5b9ef18e..3a6550848 100644 --- a/coderadar-plugins/checkstyle-analyzer-plugin/src/main/resources/checkstyle.xml +++ b/coderadar-plugins/checkstyle-analyzer-plugin/src/main/resources/checkstyle.xml @@ -8,7 +8,8 @@ If you set the basedir property below, then all reported file names will be relative to the specified directory. See http://checkstyle.sourceforge.net/5.x/config.html#Checker - --> + + --> @@ -56,6 +57,11 @@ + + + + + @@ -90,23 +96,16 @@ - - - + - + - - - - - @@ -359,4 +358,4 @@ - \ No newline at end of file + diff --git a/coderadar-plugins/checkstyle-analyzer-plugin/src/test/resources/checkstyle.xml b/coderadar-plugins/checkstyle-analyzer-plugin/src/test/resources/checkstyle.xml index 5c2a901cf..3a6550848 100644 --- a/coderadar-plugins/checkstyle-analyzer-plugin/src/test/resources/checkstyle.xml +++ b/coderadar-plugins/checkstyle-analyzer-plugin/src/test/resources/checkstyle.xml @@ -57,6 +57,11 @@ + + + + + @@ -91,9 +96,7 @@ - - - + @@ -101,13 +104,8 @@ - - - - - @@ -360,4 +358,4 @@ - \ No newline at end of file + diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectControllerTest.java index 3bf3f8e57..9a1f72d72 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetAvailableMetricsInProjectControllerTest.java @@ -66,7 +66,7 @@ void returnsNothingWhenNotAnalyzed() throws Exception { .andReturn(); List metrics = - fromJson(new TypeReference>() {}, result.getResponse().getContentAsString()); + fromJson(new TypeReference<>() {}, result.getResponse().getContentAsString()); Assertions.assertTrue(metrics.isEmpty()); } @@ -96,7 +96,7 @@ void returnsLocMetrics() throws Exception { .andReturn(); List metrics = - fromJson(new TypeReference>() {}, result.getResponse().getContentAsString()); + fromJson(new TypeReference<>() {}, result.getResponse().getContentAsString()); Assertions.assertEquals(4, metrics.size()); Assertions.assertTrue(metrics.contains("coderadar:size:eloc:java")); @@ -130,7 +130,7 @@ void returnsCheckstyleMetrics() throws Exception { .andReturn(); List metrics = - fromJson(new TypeReference>() {}, result.getResponse().getContentAsString()); + fromJson(new TypeReference<>() {}, result.getResponse().getContentAsString()); Assertions.assertTrue( metrics.contains( @@ -138,9 +138,6 @@ void returnsCheckstyleMetrics() throws Exception { Assertions.assertTrue( metrics.contains( "checkstyle:com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck")); - Assertions.assertTrue( - metrics.contains( - "checkstyle:com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck")); Assertions.assertTrue( metrics.contains( "checkstyle:com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck")); @@ -162,8 +159,6 @@ void returnsCheckstyleMetrics() throws Exception { Assertions.assertTrue( metrics.contains( "checkstyle:com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck")); - Assertions.assertTrue( - metrics.contains("checkstyle:com.puppycrawl.tools.checkstyle.checks.regexp.RegexpCheck")); } @Test @@ -200,7 +195,7 @@ void returnsLocAndCheckstyleMetrics() throws Exception { .andReturn(); List metrics = - fromJson(new TypeReference>() {}, result.getResponse().getContentAsString()); + fromJson(new TypeReference<>() {}, result.getResponse().getContentAsString()); Assertions.assertTrue(metrics.contains("coderadar:size:eloc:java")); Assertions.assertTrue(metrics.contains("coderadar:size:sloc:java")); @@ -212,9 +207,6 @@ void returnsLocAndCheckstyleMetrics() throws Exception { Assertions.assertTrue( metrics.contains( "checkstyle:com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck")); - Assertions.assertTrue( - metrics.contains( - "checkstyle:com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck")); Assertions.assertTrue( metrics.contains( "checkstyle:com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck")); @@ -236,8 +228,6 @@ void returnsLocAndCheckstyleMetrics() throws Exception { Assertions.assertTrue( metrics.contains( "checkstyle:com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck")); - Assertions.assertTrue( - metrics.contains("checkstyle:com.puppycrawl.tools.checkstyle.checks.regexp.RegexpCheck")); } @Test diff --git a/coderadar-ui/package-lock.json b/coderadar-ui/package-lock.json index 6c83ecb1f..caec96024 100644 --- a/coderadar-ui/package-lock.json +++ b/coderadar-ui/package-lock.json @@ -485,9 +485,19 @@ } }, "@angular/elements": { - "version": "9.1.4", - "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-9.1.4.tgz", - "integrity": "sha512-VXb+/eZv2x8CsDESnk8ICysDE3C2Htuj76WiG6NO4X1aX26XLTvnT5YLnOJ+8l8L88eh6s80Rphw6Gr6amUXHA==" + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-10.0.2.tgz", + "integrity": "sha512-ZYOuDojWJCCiRoZYXPtGhVVPT1y75V/wktzaMKLcNY/MxnJYW984i/Ynv7gdeqC8kvf0v1s0FkF7t1xndUwbCA==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", + "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" + } + } }, "@angular/flex-layout": { "version": "7.0.0-beta.24", @@ -7070,9 +7080,9 @@ } }, "moment": { - "version": "2.25.3", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz", - "integrity": "sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg==" + "version": "2.27.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz", + "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==" }, "move-concurrently": { "version": "1.0.1", diff --git a/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/ChangeTypeMapper.java b/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/ChangeTypeMapper.java index 2deba828c..4cc226396 100644 --- a/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/ChangeTypeMapper.java +++ b/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/ChangeTypeMapper.java @@ -5,6 +5,8 @@ public class ChangeTypeMapper { + private ChangeTypeMapper() {} + public static ChangeType jgitToCoderadar(DiffEntry.ChangeType changeType) { return ChangeType.valueOf(changeType.name()); } diff --git a/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetAvailableBranchesAdapter.java b/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetAvailableBranchesAdapter.java index 412d81d84..9f0302fc5 100644 --- a/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetAvailableBranchesAdapter.java +++ b/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetAvailableBranchesAdapter.java @@ -31,7 +31,7 @@ private List getBranches(Git git) throws GitAPIException { int length = branchName.length; String truncatedName = branchName[length - 1]; if (result.stream().noneMatch(branch -> branch.getName().equals(truncatedName))) { - result.add(new Branch().setName(truncatedName).setCommitHash(ref.getObjectId().getName())); + result.add(new Branch(truncatedName, ref.getObjectId().name())); } } return result; diff --git a/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetDiffEntriesForCommitsAdapter.java b/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetDiffEntriesForCommitsAdapter.java index 09ee50afc..5a8fef26e 100644 --- a/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetDiffEntriesForCommitsAdapter.java +++ b/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetDiffEntriesForCommitsAdapter.java @@ -23,8 +23,7 @@ public class GetDiffEntriesForCommitsAdapter implements GetDiffEntriesForCommits @Override public List getDiffs(String projectRoot, String commitName1, String commitName2) throws UnableToGetDiffsFromCommitsException { - try { - Git git = Git.open(new File(projectRoot)); + try (Git git = Git.open(new File(projectRoot))) { Repository repository = git.getRepository(); RevCommit commit1 = repository.parseCommit(ObjectId.fromString(commitName1)); RevCommit commit2 = repository.parseCommit(ObjectId.fromString(commitName2)); @@ -35,32 +34,30 @@ public List getDiffs(String projectRoot, String commitName1, String c commit2 = tmp; } - ObjectReader reader = git.getRepository().newObjectReader(); - CanonicalTreeParser oldTreeIter = new CanonicalTreeParser(); - ObjectId oldTree = commit1.getTree(); - oldTreeIter.reset(reader, oldTree); - CanonicalTreeParser newTreeIter = new CanonicalTreeParser(); - ObjectId newTree = commit2.getTree(); - newTreeIter.reset(reader, newTree); + + try (ObjectReader reader = git.getRepository().newObjectReader()) { + ObjectId oldTree = commit1.getTree(); + oldTreeIter.reset(reader, oldTree); + + ObjectId newTree = commit2.getTree(); + newTreeIter.reset(reader, newTree); + } DiffFormatter df = new DiffFormatter(new ByteArrayOutputStream()); df.setRepository(repository); - List entries = - df.scan(oldTreeIter, newTreeIter).stream() - .map( - diffEntry -> { - DiffEntry entry = new DiffEntry(); - entry.setNewPath(diffEntry.getNewPath()); - entry.setOldPath(diffEntry.getOldPath()); - entry.setChangeType( - ChangeTypeMapper.jgitToCoderadar(diffEntry.getChangeType()).ordinal()); - return entry; - }) - .collect(Collectors.toList()); - git.close(); - return entries; + return df.scan(oldTreeIter, newTreeIter).stream() + .map( + diffEntry -> { + DiffEntry entry = new DiffEntry(); + entry.setNewPath(diffEntry.getNewPath()); + entry.setOldPath(diffEntry.getOldPath()); + entry.setChangeType( + ChangeTypeMapper.jgitToCoderadar(diffEntry.getChangeType()).ordinal()); + return entry; + }) + .collect(Collectors.toList()); } catch (IOException e) { throw new UnableToGetDiffsFromCommitsException(e.getMessage()); } From ac6f8554bd998060bb7af7653d3bc6904732206c Mon Sep 17 00:00:00 2001 From: Kilian Krause Date: Mon, 6 Jul 2020 09:49:22 +0200 Subject: [PATCH 57/76] remove ProjectRoleValidator --- .../domain/ProjectRolePattern.java | 22 ----------- .../domain/ProjectRoleValidator.java | 19 ---------- .../ProjectRoleValidatorTest.java | 38 ------------------- 3 files changed, 79 deletions(-) delete mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRolePattern.java delete mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRoleValidator.java delete mode 100644 coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRolePattern.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRolePattern.java deleted file mode 100644 index 5bfc8c1dd..000000000 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRolePattern.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.reflectoring.coderadar.useradministration.domain; - -import static java.lang.annotation.ElementType.*; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; - -@Target({FIELD}) -@Retention(RetentionPolicy.RUNTIME) -@Constraint(validatedBy = ProjectRoleValidator.class) -public @interface ProjectRolePattern { - ProjectRole[] anyOf() default {ProjectRole.ADMIN, ProjectRole.MEMBER}; - - String message() default "must be any of {anyOf}"; - - Class[] groups() default {}; - - Class[] payload() default {}; -} diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRoleValidator.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRoleValidator.java deleted file mode 100644 index ef4f99ed6..000000000 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRoleValidator.java +++ /dev/null @@ -1,19 +0,0 @@ -package io.reflectoring.coderadar.useradministration.domain; - -import java.util.Arrays; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - -public class ProjectRoleValidator implements ConstraintValidator { - private ProjectRole[] projectRoles; - - @Override - public void initialize(ProjectRolePattern constraintAnnotation) { - this.projectRoles = constraintAnnotation.anyOf(); - } - - @Override - public boolean isValid(ProjectRole value, ConstraintValidatorContext context) { - return value == null || Arrays.asList(projectRoles).contains(value); - } -} diff --git a/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java b/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java deleted file mode 100644 index 325c6b096..000000000 --- a/coderadar-core/src/test/java/io/reflectoring/coderadar/useradministration/ProjectRoleValidatorTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package io.reflectoring.coderadar.useradministration; - -import io.reflectoring.coderadar.useradministration.domain.ProjectRole; -import io.reflectoring.coderadar.useradministration.domain.ProjectRolePattern; -import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Test; - -class ProjectRoleValidatorTest { - private final Validator validator = Validation.buildDefaultValidatorFactory().getValidator(); - - @Test - void acceptAdminRole() { - TestDto testDto = new TestDto(ProjectRole.ADMIN); - - Set> result = validator.validate(testDto); - Assertions.assertThat(result).isEmpty(); - } - - @Test - void acceptMemberRole() { - TestDto testDto = new TestDto(ProjectRole.MEMBER); - - Set> result = validator.validate(testDto); - Assertions.assertThat(result).isEmpty(); - } - - static class TestDto { - @ProjectRolePattern private final ProjectRole projectRole; - - TestDto(ProjectRole role) { - this.projectRole = role; - } - } -} From 6227d6bd2e5e380c75fc323873e3c038c1a8ce5b Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Mon, 6 Jul 2020 10:25:12 +0200 Subject: [PATCH 58/76] use only one tempDir for checkstyle and remove unnecessary database quering --- .../module/adapter/CreateModuleAdapter.java | 3 +-- .../graph/query/adapter/GetMetricTreeForCommitAdapter.java | 3 +-- .../checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java | 4 +++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/module/adapter/CreateModuleAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/module/adapter/CreateModuleAdapter.java index 0cab9f3cc..67c131bc3 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/module/adapter/CreateModuleAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/module/adapter/CreateModuleAdapter.java @@ -194,8 +194,7 @@ private String checkPathIsValid(String path, ProjectEntity projectEntity) } // Check if a module with the same path already exists. - for (ModuleEntity entity : - moduleRepository.findModulesInProjectSortedDesc(projectEntity.getId())) { + for (ModuleEntity entity : projectEntity.getModules()) { if (entity.getPath().equals(path)) { throw new ModuleAlreadyExistsException(path); } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetMetricTreeForCommitAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetMetricTreeForCommitAdapter.java index 32a941e77..1973986ed 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetMetricTreeForCommitAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetMetricTreeForCommitAdapter.java @@ -43,8 +43,7 @@ MetricTree get( } else { result = metricQueryRepository.getMetricTreeForCommit(project.getId(), commitHash, metrics); } - List moduleEntities = // project already has the modules?? - moduleRepository.findModulesInProjectSortedDesc(project.getId()); + List moduleEntities = project.getModules(); List moduleChildren = processModules(moduleEntities, result); MetricTree rootModule = processRootModule(result); rootModule.getChildren().addAll(findChildModules(project.getModules(), moduleChildren)); diff --git a/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java b/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java index 99e8480de..2fb45fb38 100644 --- a/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java +++ b/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java @@ -22,6 +22,8 @@ public class CheckstyleSourceCodeFileAnalyzerPlugin private CoderadarAuditListener auditListener; + private final File tempDir = Files.createTempDir(); + public CheckstyleSourceCodeFileAnalyzerPlugin() { try { init(createDefaultConfiguration()); @@ -71,7 +73,7 @@ public FileMetrics analyzeFile(String filepath, byte[] fileContent) throws Analy private File createTempFile(byte[] fileContent, String filename) throws IOException { String[] temp = filename.split("/"); - File file = new File(Files.createTempDir(), temp[temp.length - 1]); + File file = new File(tempDir, temp[temp.length - 1]); file.deleteOnExit(); try (FileOutputStream out = new FileOutputStream(file)) { out.write(fileContent); From 6675d8baf779d3b352c4a6aec1cd4fef2aaacb04 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Mon, 6 Jul 2020 10:45:49 +0200 Subject: [PATCH 59/76] remove unused moduleRepository field --- .../graph/query/adapter/GetMetricTreeForCommitAdapter.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetMetricTreeForCommitAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetMetricTreeForCommitAdapter.java index 1973986ed..d96582968 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetMetricTreeForCommitAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetMetricTreeForCommitAdapter.java @@ -2,7 +2,6 @@ import io.reflectoring.coderadar.graph.projectadministration.domain.ModuleEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; -import io.reflectoring.coderadar.graph.projectadministration.module.repository.ModuleRepository; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.graph.query.repository.MetricQueryRepository; import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException; @@ -22,15 +21,11 @@ public class GetMetricTreeForCommitAdapter implements GetMetricTreeForCommitPort private final MetricQueryRepository metricQueryRepository; private final ProjectRepository projectRepository; - private final ModuleRepository moduleRepository; public GetMetricTreeForCommitAdapter( - MetricQueryRepository metricQueryRepository, - ProjectRepository projectRepository, - ModuleRepository moduleRepository) { + MetricQueryRepository metricQueryRepository, ProjectRepository projectRepository) { this.metricQueryRepository = metricQueryRepository; this.projectRepository = projectRepository; - this.moduleRepository = moduleRepository; } MetricTree get( From ec62bb9b8313fb15bca1e607ab56f2b6feccc47a Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Mon, 6 Jul 2020 12:37:49 +0200 Subject: [PATCH 60/76] show when a file was deleted in the file browser --- .../GetFileContentWithMetricsService.java | 19 +++++++++++-------- .../ContributorQueryRepository.java | 2 +- .../repository/MetricQueryRepository.java | 2 +- .../src/app/service/contributor.service.ts | 2 ++ .../view/file-view/file-view.component.html | 7 +++++-- .../adapter/GetRawCommitContentAdapter.java | 8 +++++++- 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetFileContentWithMetricsService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetFileContentWithMetricsService.java index 7ad5554e2..da17f3607 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetFileContentWithMetricsService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/query/service/GetFileContentWithMetricsService.java @@ -37,13 +37,16 @@ public FileContentWithMetrics getFileContentWithMetrics( Project project = getProjectPort.get(projectId); String workdir = coderadarConfigurationProperties.getWorkdir() + "/projects/" + project.getWorkdirName(); - String content = - new String( - getRawCommitContentPort.getCommitContent( - workdir, command.getFilepath(), command.getCommitHash())); - List metrics = - getMetricsAndFindingsForFilePort.getMetricsAndFindingsForFile( - projectId, command.getCommitHash(), command.getFilepath()); - return new FileContentWithMetrics(content, metrics); + byte[] rawContent = + getRawCommitContentPort.getCommitContent( + workdir, command.getFilepath(), command.getCommitHash()); + if (rawContent != null) { + List metrics = + getMetricsAndFindingsForFilePort.getMetricsAndFindingsForFile( + projectId, command.getCommitHash(), command.getFilepath()); + return new FileContentWithMetrics(new String(rawContent), metrics); + } else { + return new FileContentWithMetrics("", null); + } } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/ContributorQueryRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/ContributorQueryRepository.java index 23f7b5dd8..45fb72a64 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/ContributorQueryRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/ContributorQueryRepository.java @@ -34,7 +34,7 @@ List getFilesWithContributors( + "CALL apoc.path.subgraphNodes(c, {relationshipFilter:'IS_CHILD_OF>'}) YIELD node WITH node as c " + "ORDER BY c.timestamp DESC WITH collect(c) as commits " + "CALL apoc.cypher.run('UNWIND commits as c OPTIONAL MATCH (f)-[:CHANGED_IN {changeType: \"DELETE\"}]->(c) " - + "RETURN collect(f) as deletes', {commits: commits}) YIELD value WITH commits, value.deletes as deletes " + + "RETURN collect(f) as deletes', {commits: commits, name: {1}}) YIELD value WITH commits, value.deletes as deletes " + "MATCH (p)-[:CONTAINS*1..]->(f)-[:RENAMED_FROM*0..]->(f2) WHERE ID(p) = {0} AND NOT f IN deletes " + "AND f.path = {2} WITH collect(f) + collect(f2) as files, commits " + "UNWIND commits as c " diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/MetricQueryRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/MetricQueryRepository.java index 58dfeaf61..636cefea7 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/MetricQueryRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/MetricQueryRepository.java @@ -161,7 +161,7 @@ List> getMetricsAndFindingsForCommitAndFilepath( */ @Query( "MATCH (p)-[:CONTAINS_COMMIT]->(c:CommitEntity) WHERE ID(p) = {0} AND c.name = {1} WITH c LIMIT 1 " - + "MATCH (f)-[r:CHANGED_IN]->(c) WHERE r.changeType <> \"DELETE\" " + + "MATCH (f)-[r:CHANGED_IN]->(c) " + "RETURN DISTINCT f.path as path") List getFilesChangedInCommit(long projectId, @NonNull String commitHash); } diff --git a/coderadar-ui/src/app/service/contributor.service.ts b/coderadar-ui/src/app/service/contributor.service.ts index aaa5bcc3a..8af18a7a2 100644 --- a/coderadar-ui/src/app/service/contributor.service.ts +++ b/coderadar-ui/src/app/service/contributor.service.ts @@ -18,6 +18,8 @@ export class ContributorService { {observe: 'response'}).toPromise(); } + + getContributorsForFile(projectId: number, path: string, commitHash: string): Promise> { return this.httpClient.post(this.apiURL + 'projects/' + projectId + '/contributors/path', {path, commitHash}, {observe: 'response'}).toPromise(); diff --git a/coderadar-ui/src/app/view/file-view/file-view.component.html b/coderadar-ui/src/app/view/file-view/file-view.component.html index 00ebd7ace..da2bfcee7 100644 --- a/coderadar-ui/src/app/view/file-view/file-view.component.html +++ b/coderadar-ui/src/app/view/file-view/file-view.component.html @@ -14,7 +14,7 @@ {{currentSelectedFilepath}}
-

+

Authored by:

@@ -26,7 +26,7 @@

-
+
@@ -55,6 +55,9 @@

+
+ File was deleted +
diff --git a/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetRawCommitContentAdapter.java b/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetRawCommitContentAdapter.java index 1d1971464..68bdca5fc 100644 --- a/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetRawCommitContentAdapter.java +++ b/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetRawCommitContentAdapter.java @@ -56,7 +56,13 @@ public byte[] getFileDiff(String projectRoot, String filepath, String commitHash } else { rt1 = new RawText(new byte[0]); } - RawText rt2 = new RawText(BlobUtils.getRawContent(git.getRepository(), commit, filepath)); + byte[] rawContent = BlobUtils.getRawContent(git.getRepository(), commit, filepath); + RawText rt2; + if (rawContent != null && rawContent.length != 0) { + rt2 = new RawText(BlobUtils.getRawContent(git.getRepository(), commit, filepath)); + } else { + rt2 = new RawText(new byte[] {'\n'}); + } ByteArrayOutputStream out = new ByteArrayOutputStream(); new DiffFormatter(out) .format(new HistogramDiff().diff(RawTextComparator.DEFAULT, rt1, rt2), rt1, rt2); From b36d3c17aac94e8bf2c603a912e41a1fbfcbb158 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov <32562426+maximAtanasov@users.noreply.github.com> Date: Mon, 6 Jul 2020 12:40:31 +0200 Subject: [PATCH 61/76] Update ContributorQueryRepository.java --- .../graph/query/repository/ContributorQueryRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/ContributorQueryRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/ContributorQueryRepository.java index 45fb72a64..23f7b5dd8 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/ContributorQueryRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/ContributorQueryRepository.java @@ -34,7 +34,7 @@ List getFilesWithContributors( + "CALL apoc.path.subgraphNodes(c, {relationshipFilter:'IS_CHILD_OF>'}) YIELD node WITH node as c " + "ORDER BY c.timestamp DESC WITH collect(c) as commits " + "CALL apoc.cypher.run('UNWIND commits as c OPTIONAL MATCH (f)-[:CHANGED_IN {changeType: \"DELETE\"}]->(c) " - + "RETURN collect(f) as deletes', {commits: commits, name: {1}}) YIELD value WITH commits, value.deletes as deletes " + + "RETURN collect(f) as deletes', {commits: commits}) YIELD value WITH commits, value.deletes as deletes " + "MATCH (p)-[:CONTAINS*1..]->(f)-[:RENAMED_FROM*0..]->(f2) WHERE ID(p) = {0} AND NOT f IN deletes " + "AND f.path = {2} WITH collect(f) + collect(f2) as files, commits " + "UNWIND commits as c " From d4034452b9f31c77842b237fe699c42cf18bf212 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Fri, 10 Jul 2020 12:03:35 +0200 Subject: [PATCH 62/76] apply review changes --- .../reflectoring/coderadar/app/Injector.java | 40 ---------- .../resources/application.properties.template | 2 +- .../analyzer/service/AnalyzingService.java | 56 +++++++------ .../coderadar/dependencymap/domain/Node.java | 50 +++++------- .../CreateAnalyzerConfigurationService.java | 6 +- .../DeleteAnalyzerConfigurationService.java | 6 +- .../UpdateAnalyzerConfigurationService.java | 6 +- .../domain/ProjectRole.java | 4 +- .../port/driven/AddTeamToProjectPort.java | 3 +- .../port/driven/AddUsersToTeamPort.java | 2 +- .../driven/RemoveUserFromProjectPort.java | 3 +- .../driven/SetUserRoleForProjectPort.java | 3 +- .../driver/CoderadarPasswordValidator.java | 3 - .../RemoveUserFromProjectUseCase.java | 3 +- .../SetUserRoleForProjectUseCase.java | 3 +- .../driver/teams/AddTeamToProjectUseCase.java | 3 +- .../driver/teams/AddUsersToTeamUseCase.java | 2 +- .../port/driven/GetRawCommitContentPort.java | 2 - .../adapter/DependencyCompareTreeAdapter.java | 46 +++++------ .../adapter/DependencyTreeAdapter.java | 7 +- .../dependencymap/analyzers/JavaAnalyzer.java | 23 +++--- .../dependencymap/JavaAnalyzerTest.java | 8 +- .../coderadar/dependencymap/NodeTest.java | 26 +++--- .../module/adapter/CreateModuleAdapter.java | 2 +- .../project/adapter/CommitAdapter.java | 8 +- .../project/repository/ProjectRepository.java | 8 +- .../adapter/GetCommitsInProjectAdapter.java | 9 +-- .../GetDeltaTreeForTwoCommitsAdapter.java | 25 +++--- .../adapter/GetFileTreeForCommitAdapter.java | 2 +- .../graph/query/adapter/PatternUtil.java | 8 +- .../adapter/ListProjectsForUserAdapter.java | 2 +- .../teams/ListProjectsForTeamAdapter.java | 2 +- .../GetContributorAdapterTest.java | 4 +- .../MergeContributorsAdapterTest.java | 4 +- .../UpdateContributorAdapterTest.java | 4 +- ...rConfigurationsFromProjectServiceTest.java | 2 +- ...pdateAnalyzerConfigurationAdapterTest.java | 1 - .../CreateFilePatternAdapterTest.java | 3 +- .../GetFilePatternAdapterTest.java | 2 +- .../ListModulesOfProjectAdapterTest.java | 2 +- .../project/ListProjectsAdapterTest.java | 4 +- .../project/UpdateProjectAdapterTest.java | 4 +- .../user/GetUserAdapterTest.java | 4 +- ...tAvailableMetricsInProjectAdapterTest.java | 6 +- .../plugin/api/FileMetricsWithChangeType.java | 46 ----------- .../coderadar/plugin/api/FileSetMetrics.java | 48 ----------- .../api/SourceCodeFileAnalyzerPlugin.java | 2 +- ...heckstyleSourceCodeFileAnalyzerPlugin.java | 2 +- .../CheckstylePropertiesResolverTest.java | 6 +- ...styleSourceCodeFileAnalyzerPluginTest.java | 6 +- .../checkstyle/ServiceLoaderTest.java | 4 +- .../coderadar/analyzer/loc/LineMarker.java | 13 +++ .../loc/{Loc.java => LinesOfCode.java} | 2 +- .../analyzer/loc/LocAnalyzerPlugin.java | 8 +- .../coderadar/analyzer/loc/LocCounter.java | 6 +- .../analyzer/loc/profiles/Profiles.java | 10 ++- ... LinesOfCodeAnalyzerPluginFilterTest.java} | 4 +- ...ava => LinesOfCodeAnalyzerPluginTest.java} | 4 +- .../analyzer/loc/ServiceLoaderTest.java | 4 +- .../loc/profiles/AbstractLocProfileTest.java | 4 +- .../loc/profiles/JavaLocProfileTest.java | 14 ++-- ...st.java => XmlLinesOfCodeProfileTest.java} | 14 ++-- ...DeleteAnalyzerConfigurationController.java | 2 +- .../RemoveUserFromProjectController.java | 7 +- .../ListProjectsForUserControllerTest.java | 5 +- .../RemoveUserFromProjectControllerTest.java | 2 +- .../ListProjectsForTeamControllerTest.java | 2 +- .../teams/ListTeamsForUserControllerTest.java | 15 +++- .../rest/IntegrationTestTemplate.java | 13 +++ .../PaySimProjectIntegrationTest.java | 5 +- ...ListAnalyzerControllerIntegrationTest.java | 6 +- .../rest/branches/DeleteBranchTest.java | 2 +- .../branches/ListBranchesControllerTest.java | 2 +- .../branches/SaveProjectWithBranchesTest.java | 4 +- ...tContributorControllerIntegrationTest.java | 4 +- ...ContributorsControllerIntegrationTest.java | 8 +- ...ContributorsControllerIntegrationTest.java | 4 +- ...eContributorControllerIntegrationTest.java | 4 +- .../rest/dependencymap/CompareTreeTest.java | 14 ++-- .../rest/dependencymap/TreeTest.java | 18 ++--- ...ListProjectsControllerIntegrationTest.java | 2 - .../query/GetCommitLogControllerTest.java | 2 +- .../query/GetCriticalFilesControllerTest.java | 12 +-- ...tFileContentWithMetricsControllerTest.java | 2 +- .../rest/query/GetFileDiffControllerTest.java | 2 +- .../GetFileTreeForCommitControllerTest.java | 2 +- ...jectsForUserControllerIntegrationTest.java | 2 - .../ListUsersControllerIntegrationTest.java | 1 - ...rsForProjectControllerIntegrationTest.java | 2 - .../LoginUserControllerIntegrationTest.java | 1 - ...rFromProjectControllerIntegrationTest.java | 2 - ...leForProjectControllerIntegrationTest.java | 2 - ...eamToProjectControllerIntegrationTest.java | 1 - ...dUsersToTeamControllerIntegrationTest.java | 1 - .../CreateTeamControllerIntegrationTest.java | 1 - .../DeleteTeamControllerIntegrationTest.java | 3 +- ...jectsForTeamControllerIntegrationTest.java | 1 - ...msForProjectControllerIntegrationTest.java | 1 - ...TeamsForUserControllerIntegrationTest.java | 6 +- ...mFromProjectControllerIntegrationTest.java | 1 - ...sersFromTeamControllerIntegrationTest.java | 1 - coderadar-ui/src/app/app.module.ts | 10 +-- .../src/app/city-map/VisualizationConfig.ts | 4 +- .../autosuggest-wrapper.component.ts | 35 ++++---- .../commit-chooser.component.ts | 28 ++++--- .../control-panel/control-panel.module.ts | 2 +- .../pipes/highlight-search.pipe.ts | 10 +-- .../control-panel/search/search.component.ts | 38 ++++----- .../app/city-map/helper/element-analyzer.ts | 14 ++-- .../src/app/city-map/interfaces/INode.ts | 2 +- .../interaction-handler.ts | 8 +- .../visualization/screen/screen.component.ts | 40 +++++----- .../dependency-base.ts | 34 ++++---- .../dependency-compare.component.spec.ts | 12 ++- .../dependency-root.component.spec.ts | 3 +- coderadar-ui/src/app/model/project-role.ts | 4 +- coderadar-ui/src/app/model/team.ts | 2 +- .../src/app/service/contributor.service.ts | 2 - .../src/app/service/project.service.ts | 5 +- coderadar-ui/src/app/service/team.service.ts | 38 ++++----- coderadar-ui/src/app/service/user.service.ts | 8 +- .../app/view/add-team/add-team.component.html | 1 + .../app/view/add-team/add-team.component.ts | 22 ++--- .../configure-project.component.ts | 36 +++++---- .../edit-project/edit-project.component.ts | 2 +- .../view/file-view/file-view.component.html | 42 +++++----- .../app/view/file-view/file-view.component.ts | 30 +++---- .../src/app/view/login/login.component.ts | 2 +- .../add-project-to-team-dialog-data.ts | 11 +++ .../add-project-to-team-dialog.component.ts | 29 +++++++ .../delete-project-dialog.component.ts | 26 ++++++ .../main-dashboard/delete-project-dialog.html | 2 +- .../main-dashboard.component.html | 2 +- .../main-dashboard.component.scss | 4 +- .../main-dashboard.component.spec.ts | 2 +- .../main-dashboard.component.ts | 80 +++---------------- .../list-view/list-view.component.ts | 6 +- .../project-dashboard.component.ts | 8 +- .../sidenav-content.component.html | 3 +- .../teams-dashboard.component.html | 4 +- .../teams-dashboard.component.ts | 14 ++-- .../view-commit/view-commit.component.html | 6 +- coderadar-ui/src/styles.scss | 2 - .../adapter/GetRawCommitContentAdapter.java | 12 +-- .../vcs/adapter/WalkCommitTreeAdapter.java | 4 +- .../adapter/CloneRepositoryAdapterTest.java | 4 +- .../ComputeContributorAdapterTest.java | 4 +- .../adapter/DeleteRepositoryAdapterTest.java | 4 +- 148 files changed, 650 insertions(+), 786 deletions(-) delete mode 100644 coderadar-app/src/main/java/io/reflectoring/coderadar/app/Injector.java delete mode 100644 coderadar-plugin-api/src/main/java/io/reflectoring/coderadar/plugin/api/FileMetricsWithChangeType.java delete mode 100644 coderadar-plugin-api/src/main/java/io/reflectoring/coderadar/plugin/api/FileSetMetrics.java rename coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/{Loc.java => LinesOfCode.java} (96%) rename coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/{LocAnalyzerPluginFilterTest.java => LinesOfCodeAnalyzerPluginFilterTest.java} (83%) rename coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/{LocAnalyzerPluginTest.java => LinesOfCodeAnalyzerPluginTest.java} (87%) rename coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/profiles/{XmlLocProfileTest.java => XmlLinesOfCodeProfileTest.java} (57%) create mode 100644 coderadar-ui/src/app/view/main-dashboard/add-project-to-team-dialog-data.ts create mode 100644 coderadar-ui/src/app/view/main-dashboard/add-project-to-team-dialog.component.ts create mode 100644 coderadar-ui/src/app/view/main-dashboard/delete-project-dialog.component.ts diff --git a/coderadar-app/src/main/java/io/reflectoring/coderadar/app/Injector.java b/coderadar-app/src/main/java/io/reflectoring/coderadar/app/Injector.java deleted file mode 100644 index d1ec87a80..000000000 --- a/coderadar-app/src/main/java/io/reflectoring/coderadar/app/Injector.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.reflectoring.coderadar.app; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.lang.NonNull; -import org.springframework.stereotype.Component; - -/** - * Helper class to make it possible to resolve {@link - * org.springframework.beans.factory.annotation.Autowired} annotations on beans that are not - * themselves part of the Spring application context. - */ -@Component -public class Injector implements ApplicationContextAware { - - private static ApplicationContext applicationContext; - - private static final Injector INSTANCE = new Injector(); - - private Injector() {} - - public static Injector getInstance() { - return INSTANCE; - } - - /** - * Resolves {@link org.springframework.beans.factory.annotation.Autowired} annotations on the - * fields of the given object and injects them with beans from the Spring application context. - * - * @param bean the bean whose fields to inject. - */ - public void inject(Object bean) { - applicationContext.getAutowireCapableBeanFactory().autowireBean(bean); - } - - @Override - public void setApplicationContext(@NonNull ApplicationContext applicationContext) { - Injector.applicationContext = applicationContext; - } -} diff --git a/coderadar-app/src/main/resources/application.properties.template b/coderadar-app/src/main/resources/application.properties.template index 19bf7e38b..9b3f5125f 100644 --- a/coderadar-app/src/main/resources/application.properties.template +++ b/coderadar-app/src/main/resources/application.properties.template @@ -11,7 +11,7 @@ coderadar.cors.enabled=true logging.level.io.reflectoring.coderadar=DEBUG logging.level.org.reflections=ERROR -logging.file=coderadar.log +logging.file.name=coderadar.log spring.data.neo4j.username=neo4j spring.data.neo4j.password=neo3j diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzingService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzingService.java index 69a41649f..09efc9241 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzingService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/analyzer/service/AnalyzingService.java @@ -140,44 +140,42 @@ private void startAnalyzingTask( */ private void zeroOutMissingMetrics( Commit commit, List metrics, Map> fileMetrics) { + for (FileToCommitRelationship relationship : commit.getTouchedFiles()) { - List values = fileMetrics.get(relationship.getFile().getId()); - if (values != null) { - for (MetricValue value : values) { - if (value.getValue() != 0 - && metrics.stream() - .noneMatch( - metricValue -> - metricValue.getName().equals(value.getName()) - && metricValue.getFileId() == value.getFileId())) { - metrics.add( - new MetricValue( - value.getName(), - 0L, - commit.getId(), - value.getFileId(), - Collections.emptyList())); - } + List values = + fileMetrics.getOrDefault(relationship.getFile().getId(), Collections.emptyList()); + + for (MetricValue value : values) { + if (value.getValue() != 0 + && metrics.stream() + .noneMatch( + metricValue -> + metricValue.getName().equals(value.getName()) + && metricValue.getFileId() == value.getFileId())) { + metrics.add( + new MetricValue( + value.getName(), 0L, commit.getId(), value.getFileId(), Collections.emptyList())); } } } + if (metrics.isEmpty()) { + return; + } metrics.sort(Comparator.comparingLong(MetricValue::getFileId)); - if (!metrics.isEmpty()) { - long fileId = metrics.get(0).getFileId(); - List metricsForFile = new ArrayList<>(); - for (MetricValue metricValue : metrics) { - if (metricValue.getValue() != 0) { - if (metricValue.getFileId() != fileId) { - fileMetrics.put(fileId, new ArrayList<>(metricsForFile)); - fileId = metricValue.getFileId(); - metricsForFile.clear(); - } - metricsForFile.add(metricValue); + long fileId = metrics.get(0).getFileId(); + List metricsForFile = new ArrayList<>(); + for (MetricValue metricValue : metrics) { + if (metricValue.getValue() != 0) { + if (metricValue.getFileId() != fileId) { + fileMetrics.put(fileId, new ArrayList<>(metricsForFile)); + fileId = metricValue.getFileId(); + metricsForFile.clear(); } + metricsForFile.add(metricValue); } - fileMetrics.put(fileId, metricsForFile); } + fileMetrics.put(fileId, metricsForFile); } /** diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/Node.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/Node.java index af371281a..71d6e8e48 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/Node.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/dependencymap/domain/Node.java @@ -1,8 +1,6 @@ package io.reflectoring.coderadar.dependencymap.domain; -import java.util.HashSet; -import java.util.List; -import java.util.Stack; +import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; import lombok.Getter; import lombok.Setter; @@ -94,10 +92,10 @@ public Node getNodeByPath(String nodePath) { if (nodePath == null || nodePath.equals("")) { return null; } - String[] path = nodePath.split("/"); + String[] pathSplit = nodePath.split("/"); Node tmp = this; // iterate over every part of the new path - for (String s : path) { + for (String s : pathSplit) { // if the Node-object already exists, iterate over it if (tmp.getChildByName(s) != null) { tmp = tmp.getChildByName(s); @@ -119,19 +117,16 @@ public Node createNodeByPath(String nodePath) { if (nodePath == null || nodePath.equals("")) { return null; } - String[] path = nodePath.split("/"); + String[] pathSplit = nodePath.split("/"); Node tmp = this; // iterate over every part of the new path int i = 0; - while (i < path.length) { - String s = path[i]; + while (i < pathSplit.length) { + String s = pathSplit[i]; // if the Node-object already exists, iterate over it if (tmp.getChildByName(s) != null) { tmp = tmp.getChildByName(s); } else { - // create new Node - // Node node = new Node(new ArrayList<>(), tmp.getPath() + "/" + s, s, - // packageName); Node node = new Node(s, tmp.getPath().equals("") ? s : tmp.getPath() + "/" + s, ""); tmp.addToChildren(node); tmp = node; @@ -179,19 +174,16 @@ public int countDependenciesOn(Node node) { */ public boolean hasDependencyOn(Node node) { for (NodeDTO dependency : dependencies) { - if (!this.hasChildren() && !node.hasChildren() || this.hasChildren() && !node.hasChildren()) { - if (dependency.getPath().equals(node.getPath())) { - return true; - } - } else if (!this.hasChildren() && node.hasChildren() - || this.hasChildren() && node.hasChildren()) { - if (dependency - .getPath() - .contains( - (node.getPackageName().equals("") ? node.getFilename() : node.getPackageName()) - .replaceAll("\\.", "/"))) { - return true; - } + if ((!node.hasChildren() && dependency.getPath().equals(node.getPath())) + || (node.hasChildren() + && dependency + .getPath() + .contains( + (node.getPackageName().equals("") + ? node.getFilename() + : node.getPackageName()) + .replaceAll("\\.", "/")))) { + return true; } } return false; @@ -227,13 +219,13 @@ public NodeDTO getDependencyByPath(String path) { * @param traverseInterface method to call. */ public void traversePost(TraverseInterface traverseInterface) { - Stack stack = new Stack<>(); + Deque stack = new ArrayDeque<>(); HashSet hash = new HashSet<>(); Node root = this; stack.push(root); while (!stack.isEmpty()) { root = stack.peek(); - if (root.children.size() == 0 || hash.contains(root)) { + if (root.children.isEmpty() || hash.contains(root)) { traverseInterface.traverseMethod(stack.pop()); } else { root.children.forEach(stack::push); @@ -249,11 +241,11 @@ public void traversePost(TraverseInterface traverseInterface) { */ public void traversePre(TraverseInterface traverseInterface) { Node root = this; - Stack stack = new Stack<>(); - stack.add(root); + Deque stack = new ArrayDeque<>(); + stack.push(root); while (!stack.isEmpty()) { - root = stack.pop(); + root = stack.removeLast(); stack.addAll(root.children); traverseInterface.traverseMethod(root); } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/CreateAnalyzerConfigurationService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/CreateAnalyzerConfigurationService.java index c99cf3333..bb82bcd5c 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/CreateAnalyzerConfigurationService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/CreateAnalyzerConfigurationService.java @@ -43,9 +43,9 @@ public Long create(CreateAnalyzerConfigurationCommand command, long projectId) { analyzerConfiguration.setAnalyzerName(command.getAnalyzerName()); Long id = createAnalyzerConfigurationPort.create(analyzerConfiguration, projectId); logger.info( - String.format( - "Added analyzerConfiguration %s for project with id %d", - analyzerConfiguration.getAnalyzerName(), projectId)); + "Added analyzerConfiguration {} for project with id {}", + analyzerConfiguration.getAnalyzerName(), + projectId); return id; } else { throw new AnalyzerConfigurationException( diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/DeleteAnalyzerConfigurationService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/DeleteAnalyzerConfigurationService.java index bd397ac0c..b00716608 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/DeleteAnalyzerConfigurationService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/DeleteAnalyzerConfigurationService.java @@ -29,8 +29,8 @@ public void deleteAnalyzerConfiguration(long id, long projectId) { getAnalyzerConfigurationPort.getAnalyzerConfiguration(id); port.deleteAnalyzerConfiguration(id); logger.info( - String.format( - "Deleted analyzerConfiguration %s for project with id %d", - analyzerConfiguration.getAnalyzerName(), projectId)); + "Deleted analyzerConfiguration {} for project with id {}", + analyzerConfiguration.getAnalyzerName(), + projectId); } } diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/UpdateAnalyzerConfigurationService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/UpdateAnalyzerConfigurationService.java index 2765ab04a..5773612d2 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/UpdateAnalyzerConfigurationService.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/projectadministration/service/analyzerconfig/UpdateAnalyzerConfigurationService.java @@ -52,9 +52,9 @@ public void update( analyzerConfiguration.setEnabled(command.isEnabled()); updateAnalyzerConfigurationPort.update(analyzerConfiguration); logger.info( - String.format( - "Updated analyzerConfiguration with id %d for project with id %d", - analyzerConfiguration.getId(), projectId)); + "Updated analyzerConfiguration with id {} for project with id {}", + analyzerConfiguration.getId(), + projectId); } else { throw new AnalyzerConfigurationException( "An analyzer with this name is already configured for the project!"); diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java index 56daa1860..b97bbd87f 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/domain/ProjectRole.java @@ -2,10 +2,10 @@ /** * ADMIN: - Can delete a project - Can remove users from a team - Can add users to a team - Can - * analyze an project - Can delete analysis results - Can configure file patterns, modules, + * analyze a project - Can delete analysis results - Can configure file patterns, modules, * analyzers, (merge contributors?) * - *

MEMBER: - Can analyze an project. + *

MEMBER: - Can analyze a project. */ public enum ProjectRole { ADMIN("admin"), diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java index 980144861..47a31adb9 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddTeamToProjectPort.java @@ -5,7 +5,8 @@ public interface AddTeamToProjectPort { /** - * Creates a team in the given project. + * Creates a team in the given project. If the team is already assigned to the project, the + * existing role is overwritten. * * @param projectId The id of the project. * @param teamId The team id. diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java index 3657d5114..7d2cf7342 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/AddUsersToTeamPort.java @@ -5,7 +5,7 @@ public interface AddUsersToTeamPort { /** - * Adds users to a team. + * Adds users to a team. If a user is already in the team nothing is changed. * * @param teamId The id of the team. * @param userIds The ids of the users. diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveUserFromProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveUserFromProjectPort.java index 340659e74..ae10d759a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveUserFromProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/RemoveUserFromProjectPort.java @@ -4,7 +4,8 @@ public interface RemoveUserFromProjectPort { /** * Removes the role a given user has to a project. If the user is not in any team with access to - * the project, they will no longer have access to the project. + * the project, they will no longer have access to the project. If the user is not assigned to the + * project, nothing is changed. * * @param projectId The id of the project. * @param userId The id of the user. diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java index ba0fa7140..b0e6cd7e3 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driven/SetUserRoleForProjectPort.java @@ -5,7 +5,8 @@ public interface SetUserRoleForProjectPort { /** - * Gives a user a role in the project. + * Gives a user a role in the project. If the user is already assigned to the project, the + * existing role is overwritten. * * @param projectId The id of the project. * @param userId The id of the user. diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/CoderadarPasswordValidator.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/CoderadarPasswordValidator.java index f649b02eb..c31884e81 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/CoderadarPasswordValidator.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/CoderadarPasswordValidator.java @@ -9,9 +9,6 @@ /** Validator for user passwords. */ public class CoderadarPasswordValidator implements ConstraintValidator { - @Override - public void initialize(ValidPassword constraintAnnotation) {} - @Override public boolean isValid(String value, ConstraintValidatorContext context) { if (value == null || value.isEmpty()) { diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/RemoveUserFromProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/RemoveUserFromProjectUseCase.java index 6cac0dd94..e57ed4cc6 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/RemoveUserFromProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/RemoveUserFromProjectUseCase.java @@ -4,7 +4,8 @@ public interface RemoveUserFromProjectUseCase { /** * Removes the role a given user has to a project. If the user is not in any team with access to - * the project, they will no longer have access to the project. + * the project, they will no longer have access to the project. If the user is not assigned to the + * project, nothing is changed. * * @param projectId The id of the project. * @param userId The id of the user. diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java index aa0a27b77..69ae3d44f 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/permissions/SetUserRoleForProjectUseCase.java @@ -5,7 +5,8 @@ public interface SetUserRoleForProjectUseCase { /** - * Gives a user a role in the project. + * Gives a user a role in the project. If the user is already assigned to the project, the + * existing role is overwritten. * * @param projectId The id of the project. * @param userId The id of the user. diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java index 27357c8e3..793805cea 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddTeamToProjectUseCase.java @@ -5,7 +5,8 @@ public interface AddTeamToProjectUseCase { /** - * Creates a team in the given project. + * Creates a team in the given project. If the team is already assigned to the project, the + * existing role is overwritten. * * @param projectId The id of the project. * @param teamId The id of the team. diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java index 009ea374e..0e50b3d09 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/port/driver/teams/AddUsersToTeamUseCase.java @@ -5,7 +5,7 @@ public interface AddUsersToTeamUseCase { /** - * Adds users to a team. + * Adds users to a team. If a user is already in the team nothing is changed. * * @param teamId The id of the team. * @param userIds The ids of the users. diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java index 8f48bf550..4e745c09a 100644 --- a/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java +++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/vcs/port/driven/GetRawCommitContentPort.java @@ -1,6 +1,5 @@ package io.reflectoring.coderadar.vcs.port.driven; -import io.reflectoring.coderadar.vcs.UnableToGetCommitContentException; import java.util.HashMap; import java.util.List; @@ -22,7 +21,6 @@ public interface GetRawCommitContentPort { * @param commitHash The commit hash * @return The diff against the same file in the parent commit or an empty array if the file does * not exist - * @throws UnableToGetCommitContentException Thrown if the commit is not found. */ byte[] getFileDiff(String projectRoot, String filepath, String commitHash); /** diff --git a/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/adapter/DependencyCompareTreeAdapter.java b/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/adapter/DependencyCompareTreeAdapter.java index e51ae7de3..9b5638e27 100644 --- a/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/adapter/DependencyCompareTreeAdapter.java +++ b/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/adapter/DependencyCompareTreeAdapter.java @@ -101,33 +101,31 @@ public CompareNode getRoot( // traverse to compare nodes and to set their level this.root.traversePost( node -> { - if (node.hasChildren()) { - node.getChildren().sort(new CompareNodeComparator()); - int level = 0; - CompareNode childI; - CompareNode childJ; - for (int i = 0; i < node.getChildren().size(); i++) { - childI = node.getChildren().get(i); - // for every child in the current layer check - for (int j = 0; j < node.getChildren().size(); j++) { - childJ = node.getChildren().get(j); - if (i == j) continue; - // if any child before this has a dependency on this - // or any child before has more dependencies on this than this has on any child - // before - // raise layer, break - if (childJ.hasDependencyOn(childI) && !childI.hasDependencyOn(childJ)) { - level = (level < childJ.getLevel() ? childJ.getLevel() + 1 : level + 1); - } else if (childJ.countDependenciesOn(childI) - > childI.countDependenciesOn(childJ)) { - level = (level < childJ.getLevel() ? childJ.getLevel() + 1 : level + 1); - } + if (!node.hasChildren()) { + return; + } + node.getChildren().sort(new CompareNodeComparator()); + int level = 0; + CompareNode childI; + CompareNode childJ; + for (int i = 0; i < node.getChildren().size(); i++) { + childI = node.getChildren().get(i); + // for every child in the current layer check + for (int j = 0; j < node.getChildren().size(); j++) { + childJ = node.getChildren().get(j); + // if any child before this has a dependency on this + // or any child before has more dependencies on this than this has on any child + // before + // raise layer, break + if (i != j && (childJ.hasDependencyOn(childI) && !childI.hasDependencyOn(childJ)) + || childJ.countDependenciesOn(childI) > childI.countDependenciesOn(childJ)) { + level = (level < childJ.getLevel() ? childJ.getLevel() + 1 : level + 1); } - childI.setLevel(level); - level = 0; } - node.getChildren().sort(Comparator.comparingInt(CompareNode::getLevel)); + childI.setLevel(level); + level = 0; } + node.getChildren().sort(Comparator.comparingInt(CompareNode::getLevel)); }); return root; } catch (UnableToGetDiffsFromCommitsException e) { diff --git a/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/adapter/DependencyTreeAdapter.java b/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/adapter/DependencyTreeAdapter.java index 24f23e2ea..cb9836a2f 100644 --- a/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/adapter/DependencyTreeAdapter.java +++ b/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/adapter/DependencyTreeAdapter.java @@ -88,15 +88,12 @@ public Node getRoot(String projectRoot, String commitName, String repoName) { // for every child in the current layer check for (int j = 0; j < node.getChildren().size(); j++) { childJ = node.getChildren().get(j); - if (i == j) continue; // if any child before this has a dependency on this // or any child before has more dependencies on this than this has on any child // before // raise layer, break - if (childJ.hasDependencyOn(childI) && !childI.hasDependencyOn(childJ)) { - level = (level < childJ.getLevel() ? childJ.getLevel() + 1 : level + 1); - } else if (childJ.countDependenciesOn(childI) - > childI.countDependenciesOn(childJ)) { + if (i != j && (childJ.hasDependencyOn(childI) && !childI.hasDependencyOn(childJ)) + || childJ.countDependenciesOn(childI) > childI.countDependenciesOn(childJ)) { level = (level < childJ.getLevel() ? childJ.getLevel() + 1 : level + 1); } } diff --git a/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/analyzers/JavaAnalyzer.java b/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/analyzers/JavaAnalyzer.java index 9e335d26d..dadc139b0 100644 --- a/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/analyzers/JavaAnalyzer.java +++ b/coderadar-dependency-map/src/main/java/io/reflectoring/coderadar/dependencymap/analyzers/JavaAnalyzer.java @@ -123,7 +123,7 @@ private String clearFileContent(final String fileContent) { */ public List getDependenciesFromImportLine(String line) { // possibilities for there to be more than one dependency in one line - // import org.somepackage.A a; import org.somepackage.B; + // import org.somepackage.A a; import org.somepackage.B; List foundDependencies = new ArrayList<>(); String lineString = line; while (lineString.contains(";")) { @@ -157,10 +157,9 @@ public List getDependenciesFromLine(String line) { while (separator != null) { Matcher fullyClassifiedMatcher = fullyClassifiedPattern.matcher(lineString); if (fullyClassifiedMatcher.find() - && !JavaUtils.isJavaKeyword(fullyClassifiedMatcher.group())) { - if (!foundDependencies.contains(fullyClassifiedMatcher.group())) { - foundDependencies.add(fullyClassifiedMatcher.group()); - } + && !JavaUtils.isJavaKeyword(fullyClassifiedMatcher.group()) + && !foundDependencies.contains(fullyClassifiedMatcher.group())) { + foundDependencies.add(fullyClassifiedMatcher.group()); } // split lineString at first found position of found separator lineString = lineString.substring(lineString.indexOf(separator) + separator.length()); @@ -184,7 +183,7 @@ public String getFirstSeparator(String toCheck) { int index = toCheck.length(); String separator = null; for (Map.Entry entry : separators.entrySet()) { - if (toCheck.contains("@") && entry.getValue()) { + if (toCheck.contains("@") && Boolean.TRUE.equals(entry.getValue())) { // entry is a regex Matcher matcher = cache.getPattern(entry.getKey()).matcher(toCheck); if (matcher.find()) { @@ -194,14 +193,12 @@ public String getFirstSeparator(String toCheck) { index = toCheck.indexOf(separator); } } - } else { + } else if (toCheck.contains(entry.getKey()) + && toCheck.indexOf(entry.getKey()) < index + && checkTmpString(entry.getKey(), toCheck)) { // entry is not a regex - if (toCheck.contains(entry.getKey()) - && toCheck.indexOf(entry.getKey()) < index - && checkTmpString(entry.getKey(), toCheck)) { - separator = entry.getKey(); - index = toCheck.indexOf(separator); - } + separator = entry.getKey(); + index = toCheck.indexOf(separator); } } return separator; diff --git a/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/JavaAnalyzerTest.java b/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/JavaAnalyzerTest.java index 4409368d1..9b6e73a17 100644 --- a/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/JavaAnalyzerTest.java +++ b/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/JavaAnalyzerTest.java @@ -96,7 +96,7 @@ public void setUp() { *

missing: RandomClass3, Annotation2, Annotation3 */ @Test - public void testGetValidImports() { + void testGetValidImports() { List imports = analyzer.getValidImports(fileContent); Assertions.assertEquals(50, imports.size()); Assertions.assertEquals("java.util.Objects", imports.get(0)); @@ -156,7 +156,7 @@ public void testGetValidImports() { } @Test - public void testGetFirstSeparator() { + void testGetFirstSeparator() { String test = "= ((ClassQ.isEmpty() && classR.isEmpty())"; // should return first '(' after ClassQ.isEmpty, because there is no potential import between // begin and all separators before that '(' @@ -164,7 +164,7 @@ public void testGetFirstSeparator() { } @Test - public void testDependencyStrings() { + void testDependencyStrings() { String line = "import org.wickedsource.dependencytree.sbdfjksbdf; import org.wickedsource.dependencytree.fhzgkobd;"; // should return first '(' after ClassQ.isEmpty, because there is no potential import between @@ -176,7 +176,7 @@ public void testDependencyStrings() { } @Test - public void testImportDependencyStrings() { + void testImportDependencyStrings() { String line = "ClassP b = ((ClassQ.isEmpty() && classR.isEmpty()) || classS.isEmpty || ((classT.size > classU.size) && classV.size < classW.size)) ? ClassX.get : classY.get;"; // should return first '(' after ClassQ.isEmpty, because there is no potential import between diff --git a/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/NodeTest.java b/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/NodeTest.java index e89d4d8f7..963885574 100644 --- a/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/NodeTest.java +++ b/coderadar-dependency-map/src/test/java/io/reflectoring/coderadar/dependencymap/NodeTest.java @@ -10,7 +10,7 @@ @TestInstance(TestInstance.Lifecycle.PER_CLASS) @ExtendWith(MockitoExtension.class) -public class NodeTest { +class NodeTest { private Node testRoot; @@ -38,32 +38,32 @@ public void init() { } @Test - public void testGetNodeByPath() { + void testGetNodeByPath() { Node test = testRoot.getNodeByPath("testNode1_2/testNode2_4"); Assertions.assertNotNull(test); Assertions.assertEquals("testNode2_4", test.getFilename()); } @Test - public void testGetNodeByPathEmptyString() { + void testGetNodeByPathEmptyString() { Node empty = testRoot.getNodeByPath(""); Assertions.assertNull(empty); } @Test - public void testGetNodeByPathInvalidString() { + void testGetNodeByPathInvalidString() { Node empty = testRoot.getNodeByPath("jhsbdlfjs"); Assertions.assertNull(empty); } @Test - public void testGetNodeByPathNull() { + void testGetNodeByPathNull() { Node empty = testRoot.getNodeByPath(null); Assertions.assertNull(empty); } @Test - public void testCreateNodeByPath() { + void testCreateNodeByPath() { Node testRoot = new Node("testRoot", "", ""); testRoot.createNodeByPath("testNode1_5/testNode2_5/testNode3_1"); @@ -77,19 +77,19 @@ public void testCreateNodeByPath() { } @Test - public void testCreateNodeByPathEmptyString() { + void testCreateNodeByPathEmptyString() { Node empty = testRoot.createNodeByPath(""); Assertions.assertNull(empty); } @Test - public void testCreateNodeByPathNull() { + void testCreateNodeByPathNull() { Node empty = testRoot.createNodeByPath(null); Assertions.assertNull(empty); } @Test - public void testTraversePre() { + void testTraversePre() { Assertions.assertNotNull(testRoot); StringBuilder traversed = new StringBuilder(); testRoot.traversePre(node -> traversed.append(node.getFilename()).append("\n")); @@ -108,7 +108,7 @@ public void testTraversePre() { } @Test - public void testTraversePost() { + void testTraversePost() { Assertions.assertNotNull(testRoot); StringBuilder traversed = new StringBuilder(); testRoot.traversePost(node -> traversed.append(node.getFilename()).append("\n")); @@ -127,7 +127,7 @@ public void testTraversePost() { } @Test - public void testGetParent() { + void testGetParent() { Assertions.assertNotNull(testRoot); Node testNode2_1 = testRoot.getNodeByPath("testNode1_1/testNode2_1"); Assertions.assertNotNull(testNode2_1); @@ -136,14 +136,14 @@ public void testGetParent() { } @Test - public void testGetParentRootChild() { + void testGetParentRootChild() { Assertions.assertNotNull(testRoot); Assertions.assertEquals( "testRoot", testRoot.getNodeByPath("testNode1_1").getParent(testRoot).getFilename()); } @Test - public void testGetParentRoot() { + void testGetParentRoot() { Assertions.assertNotNull(testRoot); Assertions.assertNull(testRoot.getParent(testRoot)); } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/module/adapter/CreateModuleAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/module/adapter/CreateModuleAdapter.java index 67c131bc3..4aee2b730 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/module/adapter/CreateModuleAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/module/adapter/CreateModuleAdapter.java @@ -179,7 +179,7 @@ private List findChildModules(List modules, String p * @return The corrected path. */ private String checkPathIsValid(String path, ProjectEntity projectEntity) - throws ModulePathInvalidException, ModuleAlreadyExistsException { + throws ModulePathInvalidException { path = path.trim(); if (path.contains("//")) { diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/adapter/CommitAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/adapter/CommitAdapter.java index b81b0b2b3..24cf5181d 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/adapter/CommitAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/adapter/CommitAdapter.java @@ -276,9 +276,7 @@ public void addCommits(long projectId, List commits, List update // Get all of the existing commits and save them in a map Map walkedCommits = new HashMap<>(); IdentityHashMap walkedFiles = new IdentityHashMap<>(); - for (CommitEntity c : commitRepository.findByProjectId(projectId)) { - walkedCommits.put(c.getName(), c); - } + commitRepository.findByProjectId(projectId).forEach(c -> walkedCommits.put(c.getName(), c)); // Remove any already existing commits from the new commits passed into this method commits.removeIf(commit -> walkedCommits.containsKey(commit.getName())); @@ -290,9 +288,7 @@ public void addCommits(long projectId, List commits, List update for (Commit commit : commits) { CommitEntity commitEntity = commitBaseDataMapper.mapDomainObject(commit); List parents = new ArrayList<>(commit.getParents().size()); - for (Commit parent : commit.getParents()) { - parents.add(walkedCommits.get(parent.getName())); - } + commit.getParents().forEach(parent -> parents.add(walkedCommits.get(parent.getName()))); commitEntity.setParents(parents); walkedCommits.put(commitEntity.getName(), commitEntity); diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java index bbedb42e6..3d9c4ab63 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/repository/ProjectRepository.java @@ -165,7 +165,7 @@ public interface ProjectRepository extends Neo4jRepository /** * @param userId The user id. - * @return All the project a user is assigned to. + * @return All projects a user is assigned to. */ @Query( "MATCH (u:UserEntity) WHERE ID(u) = {0} WITH u " @@ -173,12 +173,12 @@ public interface ProjectRepository extends Neo4jRepository + "WITH p1, u " + "MATCH (p2:ProjectEntity)<-[:ASSIGNED_TO*0..1]-(t)<-[:IS_IN*0..1]-(u) WHERE p2.isBeingDeleted = FALSE WITH collect(p1) + collect(p2) as list " + "UNWIND list AS p RETURN DISTINCT p ORDER BY p.name") - List findProjectsByUsedId(long userId); + List findProjectsByUserId(long userId); /** * @param teamId The team id. - * @return All the project a team is assigned to. + * @return All projects a team is assigned to. */ @Query("MATCH (t)-[:ASSIGNED_TO]->(p) WHERE ID(t) = {0} AND p.isBeingDeleted = FALSE RETURN p") - List listProjectByTeamId(long teamId); + List listProjectsByTeamId(long teamId); } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetCommitsInProjectAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetCommitsInProjectAdapter.java index ca2613cad..51a008329 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetCommitsInProjectAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetCommitsInProjectAdapter.java @@ -72,13 +72,8 @@ private List mapCommitEntitiesNoParents(List> commit continue; } FileToCommitRelationship fileToCommitRelationship = new FileToCommitRelationship(); - File file = walkedFiles.get(fileId); - if (file == null) { - file = new File(); - file.setId(fileId); - file.setPath(filepath); - walkedFiles.put(fileId, file); - } + File file = + walkedFiles.computeIfAbsent(fileId, id -> new File().setId(id).setPath(filepath)); fileToCommitRelationship.setFile(file); commit.getTouchedFiles().add(fileToCommitRelationship); } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetDeltaTreeForTwoCommitsAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetDeltaTreeForTwoCommitsAdapter.java index 8cbf1c4cb..fdf865722 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetDeltaTreeForTwoCommitsAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetDeltaTreeForTwoCommitsAdapter.java @@ -117,20 +117,19 @@ private DeltaTree createDeltaTree( deltaTree.setType(commit2Tree.getType()); deltaTree.setCommit1Metrics(commit1Tree.getMetrics()); deltaTree.setCommit2Metrics(commit2Tree.getMetrics()); + int tree1Counter = 0; int tree2Counter = 0; - while (tree1Counter < commit1Tree.getChildren().size() - || tree2Counter < commit2Tree.getChildren().size()) { + int commit1ChildrenSize = commit1Tree.getChildren().size(); + int commit2ChildrenSize = commit2Tree.getChildren().size(); + + while (tree1Counter < commit1ChildrenSize || tree2Counter < commit2ChildrenSize) { MetricTree metricTree2 = - tree2Counter < commit2Tree.getChildren().size() - ? commit2Tree.getChildren().get(tree2Counter) - : null; + tree2Counter < commit2ChildrenSize ? commit2Tree.getChildren().get(tree2Counter) : null; MetricTree metricTree1 = - tree1Counter < commit1Tree.getChildren().size() - ? commit1Tree.getChildren().get(tree1Counter) - : null; + tree1Counter < commit1ChildrenSize ? commit1Tree.getChildren().get(tree1Counter) : null; if (getChangeType(metricTree1, metricTree2).equals(ChangeType.MODIFY)) { if (Objects.requireNonNull(metricTree1).getType().equals(MetricTreeNodeType.MODULE) @@ -143,22 +142,22 @@ private DeltaTree createDeltaTree( .getChildren() .add(createFileNode(metricTree1, Objects.requireNonNull(metricTree2))); } - tree1Counter++; - tree2Counter++; + ++tree1Counter; + ++tree2Counter; } else if (getChangeType(metricTree1, metricTree2).equals(ChangeType.DELETE)) { deltaTree.getChildren().add(createDeletedFileNode(Objects.requireNonNull(metricTree1))); removedFiles.add(metricTree1.getName()); - tree1Counter++; + ++tree1Counter; } else { if (Objects.requireNonNull(metricTree2).getType().equals(MetricTreeNodeType.MODULE) && metricTree1 != null) { deltaTree.getChildren().add(createAddedFileNode(metricTree1)); addedFiles.add(metricTree1.getName()); - tree1Counter++; + ++tree1Counter; } else { deltaTree.getChildren().add(createAddedFileNode(metricTree2)); addedFiles.add(metricTree2.getName()); - tree2Counter++; + ++tree2Counter; } } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetFileTreeForCommitAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetFileTreeForCommitAdapter.java index c95b37627..bd6bee1a7 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetFileTreeForCommitAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/GetFileTreeForCommitAdapter.java @@ -68,7 +68,7 @@ private void mergeSinglePaths(FileTree fileTree) { private void addToTree(FileTree tree, List path) { if (tree.getChildren() == null) { - tree.setChildren(new ArrayList<>(8)); + tree.setChildren(new ArrayList<>()); } for (FileTree child : tree.getChildren()) { if (child.getPath().equals(path.get(0))) { diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/PatternUtil.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/PatternUtil.java index b374c0a30..90e10155c 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/PatternUtil.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/adapter/PatternUtil.java @@ -19,11 +19,7 @@ private PatternUtil() {} private static final String SLASHY = "[\\\\/]"; private static final String NOT_SLASHY = "[^\\\\/]"; - public static Pattern toPattern(String line) { - return toPattern(line, 0); - } - - public static Pattern toPattern(String line, int flags) { + private static Pattern toPattern(String line) { line = line.trim(); int strLen = line.length(); StringBuilder sb = new StringBuilder(strLen << 2); @@ -85,7 +81,7 @@ public static Pattern toPattern(String line, int flags) { } previousChar = currentChar; } - return Pattern.compile(sb.toString(), flags); + return Pattern.compile(sb.toString(), 0); } /** diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java index 06bdea9f7..d43dd70f5 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/ListProjectsForUserAdapter.java @@ -19,6 +19,6 @@ public ListProjectsForUserAdapter(ProjectRepository projectRepository) { @Override public List listProjects(long userId) { - return projectMapper.mapNodeEntities(projectRepository.findProjectsByUsedId(userId)); + return projectMapper.mapNodeEntities(projectRepository.findProjectsByUserId(userId)); } } diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java index c57c75c2d..023bb2cf2 100644 --- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java +++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/useradministration/adapter/teams/ListProjectsForTeamAdapter.java @@ -19,6 +19,6 @@ public ListProjectsForTeamAdapter(ProjectRepository projectRepository) { @Override public List listProjects(long teamId) { - return projectMapper.mapNodeEntities(projectRepository.listProjectByTeamId(teamId)); + return projectMapper.mapNodeEntities(projectRepository.listProjectsByTeamId(teamId)); } } diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/contributor/GetContributorAdapterTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/contributor/GetContributorAdapterTest.java index 0185c10d9..e3fd46f86 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/contributor/GetContributorAdapterTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/contributor/GetContributorAdapterTest.java @@ -14,7 +14,7 @@ import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) -public class GetContributorAdapterTest { +class GetContributorAdapterTest { private GetContributorAdapter getContributorAdapter; @Mock private ContributorRepository contributorRepository; @@ -25,7 +25,7 @@ public void setup() { } @Test - public void throwsExceptionIfContributorDoesNotExist() { + void throwsExceptionIfContributorDoesNotExist() { when(contributorRepository.findById(10L)).thenReturn(Optional.empty()); Assertions.assertThrows( diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/contributor/MergeContributorsAdapterTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/contributor/MergeContributorsAdapterTest.java index 18a3c59fa..6256a8cbb 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/contributor/MergeContributorsAdapterTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/contributor/MergeContributorsAdapterTest.java @@ -17,7 +17,7 @@ import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) -public class MergeContributorsAdapterTest { +class MergeContributorsAdapterTest { private MergeContributorsAdapter mergeContributorsAdapter; @Mock private ContributorRepository contributorRepository; @@ -28,7 +28,7 @@ public void setup() { } @Test - public void mergeTwoContributorsSuccessfully() { + void mergeTwoContributorsSuccessfully() { ContributorEntity contributor1 = new ContributorEntity(); contributor1.setId(1L); contributor1.setDisplayName("Max"); diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/contributor/UpdateContributorAdapterTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/contributor/UpdateContributorAdapterTest.java index e30544021..3bcf500ca 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/contributor/UpdateContributorAdapterTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/contributor/UpdateContributorAdapterTest.java @@ -15,7 +15,7 @@ import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) -public class UpdateContributorAdapterTest { +class UpdateContributorAdapterTest { private UpdateContributorAdapter updateContributorAdapter; @Mock private ContributorRepository contributorRepository; @@ -26,7 +26,7 @@ public void setup() { } @Test - public void updateDisplayName() { + void updateDisplayName() { ContributorEntity contributor = new ContributorEntity(); contributor.setId(1L); contributor.setDisplayName("Test"); diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java index 2a48ae205..a9a7ed179 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/ListAnalyzerConfigurationsFromProjectServiceTest.java @@ -37,7 +37,7 @@ void shouldReturnEmptyListWhenNoAnalyzerConfigurationsInTheProjectExist() { Iterable configurations = getAnalyzerConfigurationsFromProjectAdapter.listAnalyzerConfigurations(1L); verify(analyzerConfigurationRepository, times(1)).findByProjectId(1L); - Assertions.assertThat(configurations).hasSize(0); + Assertions.assertThat(configurations).isEmpty(); } @Test diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationAdapterTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationAdapterTest.java index 2234579a6..987f138ee 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationAdapterTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/analyzerconfig/UpdateAnalyzerConfigurationAdapterTest.java @@ -59,6 +59,5 @@ void shouldUpdateAnalyzerConfigurationWhenAAnalyzerConfigurationWithThePassingId updateAnalyzerConfigurationAdapter.update(newItem); verify(analyzerConfigurationRepository, times(1)).save(mockedItem); - Assertions.assertNotEquals(mockedOldItem, newItem); } } diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/CreateFilePatternAdapterTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/CreateFilePatternAdapterTest.java index 839e54acd..aa85a2319 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/CreateFilePatternAdapterTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/CreateFilePatternAdapterTest.java @@ -34,7 +34,6 @@ void shouldReturnLongWhenPassingAValidArgument() { .thenReturn(java.util.Optional.of(new ProjectEntity())); when(filePatternRepository.save(any())).thenReturn(filePatternEntity); Long returnedId = createFilePatternAdapter.createFilePattern(filePattern, 1L); - Assertions.assertThat(returnedId).isNotNull(); - Assertions.assertThat(returnedId).isEqualTo(2L); + Assertions.assertThat(returnedId).isNotNull().isEqualTo(2L); } } diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/GetFilePatternAdapterTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/GetFilePatternAdapterTest.java index cf2893720..c0860d2c3 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/GetFilePatternAdapterTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/filepattern/GetFilePatternAdapterTest.java @@ -15,7 +15,7 @@ import org.junit.jupiter.api.Test; @DisplayName("Get file pattern") -public class GetFilePatternAdapterTest { +class GetFilePatternAdapterTest { private FilePatternRepository filePatternRepository = mock(FilePatternRepository.class); @Test diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/module/ListModulesOfProjectAdapterTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/module/ListModulesOfProjectAdapterTest.java index dbe16c6a2..4b7dfcbf2 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/module/ListModulesOfProjectAdapterTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/module/ListModulesOfProjectAdapterTest.java @@ -33,7 +33,7 @@ void shouldReturnEmptyListWhenNoModulesInTheProjectExist() { Iterable modules = listModulesOfProjectAdapter.listModules(1L); verify(moduleRepository, times(1)).findModulesInProjectSortedDesc(1L); - Assertions.assertThat(modules).hasSize(0); + Assertions.assertThat(modules).isEmpty(); } @Test diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/project/ListProjectsAdapterTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/project/ListProjectsAdapterTest.java index 3eed6a0d9..fc5defd4a 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/project/ListProjectsAdapterTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/project/ListProjectsAdapterTest.java @@ -15,7 +15,7 @@ @DisplayName("List projects") class ListProjectsAdapterTest { - private ProjectRepository projectRepository = mock(ProjectRepository.class); + private final ProjectRepository projectRepository = mock(ProjectRepository.class); private ListProjectsAdapter listProjectsAdapter; @@ -31,7 +31,7 @@ void shouldReturnEmptyListWhenNoProjectsExist() { List projects = listProjectsAdapter.getProjects(); verify(projectRepository, times(1)).findAll(); - Assertions.assertThat(projects).hasSize(0); + Assertions.assertThat(projects).isEmpty(); } @Test diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/project/UpdateProjectAdapterTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/project/UpdateProjectAdapterTest.java index b79f43091..13c2417e0 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/project/UpdateProjectAdapterTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/project/UpdateProjectAdapterTest.java @@ -7,14 +7,13 @@ import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; import io.reflectoring.coderadar.projectadministration.domain.Project; import java.util.Optional; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @DisplayName("Update project") class UpdateProjectAdapterTest { - private ProjectRepository projectRepository = mock(ProjectRepository.class); + private final ProjectRepository projectRepository = mock(ProjectRepository.class); private UpdateProjectAdapter updateProjectAdapter; @@ -42,6 +41,5 @@ void shouldUpdateProjectWhenAProjectWithThePassingIdExists() { updateProjectAdapter.update(project); verify(projectRepository, times(1)).save(mockedItem); - Assertions.assertNotEquals(mockedOldItem, project); } } diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/user/GetUserAdapterTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/user/GetUserAdapterTest.java index 1671a1105..7deb893fd 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/user/GetUserAdapterTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/projectadministration/user/GetUserAdapterTest.java @@ -14,8 +14,8 @@ import org.mockito.Mockito; @DisplayName("Load user") -public class GetUserAdapterTest { - private UserRepository userRepository = mock(UserRepository.class); +class GetUserAdapterTest { + private final UserRepository userRepository = mock(UserRepository.class); @Test @DisplayName("Should return user when passing valid argument") diff --git a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/query/GetAvailableMetricsInProjectAdapterTest.java b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/query/GetAvailableMetricsInProjectAdapterTest.java index b39b052f4..a55fb741b 100644 --- a/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/query/GetAvailableMetricsInProjectAdapterTest.java +++ b/coderadar-graph/src/test/java/io/reflectoring/coderadar/graph/query/GetAvailableMetricsInProjectAdapterTest.java @@ -16,8 +16,8 @@ @DisplayName("Get available metrics in project") class GetAvailableMetricsInProjectAdapterTest { - private ProjectRepository projectRepository = mock(ProjectRepository.class); - private MetricQueryRepository metricQueryRepository = mock(MetricQueryRepository.class); + private final ProjectRepository projectRepository = mock(ProjectRepository.class); + private final MetricQueryRepository metricQueryRepository = mock(MetricQueryRepository.class); private GetAvailableMetricsInProjectAdapter getAvailableMetricsInProjectAdapter; @@ -37,7 +37,7 @@ void shouldReturnEmptyListOfStringsWhenNoMetricsAreAvailable() { List returnedMetrics = getAvailableMetricsInProjectAdapter.get(1L); - assertThat(returnedMetrics).hasSize(0); + assertThat(returnedMetrics).isEmpty(); } @Test diff --git a/coderadar-plugin-api/src/main/java/io/reflectoring/coderadar/plugin/api/FileMetricsWithChangeType.java b/coderadar-plugin-api/src/main/java/io/reflectoring/coderadar/plugin/api/FileMetricsWithChangeType.java deleted file mode 100644 index 1e22fd233..000000000 --- a/coderadar-plugin-api/src/main/java/io/reflectoring/coderadar/plugin/api/FileMetricsWithChangeType.java +++ /dev/null @@ -1,46 +0,0 @@ -package io.reflectoring.coderadar.plugin.api; - -public class FileMetricsWithChangeType extends FileMetrics { - - private ChangeType changeType; - - public FileMetricsWithChangeType() { - } - - public FileMetricsWithChangeType(ChangeType changeType) { - this.changeType = changeType; - } - - public FileMetricsWithChangeType(FileMetrics copyFrom, ChangeType changeType) { - super(copyFrom); - this.changeType = changeType; - } - - public ChangeType getChangeType() { - return changeType; - } - - public void setChangeType(ChangeType changeType) { - this.changeType = changeType; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; - - FileMetricsWithChangeType that = (FileMetricsWithChangeType) o; - - if (changeType != that.changeType) return false; - - return true; - } - - @Override - public int hashCode() { - int result = super.hashCode(); - result = 31 * result + (changeType != null ? changeType.hashCode() : 0); - return result; - } -} diff --git a/coderadar-plugin-api/src/main/java/io/reflectoring/coderadar/plugin/api/FileSetMetrics.java b/coderadar-plugin-api/src/main/java/io/reflectoring/coderadar/plugin/api/FileSetMetrics.java deleted file mode 100644 index 586cdf298..000000000 --- a/coderadar-plugin-api/src/main/java/io/reflectoring/coderadar/plugin/api/FileSetMetrics.java +++ /dev/null @@ -1,48 +0,0 @@ -package io.reflectoring.coderadar.plugin.api; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -/** - * Stores metrics to each of a set of files. - */ -public class FileSetMetrics { - - private Map metrics = new HashMap<>(); - - public FileMetrics getFileMetrics(String file) { - return metrics.get(file); - } - - public void addMetricsToFile(String file, FileMetrics metrics) { - FileMetrics fileMetrics = this.metrics.get(file); - if (fileMetrics == null) { - this.metrics.put(file, metrics); - } else { - fileMetrics = this.metrics.get(file); - fileMetrics.add(metrics); - } - } - - public Set getFiles() { - return metrics.keySet(); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - FileSetMetrics that = (FileSetMetrics) o; - - if (metrics != null ? !metrics.equals(that.metrics) : that.metrics != null) return false; - - return true; - } - - @Override - public int hashCode() { - return metrics != null ? metrics.hashCode() : 0; - } -} diff --git a/coderadar-plugin-api/src/main/java/io/reflectoring/coderadar/plugin/api/SourceCodeFileAnalyzerPlugin.java b/coderadar-plugin-api/src/main/java/io/reflectoring/coderadar/plugin/api/SourceCodeFileAnalyzerPlugin.java index 838acd70c..02791fc6a 100644 --- a/coderadar-plugin-api/src/main/java/io/reflectoring/coderadar/plugin/api/SourceCodeFileAnalyzerPlugin.java +++ b/coderadar-plugin-api/src/main/java/io/reflectoring/coderadar/plugin/api/SourceCodeFileAnalyzerPlugin.java @@ -20,5 +20,5 @@ public interface SourceCodeFileAnalyzerPlugin extends AnalyzerPlugin { * @param fileContent the content of the file. * @return a set of metric values calculated for the given file. */ - FileMetrics analyzeFile(String filename, byte[] fileContent) throws AnalyzerException; + FileMetrics analyzeFile(String filename, byte[] fileContent); } diff --git a/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java b/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java index 2fb45fb38..f8dd688da 100644 --- a/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java +++ b/coderadar-plugins/checkstyle-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPlugin.java @@ -55,7 +55,7 @@ private Configuration createDefaultConfiguration() throws CheckstyleException { } @Override - public FileMetrics analyzeFile(String filepath, byte[] fileContent) throws AnalyzerException { + public FileMetrics analyzeFile(String filepath, byte[] fileContent) { File fileToAnalyze = null; try { fileToAnalyze = createTempFile(fileContent, filepath); diff --git a/coderadar-plugins/checkstyle-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstylePropertiesResolverTest.java b/coderadar-plugins/checkstyle-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstylePropertiesResolverTest.java index 2e0743120..02b15c20a 100644 --- a/coderadar-plugins/checkstyle-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstylePropertiesResolverTest.java +++ b/coderadar-plugins/checkstyle-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstylePropertiesResolverTest.java @@ -4,10 +4,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class CheckstylePropertiesResolverTest { +class CheckstylePropertiesResolverTest { @Test - public void existingPropertiesAreResolved() { + void existingPropertiesAreResolved() { Properties properties = new Properties(); properties.put(CheckstyleSourceCodeFileAnalyzerPlugin.class.getName() + ".property1", "value1"); CheckstylePropertiesResolver resolver = new CheckstylePropertiesResolver(properties); @@ -15,7 +15,7 @@ public void existingPropertiesAreResolved() { } @Test - public void missingPropertiesAreNotResolved() { + void missingPropertiesAreNotResolved() { Properties properties = new Properties(); properties.put( CheckstyleSourceCodeFileAnalyzerPlugin.class.getName() + ".existingProperty", diff --git a/coderadar-plugins/checkstyle-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPluginTest.java b/coderadar-plugins/checkstyle-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPluginTest.java index 4a13ef4dc..6f6227824 100644 --- a/coderadar-plugins/checkstyle-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPluginTest.java +++ b/coderadar-plugins/checkstyle-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/checkstyle/CheckstyleSourceCodeFileAnalyzerPluginTest.java @@ -8,10 +8,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class CheckstyleSourceCodeFileAnalyzerPluginTest { +class CheckstyleSourceCodeFileAnalyzerPluginTest { @Test - public void metricsAreCalculatedCorrectly() throws AnalyzerException, IOException { + void metricsAreCalculatedCorrectly() throws AnalyzerException, IOException { byte[] fileContent = IOUtils.toByteArray(getClass().getResourceAsStream("/CheckstyleAnalyzer.java.txt")); @@ -27,7 +27,7 @@ public void metricsAreCalculatedCorrectly() throws AnalyzerException, IOExceptio } @Test - public void cyclomaticComplexityIsCalculatedCorrectly() throws IOException { + void cyclomaticComplexityIsCalculatedCorrectly() throws IOException { byte[] fileContent = IOUtils.toByteArray(getClass().getResourceAsStream("/AntPathMatcher.java.txt")); diff --git a/coderadar-plugins/checkstyle-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/checkstyle/ServiceLoaderTest.java b/coderadar-plugins/checkstyle-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/checkstyle/ServiceLoaderTest.java index 339b5c801..9cfa6a17b 100644 --- a/coderadar-plugins/checkstyle-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/checkstyle/ServiceLoaderTest.java +++ b/coderadar-plugins/checkstyle-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/checkstyle/ServiceLoaderTest.java @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class ServiceLoaderTest { +class ServiceLoaderTest { @Test - public void analyzerIsRegisteredWithServiceLoader() { + void analyzerIsRegisteredWithServiceLoader() { ServiceLoader loader = ServiceLoader.load( SourceCodeFileAnalyzerPlugin.class, diff --git a/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LineMarker.java b/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LineMarker.java index 0e5490bbb..11797efa8 100644 --- a/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LineMarker.java +++ b/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LineMarker.java @@ -1,5 +1,6 @@ package io.reflectoring.coderadar.analyzer.loc; +import java.util.Objects; import lombok.AllArgsConstructor; import lombok.Getter; @@ -22,4 +23,16 @@ public enum Type { public int compareTo(LineMarker o) { return this.startIndex.compareTo(o.getStartIndex()); } + + @Override + public boolean equals(Object o) { + return o instanceof LineMarker + && this.startIndex.equals(((LineMarker) o).startIndex) + && this.type.equals(((LineMarker) o).type); + } + + @Override + public int hashCode() { + return Objects.hash(startIndex, type); + } } diff --git a/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/Loc.java b/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LinesOfCode.java similarity index 96% rename from coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/Loc.java rename to coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LinesOfCode.java index d49af461e..b20fc3adf 100644 --- a/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/Loc.java +++ b/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LinesOfCode.java @@ -3,7 +3,7 @@ import lombok.Data; @Data -public class Loc { +public class LinesOfCode { /** Lines of code. Total lines of code, including comments and empty lines. */ private int loc; diff --git a/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LocAnalyzerPlugin.java b/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LocAnalyzerPlugin.java index a8661894b..1032278e8 100644 --- a/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LocAnalyzerPlugin.java +++ b/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LocAnalyzerPlugin.java @@ -8,7 +8,7 @@ /** Counts several types of lines of code. */ public class LocAnalyzerPlugin implements SourceCodeFileAnalyzerPlugin { - private LocCounter locCounter = new LocCounter(); + private final LocCounter locCounter = new LocCounter(); @Override public AnalyzerFileFilter getFilter() { @@ -16,18 +16,18 @@ public AnalyzerFileFilter getFilter() { } @Override - public FileMetrics analyzeFile(String filename, byte[] fileContent) throws AnalyzerException { + public FileMetrics analyzeFile(String filename, byte[] fileContent) { try { String fileEnding = filename.substring(filename.lastIndexOf('.')); LocProfile profile = Profiles.getForFile(filename); - Loc loc = locCounter.count(fileContent, profile); + LinesOfCode loc = locCounter.count(fileContent, profile); return toFileMetrics(loc, fileEnding); } catch (IOException e) { throw new AnalyzerException(e); } } - private FileMetrics toFileMetrics(Loc loc, String fileEnding) { + private FileMetrics toFileMetrics(LinesOfCode loc, String fileEnding) { String sanitizedFileEnding = fileEnding.replaceAll("\\.", ""); FileMetrics metrics = new FileMetrics(); metrics.setMetricCount( diff --git a/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LocCounter.java b/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LocCounter.java index 3c4c71663..b8a627d27 100644 --- a/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LocCounter.java +++ b/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/LocCounter.java @@ -13,8 +13,8 @@ public class LocCounter { - public Loc count(byte[] fileContent, LocProfile profile) throws IOException { - Loc loc = new Loc(); + public LinesOfCode count(byte[] fileContent, LocProfile profile) throws IOException { + LinesOfCode loc = new LinesOfCode(); LocContext context = new LocContext(); BufferedReader reader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(fileContent))); @@ -25,7 +25,7 @@ public Loc count(byte[] fileContent, LocProfile profile) throws IOException { return loc; } - private void countLine(String line, LocProfile profile, Loc loc, LocContext context) { + private void countLine(String line, LocProfile profile, LinesOfCode loc, LocContext context) { if (isEmptyLine(line)) { loc.incrementLoc(); } else if (isCommentLine(line, profile, context)) { diff --git a/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/profiles/Profiles.java b/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/profiles/Profiles.java index 62b72f5c7..1b6994cb6 100644 --- a/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/profiles/Profiles.java +++ b/coderadar-plugins/loc-analyzer-plugin/src/main/java/io/reflectoring/coderadar/analyzer/loc/profiles/Profiles.java @@ -5,11 +5,13 @@ public class Profiles { - private static final Map PROFILES = new HashMap<>(); + private Profiles() {} + + private static final Map LOC_PROFILES = new HashMap<>(); static { - PROFILES.put(".java", new JavaLocProfile()); - PROFILES.put(".xml", new XmlLocProfile()); + LOC_PROFILES.put(".java", new JavaLocProfile()); + LOC_PROFILES.put(".xml", new XmlLocProfile()); } public static LocProfile getForFile(String file) { @@ -20,6 +22,6 @@ public static LocProfile getForFile(String file) { } String fileEnding = file.substring(lastDotIndex); - return PROFILES.get(fileEnding); + return LOC_PROFILES.get(fileEnding); } } diff --git a/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/LocAnalyzerPluginFilterTest.java b/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/LinesOfCodeAnalyzerPluginFilterTest.java similarity index 83% rename from coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/LocAnalyzerPluginFilterTest.java rename to coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/LinesOfCodeAnalyzerPluginFilterTest.java index f81032982..73a3c1c0a 100644 --- a/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/LocAnalyzerPluginFilterTest.java +++ b/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/LinesOfCodeAnalyzerPluginFilterTest.java @@ -4,10 +4,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class LocAnalyzerPluginFilterTest { +class LinesOfCodeAnalyzerPluginFilterTest { @Test - public void filterAcceptsTheCorrectFiles() { + void filterAcceptsTheCorrectFiles() { AnalyzerFileFilter filter = new LocAnalyzerFileFilter(); Assertions.assertTrue(filter.acceptFilename("Testfile.java")); diff --git a/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/LocAnalyzerPluginTest.java b/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/LinesOfCodeAnalyzerPluginTest.java similarity index 87% rename from coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/LocAnalyzerPluginTest.java rename to coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/LinesOfCodeAnalyzerPluginTest.java index 3231f6bf4..1d207156c 100644 --- a/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/LocAnalyzerPluginTest.java +++ b/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/LinesOfCodeAnalyzerPluginTest.java @@ -7,10 +7,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class LocAnalyzerPluginTest { +class LinesOfCodeAnalyzerPluginTest { @Test - public void metricIsCalculatedCorrectly() throws Exception { + void metricIsCalculatedCorrectly() throws Exception { InputStream in = getClass().getResourceAsStream("AcceptedJavaFile.txt"); byte[] fileContent = IOUtils.toByteArray(in); diff --git a/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/ServiceLoaderTest.java b/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/ServiceLoaderTest.java index 259b3aa35..ef0f2e6a0 100644 --- a/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/ServiceLoaderTest.java +++ b/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/ServiceLoaderTest.java @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -public class ServiceLoaderTest { +class ServiceLoaderTest { @Test - public void analyzerIsRegisteredWithServiceLoader() { + void analyzerIsRegisteredWithServiceLoader() { ServiceLoader loader = ServiceLoader.load(SourceCodeFileAnalyzerPlugin.class); Iterator plugins = loader.iterator(); diff --git a/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/profiles/AbstractLocProfileTest.java b/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/profiles/AbstractLocProfileTest.java index 8d81956ff..66a11370e 100644 --- a/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/profiles/AbstractLocProfileTest.java +++ b/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/profiles/AbstractLocProfileTest.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Java6Assertions.assertThat; -import io.reflectoring.coderadar.analyzer.loc.Loc; +import io.reflectoring.coderadar.analyzer.loc.LinesOfCode; import io.reflectoring.coderadar.analyzer.loc.LocAnalyzerPlugin; import io.reflectoring.coderadar.analyzer.loc.LocCounter; import java.io.IOException; @@ -12,7 +12,7 @@ public abstract class AbstractLocProfileTest { - Loc countLines(String path, LocProfile profile) throws IOException { + LinesOfCode countLines(String path, LocProfile profile) throws IOException { InputStream in = getClass().getResourceAsStream(path); assertThat(in).isNotNull(); ByteArrayOutputStream out = new ByteArrayOutputStream(); diff --git a/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/profiles/JavaLocProfileTest.java b/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/profiles/JavaLocProfileTest.java index e364e7ed0..56e00367e 100644 --- a/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/profiles/JavaLocProfileTest.java +++ b/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/profiles/JavaLocProfileTest.java @@ -2,17 +2,17 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.reflectoring.coderadar.analyzer.loc.Loc; +import io.reflectoring.coderadar.analyzer.loc.LinesOfCode; import java.io.IOException; import org.junit.jupiter.api.Test; -public class JavaLocProfileTest extends AbstractLocProfileTest { +class JavaLocProfileTest extends AbstractLocProfileTest { - private LocProfile profile = new JavaLocProfile(); + private final LocProfile profile = new JavaLocProfile(); @Test - public void standard() throws IOException { - Loc loc = countLines("/testcode/java/standard.java.loctest", profile); + void standard() throws IOException { + LinesOfCode loc = countLines("/testcode/java/standard.java.loctest", profile); assertThat(loc.getLoc()).isEqualTo(7); assertThat(loc.getSloc()).isEqualTo(3); assertThat(loc.getEloc()).isEqualTo(2); @@ -20,8 +20,8 @@ public void standard() throws IOException { } @Test - public void nested() throws IOException { - Loc loc = countLines("/testcode/java/nested.java.loctest", profile); + void nested() throws IOException { + LinesOfCode loc = countLines("/testcode/java/nested.java.loctest", profile); assertThat(loc.getLoc()).isEqualTo(12); assertThat(loc.getSloc()).isEqualTo(5); assertThat(loc.getEloc()).isEqualTo(3); diff --git a/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/profiles/XmlLocProfileTest.java b/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/profiles/XmlLinesOfCodeProfileTest.java similarity index 57% rename from coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/profiles/XmlLocProfileTest.java rename to coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/profiles/XmlLinesOfCodeProfileTest.java index 59e514103..5ddd544e7 100644 --- a/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/profiles/XmlLocProfileTest.java +++ b/coderadar-plugins/loc-analyzer-plugin/src/test/java/io/reflectoring/coderadar/analyzer/loc/profiles/XmlLinesOfCodeProfileTest.java @@ -2,17 +2,17 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.reflectoring.coderadar.analyzer.loc.Loc; +import io.reflectoring.coderadar.analyzer.loc.LinesOfCode; import java.io.IOException; import org.junit.jupiter.api.Test; -public class XmlLocProfileTest extends AbstractLocProfileTest { +class XmlLinesOfCodeProfileTest extends AbstractLocProfileTest { - private LocProfile profile = new XmlLocProfile(); + private final LocProfile profile = new XmlLocProfile(); @Test - public void standard() throws IOException { - Loc loc = countLines("/testcode/xml/standard.xml.loctest", profile); + void standard() throws IOException { + LinesOfCode loc = countLines("/testcode/xml/standard.xml.loctest", profile); assertThat(loc.getLoc()).isEqualTo(15); assertThat(loc.getSloc()).isEqualTo(10); assertThat(loc.getEloc()).isEqualTo(10); @@ -20,8 +20,8 @@ public void standard() throws IOException { } @Test - public void nested() throws IOException { - Loc loc = countLines("/testcode/xml/nested.xml.loctest", profile); + void nested() throws IOException { + LinesOfCode loc = countLines("/testcode/xml/nested.xml.loctest", profile); assertThat(loc.getLoc()).isEqualTo(15); assertThat(loc.getSloc()).isEqualTo(9); assertThat(loc.getEloc()).isEqualTo(9); diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigurationController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigurationController.java index ec0fca00a..94ef600b3 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigurationController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigurationController.java @@ -27,9 +27,9 @@ public DeleteAnalyzerConfigurationController( public ResponseEntity deleteAnalyzerConfiguration( @PathVariable("analyzerConfigurationId") long analyzerConfigurationId, @PathVariable("projectId") long projectId) { + authenticationService.authenticateAdmin(projectId); deleteAnalyzerConfigurationUseCase.deleteAnalyzerConfiguration( analyzerConfigurationId, projectId); - authenticationService.authenticateAdmin(projectId); return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectController.java index 76fbfb0b6..31bedb9e9 100644 --- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectController.java +++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectController.java @@ -2,6 +2,7 @@ import io.reflectoring.coderadar.rest.AbstractBaseController; import io.reflectoring.coderadar.useradministration.port.driver.permissions.RemoveUserFromProjectUseCase; +import io.reflectoring.coderadar.useradministration.service.security.AuthenticationService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; @@ -13,15 +14,19 @@ @Transactional public class RemoveUserFromProjectController implements AbstractBaseController { private final RemoveUserFromProjectUseCase removeUserFromProjectUseCase; + private final AuthenticationService authenticationService; public RemoveUserFromProjectController( - RemoveUserFromProjectUseCase removeUserFromProjectUseCase) { + RemoveUserFromProjectUseCase removeUserFromProjectUseCase, + AuthenticationService authenticationService) { this.removeUserFromProjectUseCase = removeUserFromProjectUseCase; + this.authenticationService = authenticationService; } @DeleteMapping(path = "/projects/{projectId}/users/{userId}") public ResponseEntity removeUserRoleFromProject( @PathVariable long projectId, @PathVariable long userId) { + authenticationService.authenticateAdmin(projectId); removeUserFromProjectUseCase.removeUserFromProject(projectId, userId); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java index a09cd84f5..81bc0d8ed 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/ListProjectsForUserControllerTest.java @@ -32,14 +32,13 @@ void testListProjectsForUser() { ResponseEntity> response = testController.listProjectsForUser(1L); Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); Assertions.assertNotNull(response.getBody()); - Assertions.assertEquals(1L, response.getBody().size()); + Assertions.assertEquals(1, response.getBody().size()); Assertions.assertEquals(2L, response.getBody().get(0).getId()); Assertions.assertEquals("TestProject1", response.getBody().get(0).getName()); } @Test - void testListProjectsForUserThrowsWhenUserNotFound() { // TODO: Exception is caught by the - // ExceptionHandler, is this test needed? + void testListProjectsForUserThrowsWhenUserNotFound() { Mockito.when(listProjectsForUserUseCase.listProjects(1L)) .thenThrow(new UserNotFoundException(1L)); Assertions.assertThrows( diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java index 4db4f702e..eef0970b2 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java @@ -17,7 +17,7 @@ class RemoveUserFromProjectControllerTest extends UnitTestTemplate { private final RemoveUserFromProjectUseCase removeUserFromProjectUseCase = mock(RemoveUserFromProjectUseCase.class); private final RemoveUserFromProjectController testController = - new RemoveUserFromProjectController(removeUserFromProjectUseCase); + new RemoveUserFromProjectController(removeUserFromProjectUseCase, authenticationService); @Test void testRemoveUserFromProjectController() { diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java index 18df7c88e..884625db5 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListProjectsForTeamControllerTest.java @@ -31,7 +31,7 @@ void testListProjectsForTeam() { ResponseEntity> response = testController.listProjectsForTeam(1L); Assertions.assertEquals(HttpStatus.OK, response.getStatusCode()); Assertions.assertNotNull(response.getBody()); - Assertions.assertEquals(1L, response.getBody().size()); + Assertions.assertEquals(1, response.getBody().size()); Assertions.assertEquals(2L, response.getBody().get(0).getId()); Assertions.assertEquals("TestProject1", response.getBody().get(0).getName()); } diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java index c65e818bc..85d72a4ee 100644 --- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java +++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/ListTeamsForUserControllerTest.java @@ -31,12 +31,16 @@ void setUp() { Mockito.when(listTeamsForUserUseCase.listTeamsForUser(5L)) .thenReturn( Arrays.asList( - new Team().setId(1L).setName("TestTeam1"), + new Team() + .setId(1L) + .setName("TestTeam1") + .setMembers( + Collections.singletonList(new User().setId(5L).setUsername("TestUser1"))), new Team() .setId(2L) .setName("TestTeam2") .setMembers( - Collections.singletonList(new User().setId(3L).setUsername("TestUser1"))))); + Collections.singletonList(new User().setId(5L).setUsername("TestUser1"))))); } @Test @@ -48,13 +52,18 @@ void testListTeamsForUser() { Assertions.assertEquals(2, responseEntity.getBody().size()); Assertions.assertEquals(1L, responseEntity.getBody().get(0).getId()); Assertions.assertEquals("TestTeam1", responseEntity.getBody().get(0).getName()); + Assertions.assertNotNull(responseEntity.getBody().get(0).getMembers()); + Assertions.assertEquals(1, responseEntity.getBody().get(0).getMembers().size()); + Assertions.assertEquals(5L, responseEntity.getBody().get(0).getMembers().get(0).getId()); + Assertions.assertEquals( + "TestUser1", responseEntity.getBody().get(0).getMembers().get(0).getUsername()); Assertions.assertEquals(2L, responseEntity.getBody().get(1).getId()); Assertions.assertEquals("TestTeam2", responseEntity.getBody().get(1).getName()); Assertions.assertNotNull(responseEntity.getBody().get(1).getMembers()); Assertions.assertEquals(1, responseEntity.getBody().get(1).getMembers().size()); - Assertions.assertEquals(3L, responseEntity.getBody().get(1).getMembers().get(0).getId()); + Assertions.assertEquals(5L, responseEntity.getBody().get(1).getMembers().get(0).getId()); Assertions.assertEquals( "TestUser1", responseEntity.getBody().get(1).getMembers().get(0).getUsername()); } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/IntegrationTestTemplate.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/IntegrationTestTemplate.java index 6eea9061d..c162e3989 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/IntegrationTestTemplate.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/IntegrationTestTemplate.java @@ -1,7 +1,11 @@ package io.reflectoring.coderadar.rest; +import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; +import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.mockito.MockitoAnnotations; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.transaction.annotation.Transactional; @@ -12,8 +16,17 @@ @Transactional public abstract class IntegrationTestTemplate { + @Autowired private ProjectRepository projectRepository; + @Autowired private UserRepository userRepository; + @BeforeEach public void setup() { MockitoAnnotations.initMocks(this); } + + @AfterEach + void tearDown() { + projectRepository.deleteAll(); + userRepository.deleteAll(); + } } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java index 0bb38b001..3f86416bd 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java @@ -38,10 +38,7 @@ import java.util.List; import net.lingala.zip4j.ZipFile; import org.apache.tomcat.util.http.fileupload.FileUtils; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.*; import org.neo4j.ogm.session.Session; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java index f9bef9fb0..f9c7a9447 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class ListAnalyzerControllerIntegrationTest extends ControllerTestTemplate { +class ListAnalyzerControllerIntegrationTest extends ControllerTestTemplate { @Test void getAvailableAnalyzers() throws Exception { @@ -20,9 +20,7 @@ void getAvailableAnalyzers() throws Exception { .andDo( result -> { List results = - fromJson( - new TypeReference>() {}, - result.getResponse().getContentAsString()); + fromJson(new TypeReference<>() {}, result.getResponse().getContentAsString()); Assertions.assertTrue( results.contains("io.reflectoring.coderadar.analyzer.loc.LocAnalyzerPlugin")); Assertions.assertTrue( diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/DeleteBranchTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/DeleteBranchTest.java index c78fd358b..93a2d1b7a 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/DeleteBranchTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/DeleteBranchTest.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -public class DeleteBranchTest extends ControllerTestTemplate { +class DeleteBranchTest extends ControllerTestTemplate { @Autowired private CreateProjectService createProjectService; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java index 521e7327c..26c7c33b4 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java @@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class ListBranchesControllerTest extends ControllerTestTemplate { +class ListBranchesControllerTest extends ControllerTestTemplate { @Autowired private CreateProjectService createProjectService; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java index ec22d38b1..31c12bf52 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java @@ -18,7 +18,7 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class SaveProjectWithBranchesTest extends ControllerTestTemplate { +class SaveProjectWithBranchesTest extends ControllerTestTemplate { @Autowired private CommitRepository commitRepository; @Autowired private BranchRepository branchRepository; @@ -34,7 +34,7 @@ void createProjectWithBranchesSuccessfully() throws Exception { .andExpect(MockMvcResultMatchers.status().isCreated()) .andDo( result -> { - Long id = + long id = fromJson(result.getResponse().getContentAsString(), IdResponse.class).getId(); List branches = branchRepository.getBranchesInProjectSortedByName(id); Assertions.assertEquals(3L, branches.size()); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/GetContributorControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/GetContributorControllerIntegrationTest.java index 2706ff7be..3e74e2745 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/GetContributorControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/GetContributorControllerIntegrationTest.java @@ -23,12 +23,12 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultHandler; -public class GetContributorControllerIntegrationTest extends ControllerTestTemplate { +class GetContributorControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ContributorRepository contributorRepository; @Autowired private SessionFactory sessionFactory; @Test - public void getSingleContributor() throws Exception { + void getSingleContributor() throws Exception { URL testRepoURL = this.getClass().getClassLoader().getResource("test-repository"); CreateProjectCommand command1 = new CreateProjectCommand( diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/ListContributorsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/ListContributorsControllerIntegrationTest.java index d5f65689b..47be25730 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/ListContributorsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/ListContributorsControllerIntegrationTest.java @@ -22,7 +22,7 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultHandler; -public class ListContributorsControllerIntegrationTest extends ControllerTestTemplate { +class ListContributorsControllerIntegrationTest extends ControllerTestTemplate { private long projectId; @@ -49,7 +49,7 @@ public void setUp() throws Exception { } @Test - public void listContributors() throws Exception { + void listContributors() throws Exception { MvcResult result = mvc() .perform( @@ -68,7 +68,7 @@ public void listContributors() throws Exception { } @Test - public void listContributorsForFile() throws Exception { + void listContributorsForFile() throws Exception { GetContributorsForPathCommand command = new GetContributorsForPathCommand( "GetMetricsForCommitCommand.java", "e9f7ff6fdd8c0863fdb5b24c9ed35a3651e20382"); @@ -98,7 +98,7 @@ public void listContributorsForFile() throws Exception { } @Test - public void listContributorsForDirectory() throws Exception { + void listContributorsForDirectory() throws Exception { GetContributorsForPathCommand command = new GetContributorsForPathCommand( "testModule1", "e9f7ff6fdd8c0863fdb5b24c9ed35a3651e20382"); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsControllerIntegrationTest.java index 0e5e641e1..49ae68a70 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/MergeContributorsControllerIntegrationTest.java @@ -19,11 +19,11 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.ResultHandler; -public class MergeContributorsControllerIntegrationTest extends ControllerTestTemplate { +class MergeContributorsControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ContributorRepository contributorRepository; @Test - public void mergesTwoContributors() throws Exception { + void mergesTwoContributors() throws Exception { URL testRepoURL = this.getClass().getClassLoader().getResource("test-repository"); CreateProjectCommand command1 = new CreateProjectCommand( diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorControllerIntegrationTest.java index 52a714340..b74b3bef7 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/contributor/UpdateContributorControllerIntegrationTest.java @@ -17,11 +17,11 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.ResultHandler; -public class UpdateContributorControllerIntegrationTest extends ControllerTestTemplate { +class UpdateContributorControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ContributorRepository contributorRepository; @Test - public void updateContributor() throws Exception { + void updateContributor() throws Exception { URL testRepoURL = this.getClass().getClassLoader().getResource("test-repository"); CreateProjectCommand command1 = new CreateProjectCommand( diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java index 613cbcf3d..a4bffb7a2 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java @@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class CompareTreeTest extends ControllerTestTemplate { +class CompareTreeTest extends ControllerTestTemplate { private CompareNode root; private File f; @@ -120,7 +120,7 @@ private void deleteFile(File f) { } @Test - public void testCreateTree() { + void testCreateTree() { Assertions.assertNotNull(root); Assertions.assertEquals("testSrc", root.getFilename()); Assertions.assertEquals(1, root.getChildren().size()); @@ -354,7 +354,7 @@ public void testCreateTree() { } @Test - public void testHasDependencyOn() { + void testHasDependencyOn() { Assertions.assertNotNull(root); CompareNode wildcardpackage = root.getNodeByPath("src/org/wickedsource/dependencytree/wildcardpackage"); @@ -370,7 +370,7 @@ public void testHasDependencyOn() { } @Test - public void testCountDependenciesOn() { + void testCountDependenciesOn() { Assertions.assertNotNull(root); CompareNode wildcardpackage = root.getNodeByPath("src/org/wickedsource/dependencytree/wildcardpackage"); @@ -389,21 +389,21 @@ public void testCountDependenciesOn() { } @Test - public void testGetNodeFromImportNoClass() { + void testGetNodeFromImportNoClass() { List imports = dependencyTree.getNodeFromImport("org.wickedsource.dependencytree.sbdfjksbdf"); Assertions.assertEquals(0, imports.size()); } @Test - public void testGetNodeFromImportWildcard() { + void testGetNodeFromImportWildcard() { List imports = dependencyTree.getNodeFromImport("org.wickedsource.dependencytree.wildcardpackage.*"); Assertions.assertEquals(4, imports.size()); } @Test - public void testGetNodeFromImportClass() { + void testGetNodeFromImportClass() { List imports = dependencyTree.getNodeFromImport( "org.wickedsource.dependencytree.somepackage.CoreDependencyTest"); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java index 02b461bf4..bdad0ed6a 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java @@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -public class TreeTest extends ControllerTestTemplate { +class TreeTest extends ControllerTestTemplate { private Node root; private File f; @@ -43,7 +43,7 @@ public class TreeTest extends ControllerTestTemplate { @Autowired private GetProjectPort getProjectPort; @BeforeEach - public void initEach() { + void initEach() { try { URL testRepoURL = this.getClass().getClassLoader().getResource("testSrc"); CreateProjectCommand command = new CreateProjectCommand(); @@ -89,7 +89,7 @@ private void deleteFile(File f) { } @Test - public void testInPackageDependencies() { + void testInPackageDependencies() { Assertions.assertNotNull(root); Node notADependencyTest = root.getNodeByPath( @@ -99,7 +99,7 @@ public void testInPackageDependencies() { } @Test - public void testCreateTree() { + void testCreateTree() { Assertions.assertNotNull(root); Assertions.assertEquals("testSrc", root.getFilename()); Assertions.assertEquals(1, root.getChildren().size()); @@ -219,7 +219,7 @@ public void testCreateTree() { } @Test - public void testHasDependencyOn() { + void testHasDependencyOn() { Assertions.assertNotNull(root); Node wildcardpackage = root.getNodeByPath("src/org/wickedsource/dependencytree/wildcardpackage"); @@ -235,7 +235,7 @@ public void testHasDependencyOn() { } @Test - public void testCountDependenciesOn() { + void testCountDependenciesOn() { Assertions.assertNotNull(root); Node wildcardpackage = root.getNodeByPath("src/org/wickedsource/dependencytree/wildcardpackage"); @@ -251,21 +251,21 @@ public void testCountDependenciesOn() { } @Test - public void testGetNodeFromImportNoClass() { + void testGetNodeFromImportNoClass() { List imports = dependencyTree.getNodeFromImport("org.wickedsource.dependencytree.sbdfjksbdf"); Assertions.assertEquals(0, imports.size()); } @Test - public void testGetNodeFromImportWildcard() { + void testGetNodeFromImportWildcard() { List imports = dependencyTree.getNodeFromImport("org.wickedsource.dependencytree.wildcardpackage.*"); Assertions.assertEquals(2, imports.size()); } @Test - public void testGetNodeFromImportClass() { + void testGetNodeFromImportClass() { List imports = dependencyTree.getNodeFromImport( "org.wickedsource.dependencytree.somepackage.CoreDependencyTest"); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java index c51ab2280..4e5a75b2e 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java @@ -21,8 +21,6 @@ class ListProjectsControllerIntegrationTest extends ControllerTestTemplate { @BeforeEach public void setUp() { - projectRepository.deleteAll(); - ProjectEntity testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); testProject.setName("project"); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitLogControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitLogControllerTest.java index c35a66a59..52515fb03 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitLogControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCommitLogControllerTest.java @@ -20,7 +20,7 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; -public class GetCommitLogControllerTest extends ControllerTestTemplate { +class GetCommitLogControllerTest extends ControllerTestTemplate { private Long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesControllerTest.java index 9c7e2be78..8d297a247 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetCriticalFilesControllerTest.java @@ -28,11 +28,11 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultHandler; -public class GetCriticalFilesControllerTest extends ControllerTestTemplate { +class GetCriticalFilesControllerTest extends ControllerTestTemplate { private long projectId; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { URL testRepoURL = this.getClass().getClassLoader().getResource("test-repository"); CreateProjectCommand command1 = new CreateProjectCommand( @@ -54,7 +54,7 @@ public void setUp() throws Exception { } @Test - public void throwsExceptionWhenNoFilePatternsAreDefined() throws Exception { + void throwsExceptionWhenNoFilePatternsAreDefined() throws Exception { GetFilesWithContributorsCommand command = new GetFilesWithContributorsCommand("e9f7ff6fdd8c0863fdb5b24c9ed35a3651e20382", 1); MvcResult result = @@ -74,7 +74,7 @@ public void throwsExceptionWhenNoFilePatternsAreDefined() throws Exception { } @Test - public void getCriticalFilesSuccessfully() throws Exception { + void getCriticalFilesSuccessfully() throws Exception { CreateFilePatternCommand command = new CreateFilePatternCommand("**/*.java", InclusionType.INCLUDE); mvc() @@ -108,7 +108,7 @@ public void getCriticalFilesSuccessfully() throws Exception { } @Test - public void getCriticalFilesWithTwoContributors() throws Exception { + void getCriticalFilesWithTwoContributors() throws Exception { CreateFilePatternCommand command = new CreateFilePatternCommand("**/*.java", InclusionType.INCLUDE); mvc() @@ -145,7 +145,7 @@ public void getCriticalFilesWithTwoContributors() throws Exception { } @Test - public void getFrequentlyChangedFiles() throws Exception { + void getFrequentlyChangedFiles() throws Exception { CreateFilePatternCommand command = new CreateFilePatternCommand("**/*.java", InclusionType.INCLUDE); mvc() diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileContentWithMetricsControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileContentWithMetricsControllerTest.java index 3da3bdf54..f7a9955e3 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileContentWithMetricsControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileContentWithMetricsControllerTest.java @@ -21,7 +21,7 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; -public class GetFileContentWithMetricsControllerTest extends ControllerTestTemplate { +class GetFileContentWithMetricsControllerTest extends ControllerTestTemplate { long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileDiffControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileDiffControllerTest.java index 129b2712e..900f51e39 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileDiffControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileDiffControllerTest.java @@ -21,7 +21,7 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; -public class GetFileDiffControllerTest extends ControllerTestTemplate { +class GetFileDiffControllerTest extends ControllerTestTemplate { long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java index bbd53960b..497cb5fee 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/query/GetFileTreeForCommitControllerTest.java @@ -20,7 +20,7 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; -public class GetFileTreeForCommitControllerTest extends ControllerTestTemplate { +class GetFileTreeForCommitControllerTest extends ControllerTestTemplate { long projectId; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java index 75c9c8b3b..94eeb8ff4 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java @@ -30,7 +30,6 @@ class ListProjectsForUserControllerIntegrationTest extends ControllerTestTemplat @BeforeEach void setUp() { - projectRepository.deleteAll(); testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); testProject.setName("project"); @@ -40,7 +39,6 @@ void setUp() { testProject.setVcsUsername("testUser"); projectRepository.save(testProject); - userRepository.deleteAll(); testUser = new UserEntity(); testUser.setUsername("username"); testUser.setPassword(PasswordUtil.hash("password1")); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java index 4fb832967..27b67cd68 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java @@ -23,7 +23,6 @@ class ListUsersControllerIntegrationTest extends ControllerTestTemplate { @BeforeEach void setUp() { - userRepository.deleteAll(); testUser = new UserEntity(); testUser.setUsername("username"); testUser.setPassword(PasswordUtil.hash("password1")); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java index 949010d63..6accadc6c 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java @@ -30,7 +30,6 @@ class ListUsersForProjectControllerIntegrationTest extends ControllerTestTemplat @BeforeEach void setUp() { - projectRepository.deleteAll(); testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); testProject.setName("project"); @@ -40,7 +39,6 @@ void setUp() { testProject.setVcsUsername("testUser"); projectRepository.save(testProject); - userRepository.deleteAll(); testUser = new UserEntity(); testUser.setUsername("username"); testUser.setPassword(PasswordUtil.hash("password1")); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java index b8a05b658..b33ca6146 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java @@ -20,7 +20,6 @@ class LoginUserControllerIntegrationTest extends ControllerTestTemplate { @Test void loginUserSuccessfully() throws Exception { - userRepository.deleteAll(); UserEntity testUser = new UserEntity(); testUser.setUsername("username"); testUser.setPassword(PasswordUtil.hash("password1")); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java index 8d26be6d9..4e3542f8d 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java @@ -27,7 +27,6 @@ class RemoveUserFromProjectControllerIntegrationTest extends ControllerTestTempl @BeforeEach void setUp() { - projectRepository.deleteAll(); testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); testProject.setName("project"); @@ -37,7 +36,6 @@ void setUp() { testProject.setVcsUsername("testUser"); projectRepository.save(testProject); - userRepository.deleteAll(); testUser = new UserEntity(); testUser.setUsername("username"); testUser.setPassword(PasswordUtil.hash("password1")); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java index bf515af6b..7e51107af 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java @@ -30,7 +30,6 @@ class SetUserRoleForProjectControllerIntegrationTest extends ControllerTestTempl @BeforeEach void setUp() { - projectRepository.deleteAll(); testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); testProject.setName("project"); @@ -40,7 +39,6 @@ void setUp() { testProject.setVcsUsername("testUser"); projectRepository.save(testProject); - userRepository.deleteAll(); testUser = new UserEntity(); testUser.setUsername("username"); testUser.setPassword(PasswordUtil.hash("password1")); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java index 0feaa81db..6086741de 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java @@ -34,7 +34,6 @@ void setUp() { teamEntity.setName("testTeam"); teamRepository.save(teamEntity, 1); - projectRepository.deleteAll(); testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); testProject.setName("project"); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java index f9b0a245a..731b98ee3 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java @@ -29,7 +29,6 @@ class AddUsersToTeamControllerIntegrationTest extends ControllerTestTemplate { @BeforeEach void setUp() { - userRepository.deleteAll(); testUser = new UserEntity(); testUser.setUsername("username"); testUser.setPassword("password1"); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java index c215aaf36..85d30dfc9 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java @@ -29,7 +29,6 @@ class CreateTeamControllerIntegrationTest extends ControllerTestTemplate { @BeforeEach void setUp() { - userRepository.deleteAll(); testUser = new UserEntity(); testUser.setUsername("username"); testUser.setPassword(PasswordUtil.hash("password1")); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java index 1089eedfb..9e3c43ea5 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java @@ -32,7 +32,6 @@ void setUp() { teamEntity.setName("testTeam"); teamRepository.save(teamEntity, 1); - userRepository.deleteAll(); testUser = new UserEntity(); testUser.setUsername("username"); testUser.setPassword(PasswordUtil.hash("password1")); @@ -58,7 +57,7 @@ void deleteTeamWithUsersSuccessfully() throws Exception { void deleteTeamWithNoUsersSuccessfully() throws Exception { mvc() .perform(delete("/api/teams/" + teamEntity.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()); // TODO: Document + .andExpect(MockMvcResultMatchers.status().isOk()); List teams = teamRepository.findAllWithMembers(); Assertions.assertTrue(teams.isEmpty()); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java index da2db458f..975692742 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java @@ -29,7 +29,6 @@ class ListProjectsForTeamControllerIntegrationTest extends ControllerTestTemplat @BeforeEach void setUp() { - projectRepository.deleteAll(); testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); testProject.setName("project"); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java index f09b52615..f7de04846 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java @@ -29,7 +29,6 @@ class ListTeamsForProjectControllerIntegrationTest extends ControllerTestTemplat @BeforeEach void setUp() { - projectRepository.deleteAll(); testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); testProject.setName("project"); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java index 5f75df6d5..8e50e241c 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java @@ -6,7 +6,6 @@ import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; -import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import io.reflectoring.coderadar.rest.domain.GetTeamResponse; import java.util.Collections; @@ -21,14 +20,11 @@ class ListTeamsForUserControllerIntegrationTest extends ControllerTestTemplate { @Autowired private TeamRepository teamRepository; - @Autowired private UserRepository userRepository; - private TeamEntity teamEntity; private UserEntity testUser; @BeforeEach void setUp() { - userRepository.deleteAll(); testUser = new UserEntity(); testUser.setUsername("testUser"); testUser.setPassword("password1"); @@ -40,7 +36,7 @@ void setUp() { } @Test - void listTeamsForProjectSuccessfully() throws Exception { + void listTeamsForUserSuccessfully() throws Exception { MvcResult result = mvc() .perform(get("/api/users/" + testUser.getId() + "/teams")) diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java index 6470702d7..45248412a 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java @@ -27,7 +27,6 @@ class RemoveTeamFromProjectControllerIntegrationTest extends ControllerTestTempl @BeforeEach void setUp() { - projectRepository.deleteAll(); testProject = new ProjectEntity(); testProject.setVcsUrl("https://valid.url"); testProject.setName("project"); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java index 62e03a29d..93f9732a2 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java @@ -29,7 +29,6 @@ class RemoveUsersFromTeamControllerIntegrationTest extends ControllerTestTemplat @BeforeEach void setUp() { - userRepository.deleteAll(); testUser = new UserEntity(); testUser.setUsername("username"); testUser.setPassword("password1"); diff --git a/coderadar-ui/src/app/app.module.ts b/coderadar-ui/src/app/app.module.ts index c0cb760a1..c4f89dfdc 100644 --- a/coderadar-ui/src/app/app.module.ts +++ b/coderadar-ui/src/app/app.module.ts @@ -9,11 +9,7 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {AddProjectComponent} from './view/add-project/add-project.component'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {FlexLayoutModule} from '@angular/flex-layout'; -import { - MainDashboardComponent, - ConfirmDeleteProjectDialogComponent, - AddProjectToTeamDialogComponent -} from './view/main-dashboard/main-dashboard.component'; +import {MainDashboardComponent} from './view/main-dashboard/main-dashboard.component'; import {LayoutModule} from '@angular/cdk/layout'; import {AuthInterceptor} from './auth.interceptor'; import {ConfigureProjectComponent, MergeDialogComponent} from './view/configure-project/configure-project.component'; @@ -72,6 +68,8 @@ import { FileViewComponent } from './view/file-view/file-view.component'; import { TeamsDashboardComponent } from './view/teams-dashboard/teams-dashboard.component'; import { AddTeamComponent } from './view/add-team/add-team.component'; import { SidenavContentComponent } from './view/sidenav-content/sidenav-content.component'; +import {AddProjectToTeamDialogComponent} from "./view/main-dashboard/add-project-to-team-dialog.component"; +import {ConfirmDeleteProjectDialogComponent} from "./view/main-dashboard/delete-project-dialog.component"; const appRoutes: Routes = [ {path: 'login', component: LoginComponent}, @@ -99,7 +97,6 @@ const appRoutes: Routes = [ RegisterComponent, AddProjectComponent, MainDashboardComponent, - ConfirmDeleteProjectDialogComponent, ConfigureProjectComponent, EditProjectComponent, HeaderComponent, @@ -121,6 +118,7 @@ const appRoutes: Routes = [ AddProjectToTeamDialogComponent, AddTeamComponent, SidenavContentComponent, + ConfirmDeleteProjectDialogComponent ], imports: [ BrowserModule, diff --git a/coderadar-ui/src/app/city-map/VisualizationConfig.ts b/coderadar-ui/src/app/city-map/VisualizationConfig.ts index 92953dfc2..c0135467b 100644 --- a/coderadar-ui/src/app/city-map/VisualizationConfig.ts +++ b/coderadar-ui/src/app/city-map/VisualizationConfig.ts @@ -5,7 +5,7 @@ export class VisualizationConfig { // VISUALIZATION SETTINGS static EDGE_LENGTH_FACTOR = 2; static HEIGHT_FACTOR = 0.1; - static ROOT_NAME = "root"; + static ROOT_NAME = 'root'; // static GLOBAL_MAX_GROUND_AREA = 100; // static GLOBAL_MIN_GROUND_AREA = 1; // static GLOBAL_MAX_HEIGHT = 100; @@ -31,7 +31,7 @@ export class VisualizationConfig { static COLOR_DELETED_FILE = '#d90206'; static COLOR_UNCHANGED_FILE = '#cccccc'; - //HIGHLIGHTING + // HIGHLIGHTING static HIGHLIGHT_BOX_MARGIN = 0.25; static getShortNameByMetricName(metricName: string): IMetric { diff --git a/coderadar-ui/src/app/city-map/autosuggest-wrapper/autosuggest-wrapper.component.ts b/coderadar-ui/src/app/city-map/autosuggest-wrapper/autosuggest-wrapper.component.ts index 9e4538452..ab0533566 100644 --- a/coderadar-ui/src/app/city-map/autosuggest-wrapper/autosuggest-wrapper.component.ts +++ b/coderadar-ui/src/app/city-map/autosuggest-wrapper/autosuggest-wrapper.component.ts @@ -16,52 +16,53 @@ import {debounceTime, distinctUntilChanged, map, startWith} from 'rxjs/operators templateUrl: './autosuggest-wrapper.component.html', styleUrls: ['./autosuggest-wrapper.component.scss'] }) -export class AutosuggestWrapperComponent implements OnInit{ +export class AutosuggestWrapperComponent implements OnInit { @ViewChild('inputElement') inputElement; @Input() model$: Observable; @Input() source$: Observable; @Input() isDisabled: boolean; - @Input() resetOnBlur:boolean = false; + @Input() resetOnBlur = false; @Input() alignRight = false; @Input() label: string; @Output() valueChanged = new EventEmitter(); - @Input() filterOptions :((value: any,source:any[])=> any[]) = (value, options) => options; - @Input() formatOption :((value: any)=> string ) = value => value.toString(); - displayOptions: Observable<{value:any,displayValue:string }[]>; - formattedOptions: {value:any,displayValue:string }[]; + displayOptions: Observable<{value: any, displayValue: string }[]>; + formattedOptions: {value: any, displayValue: string }[]; formControl = new FormControl(); - lastSetValue:any; + lastSetValue: any; + @Input() filterOptions: ((value: any, source: any[]) => any[]) = (value, options) => options; + @Input() formatOption: ((value: any) => string ) = value => value.toString(); handleValueChanged(selectedOption: any) { this.lastSetValue = selectedOption; this.valueChanged.emit(selectedOption.value); } - displayFunction(option:{value:any,displayValue:string }):string{ - if(option){ + displayFunction(option: {value: any, displayValue: string }): string { + if (option) { return option.displayValue; - }else{ - return ""; + } else { + return ''; } } - onBlur(){ - if (this.resetOnBlur)this.formControl.reset(this.associateFormattedOptions(this.lastSetValue)) + onBlur() { + if (this.resetOnBlur) {this.formControl.reset(this.associateFormattedOptions(this.lastSetValue)); } } - associateFormattedOptions(value):{value:any,displayValue:string}{ - return {value:value,displayValue:this.formatOption(value)}; + associateFormattedOptions(value): {value: any, displayValue: string} { + return {value, displayValue: this.formatOption(value)}; } ngOnInit(): void { - if(this.model$)this.model$.subscribe(value => { + if (this.model$) {this.model$.subscribe(value => { this.formControl.setValue(this.associateFormattedOptions(value)); this.lastSetValue = value; }); + } this.formattedOptions = []; this.source$.subscribe(value => value.forEach(option => this.formattedOptions.push(this.associateFormattedOptions(option)))); @@ -70,7 +71,7 @@ export class AutosuggestWrapperComponent implements OnInit{ debounceTime(200), distinctUntilChanged(), startWith(' '), - map(value => this.filterOptions(value,this.formattedOptions)) + map(value => this.filterOptions(value, this.formattedOptions)) ); } } diff --git a/coderadar-ui/src/app/city-map/control-panel/commit-chooser/commit-chooser.component.ts b/coderadar-ui/src/app/city-map/control-panel/commit-chooser/commit-chooser.component.ts index e2bdd8bf1..9f00239a1 100644 --- a/coderadar-ui/src/app/city-map/control-panel/commit-chooser/commit-chooser.component.ts +++ b/coderadar-ui/src/app/city-map/control-panel/commit-chooser/commit-chooser.component.ts @@ -1,15 +1,19 @@ -import {Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges} from '@angular/core'; +import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import {CommitType} from '../../enum/CommitType'; import {Commit} from '../../../model/commit'; -import {Observable} from "rxjs"; -import {DatePipe} from "@angular/common"; +import {Observable} from 'rxjs'; +import {DatePipe} from '@angular/common'; @Component({ selector: 'app-commit-chooser', templateUrl: './commit-chooser.component.html', styleUrls: ['./commit-chooser.component.scss'] }) -export class CommitChooserComponent implements OnInit{ +export class CommitChooserComponent implements OnInit { + + constructor(public datepipe: DatePipe) {} + + static readonly COMMIT_HASH_LENGTH = 7; @Input() commitType: CommitType; @Input() commits: Observable; @@ -20,10 +24,6 @@ export class CommitChooserComponent implements OnInit{ @Output() changeCommit = new EventEmitter(); - static readonly COMMIT_HASH_LENGTH = 7; - - constructor(public datepipe:DatePipe) {} - ngOnInit() { this.selected.subscribe(value => this.handleCommitChanged(value)); } @@ -31,12 +31,13 @@ export class CommitChooserComponent implements OnInit{ formatCommit(commit: Commit): string { if (commit === null || commit === undefined) { - return "empty"; + return 'empty'; } - return commit.name.substring(0, CommitChooserComponent.COMMIT_HASH_LENGTH) + ', ' + commit.author + ', ' + new Date(commit.timestamp).toUTCString(); + return commit.name.substring(0, CommitChooserComponent.COMMIT_HASH_LENGTH) + ', ' + commit.author + + ', ' + new Date(commit.timestamp).toUTCString(); } - filterCommitOptions(value: string,source:{value:Commit,displayValue:string}[]): {value:Commit,displayValue:string}[] { + filterCommitOptions(value: string, source: {value: Commit, displayValue: string}[]): {value: Commit, displayValue: string}[] { if (source === undefined) { return []; } else if (typeof value !== 'string') { @@ -56,8 +57,9 @@ export class CommitChooserComponent implements OnInit{ if (optionAny.author.toLowerCase().includes(lowercaseValue)) {score += 25; } if (optionAny.name.startsWith(value)) {score += 1000; } if (optionAny.name.includes(lowercaseValue)) {score += 500; } - if (option.displayValue.substring(option.value.author.length+CommitChooserComponent.COMMIT_HASH_LENGTH).toLowerCase().includes(lowercaseValue)){score+=1000} - if (score > 0||value==="") { + if (option.displayValue.substring(option.value.author.length + CommitChooserComponent.COMMIT_HASH_LENGTH) + .toLowerCase().includes(lowercaseValue)) {score += 1000; } + if (score > 0 || value === '') { optionAny.score = score; return option; } diff --git a/coderadar-ui/src/app/city-map/control-panel/control-panel.module.ts b/coderadar-ui/src/app/city-map/control-panel/control-panel.module.ts index 91086b2e2..b747bfdef 100644 --- a/coderadar-ui/src/app/city-map/control-panel/control-panel.module.ts +++ b/coderadar-ui/src/app/city-map/control-panel/control-panel.module.ts @@ -30,7 +30,7 @@ import { } from '@angular/material'; import {LayoutModule} from '@angular/cdk/layout'; import {ProjectService} from '../../service/project.service'; -import {HighlightSearchPipe} from "./pipes/highlight-search.pipe"; +import {HighlightSearchPipe} from './pipes/highlight-search.pipe'; @NgModule({ imports: [ diff --git a/coderadar-ui/src/app/city-map/control-panel/pipes/highlight-search.pipe.ts b/coderadar-ui/src/app/city-map/control-panel/pipes/highlight-search.pipe.ts index 60abc233e..64c3e2881 100644 --- a/coderadar-ui/src/app/city-map/control-panel/pipes/highlight-search.pipe.ts +++ b/coderadar-ui/src/app/city-map/control-panel/pipes/highlight-search.pipe.ts @@ -6,11 +6,11 @@ import { Pipe, PipeTransform } from '@angular/core'; export class HighlightSearchPipe implements PipeTransform { transform(value: any, args?: string): any { - if(!args) {return value;} - if(typeof args !== 'string') return value; - if(args.toString()===" ") return value; - var re = new RegExp(args,'gi'); - return value.replace(re,"$&"); + if (!args) {return value; } + if (typeof args !== 'string') { return value; } + if (args.toString() === ' ') { return value; } + const re = new RegExp(args, 'gi'); + return value.replace(re, '$&'); } } diff --git a/coderadar-ui/src/app/city-map/control-panel/search/search.component.ts b/coderadar-ui/src/app/city-map/control-panel/search/search.component.ts index 3bbb161ec..ecb54bbba 100644 --- a/coderadar-ui/src/app/city-map/control-panel/search/search.component.ts +++ b/coderadar-ui/src/app/city-map/control-panel/search/search.component.ts @@ -1,6 +1,6 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {Observable} from "rxjs"; -import {VisualizationConfig} from "../../VisualizationConfig"; +import {Observable} from 'rxjs'; +import {VisualizationConfig} from '../../VisualizationConfig'; @Component({ selector: 'app-search', @@ -16,7 +16,7 @@ export class SearchComponent implements OnInit { constructor() { } - filterFileOptions(value: string,source:{value:string,displayValue:string}[]): {value:string,displayValue:string}[] { + filterFileOptions(value: string, source: {value: string, displayValue: string, score: number}[]): {value: string, displayValue: string}[] { if (source === undefined) { return []; } else if (typeof value !== 'string') { @@ -27,30 +27,30 @@ export class SearchComponent implements OnInit { const lowercaseValue = value.toLowerCase(); source.forEach(option => { - var score = 0; - //Positive conditions - if(option.displayValue.startsWith(value))score += 10 - if(option.displayValue.toLowerCase().includes(lowercaseValue))score +=1; - //Final conditions - if(option.displayValue===VisualizationConfig.ROOT_NAME)score = 0; - option["score"] = score; + let score = 0; + // Positive conditions + if (option.displayValue.startsWith(value)) {score += 10; } + if (option.displayValue.toLowerCase().includes(lowercaseValue)) {score += 1; } + // Final conditions + if (option.displayValue === VisualizationConfig.ROOT_NAME) {score = 0; } + option.score = score; }); - const filteredFiles: {value:string,displayValue:string}[] = source.filter(option => { - if(option["score"]<=0)return; - if(option.value.toLowerCase().includes(lowercaseValue))return option; + const filteredFiles: {value: string, displayValue: string, score: number}[] = source.filter(option => { + if (option.score <= 0) {return; } + if (option.value.toLowerCase().includes(lowercaseValue)) {return option; } }); return filteredFiles.sort( - (a, b) =>{ - return Math.sign(b["score"] - a["score"]); + (a, b) => { + return Math.sign(b.score - a.score); }); } - formatFileOptions(option: string): string{ - if(option){ + formatFileOptions(option: string): string { + if (option) { return option; - }else{ - return ""; + } else { + return ''; } } diff --git a/coderadar-ui/src/app/city-map/helper/element-analyzer.ts b/coderadar-ui/src/app/city-map/helper/element-analyzer.ts index 1a19ffe90..c89b2b83c 100644 --- a/coderadar-ui/src/app/city-map/helper/element-analyzer.ts +++ b/coderadar-ui/src/app/city-map/helper/element-analyzer.ts @@ -2,7 +2,7 @@ import {INode} from '../interfaces/INode'; import {NodeType} from '../enum/NodeType'; import {ScreenType} from '../enum/ScreenType'; import {CommitReferenceType} from '../enum/CommitReferenceType'; -import {MetricValue} from "../../model/metric-value"; +import {MetricValue} from '../../model/metric-value'; export class ElementAnalyzer { @@ -113,7 +113,8 @@ export class ElementAnalyzer { } else if (commit2Metrics === null) { return commit1Metrics[metricName]; } else { - let commit1 = this.getValueFromMetric(commit1Metrics, metricName), commit2 = this.getValueFromMetric(commit2Metrics, metricName); + const commit1 = this.getValueFromMetric(commit1Metrics, metricName); + const commit2 = this.getValueFromMetric(commit2Metrics, metricName); return commit1 < commit2 ? commit1 : commit2; } @@ -125,11 +126,12 @@ export class ElementAnalyzer { } if (commit1Metrics === null) { - return this.getValueFromMetric(commit2Metrics, metricName) + return this.getValueFromMetric(commit2Metrics, metricName); } else if (commit2Metrics === null) { return this.getValueFromMetric(commit1Metrics, metricName); } else { - let commit1 = this.getValueFromMetric(commit1Metrics, metricName), commit2 = this.getValueFromMetric(commit2Metrics, metricName); + const commit1 = this.getValueFromMetric(commit1Metrics, metricName); + const commit2 = this.getValueFromMetric(commit2Metrics, metricName); return commit1 > commit2 ? commit1 : commit2; } @@ -198,8 +200,8 @@ export class ElementAnalyzer { } } - static getValueFromMetric(metrics: MetricValue[], metricName: String) { - let index = metrics ? Object.values(metrics).findIndex(object => object.metricName === metricName): -1; + static getValueFromMetric(metrics: MetricValue[], metricName: string) { + const index = metrics ? Object.values(metrics).findIndex(object => object.metricName === metricName) : -1; return index >= 0 ? Number(metrics[index].value) : undefined; } diff --git a/coderadar-ui/src/app/city-map/interfaces/INode.ts b/coderadar-ui/src/app/city-map/interfaces/INode.ts index f29c88328..df1a2b45d 100644 --- a/coderadar-ui/src/app/city-map/interfaces/INode.ts +++ b/coderadar-ui/src/app/city-map/interfaces/INode.ts @@ -1,6 +1,6 @@ import {IPackerElement} from './IPackerElement'; import {NodeType} from '../enum/NodeType'; -import {MetricValue} from "../../model/metric-value"; +import {MetricValue} from '../../model/metric-value'; export interface INode { name: string; diff --git a/coderadar-ui/src/app/city-map/visualization/interaction-handler/interaction-handler.ts b/coderadar-ui/src/app/city-map/visualization/interaction-handler/interaction-handler.ts index 73d1a0688..4338cb500 100644 --- a/coderadar-ui/src/app/city-map/visualization/interaction-handler/interaction-handler.ts +++ b/coderadar-ui/src/app/city-map/visualization/interaction-handler/interaction-handler.ts @@ -10,7 +10,7 @@ import { } from 'three'; import {FocusService} from '../../service/focus.service'; import {TooltipService} from '../../service/tooltip.service'; -import {VisualizationConfig} from "../../VisualizationConfig"; +import {VisualizationConfig} from '../../VisualizationConfig'; export class InteractionHandler { @@ -181,11 +181,11 @@ export class InteractionHandler { private findFirstNonHelperBlockIntersection(intersections: Intersection[]): Intersection { if (intersections.length > 0) { - for (let i = 0; i < intersections.length; i++) { + for (const i of intersections) { // find the first block that is not a helper block // this lets the clicks go through the helper blocks - if (!intersections[i].object.userData.isHelper) { - return intersections[i]; + if (!i.object.userData.isHelper) { + return i; } } } diff --git a/coderadar-ui/src/app/city-map/visualization/screen/screen.component.ts b/coderadar-ui/src/app/city-map/visualization/screen/screen.component.ts index f8f36f65b..9b6ff6403 100644 --- a/coderadar-ui/src/app/city-map/visualization/screen/screen.component.ts +++ b/coderadar-ui/src/app/city-map/visualization/screen/screen.component.ts @@ -131,7 +131,7 @@ export class ScreenComponent implements OnInit, OnChanges, OnDestroy { } createRenderer() { - this.renderer = new WebGLRenderer({antialias: true, preserveDrawingBuffer: true,logarithmicDepthBuffer:true}); + this.renderer = new WebGLRenderer({antialias: true, preserveDrawingBuffer: true, logarithmicDepthBuffer: true}); this.renderer.setClearColor(0xf0f0f0); this.renderer.setSize(this.getScreenWidth() - 0, window.innerHeight); @@ -296,7 +296,7 @@ export class ScreenComponent implements OnInit, OnChanges, OnDestroy { }; } - private getRoot():Object3D{ + private getRoot(): Object3D { return this.scene.getObjectByName(VisualizationConfig.ROOT_NAME); } @@ -353,35 +353,35 @@ export class ScreenComponent implements OnInit, OnChanges, OnDestroy { } private createTooltip() { - var material = new THREE.MeshBasicMaterial({ - color:0xff0000 + const material = new THREE.MeshBasicMaterial({ + color: 0xff0000 }); - var geometry = new THREE.Geometry(); + const geometry = new THREE.Geometry(); geometry.vertices.push( - new Vector3(0,0,0), - new Vector3(0,-1,0) + new Vector3(0, 0, 0), + new Vector3(0, -1, 0) ); - var tipSize = 0.1; - var tipGeometry = new THREE.SphereGeometry(tipSize,16,16); - this.tooltipLine = new Line(geometry,material); - var tooltipLineTip = new Mesh(tipGeometry,material); + const tipSize = 0.1; + const tipGeometry = new THREE.SphereGeometry(tipSize, 16, 16); + this.tooltipLine = new Line(geometry, material); + const tooltipLineTip = new Mesh(tipGeometry, material); tooltipLineTip.position.setY(-1); this.tooltipLine.add(tooltipLineTip); - this.tooltipLine.type = "TooltipLine"; + this.tooltipLine.type = 'TooltipLine'; this.tooltipLine.visible = false; this.tooltipLine.userData.isHelper = true; this.scene.add(this.tooltipLine); } - private createSelectionHighlightBox(){ - var material = new THREE.MeshBasicMaterial({ - color:0xffff00, - opacity:0.5, - transparent:true + private createSelectionHighlightBox() { + const material = new THREE.MeshBasicMaterial({ + color: 0xffff00, + opacity: 0.5, + transparent: true }); - var geometry = new THREE.BoxGeometry(1,1,1); - this.highlightBox = new Mesh(geometry,material); - this.highlightBox.type = "HighlightBox"; + const geometry = new THREE.BoxGeometry(1, 1, 1); + this.highlightBox = new Mesh(geometry, material); + this.highlightBox.type = 'HighlightBox'; this.highlightBox.visible = false; this.highlightBox.userData.isHelper = true; this.scene.add(this.highlightBox); diff --git a/coderadar-ui/src/app/levelized-structure-map/dependency-base.ts b/coderadar-ui/src/app/levelized-structure-map/dependency-base.ts index bccc071ad..6a7c964ea 100644 --- a/coderadar-ui/src/app/levelized-structure-map/dependency-base.ts +++ b/coderadar-ui/src/app/levelized-structure-map/dependency-base.ts @@ -2,10 +2,10 @@ import {ElementRef, HostListener, ViewChild} from '@angular/core'; import html2canvas from 'html2canvas'; import * as $ from 'jquery'; import * as jspdf from 'jspdf'; -import {AppComponent} from "../app.component"; -import {Project} from "../model/project"; -import {FORBIDDEN, NOT_FOUND} from "http-status-codes"; -import {EdgeModel} from "./edge.model"; +import {AppComponent} from '../app.component'; +import {Project} from '../model/project'; +import {FORBIDDEN, NOT_FOUND} from 'http-status-codes'; +import {EdgeModel} from './edge.model'; export abstract class DependencyBase { @@ -138,7 +138,7 @@ export abstract class DependencyBase { draw(callback): void { // clear svg - $("#3svg").empty(); + $('#3svg').empty(); this.drawn = []; const rootList = document.getElementById('3list__root'); this.svg = document.getElementById('3svg'); @@ -178,7 +178,7 @@ export abstract class DependencyBase { // calculate positions for arrows of currentNode and its dependencies if (currentNode.dependencies.length > 0) { // find last visible element for currentNode as start - let start = this.findLastHTMLElement(currentNode.path) as HTMLElement; + const start = this.findLastHTMLElement(currentNode.path) as HTMLElement; let toDraw; if (this.activeDependency !== undefined) { // activeDependency is set is not start @@ -189,13 +189,15 @@ export abstract class DependencyBase { // different values for chrome and firefox // (ref: https://stackoverflow.com/questions/1472842/firefox-and-chrome-give-different-values-for-offsettop). const startx = ($(start).offset().left - $(this.svg).offset().left) / this.zoomElement.scale + start.offsetWidth / 2; - let starty = ($(start).offset().top - $(this.svg).offset().top) / this.zoomElement.scale + start.offsetHeight + ($(start).css('padding-top') !== '0px' ? 0 : 5); - let startTop = starty - start.offsetHeight - ($(start).css('padding-top') !== '0px' ? 0 : 10); + const starty = ($(start).offset().top - $(this.svg).offset().top) / + this.zoomElement.scale + start.offsetHeight + ($(start).css('padding-top') !== '0px' ? 0 : 5); + + const startTop = starty - start.offsetHeight - ($(start).css('padding-top') !== '0px' ? 0 : 10); console.log(parseFloat($(start).css('padding-top'))); currentNode.dependencies.forEach(dependency => { // find last visible element for dependency as end - let end = this.findLastHTMLElement(dependency.path) as HTMLElement; + const end = this.findLastHTMLElement(dependency.path) as HTMLElement; // if activeDependency is set, draw only activeDependency related dependencies if (this.activeDependency !== undefined) { @@ -210,8 +212,10 @@ export abstract class DependencyBase { // end = end.parentNode as HTMLElement; const endx = ($(end).offset().left - $(this.svg).offset().left) / this.zoomElement.scale + end.offsetWidth / 2; - let endy = ($(end).offset().top - $(this.svg).offset().top) / this.zoomElement.scale - ($(end).css('padding-bottom') !== '0px' ? 0 : 7); - let endBottom = endy + end.offsetHeight + ($(end).css('padding-bottom') !== '0px' ? 0 : 14); + const endy = ($(end).offset().top - $(this.svg).offset().top) / + this.zoomElement.scale - ($(end).css('padding-bottom') !== '0px' ? 0 : 7); + + const endBottom = endy + end.offsetHeight + ($(end).css('padding-bottom') !== '0px' ? 0 : 14); if (start !== end) { if (dependency.changed === 'ADD') { @@ -250,7 +254,7 @@ export abstract class DependencyBase { svgArrow(startx, starty, endx, endy, color, width?, dashed?) { // reduce number of nodes - let edge = new EdgeModel(startx, starty, endx, endy, color, width, dashed); + const edge = new EdgeModel(startx, starty, endx, endy, color, width, dashed); if (this.drawn.filter(existingEdge => existingEdge.equals(edge)).length > 0) { return; } @@ -260,7 +264,7 @@ export abstract class DependencyBase { // definition of teh figure to draw, either a line or a curve let figureDefinition; - if (Math.abs(parseInt(startx) - parseInt(endx)) < 10) { + if (Math.abs(parseInt(startx, 10) - parseInt(endx, 10)) < 10) { // draw straight line because there is not enough space for a curve figureDefinition = `M ${startx} ${starty} L ${endx} ${endy}`; angle = Math.atan2(endy - starty, endx - startx); @@ -301,8 +305,8 @@ export abstract class DependencyBase { ); } - drawFigure(figureDefinition: string, width: number, color: string, dashed? : boolean) { - const figure = document.createElementNS("http://www.w3.org/2000/svg", 'path'); + drawFigure(figureDefinition: string, width: number, color: string, dashed?: boolean) { + const figure = document.createElementNS('http://www.w3.org/2000/svg', 'path'); figure.setAttribute('d', figureDefinition); figure.style.stroke = color; figure.style.fill = 'transparent'; diff --git a/coderadar-ui/src/app/levelized-structure-map/dependency-compare/dependency-compare.component.spec.ts b/coderadar-ui/src/app/levelized-structure-map/dependency-compare/dependency-compare.component.spec.ts index 34ffede5d..7675cbbe0 100644 --- a/coderadar-ui/src/app/levelized-structure-map/dependency-compare/dependency-compare.component.spec.ts +++ b/coderadar-ui/src/app/levelized-structure-map/dependency-compare/dependency-compare.component.spec.ts @@ -183,7 +183,8 @@ describe('DependencyRootComponent', () => { changed: null }, { - path: 'org/wickedsource/dependencytree/example/wildcardpackage/WildcardImportCircularDependencyTest.java', + path: + 'org/wickedsource/dependencytree/example/wildcardpackage/WildcardImportCircularDependencyTest.java', changed: null } ] @@ -209,7 +210,8 @@ describe('DependencyRootComponent', () => { changed: null }, { - path: 'org/wickedsource/dependencytree/example/wildcardpackage/WildcardImportCircularDependencyTest.java', + path: + 'org/wickedsource/dependencytree/example/wildcardpackage/WildcardImportCircularDependencyTest.java', changed: null } ] @@ -301,7 +303,8 @@ describe('DependencyRootComponent', () => { { filename: 'WildcardImportCircularDependencyTest.java', path: 'org/wickedsource/dependencytree/example/wildcardpackage/WildcardImportCircularDependencyTest.java', - packageName: 'org.wickedsource.dependencytree.example.wildcardpackage.WildcardImportCircularDependencyTest.java', + packageName: + 'org.wickedsource.dependencytree.example.wildcardpackage.WildcardImportCircularDependencyTest.java', level: 0, changed: null, children: [], @@ -574,7 +577,8 @@ describe('DependencyRootComponent', () => { expect(dependencyTree.children[0].changed).toBe('ADD'); }); const req = httpTestingController. - expectOne('http://localhost:8080/analyzers/1/structureMap/0b79780c8e8c8736a8e0ddafc964fc4446f007f2/643a55c23dce1832b5da07816f068896aef854e6'); + expectOne( + 'http://localhost:8080/analyzers/1/structureMap/0b79780c8e8c8736a8e0ddafc964fc4446f007f2/643a55c23dce1832b5da07816f068896aef854e6'); expect(req.request.method).toEqual('GET'); req.flush(mockResponse); }); diff --git a/coderadar-ui/src/app/levelized-structure-map/dependency-root/dependency-root.component.spec.ts b/coderadar-ui/src/app/levelized-structure-map/dependency-root/dependency-root.component.spec.ts index 9066c2f67..582c8a478 100644 --- a/coderadar-ui/src/app/levelized-structure-map/dependency-root/dependency-root.component.spec.ts +++ b/coderadar-ui/src/app/levelized-structure-map/dependency-root/dependency-root.component.spec.ts @@ -227,7 +227,8 @@ describe('DependencyRootComponent', () => { { filename: 'WildcardImportCircularDependencyTest.java', path: 'org/wickedsource/dependencytree/example/wildcardpackage/WildcardImportCircularDependencyTest.java', - packageName: 'org.wickedsource.dependencytree.example.wildcardpackage.WildcardImportCircularDependencyTest.java', + packageName: + 'org.wickedsource.dependencytree.example.wildcardpackage.WildcardImportCircularDependencyTest.java', level: 0, children: [], dependencies: [ diff --git a/coderadar-ui/src/app/model/project-role.ts b/coderadar-ui/src/app/model/project-role.ts index 20bbdf611..584a24e7c 100644 --- a/coderadar-ui/src/app/model/project-role.ts +++ b/coderadar-ui/src/app/model/project-role.ts @@ -1,4 +1,4 @@ export enum ProjectRole { - ADMIN= "admin", - MEMBER = "member" + ADMIN= 'admin', + MEMBER = 'member' } diff --git a/coderadar-ui/src/app/model/team.ts b/coderadar-ui/src/app/model/team.ts index 88a8464f4..c98d96660 100644 --- a/coderadar-ui/src/app/model/team.ts +++ b/coderadar-ui/src/app/model/team.ts @@ -1,4 +1,4 @@ -import {User} from "./user"; +import {User} from './user'; export class Team { public id: number; diff --git a/coderadar-ui/src/app/service/contributor.service.ts b/coderadar-ui/src/app/service/contributor.service.ts index 8af18a7a2..aaa5bcc3a 100644 --- a/coderadar-ui/src/app/service/contributor.service.ts +++ b/coderadar-ui/src/app/service/contributor.service.ts @@ -18,8 +18,6 @@ export class ContributorService { {observe: 'response'}).toPromise(); } - - getContributorsForFile(projectId: number, path: string, commitHash: string): Promise> { return this.httpClient.post(this.apiURL + 'projects/' + projectId + '/contributors/path', {path, commitHash}, {observe: 'response'}).toPromise(); diff --git a/coderadar-ui/src/app/service/project.service.ts b/coderadar-ui/src/app/service/project.service.ts index 1c80a4271..60b80a9b4 100644 --- a/coderadar-ui/src/app/service/project.service.ts +++ b/coderadar-ui/src/app/service/project.service.ts @@ -19,7 +19,6 @@ import {FileContentWithMetrics} from '../model/file-content-with-metrics'; }) export class ProjectService { - private apiURL = AppComponent.getApiUrl(); constructor(private httpClient: HttpClient) { @@ -205,7 +204,7 @@ export class ProjectService { * @param branch The branch to use for getting the commits. */ public getCommitsForContributor(id: number, branch: string, email: string): Promise> { - return this.httpClient.get(this.apiURL + 'projects/' + id + '/' + branch + '/commits?email='+email.replace("+", "%2B"), + return this.httpClient.get(this.apiURL + 'projects/' + id + '/' + branch + '/commits?email=' + email.replace('+', '%2B'), {observe: 'response'}).toPromise(); } @@ -320,7 +319,7 @@ export class ProjectService { } public listProjectsForUser(userId: number): Promise> { - return this.httpClient.get(this.apiURL + 'users/'+userId+'/projects', + return this.httpClient.get(this.apiURL + 'users/' + userId + '/projects', {observe: 'response'}).toPromise(); } } diff --git a/coderadar-ui/src/app/service/team.service.ts b/coderadar-ui/src/app/service/team.service.ts index 0dac592b2..50e6470ef 100644 --- a/coderadar-ui/src/app/service/team.service.ts +++ b/coderadar-ui/src/app/service/team.service.ts @@ -1,9 +1,9 @@ import {Injectable} from '@angular/core'; -import {HttpClient, HttpResponse} from "@angular/common/http"; -import {AppComponent} from "../app.component"; -import {ProjectRole} from "../model/project-role"; -import {Team} from "../model/team"; -import {Project} from "../model/project"; +import {HttpClient, HttpResponse} from '@angular/common/http'; +import {AppComponent} from '../app.component'; +import {ProjectRole} from '../model/project-role'; +import {Team} from '../model/team'; +import {Project} from '../model/project'; @Injectable({ providedIn: 'root' @@ -24,57 +24,57 @@ export class TeamService { } public addTeamToProject(projectId: number, teamId: number, role: ProjectRole): Promise> { - return this.httpClient.post(this.apiURL + 'projects/'+projectId+'/teams/' + teamId, {role}, + return this.httpClient.post(this.apiURL + 'projects/' + projectId + '/teams/' + teamId, {role}, {observe: 'response'}).toPromise(); } public addUsersToTeam(teamId: number, userIds: number[]): Promise> { - return this.httpClient.post(this.apiURL + 'teams/'+teamId+'/users', {userIds}, + return this.httpClient.post(this.apiURL + 'teams/' + teamId + '/users', {userIds}, {observe: 'response'}).toPromise(); } public removeUsersFromTeam(teamId: number, userIds: number[]): Promise> { - return this.httpClient.post(this.apiURL + 'teams/'+teamId+'/users', {userIds}, + return this.httpClient.post(this.apiURL + 'teams/' + teamId + '/users', {userIds}, {observe: 'response'}).toPromise(); } public createTeam(name: string, userIds: number[]): Promise> { return this.httpClient.post(this.apiURL + 'teams', {name, userIds}, - {observe: 'response'}).toPromise() + {observe: 'response'}).toPromise(); } public deleteTeam(teamId: number): Promise> { - return this.httpClient.delete(this.apiURL + 'teams/'+teamId, - {observe: 'response'}).toPromise() + return this.httpClient.delete(this.apiURL + 'teams/' + teamId, + {observe: 'response'}).toPromise(); } public getTeam(teamId: number): Promise> { - return this.httpClient.get(this.apiURL + 'teams/'+teamId, - {observe: 'response'}).toPromise() + return this.httpClient.get(this.apiURL + 'teams/' + teamId, + {observe: 'response'}).toPromise(); } public listProjectsForTeam(teamId: number): Promise> { - return this.httpClient.get(this.apiURL + 'teams/'+teamId+'/projects', + return this.httpClient.get(this.apiURL + 'teams/' + teamId + '/projects', {observe: 'response'}).toPromise(); } public listTeamsForProject(projectId: number): Promise> { - return this.httpClient.get(this.apiURL + 'projects/'+projectId+'/teams', + return this.httpClient.get(this.apiURL + 'projects/' + projectId + '/teams', {observe: 'response'}).toPromise(); } public listTeamsForUser(userId: number): Promise> { - return this.httpClient.get(this.apiURL + 'users/'+userId+'/teams', + return this.httpClient.get(this.apiURL + 'users/' + userId + '/teams', {observe: 'response'}).toPromise(); } - public removeTeamFromProject(projectId:number, teamId: number): Promise> { - return this.httpClient.delete(this.apiURL + 'projects/'+projectId+'/teams/'+teamId, + public removeTeamFromProject(projectId: number, teamId: number): Promise> { + return this.httpClient.delete(this.apiURL + 'projects/' + projectId + '/teams/' + teamId, {observe: 'response'}).toPromise(); } public removeTeam(id: number) { - return this.httpClient.delete(this.apiURL + 'teams/'+id, + return this.httpClient.delete(this.apiURL + 'teams/' + id, {observe: 'response'}).toPromise(); } } diff --git a/coderadar-ui/src/app/service/user.service.ts b/coderadar-ui/src/app/service/user.service.ts index 874f19c17..236f0397c 100644 --- a/coderadar-ui/src/app/service/user.service.ts +++ b/coderadar-ui/src/app/service/user.service.ts @@ -2,7 +2,7 @@ import {Injectable} from '@angular/core'; import {HttpClient, HttpResponse} from '@angular/common/http'; import {Router} from '@angular/router'; import {AppComponent} from '../app.component'; -import {User} from "../model/user"; +import {User} from '../model/user'; @Injectable({ @@ -113,12 +113,12 @@ export class UserService { {refreshToken: UserService.getLoggedInUser().refreshToken, newPassword: password}, {observe: 'response'}).toPromise(); } - public listUsersForProject(projectId: number): Promise>{ - return this.httpClient.get(this.apiURL + 'projects/'+projectId+'/users', + public listUsersForProject(projectId: number): Promise> { + return this.httpClient.get(this.apiURL + 'projects/' + projectId + '/users', {observe: 'response'}).toPromise(); } - public listUsers(): Promise>{ + public listUsers(): Promise> { return this.httpClient.get(this.apiURL + 'users', {observe: 'response'}).toPromise(); } diff --git a/coderadar-ui/src/app/view/add-team/add-team.component.html b/coderadar-ui/src/app/view/add-team/add-team.component.html index f22917f45..82180f5c8 100644 --- a/coderadar-ui/src/app/view/add-team/add-team.component.html +++ b/coderadar-ui/src/app/view/add-team/add-team.component.html @@ -31,6 +31,7 @@ The team name must not be empty! + The team must have at least one user! A team with this name already exists!

diff --git a/coderadar-ui/src/app/view/add-team/add-team.component.ts b/coderadar-ui/src/app/view/add-team/add-team.component.ts index e9804301d..ca20e56ac 100644 --- a/coderadar-ui/src/app/view/add-team/add-team.component.ts +++ b/coderadar-ui/src/app/view/add-team/add-team.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit } from '@angular/core'; -import {FormControl} from "@angular/forms"; -import {Team} from "../../model/team"; -import {User} from "../../model/user"; -import {UserService} from "../../service/user.service"; -import {TeamService} from "../../service/team.service"; -import {CONFLICT, FORBIDDEN, NOT_FOUND} from "http-status-codes"; -import {Router} from "@angular/router"; +import {FormControl} from '@angular/forms'; +import {Team} from '../../model/team'; +import {User} from '../../model/user'; +import {UserService} from '../../service/user.service'; +import {TeamService} from '../../service/team.service'; +import {CONFLICT, FORBIDDEN, NOT_FOUND} from 'http-status-codes'; +import {Router} from '@angular/router'; @Component({ selector: 'app-add-team', @@ -19,6 +19,7 @@ export class AddTeamComponent implements OnInit { users: User[] = []; nameEmpty = false; teamNameTaken = false; + noUsers: boolean; constructor(private userService: UserService, private teamService: TeamService, private router: Router) { } @@ -39,8 +40,9 @@ export class AddTeamComponent implements OnInit { } submitForm() { - this.nameEmpty = this.team.name == undefined || this.team.name.length === 0; - if(!this.nameEmpty) { + this.nameEmpty = this.team.name === undefined || this.team.name.length === 0; + this.noUsers = this.usersFormControl.value.length === 0; + if (!this.nameEmpty && !this.noUsers) { this.teamService.createTeam(this.team.name, this.usersFormControl.value).then(() => this.router.navigate(['/teams'] )).catch(error => { @@ -49,7 +51,7 @@ export class AddTeamComponent implements OnInit { } else if (error.status && error.status === CONFLICT) { this.teamNameTaken = true; } - }); //TODO: Identical team names + }); } } } diff --git a/coderadar-ui/src/app/view/configure-project/configure-project.component.ts b/coderadar-ui/src/app/view/configure-project/configure-project.component.ts index 616cee2d5..c2a6c0872 100644 --- a/coderadar-ui/src/app/view/configure-project/configure-project.component.ts +++ b/coderadar-ui/src/app/view/configure-project/configure-project.component.ts @@ -17,6 +17,23 @@ export interface DialogData { displayNames: string[]; } +@Component({ + selector: 'app-dialog-overview-example-dialog', + templateUrl: 'app-merge-dialog.html', +}) +export class MergeDialogComponent { + + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: DialogData) {} + + onNoClick(): void { + this.dialogRef.close(); + } + +} + + @Component({ selector: 'app-configure-project', templateUrl: './configure-project.component.html', @@ -43,7 +60,8 @@ export class ConfigureProjectComponent implements OnInit { moduleExists = false; constructor(private snackBar: MatSnackBar, private router: Router, private userService: UserService, private titleService: Title, - private projectService: ProjectService, private contributorService: ContributorService, private route: ActivatedRoute, public dialog: MatDialog) { + private projectService: ProjectService, private contributorService: ContributorService, + private route: ActivatedRoute, public dialog: MatDialog) { this.projectName = ''; this.filePatternIncludeInput = ''; this.filePatternExcludeInput = ''; @@ -375,19 +393,3 @@ export class ConfigureProjectComponent implements OnInit { } } } - -@Component({ - selector: 'app-dialog-overview-example-dialog', - templateUrl: 'app-merge-dialog.html', -}) -export class MergeDialogComponent { - - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: DialogData) {} - - onNoClick(): void { - this.dialogRef.close(); - } - -} diff --git a/coderadar-ui/src/app/view/edit-project/edit-project.component.ts b/coderadar-ui/src/app/view/edit-project/edit-project.component.ts index cc02ce4dd..1578bb60b 100644 --- a/coderadar-ui/src/app/view/edit-project/edit-project.component.ts +++ b/coderadar-ui/src/app/view/edit-project/edit-project.component.ts @@ -109,7 +109,7 @@ export class EditProjectComponent implements OnInit { private validateInput(): boolean { this.incorrectURL = this.project.vcsUrl.trim().length === 0; this.nameEmpty = this.project.name.trim().length === 0; - + if (this.project.startDate === 'first commit') { this.project.startDate = null; } diff --git a/coderadar-ui/src/app/view/file-view/file-view.component.html b/coderadar-ui/src/app/view/file-view/file-view.component.html index da2bfcee7..df0649688 100644 --- a/coderadar-ui/src/app/view/file-view/file-view.component.html +++ b/coderadar-ui/src/app/view/file-view/file-view.component.html @@ -30,28 +30,32 @@

-
  • - -
    • +
      +
    • + +
      • +
    -
  • -
    - -
    -
      - -
    -
    • +
      +
    • +
      + +
      +
        + +
      +
      • +

    diff --git a/coderadar-ui/src/app/view/file-view/file-view.component.ts b/coderadar-ui/src/app/view/file-view/file-view.component.ts index 79ad359d2..243e80f48 100644 --- a/coderadar-ui/src/app/view/file-view/file-view.component.ts +++ b/coderadar-ui/src/app/view/file-view/file-view.component.ts @@ -27,8 +27,8 @@ import {AppComponent} from '../../app.component'; import {Title} from '@angular/platform-browser'; import {ContributorService} from '../../service/contributor.service'; import {Contributor} from '../../model/contributor'; -import {HttpResponse} from "@angular/common/http"; -import {FileContentWithMetrics} from "../../model/file-content-with-metrics"; +import {HttpResponse} from '@angular/common/http'; +import {FileContentWithMetrics} from '../../model/file-content-with-metrics'; @Component({ selector: 'app-file-view', @@ -80,7 +80,7 @@ export class FileViewComponent implements OnInit, AfterViewChecked { hasChild = (_: number, node: FileTreeNode) => node.children !== null; public getFileTree() { - if(!this.showOnlyChangedFiles){ + if (!this.showOnlyChangedFiles) { this.showDiff = false; this.updateSelectedFile(null, this.currentSelectedFilepath); } @@ -107,23 +107,23 @@ export class FileViewComponent implements OnInit, AfterViewChecked { public updateSelectedFile(node: any, path: string): void { this.highlighted = false; this.currentFileContent = ''; - if(node === null && path === null){ + if (node === null && path === null) { return; } - if(path === null) { + if (path === null) { this.currentSelectedFilepath = this.getFullPath(this.tree.children, node, ''); this.currentSelectedFilepath = this.currentSelectedFilepath.substr(1, this.currentSelectedFilepath.length); } else { this.currentSelectedFilepath = path; } - if(this.currentSelectedFilepath === ''){ + if (this.currentSelectedFilepath === '') { return; } let promise: Promise> ; - if(this.showDiff){ - promise = this.projectService.getFileDiff(this.projectId, this.commitHash, this.currentSelectedFilepath) + if (this.showDiff) { + promise = this.projectService.getFileDiff(this.projectId, this.commitHash, this.currentSelectedFilepath); } else { - promise = this.projectService.getFileContentWithMetrics(this.projectId, this.commitHash, this.currentSelectedFilepath) + promise = this.projectService.getFileContentWithMetrics(this.projectId, this.commitHash, this.currentSelectedFilepath); } promise.then(value => { this.currentFileContent = value.body.content; @@ -153,7 +153,7 @@ export class FileViewComponent implements OnInit, AfterViewChecked { @HostListener('window:resize', ['$event']) onResize(event) { - if(this.showDiff){ + if (this.showDiff) { this.fileView.nativeElement.children.item(0).lastChild.remove(); } else { this.fileView.nativeElement.children.item(1).remove(); @@ -212,7 +212,7 @@ export class FileViewComponent implements OnInit, AfterViewChecked { const lineStart = +range.value.split('-')[0]; let findings = ''; this.currentFileMetrics.forEach(value => { - let found = false; + const found = false; for (const finding of value.findings) { if (finding.lineStart === lineStart) { findings += finding.message + '\n'; @@ -226,11 +226,11 @@ export class FileViewComponent implements OnInit, AfterViewChecked { getCodeClass() { const temp = this.currentSelectedFilepath.split('.'); const fileExtension = temp[temp.length - 1]; - if(this.showDiff) { + if (this.showDiff) { if (fileExtension === 'gradle') { return 'language-diff-groovy diff-highlight'; } - return 'language-diff-'+ fileExtension + ' diff-highlight'; + return 'language-diff-' + fileExtension + ' diff-highlight'; } else { if (fileExtension === 'gradle') { return 'line-numbers language-groovy'; @@ -240,7 +240,7 @@ export class FileViewComponent implements OnInit, AfterViewChecked { } getAllFindings(metrics: MetricWithFindings[]) { - if(metrics === null){ + if (metrics === null) { return '0'; } let result = ''; @@ -267,7 +267,7 @@ export class FileViewComponent implements OnInit, AfterViewChecked { } getPreClass() { - if(!this.showDiff){ + if (!this.showDiff) { return 'line-numbers file-content'; } else { return 'file-content'; diff --git a/coderadar-ui/src/app/view/login/login.component.ts b/coderadar-ui/src/app/view/login/login.component.ts index ac20356ce..cb982a8dd 100644 --- a/coderadar-ui/src/app/view/login/login.component.ts +++ b/coderadar-ui/src/app/view/login/login.component.ts @@ -1,7 +1,7 @@ import {Component} from '@angular/core'; import {Router} from '@angular/router'; import {UserService} from '../../service/user.service'; -import {FORBIDDEN, INTERNAL_SERVER_ERROR, NOT_FOUND} from 'http-status-codes'; +import {FORBIDDEN, NOT_FOUND} from 'http-status-codes'; import {Title} from '@angular/platform-browser'; @Component({ diff --git a/coderadar-ui/src/app/view/main-dashboard/add-project-to-team-dialog-data.ts b/coderadar-ui/src/app/view/main-dashboard/add-project-to-team-dialog-data.ts new file mode 100644 index 000000000..550cf3f84 --- /dev/null +++ b/coderadar-ui/src/app/view/main-dashboard/add-project-to-team-dialog-data.ts @@ -0,0 +1,11 @@ +import {Project} from '../../model/project'; +import {Team} from '../../model/team'; +import {ProjectRole} from '../../model/project-role'; + +export class AddProjectToTeamDialogData { + project: Project; + teams: Team[]; + role: ProjectRole; +} + + diff --git a/coderadar-ui/src/app/view/main-dashboard/add-project-to-team-dialog.component.ts b/coderadar-ui/src/app/view/main-dashboard/add-project-to-team-dialog.component.ts new file mode 100644 index 000000000..52ab4e225 --- /dev/null +++ b/coderadar-ui/src/app/view/main-dashboard/add-project-to-team-dialog.component.ts @@ -0,0 +1,29 @@ +import {Component, Inject} from '@angular/core'; +import {FormControl} from '@angular/forms'; +import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; +import {AddProjectToTeamDialogData} from './add-project-to-team-dialog-data'; + +@Component({ + selector: 'app-add-project-to-team-dialog', + templateUrl: 'add-project-to-team-dialog.html' +}) +export class AddProjectToTeamDialogComponent { + + selectedTeams: FormControl = new FormControl(); + + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: AddProjectToTeamDialogData + ) { + + } + + onNoClick(): void { + this.dialogRef.close(); + } + + onAddClick(): void { + this.data.teams = this.selectedTeams.value; + } + +} diff --git a/coderadar-ui/src/app/view/main-dashboard/delete-project-dialog.component.ts b/coderadar-ui/src/app/view/main-dashboard/delete-project-dialog.component.ts new file mode 100644 index 000000000..1a95ae037 --- /dev/null +++ b/coderadar-ui/src/app/view/main-dashboard/delete-project-dialog.component.ts @@ -0,0 +1,26 @@ +import {Component, Inject} from "@angular/core"; +import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; +import {Project} from "../../model/project"; + +class DeleteProjectDialogData { + project: Project; +} + +@Component({ + selector: 'app-delete-project-dialog', + templateUrl: 'delete-project-dialog.html' +}) +export class ConfirmDeleteProjectDialogComponent { + + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: DeleteProjectDialogData + ) { + + } + + onNoClick(): void { + this.dialogRef.close(); + } + +} diff --git a/coderadar-ui/src/app/view/main-dashboard/delete-project-dialog.html b/coderadar-ui/src/app/view/main-dashboard/delete-project-dialog.html index dce0be573..e2d292259 100644 --- a/coderadar-ui/src/app/view/main-dashboard/delete-project-dialog.html +++ b/coderadar-ui/src/app/view/main-dashboard/delete-project-dialog.html @@ -1,5 +1,5 @@
    -

    Are you sure you want to delete {{data.project.name}}?

    +

    Are you sure you want to delete {{data.project.name}}?

    diff --git a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html index 17d5644fc..5fe31a354 100644 --- a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html +++ b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.html @@ -58,7 +58,7 @@
    Project URL: {{project.vcsUrl}}
    -
    Project start date:   {{project.startDate}}
    +
    Project start date:   {{project.startDate}}
     diff --git a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss index e53f34d22..c76fc1c09 100644 --- a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss +++ b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.scss @@ -45,10 +45,10 @@ .card-list .noProjectsMessage { font-size: x-large; - text-align:center; + text-align: center; } -.card-list mat-card-content> div { +.card-list mat-card-content > div { padding-bottom: 10px; } diff --git a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.spec.ts b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.spec.ts index 629a7cc66..9f8a20517 100644 --- a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.spec.ts +++ b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.spec.ts @@ -1,7 +1,7 @@ import {LayoutModule} from '@angular/cdk/layout'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {async, ComponentFixture, TestBed} from '@angular/core/testing'; -import {MatButtonModule, MatCardModule, MatGridListModule, MatIconModule, MatMenuModule,} from '@angular/material'; +import {MatButtonModule, MatCardModule, MatGridListModule, MatIconModule, MatMenuModule, } from '@angular/material'; import {MainDashboardComponent} from './main-dashboard.component'; diff --git a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts index 87b357680..e9d694fc5 100644 --- a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts +++ b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts @@ -1,4 +1,4 @@ -import {Component, Inject, OnInit} from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {Project} from '../../model/project'; import {ProjectService} from '../../service/project.service'; import {Router} from '@angular/router'; @@ -7,12 +7,13 @@ import {FORBIDDEN, UNPROCESSABLE_ENTITY} from 'http-status-codes'; import {Title} from '@angular/platform-browser'; import {AppComponent} from '../../app.component'; import {MatDialog, MatSnackBar} from '@angular/material'; -import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog'; -import {Team} from "../../model/team"; -import {TeamService} from "../../service/team.service"; -import {HttpResponse} from "@angular/common/http"; -import {ProjectRole} from "../../model/project-role"; -import {FormControl} from "@angular/forms"; +import {MatDialogRef} from '@angular/material/dialog'; +import {Team} from '../../model/team'; +import {TeamService} from '../../service/team.service'; +import {HttpResponse} from '@angular/common/http'; +import {AddProjectToTeamDialogComponent} from './add-project-to-team-dialog.component'; +import {ConfirmDeleteProjectDialogComponent} from "./delete-project-dialog.component"; + @Component({ selector: 'app-main-dashboard', @@ -81,12 +82,12 @@ export class MainDashboardComponent implements OnInit { openAddToTeamDialog(project: Project): void { const dialogRef = this.dialog.open(AddProjectToTeamDialogComponent, { width: '300px', - data: {teams: this.teams, project: project} + data: {teams: this.teams, project} }); dialogRef.afterClosed().subscribe(result => { if (result !== undefined) { - for(let team of result.teams) { //TODO: Check if project is already in team + for (const team of result.teams) { // TODO: Check if project is already in team this.teamService.addTeamToProject(project.id, team.id, result.role); } } @@ -100,7 +101,7 @@ export class MainDashboardComponent implements OnInit { getProjects(): void { this.waiting = true; let promise: Promise>; - if(this.selectedTeam == undefined) { + if (this.selectedTeam === undefined) { promise = this.projectService.listProjectsForUser(UserService.getLoggedInUser().userId); } else { promise = this.teamService.listProjectsForTeam(this.selectedTeam.id); @@ -112,7 +113,7 @@ export class MainDashboardComponent implements OnInit { const newProject = new Project(project); this.projects.push(newProject); }); - this.waiting = false; + this.waiting = false; } ) .catch(e => { @@ -126,7 +127,7 @@ export class MainDashboardComponent implements OnInit { this.teamService.listTeamsForUser(UserService.getLoggedInUser().userId).then(value => this.teams = value.body ) .catch(e => { - if (e.status && e.status === FORBIDDEN) { //TODO: UNAUTHORIZED + if (e.status && e.status === FORBIDDEN) { // TODO: UNAUTHORIZED this.userService.refresh(() => this.getTeams()); } }); @@ -180,58 +181,3 @@ export class MainDashboardComponent implements OnInit { }); } } - -class DeleteProjectDialogData { - project: Project; -} - -@Component({ - selector: 'app-delete-project-dialog', - templateUrl: 'delete-project-dialog.html' -}) -export class ConfirmDeleteProjectDialogComponent{ - - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: DeleteProjectDialogData - ) { - - } - - onNoClick(): void { - this.dialogRef.close(); - } - -} - - -class AddProjectToTeamDialogData { - project: Project; - teams: Team[]; - role: ProjectRole; -} - -@Component({ - selector: 'app-add-project-to-team-dialog', - templateUrl: 'add-project-to-team-dialog.html' -}) -export class AddProjectToTeamDialogComponent { - - selectedTeams: FormControl = new FormControl(); - - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: AddProjectToTeamDialogData - ) { - - } - - onNoClick(): void { - this.dialogRef.close(); - } - - onAddClick(): void { - this.data.teams = this.selectedTeams.value; - } - -} diff --git a/coderadar-ui/src/app/view/project-dashboard/list-view/list-view.component.ts b/coderadar-ui/src/app/view/project-dashboard/list-view/list-view.component.ts index 8809332ee..4f18b5d88 100644 --- a/coderadar-ui/src/app/view/project-dashboard/list-view/list-view.component.ts +++ b/coderadar-ui/src/app/view/project-dashboard/list-view/list-view.component.ts @@ -16,7 +16,7 @@ import {ProjectService} from '../../../service/project.service'; import {Store} from '@ngrx/store'; import {Branch} from '../../../model/branch'; import {loadAvailableMetrics} from '../../../city-map/visualization/visualization.actions'; -import {Contributor} from "../../../model/contributor"; +import {Contributor} from '../../../model/contributor'; @Component({ selector: 'app-commit-list', @@ -228,14 +228,14 @@ export class ListViewComponent implements OnInit, OnChanges { } if (selectedCommit1Id != null) { this.selectedCommit1 = this.commitsFiltered.find(value => value.name === selectedCommit1Id); - }`` + } if (selectedCommit2Id != null) { this.selectedCommit2 = this.commitsFiltered.find(value => value.name === selectedCommit2Id); } } showCommitsInRange() { - if(this.commits.length > 0) { + if (this.commits.length > 0) { let endDate: Date; if (this.endDate === null || this.endDate.length === 0) { endDate = new Date(this.commits[0].timestamp); diff --git a/coderadar-ui/src/app/view/project-dashboard/project-dashboard.component.ts b/coderadar-ui/src/app/view/project-dashboard/project-dashboard.component.ts index e71873309..8587673a4 100644 --- a/coderadar-ui/src/app/view/project-dashboard/project-dashboard.component.ts +++ b/coderadar-ui/src/app/view/project-dashboard/project-dashboard.component.ts @@ -14,8 +14,8 @@ import * as fromRoot from '../../city-map/shared/reducers'; import {Store} from '@ngrx/store'; import {loadAvailableMetrics} from '../../city-map/visualization/visualization.actions'; import {CommitLog} from '../../model/commit-log'; -import {Contributor} from "../../model/contributor"; -import {ContributorService} from "../../service/contributor.service"; +import {Contributor} from '../../model/contributor'; +import {ContributorService} from '../../service/contributor.service'; @Component({ selector: 'app-project-dashboard', @@ -164,11 +164,11 @@ export class ProjectDashboardComponent implements OnInit, OnDestroy { if (error.status && error.status === FORBIDDEN) { this.userService.refresh(() => this.getContributors()); } - }) + }); } handleContributorChange($event: any) { - if($event == undefined) { + if ($event === undefined) { this.selectedContributor = new Contributor(); this.selectedContributor.emailAddresses = ['']; } else { diff --git a/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.html b/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.html index c02256022..af6b9ea8a 100644 --- a/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.html +++ b/coderadar-ui/src/app/view/sidenav-content/sidenav-content.component.html @@ -1,5 +1,4 @@ - Projects + Dashboard Teams - Settings diff --git a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html index 4b7eedfae..ec2eb590e 100644 --- a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html +++ b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.html @@ -1,4 +1,4 @@ - +
    @@ -35,7 +35,7 @@ Team members: - {{" " + member.username}} + {{member.username}} diff --git a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.ts b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.ts index 913ccbd6d..fe0440a91 100644 --- a/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.ts +++ b/coderadar-ui/src/app/view/teams-dashboard/teams-dashboard.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from '@angular/core'; -import {Team} from "../../model/team"; -import {TeamService} from "../../service/team.service"; -import {UserService} from "../../service/user.service"; -import {FORBIDDEN} from "http-status-codes"; +import {Team} from '../../model/team'; +import {TeamService} from '../../service/team.service'; +import {UserService} from '../../service/user.service'; +import {FORBIDDEN} from 'http-status-codes'; @Component({ selector: 'app-teams-dashboard', @@ -24,7 +24,7 @@ export class TeamsDashboardComponent implements OnInit { this.teamService.listTeamsForUser(UserService.getLoggedInUser().userId).then(value => this.teams = value.body ) .catch(e => { - if (e.status && e.status === FORBIDDEN) { //TODO: UNAUTHORIZED + if (e.status && e.status === FORBIDDEN) { // TODO: UNAUTHORIZED this.userService.refresh(() => this.getTeams()); } }); @@ -33,10 +33,10 @@ export class TeamsDashboardComponent implements OnInit { removeTeam(id: number) { this.teamService.removeTeam(id) .then(() => { - this.teams = this.teams.filter(value => value.id != id); + this.teams = this.teams.filter(value => value.id !== id); }) .catch(e => { - if (e.status && e.status === FORBIDDEN) { //TODO: UNAUTHORIZED + if (e.status && e.status === FORBIDDEN) { // TODO: UNAUTHORIZED this.userService.refresh(() => this.getTeams()); } }); diff --git a/coderadar-ui/src/app/view/view-commit/view-commit.component.html b/coderadar-ui/src/app/view/view-commit/view-commit.component.html index 46a6c2759..a98b19295 100644 --- a/coderadar-ui/src/app/view/view-commit/view-commit.component.html +++ b/coderadar-ui/src/app/view/view-commit/view-commit.component.html @@ -11,16 +11,16 @@ - {{commit.name}} + {{commit.name}}

    - Metrics: + Metrics:

    Not yet analyzed or no metrics are available
    {{metric.metricName.split('.').pop() + ' : '}} - {{metric.value}} + {{metric.value}}
    diff --git a/coderadar-ui/src/styles.scss b/coderadar-ui/src/styles.scss index 648d7edec..d5c24638d 100644 --- a/coderadar-ui/src/styles.scss +++ b/coderadar-ui/src/styles.scss @@ -62,7 +62,6 @@ Styles for most forms in the app margin: 10px; } - .waitingIndicator { position: absolute !important; margin-top: 20%; @@ -221,4 +220,3 @@ Styles for the login and register forms } } } - diff --git a/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetRawCommitContentAdapter.java b/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetRawCommitContentAdapter.java index 68bdca5fc..5cdaf6c07 100644 --- a/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetRawCommitContentAdapter.java +++ b/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/GetRawCommitContentAdapter.java @@ -23,8 +23,7 @@ public class GetRawCommitContentAdapter implements GetRawCommitContentPort { @Override - public byte[] getCommitContent(String projectRoot, String filepath, String commitHash) - throws UnableToGetCommitContentException { + public byte[] getCommitContent(String projectRoot, String filepath, String commitHash) { if (filepath.isEmpty()) { return new byte[0]; } @@ -37,8 +36,7 @@ public byte[] getCommitContent(String projectRoot, String filepath, String commi } @Override - public byte[] getFileDiff(String projectRoot, String filepath, String commitHash) - throws UnableToGetCommitContentException { + public byte[] getFileDiff(String projectRoot, String filepath, String commitHash) { if (filepath.isEmpty()) { return new byte[0]; } @@ -74,8 +72,7 @@ public byte[] getFileDiff(String projectRoot, String filepath, String commitHash @Override public HashMap getCommitContentBulk( - String projectRoot, List filepaths, String commitHash) - throws UnableToGetCommitContentException { + String projectRoot, List filepaths, String commitHash) { try (Git git = Git.open(new java.io.File(projectRoot))) { ObjectId commitId = git.getRepository().resolve(commitHash); HashMap bulkContent = new LinkedHashMap<>(); @@ -92,8 +89,7 @@ public HashMap getCommitContentBulk( public HashMap getCommitContentBulkWithFiles( String projectRoot, List files, - String commitHash) - throws UnableToGetCommitContentException { + String commitHash) { try (Git git = Git.open(new java.io.File(projectRoot))) { ObjectId commitId = git.getRepository().resolve(commitHash); HashMap bulkContent = new LinkedHashMap<>(); diff --git a/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/WalkCommitTreeAdapter.java b/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/WalkCommitTreeAdapter.java index 5a9161253..3ab4a2b16 100644 --- a/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/WalkCommitTreeAdapter.java +++ b/coderadar-vcs/src/main/java/io/reflectoring/coderadar/vcs/adapter/WalkCommitTreeAdapter.java @@ -19,8 +19,7 @@ public class WalkCommitTreeAdapter implements WalkCommitTreePort { public void walkCommitTree( String projectRoot, String name, WalkTreeCommandInterface commandInterface) throws UnableToWalkCommitTreeException { - try { - Git git = Git.open(new File(projectRoot)); + try (Git git = Git.open(new File(projectRoot))) { ObjectId commitId = git.getRepository().resolve(name); RevWalk walk = new RevWalk(git.getRepository()); @@ -41,7 +40,6 @@ public void walkCommitTree( } commandInterface.walkMethod(treeWalk.getPathString()); } - git.close(); } catch (IOException e) { throw new UnableToWalkCommitTreeException(e.getMessage()); } diff --git a/coderadar-vcs/src/test/java/io/reflectoring/coderadar/adapter/CloneRepositoryAdapterTest.java b/coderadar-vcs/src/test/java/io/reflectoring/coderadar/adapter/CloneRepositoryAdapterTest.java index aa50f2fef..89e5f97a7 100644 --- a/coderadar-vcs/src/test/java/io/reflectoring/coderadar/adapter/CloneRepositoryAdapterTest.java +++ b/coderadar-vcs/src/test/java/io/reflectoring/coderadar/adapter/CloneRepositoryAdapterTest.java @@ -13,12 +13,12 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -public class CloneRepositoryAdapterTest { +class CloneRepositoryAdapterTest { @TempDir public File folder; @Test - public void test() throws UnableToCloneRepositoryException { + void test() throws UnableToCloneRepositoryException { URL testRepoURL = this.getClass().getClassLoader().getResource("test-repository"); CloneRepositoryAdapter cloneRepositoryAdapter = new CloneRepositoryAdapter(); diff --git a/coderadar-vcs/src/test/java/io/reflectoring/coderadar/adapter/ComputeContributorAdapterTest.java b/coderadar-vcs/src/test/java/io/reflectoring/coderadar/adapter/ComputeContributorAdapterTest.java index 28fffabc5..d5aa4bb1b 100644 --- a/coderadar-vcs/src/test/java/io/reflectoring/coderadar/adapter/ComputeContributorAdapterTest.java +++ b/coderadar-vcs/src/test/java/io/reflectoring/coderadar/adapter/ComputeContributorAdapterTest.java @@ -16,7 +16,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -public class ComputeContributorAdapterTest { +class ComputeContributorAdapterTest { private URL testRepoURL = this.getClass().getClassLoader().getResource("test-repository"); @TempDir public File folder; @@ -27,7 +27,7 @@ public void setup() throws GitAPIException { } @Test - public void test() { + void test() { ComputeContributorAdapter computeContributorAdapter = new ComputeContributorAdapter(); List contributors = diff --git a/coderadar-vcs/src/test/java/io/reflectoring/coderadar/adapter/DeleteRepositoryAdapterTest.java b/coderadar-vcs/src/test/java/io/reflectoring/coderadar/adapter/DeleteRepositoryAdapterTest.java index f174197be..13bb2eea4 100644 --- a/coderadar-vcs/src/test/java/io/reflectoring/coderadar/adapter/DeleteRepositoryAdapterTest.java +++ b/coderadar-vcs/src/test/java/io/reflectoring/coderadar/adapter/DeleteRepositoryAdapterTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -public class DeleteRepositoryAdapterTest { +class DeleteRepositoryAdapterTest { @TempDir public File folder; @@ -24,7 +24,7 @@ public void setUp() throws GitAPIException { } @Test - public void testRepositoryDelete() throws IOException { + void testRepositoryDelete() throws IOException { DeleteLocalRepositoryAdapter deleteRepositoryAdapter = new DeleteLocalRepositoryAdapter(); deleteRepositoryAdapter.deleteRepository(folder.getPath()); From ce91fba4368029f87593f0077b43b1c38bb8ca5f Mon Sep 17 00:00:00 2001 From: Maxim Atanasov <32562426+maximAtanasov@users.noreply.github.com> Date: Wed, 15 Jul 2020 13:38:42 +0200 Subject: [PATCH 63/76] Deleted TODOs in main-dashboard.componenet.ts --- .../src/app/view/main-dashboard/main-dashboard.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts index e9d694fc5..98b0ddffd 100644 --- a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts +++ b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts @@ -87,7 +87,7 @@ export class MainDashboardComponent implements OnInit { dialogRef.afterClosed().subscribe(result => { if (result !== undefined) { - for (const team of result.teams) { // TODO: Check if project is already in team + for (const team of result.teams) { this.teamService.addTeamToProject(project.id, team.id, result.role); } } @@ -127,7 +127,7 @@ export class MainDashboardComponent implements OnInit { this.teamService.listTeamsForUser(UserService.getLoggedInUser().userId).then(value => this.teams = value.body ) .catch(e => { - if (e.status && e.status === FORBIDDEN) { // TODO: UNAUTHORIZED + if (e.status && e.status === FORBIDDEN) { this.userService.refresh(() => this.getTeams()); } }); From ea2ec49c6842f72e9f19850e3c9d2dd9e15fe186 Mon Sep 17 00:00:00 2001 From: Kilian Krause Date: Wed, 22 Jul 2020 14:28:21 +0200 Subject: [PATCH 64/76] add static import for MockMvcResultMatchers.status() --- .../rest/analysis/PaySimProjectIntegrationTest.java | 12 ++++++------ ...reateAnalyzerConfigControllerIntegrationTest.java | 11 ++++++----- ...eleteAnalyzerConfigControllerIntegrationTest.java | 5 +++-- .../GetAnalyzerConfigControllerIntegrationTest.java | 5 +++-- ...rConfigsFromProjectControllerIntegrationTest.java | 5 +++-- ...pdateAnalyzerConfigControllerIntegrationTest.java | 11 ++++++----- .../ListAnalyzerControllerIntegrationTest.java | 4 ++-- .../rest/branches/ListBranchesControllerTest.java | 5 +++-- .../rest/branches/SaveProjectWithBranchesTest.java | 4 ++-- .../rest/dependencymap/CompareTreeTest.java | 4 ++-- .../coderadar/rest/dependencymap/TreeTest.java | 4 ++-- .../CreateFilePatternControllerIntegrationTest.java | 7 ++++--- .../DeleteFilePatternControllerIntegrationTest.java | 5 +++-- .../GetFilePatternControllerIntegrationTest.java | 5 +++-- ...lePatternsOfProjectControllerIntegrationTest.java | 5 +++-- .../CreateModuleControllerIntegrationTest.java | 9 +++++---- .../DeleteModuleControllerIntegrationTest.java | 5 +++-- .../module/GetModuleControllerIntegrationTest.java | 5 +++-- ...istModulesOfProjectControllerIntegrationTest.java | 5 +++-- .../CreateProjectControllerIntegrationTest.java | 6 +++--- .../project/GetProjectControllerIntegrationTest.java | 5 +++-- .../ListProjectsControllerIntegrationTest.java | 4 ++-- .../UpdateProjectControllerIntegrationTest.java | 7 ++++--- .../ChangePasswordControllerIntegrationTest.java | 6 +++--- .../GetUserControllerIntegrationTest.java | 5 +++-- ...ListProjectsForUserControllerIntegrationTest.java | 4 ++-- .../ListUsersControllerIntegrationTest.java | 4 ++-- ...ListUsersForProjectControllerIntegrationTest.java | 4 ++-- .../LoginUserControllerIntegrationTest.java | 9 +++++---- .../RefreshTokenControllerIntegrationTest.java | 7 ++++--- .../RegisterUserControllerIntegrationTest.java | 10 +++++----- ...moveUserFromProjectControllerIntegrationTest.java | 4 ++-- ...tUserRoleForProjectControllerIntegrationTest.java | 4 ++-- .../AddTeamToProjectControllerIntegrationTest.java | 4 ++-- .../AddUsersToTeamControllerIntegrationTest.java | 4 ++-- .../teams/CreateTeamControllerIntegrationTest.java | 6 +++--- .../teams/DeleteTeamControllerIntegrationTest.java | 8 +++----- .../teams/GetTeamControllerIntegrationTest.java | 4 ++-- ...ListProjectsForTeamControllerIntegrationTest.java | 4 ++-- .../teams/ListTeamsControllerIntegrationTest.java | 4 ++-- ...ListTeamsForProjectControllerIntegrationTest.java | 4 ++-- .../ListTeamsForUserControllerIntegrationTest.java | 4 ++-- ...moveTeamFromProjectControllerIntegrationTest.java | 4 ++-- ...RemoveUsersFromTeamControllerIntegrationTest.java | 4 ++-- coderadar-ui/package-lock.json | 6 +++--- 45 files changed, 134 insertions(+), 117 deletions(-) diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java index 3f86416bd..aea90cbbd 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java @@ -3,6 +3,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; @@ -44,7 +45,6 @@ import org.springframework.http.MediaType; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -104,7 +104,7 @@ private void testCreatingModule(Long projectId) throws Exception { post("/api/projects/" + projectId + "/modules") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isCreated()) + .andExpect(status().isCreated()) .andReturn(); List modules = moduleRepository.findModulesInProjectSortedDesc(projectId); @@ -175,7 +175,7 @@ private void testUpdatingProject(Long projectId) throws Exception { post("/api/projects/" + projectId) .content(toJson(updateProjectCommand)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andReturn(); // Number of commits correct? @@ -384,7 +384,7 @@ private void testSavingAnalyzerConfiguration(Long projectId) throws Exception { post("/api/projects/" + projectId + "/analyzers") .content(toJson(analyzerConfigurationCommand)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isCreated()) + .andExpect(status().isCreated()) .andReturn(); // Configuration saved? @@ -408,7 +408,7 @@ private void testSavingFilePatterns(Long projectId) throws Exception { post("/api/projects/" + projectId + "/filePatterns") .content(toJson(filePatternCommand)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isCreated()) + .andExpect(status().isCreated()) .andReturn(); // Patterns saved? @@ -429,7 +429,7 @@ private Long testSavingProject() throws Exception { mvc() .perform( post("/api/projects").contentType(MediaType.APPLICATION_JSON).content(toJson(command))) - .andExpect(MockMvcResultMatchers.status().isCreated()) + .andExpect(status().isCreated()) .andReturn(); // Is the project saved? diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigControllerIntegrationTest.java index fe35d45bf..0bd3fec3a 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/CreateAnalyzerConfigControllerIntegrationTest.java @@ -4,6 +4,7 @@ import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.repository.AnalyzerConfigurationRepository; @@ -41,7 +42,7 @@ void createAnalyzerConfigurationSuccessfully() throws Exception { post("/api/projects/" + testProject.getId() + "/analyzers") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isCreated()) + .andExpect(status().isCreated()) .andExpect(containsResource(IdResponse.class)) .andDo( result -> { @@ -79,7 +80,7 @@ void createAnalyzerConfigurationReturnsErrorWhenProjectNotFound() throws Excepti post("/api/projects/1/analyzers") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage").value("Project with id 1 not found.")); } @@ -93,7 +94,7 @@ void createAnalyzerConfigurationReturnsErrorWhenAnalyzerNotFound() throws Except post("/api/projects/1/analyzers") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage") .value("Analyzer with name analyzer not found")); @@ -119,7 +120,7 @@ void createAnalyzerConfigurationReturnsErrorWhenAnalyzerAlreadyConfigured() thro post("/api/projects/" + testProject.getId() + "/analyzers") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isConflict()) + .andExpect(status().isConflict()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage") .value("An analyzer with this name is already configured for the project!")); @@ -133,6 +134,6 @@ void createAnalyzerConfigurationReturnsErrorWhenRequestIsInvalid() throws Except post("/api/projects/1/analyzers") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isBadRequest()); + .andExpect(status().isBadRequest()); } } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigControllerIntegrationTest.java index f64cafa11..e6d5d85f8 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/DeleteAnalyzerConfigControllerIntegrationTest.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.rest.analyzerconfig; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.repository.AnalyzerConfigurationRepository; @@ -39,7 +40,7 @@ void deleteAnalyzerConfigurationWithId() throws Exception { + testProject.getId() + "/analyzers/" + analyzerConfiguration.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo( result -> { Assertions.assertFalse(analyzerConfigurationRepository.findById(id).isPresent()); @@ -51,7 +52,7 @@ void deleteAnalyzerConfigurationWithId() throws Exception { void deleteAnalyzerConfigurationReturnsErrorWhenAnalyzerNotFound() throws Exception { mvc() .perform(delete("/api/projects/0/analyzers/2")) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage") .value("AnalyzerConfiguration with id 2 not found.")); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigControllerIntegrationTest.java index 227763086..5686289c2 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/GetAnalyzerConfigControllerIntegrationTest.java @@ -3,6 +3,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.repository.AnalyzerConfigurationRepository; @@ -41,7 +42,7 @@ void getAnalyzerConfigurationWithId() throws Exception { + testProject.getId() + "/analyzers/" + analyzerConfiguration.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andExpect(containsResource(GetAnalyzerConfigurationResponse.class)) .andDo( result -> { @@ -59,7 +60,7 @@ void getAnalyzerConfigurationWithId() throws Exception { void getAnalyzerConfigurationReturnsErrorWhenNotFound() throws Exception { mvc() .perform(get("/api/projects/0/analyzers/2")) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage") .value("AnalyzerConfiguration with id 2 not found.")) diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigsFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigsFromProjectControllerIntegrationTest.java index 9ccc23385..afeb25649 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigsFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/ListAnalyzerConfigsFromProjectControllerIntegrationTest.java @@ -3,6 +3,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.repository.AnalyzerConfigurationRepository; @@ -50,7 +51,7 @@ void listAnalyzerConfigurationsFromProject() throws Exception { // Test mvc() .perform(get("/api/projects/" + testProject.getId() + "/analyzers")) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andExpect(containsResource(GetAnalyzerConfigurationResponse[].class)) .andExpect( result -> { @@ -67,7 +68,7 @@ void listAnalyzerConfigurationsFromProject() throws Exception { void listAnalyzerConfigurationsReturnsErrorWhenProjectNotFound() throws Exception { mvc() .perform(get("/api/projects/1/analyzers")) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage").value("Project with id 1 not found.")); } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/UpdateAnalyzerConfigControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/UpdateAnalyzerConfigControllerIntegrationTest.java index ffcc7b6b0..6960f928c 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/UpdateAnalyzerConfigControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzerconfig/UpdateAnalyzerConfigControllerIntegrationTest.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.rest.analyzerconfig; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.projectadministration.analyzerconfig.repository.AnalyzerConfigurationRepository; @@ -47,7 +48,7 @@ void updateAnalyzerConfigurationWithId() throws Exception { + analyzerConfiguration.getId()) .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo( result -> { AnalyzerConfigurationEntity configuration = @@ -69,7 +70,7 @@ void updateAnalyzerConfigurationReturnsErrorWhenAnalyzerDoesNotExist() throws Ex post("/api/projects/0/analyzers/2") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage") .value("AnalyzerConfiguration with id 2 not found.")); @@ -108,7 +109,7 @@ void updateAnalyzerConfigurationReturnsErrorWhenAnalyzerAlreadyConfigured() thro post("/api/projects/" + testProject.getId() + "/analyzers/" + id) .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isConflict()) + .andExpect(status().isConflict()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage") .value("An analyzer with this name is already configured for the project!")); @@ -124,7 +125,7 @@ void updateAnalyzerConfigurationReturnsErrorWhenNotFound() throws Exception { post("/api/projects/0/analyzers/2") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage") .value("AnalyzerConfiguration with id 2 not found.")); @@ -138,6 +139,6 @@ void updateAnalyzerConfigurationReturnsErrorWhenRequestInvalid() throws Exceptio post("/api/projects/0/analyzers/1") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isBadRequest()); + .andExpect(status().isBadRequest()); } } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java index f9c7a9447..56a038e53 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analyzing/ListAnalyzerControllerIntegrationTest.java @@ -2,13 +2,13 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.rest.ControllerTestTemplate; import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class ListAnalyzerControllerIntegrationTest extends ControllerTestTemplate { @@ -16,7 +16,7 @@ class ListAnalyzerControllerIntegrationTest extends ControllerTestTemplate { void getAvailableAnalyzers() throws Exception { mvc() .perform(get("/api/analyzers")) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo( result -> { List results = diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java index 26c7c33b4..96dc201da 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/ListBranchesControllerTest.java @@ -3,6 +3,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.projectadministration.port.driver.project.create.CreateProjectCommand; import io.reflectoring.coderadar.projectadministration.service.project.CreateProjectService; @@ -35,7 +36,7 @@ void listAllBranchesOfProjectWithId() throws Exception { // Test mvc() .perform(get("/api/projects/" + projectId + "/branches")) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andExpect(containsResource(GetBranchResponse[].class)) .andExpect( result -> { @@ -53,7 +54,7 @@ void listAllBranchesOfProjectWithId() throws Exception { void listAllBranchesOfProjectReturnsErrorWhenProjectNotFound() throws Exception { mvc() .perform(get("/api/projects/100/branches")) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage").value("Project with id 100 not found.")); } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java index 31c12bf52..b2700f29f 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/branches/SaveProjectWithBranchesTest.java @@ -2,6 +2,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.analyzer.repository.CommitRepository; import io.reflectoring.coderadar.graph.projectadministration.branch.repository.BranchRepository; @@ -16,7 +17,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class SaveProjectWithBranchesTest extends ControllerTestTemplate { @Autowired private CommitRepository commitRepository; @@ -31,7 +31,7 @@ void createProjectWithBranchesSuccessfully() throws Exception { mvc() .perform( post("/api/projects").contentType(MediaType.APPLICATION_JSON).content(toJson(command))) - .andExpect(MockMvcResultMatchers.status().isCreated()) + .andExpect(status().isCreated()) .andDo( result -> { long id = diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java index a4bffb7a2..ed958c7a7 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/CompareTreeTest.java @@ -3,6 +3,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.CoderadarConfigurationProperties; import io.reflectoring.coderadar.dependencymap.adapter.DependencyCompareTreeAdapter; @@ -28,7 +29,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class CompareTreeTest extends ControllerTestTemplate { @@ -89,7 +89,7 @@ public void initEach() { + commitName + "/" + commitName2)) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andExpect(containsResource(CompareNode.class)) .andDo( result -> diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java index bdad0ed6a..41a5a8ac6 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/dependencymap/TreeTest.java @@ -3,6 +3,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.CoderadarConfigurationProperties; import io.reflectoring.coderadar.dependencymap.adapter.DependencyTreeAdapter; @@ -28,7 +29,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class TreeTest extends ControllerTestTemplate { @@ -61,7 +61,7 @@ void initEach() { mvc() .perform(get("/api/analyzers/" + testProject.getId() + "/structureMap/" + commitName)) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andExpect(containsResource(Node.class)) .andDo(result -> root = fromJson(result.getResponse().getContentAsString(), Node.class)); Assertions.assertNotNull(root); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/CreateFilePatternControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/CreateFilePatternControllerIntegrationTest.java index e5e6ce5bd..60d6fc3be 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/CreateFilePatternControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/CreateFilePatternControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.FilePatternEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -35,7 +36,7 @@ void createFilePatternSuccessfully() throws Exception { post("/api/projects/" + testProject.getId() + "/filePatterns") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isCreated()) + .andExpect(status().isCreated()) .andDo( result -> { FilePatternEntity filePattern = filePatternRepository.findAll().iterator().next(); @@ -65,7 +66,7 @@ void createFilePatternReturnsErrorWhenProjectDoesNotExist() throws Exception { post("/api/projects/1/filePatterns") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage").value("Project with id 1 not found.")); } @@ -78,6 +79,6 @@ void createFilePatternReturnsErrorWhenRequestIsInvalid() throws Exception { post("/api/projects/1/filePatterns") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isBadRequest()); + .andExpect(status().isBadRequest()); } } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/DeleteFilePatternControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/DeleteFilePatternControllerIntegrationTest.java index e62e3dd6c..a681ab6e4 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/DeleteFilePatternControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/DeleteFilePatternControllerIntegrationTest.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.rest.filepattern; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.FilePatternEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -35,7 +36,7 @@ void deleteFilePatternWithId() throws Exception { mvc() .perform( delete("/api/projects/" + testProject.getId() + "/filePatterns/" + filePattern.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo(result -> Assertions.assertFalse(filePatternRepository.findById(id).isPresent())) .andDo(document("filepatterns/delete")); } @@ -44,7 +45,7 @@ void deleteFilePatternWithId() throws Exception { void deleteFilePatternReturnsErrorWhenNotFound() throws Exception { mvc() .perform(delete("/api/projects/0/filePatterns/2")) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage") .value("FilePattern with id 2 not found.")); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternControllerIntegrationTest.java index df2b7d782..5cde80494 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/GetFilePatternControllerIntegrationTest.java @@ -3,6 +3,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.FilePatternEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -42,7 +43,7 @@ void getFilePatternWithId() throws Exception { mvc() .perform( get("/api/projects/" + testProject.getId() + "/filePatterns/" + filePattern.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andExpect(containsResource(GetFilePatternResponse.class)) .andDo( result -> { @@ -58,7 +59,7 @@ void getFilePatternWithId() throws Exception { void getFilePatternReturnsErrorWhenNotFound() throws Exception { mvc() .perform(get("/api/projects/0/filePatterns/2")) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage") .value("FilePattern with id 2 not found.")); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectControllerIntegrationTest.java index f4b9fdcb6..bee9869c4 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/filepattern/ListFilePatternsOfProjectControllerIntegrationTest.java @@ -3,6 +3,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.FilePatternEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -44,7 +45,7 @@ void listAllFilePatternsOfProjectWithId() throws Exception { // Test mvc() .perform(get("/api/projects/" + testProject.getId() + "/filePatterns")) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andExpect(containsResource(GetFilePatternResponse[].class)) .andExpect( result -> { @@ -60,7 +61,7 @@ void listAllFilePatternsOfProjectWithId() throws Exception { void listAllFilePatternsReturnsErrorWhenProjectNotFound() throws Exception { mvc() .perform(get("/api/projects/1/filePatterns")) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage").value("Project with id 1 not found.")); } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/CreateModuleControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/CreateModuleControllerIntegrationTest.java index 5257bcd7b..c6fd88b4d 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/CreateModuleControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/CreateModuleControllerIntegrationTest.java @@ -3,6 +3,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.FileEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ModuleEntity; @@ -44,7 +45,7 @@ void createModuleSuccessfully() throws Exception { post("/api/projects/" + testProject.getId() + "/modules") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isCreated()) + .andExpect(status().isCreated()) .andDo( result -> { Long id = @@ -79,7 +80,7 @@ void createModuleSuccessfullyWithNonExistentPath() throws Exception { post("/api/projects/" + testProject.getId() + "/modules") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isCreated()) + .andExpect(status().isCreated()) .andDo( result -> { Long id = @@ -107,7 +108,7 @@ void createModuleReturnsErrorWhenProjectNotFound() throws Exception { post("/api/projects/1/modules") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage").value("Project with id 1 not found.")); } @@ -120,6 +121,6 @@ void createModuleReturnsErrorWhenRequestIsInvalid() throws Exception { post("/api/projects/0/modules") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isBadRequest()); + .andExpect(status().isBadRequest()); } } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/DeleteModuleControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/DeleteModuleControllerIntegrationTest.java index 2bf3026dd..1c80fc33b 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/DeleteModuleControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/DeleteModuleControllerIntegrationTest.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.rest.module; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.ModuleEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -34,7 +35,7 @@ void deleteModuleWithId() throws Exception { // Test mvc() .perform(delete("/api/projects/" + testProject.getId() + "/modules/" + module.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo(result -> Assertions.assertFalse(moduleRepository.findById(id).isPresent())) .andDo(document("modules/delete")); } @@ -47,7 +48,7 @@ void deleteModuleReturnsErrorWhenModuleNotFound() throws Exception { mvc() .perform(delete("/api/projects/0/modules/0")) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage").value("Module with id 0 not found.")); } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/GetModuleControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/GetModuleControllerIntegrationTest.java index 461a21bec..767af703f 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/GetModuleControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/GetModuleControllerIntegrationTest.java @@ -3,6 +3,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.ModuleEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -36,7 +37,7 @@ void getModuleWithId() throws Exception { // Test mvc() .perform(get("/api/projects/" + testProject.getId() + "/modules/" + module.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andExpect(containsResource(GetModuleResponse.class)) .andDo( result -> { @@ -51,7 +52,7 @@ void getModuleWithId() throws Exception { void getModuleReturnsErrorWhenModuleNotFound() throws Exception { mvc() .perform(get("/api/projects/0/modules/0")) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage").value("Module with id 0 not found.")); } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectControllerIntegrationTest.java index 9c2be85b0..96c6f642f 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/module/ListModulesOfProjectControllerIntegrationTest.java @@ -3,6 +3,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.ModuleEntity; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; @@ -59,7 +60,7 @@ void listAllModulesOfProjectWithId() throws Exception { // Test mvc() .perform(get("/api/projects/" + testProject.getId() + "/modules")) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andExpect(containsResource(GetModuleResponse[].class)) .andExpect( result -> { @@ -74,7 +75,7 @@ void listAllModulesOfProjectWithId() throws Exception { void listAllModulesOfProjectReturnsErrorWhenProjectNotFound() throws Exception { mvc() .perform(get("/api/projects/1/modules")) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage").value("Project with id 1 not found.")); } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/CreateProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/CreateProjectControllerIntegrationTest.java index 871a3b189..be12fb1e1 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/CreateProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/CreateProjectControllerIntegrationTest.java @@ -3,6 +3,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.analyzer.repository.CommitRepository; import io.reflectoring.coderadar.graph.analyzer.repository.FileRepository; @@ -21,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.ResultHandler; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class CreateProjectControllerIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; @@ -37,7 +37,7 @@ void createProjectSuccessfully() throws Exception { mvc() .perform( post("/api/projects").contentType(MediaType.APPLICATION_JSON).content(toJson(command))) - .andExpect(MockMvcResultMatchers.status().isCreated()) + .andExpect(status().isCreated()) .andDo( result -> { Long id = @@ -64,7 +64,7 @@ void createProjectReturnsErrorOnInvalidData() throws Exception { mvc() .perform( post("/api/projects").contentType(MediaType.APPLICATION_JSON).content(toJson(command))) - .andExpect(MockMvcResultMatchers.status().isBadRequest()) + .andExpect(status().isBadRequest()) .andDo(document("projects/create/error400")); } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/GetProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/GetProjectControllerIntegrationTest.java index 8f1a65ff1..6870ad155 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/GetProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/GetProjectControllerIntegrationTest.java @@ -3,6 +3,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; @@ -32,7 +33,7 @@ void getProjectWithId() throws Exception { mvc() .perform(get("/api/projects/" + testProject.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andExpect(containsResource(GetProjectResponse.class)) .andDo( result -> { @@ -47,7 +48,7 @@ void getProjectWithId() throws Exception { void getProjectWithIdThrowsErrorWhenProjectDoesNotExist() throws Exception { mvc() .perform(get("/api/projects/1")) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage").value("Project with id 1 not found.")); } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java index 4e5a75b2e..58a34b760 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/ListProjectsControllerIntegrationTest.java @@ -3,6 +3,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; @@ -13,7 +14,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class ListProjectsControllerIntegrationTest extends ControllerTestTemplate { @@ -45,7 +45,7 @@ public void setUp() { void listAllProjects() throws Exception { mvc() .perform(get("/api/projects")) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andExpect(containsResource(GetProjectResponse[].class)) .andExpect( result -> { diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/UpdateProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/UpdateProjectControllerIntegrationTest.java index 358917316..eb9aace2f 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/UpdateProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/project/UpdateProjectControllerIntegrationTest.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.rest.project; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; @@ -40,7 +41,7 @@ void updateProjectWithId() throws Exception { post("/api/projects/" + testProject.getId()) .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo( result -> { ProjectEntity project = projectRepository.findById(id).get(); @@ -63,7 +64,7 @@ void updateProjectReturnsErrorWhenProjectDoesNotExist() throws Exception { post("/api/projects/1") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage").value("Project with id 1 not found.")); } @@ -77,6 +78,6 @@ void updateProjectReturnsErrorWhenRequestIsInvalid() throws Exception { post("/api/projects/0") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isBadRequest()); + .andExpect(status().isBadRequest()); } } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordControllerIntegrationTest.java index b4a77c99c..f8011d947 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ChangePasswordControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.useradministration.domain.RefreshTokenEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; @@ -17,7 +18,6 @@ import org.springframework.http.MediaType; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.test.web.servlet.ResultHandler; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class ChangePasswordControllerIntegrationTest extends ControllerTestTemplate { @@ -47,7 +47,7 @@ void ChangePasswordSuccessfully() throws Exception { post("/api/user/password/change") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo(documentPasswordChange()); Assertions.assertTrue( @@ -75,7 +75,7 @@ void ChangePasswordReturnsErrorWhenTokenInvalid() throws Exception { post("/api/user/password/change") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isUnauthorized()); + .andExpect(status().isUnauthorized()); Assertions.assertTrue( new BCryptPasswordEncoder() diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java index c5f3fad47..dfc0aa081 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/GetUserControllerIntegrationTest.java @@ -3,6 +3,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static io.reflectoring.coderadar.rest.ResultMatchers.containsResource; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; @@ -28,7 +29,7 @@ void loadUserWithId() throws Exception { mvc() .perform(get("/api/users/" + userId)) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andExpect(containsResource(GetUserResponse.class)) .andDo( result -> { @@ -44,7 +45,7 @@ void loadUserWithId() throws Exception { void loadUserWithIdOneReturnsErrorWhenUserNotFound() throws Exception { mvc() .perform(get("/api/users/1")) - .andExpect(MockMvcResultMatchers.status().isNotFound()) + .andExpect(status().isNotFound()) .andExpect( MockMvcResultMatchers.jsonPath("errorMessage").value("User with id 1 not found.")); } diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java index 94eeb8ff4..7880333f2 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; @@ -17,7 +18,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class ListProjectsForUserControllerIntegrationTest extends ControllerTestTemplate { @@ -51,7 +51,7 @@ void listProjectsForUserSuccessfully() throws Exception { MvcResult result = mvc() .perform(get("/api/users/" + testUser.getId() + "/projects")) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo(document("user/list/projects")) .andReturn(); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java index 27b67cd68..b9425b746 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; @@ -13,7 +14,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class ListUsersControllerIntegrationTest extends ControllerTestTemplate { @@ -34,7 +34,7 @@ void listUsersSuccessfully() throws Exception { MvcResult result = mvc() .perform(get("/api/users")) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo(document("users/list")) .andReturn(); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java index 6accadc6c..03d0a1e7b 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; @@ -17,7 +18,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class ListUsersForProjectControllerIntegrationTest extends ControllerTestTemplate { @@ -51,7 +51,7 @@ void listUsersForProjectSuccessfully() throws Exception { MvcResult result = mvc() .perform(get("/api/projects/" + testProject.getId() + "/users/")) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo(document("project/list/users")) .andReturn(); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java index b33ca6146..6df3f4d99 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/LoginUserControllerIntegrationTest.java @@ -3,6 +3,7 @@ import static org.hamcrest.Matchers.any; import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; @@ -29,7 +30,7 @@ void loginUserSuccessfully() throws Exception { mvc() .perform( post("/api/user/auth").content(toJson(command)).contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andExpect(MockMvcResultMatchers.jsonPath("accessToken").value(any(String.class))) .andExpect(MockMvcResultMatchers.jsonPath("refreshToken").value(any(String.class))) .andDo(documentLogin()); @@ -41,7 +42,7 @@ void loginUserReturnsErrorWhenRequestIsInvalid() throws Exception { mvc() .perform( post("/api/user/auth").content(toJson(command)).contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isBadRequest()); + .andExpect(status().isBadRequest()); } @Test @@ -50,7 +51,7 @@ void loginUserReturnsErrorWhenUserDoesNotExist() throws Exception { mvc() .perform( post("/api/user/auth").content(toJson(command)).contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isNotFound()); + .andExpect(status().isNotFound()); } @Test @@ -66,7 +67,7 @@ void loginUserReturnsErrorWhenPasswordIsWrong() throws Exception { .perform( post("/api/user/auth").content(toJson(command)).contentType(MediaType.APPLICATION_JSON)) .andExpect(MockMvcResultMatchers.jsonPath("errorMessage").value("Bad credentials")) - .andExpect(MockMvcResultMatchers.status().isForbidden()); + .andExpect(status().isForbidden()); } private ResultHandler documentLogin() { diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenControllerIntegrationTest.java index 435715318..987b33424 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RefreshTokenControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; @@ -54,7 +55,7 @@ void refreshTokenSuccessfully() throws Exception { post("/api/user/refresh") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andExpect(MockMvcResultMatchers.jsonPath("token").exists()) .andDo(documentRefresh()); } @@ -74,7 +75,7 @@ void refreshTokenReturnsErrorOnInvalidToken() throws Exception { post("/api/user/refresh") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isUnauthorized()); + .andExpect(status().isUnauthorized()); } @Test @@ -100,7 +101,7 @@ void refreshTokenReturnsErrorOnNonExpiredAccessToken() throws Exception { post("/api/user/refresh") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isBadRequest()); + .andExpect(status().isBadRequest()); } private String createExpiredAccessToken() { diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserControllerIntegrationTest.java index 9bf9a105a..2a1c2888c 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/RegisterUserControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository; @@ -11,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.ResultHandler; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class RegisterUserControllerIntegrationTest extends ControllerTestTemplate { @@ -25,7 +25,7 @@ void registerNewUserSuccessfully() throws Exception { post("/api/user/registration") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isCreated()) + .andExpect(status().isCreated()) .andDo(documentRegistration()); } @@ -37,7 +37,7 @@ void registerNewUserReturnErrorOnInvalidRequest1() throws Exception { post("/api/user/registration") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isBadRequest()); + .andExpect(status().isBadRequest()); } @Test @@ -48,7 +48,7 @@ void registerNewUserReturnErrorOnInvalidRequest2() throws Exception { post("/api/user/registration") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isBadRequest()); + .andExpect(status().isBadRequest()); } @Test @@ -65,7 +65,7 @@ void registerNewUserReturnErrorWhenUsernameExists() throws Exception { post("/api/user/registration") .content(toJson(command)) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isConflict()); + .andExpect(status().isConflict()); } private ResultHandler documentRegistration() { diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java index 4e3542f8d..1867e00dc 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.rest.useradministration.permissions; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; @@ -14,7 +15,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class RemoveUserFromProjectControllerIntegrationTest extends ControllerTestTemplate { @@ -47,7 +47,7 @@ void setUp() { void removeUserFromProjectSuccessfully() throws Exception { mvc() .perform(delete("/api/projects/" + testProject.getId() + "/users/" + testUser.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo(document("user/role/project/remove")) .andReturn(); // TODO: Document diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java index 7e51107af..dff13408d 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; @@ -17,7 +18,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class SetUserRoleForProjectControllerIntegrationTest extends ControllerTestTemplate { @@ -55,7 +55,7 @@ void setUserRoleForProjectSuccessfully() throws Exception { post("/api/projects/" + testProject.getId() + "/users/" + testUser.getId()) .content(toJson(new ProjectRoleJsonWrapper(ProjectRole.ADMIN))) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo( document( "user/role/project/set", diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java index 6086741de..90b503e04 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; @@ -17,7 +18,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class AddTeamToProjectControllerIntegrationTest extends ControllerTestTemplate { @@ -53,7 +53,7 @@ void addTeamToProjectSuccessfully() throws Exception { post("/api/projects/" + testProject.getId() + "/teams/" + teamEntity.getId()) .contentType(MediaType.APPLICATION_JSON) .content(toJson(new ProjectRoleJsonWrapper(ProjectRole.ADMIN)))) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo( document( "teams/add/project", diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java index 731b98ee3..db6bc599f 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; @@ -16,7 +17,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class AddUsersToTeamControllerIntegrationTest extends ControllerTestTemplate { @@ -49,7 +49,7 @@ void addUsersToTeamSuccessfully() throws Exception { post("/api/teams/" + teamEntity.getId() + "/users") .content(toJson(new JsonListWrapper<>(Collections.singletonList(testUser.getId())))) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo( document( "teams/add/user", diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java index 85d30dfc9..555ede7f8 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; @@ -17,7 +18,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class CreateTeamControllerIntegrationTest extends ControllerTestTemplate { @@ -47,7 +47,7 @@ void createTeamWithUsersSuccessfully() throws Exception { post("/api/teams") .contentType(MediaType.APPLICATION_JSON) .content(toJson(createTeamCommand))) - .andExpect(MockMvcResultMatchers.status().isCreated()) + .andExpect(status().isCreated()) .andDo( document( "teams/create", @@ -75,7 +75,7 @@ void createTeamWithNoUsersSuccessfully() throws Exception { post("/api/teams") .contentType(MediaType.APPLICATION_JSON) .content(toJson(createTeamCommand))) - .andExpect(MockMvcResultMatchers.status().isCreated()) + .andExpect(status().isCreated()) .andReturn(); List teams = teamRepository.findAllWithMembers(); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java index 9e3c43ea5..38892e8c7 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.rest.useradministration.teams; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; @@ -14,7 +15,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class DeleteTeamControllerIntegrationTest extends ControllerTestTemplate { @@ -45,7 +45,7 @@ void deleteTeamWithUsersSuccessfully() throws Exception { mvc() .perform(delete("/api/teams/" + teamEntity.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo(document("teams/delete")) .andReturn(); @@ -55,9 +55,7 @@ void deleteTeamWithUsersSuccessfully() throws Exception { @Test void deleteTeamWithNoUsersSuccessfully() throws Exception { - mvc() - .perform(delete("/api/teams/" + teamEntity.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()); + mvc().perform(delete("/api/teams/" + teamEntity.getId())).andExpect(status().isOk()); List teams = teamRepository.findAllWithMembers(); Assertions.assertTrue(teams.isEmpty()); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java index ac482d48d..55cb1db62 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; @@ -12,7 +13,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class GetTeamControllerIntegrationTest extends ControllerTestTemplate { @@ -32,7 +32,7 @@ void getTeamSuccessfully() throws Exception { MvcResult result = mvc() .perform(get("/api/teams/" + teamEntity.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo(document("teams/get")) .andReturn(); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java index 975692742..11ae6e21d 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; @@ -16,7 +17,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class ListProjectsForTeamControllerIntegrationTest extends ControllerTestTemplate { @@ -49,7 +49,7 @@ void listProjectsForTeamSuccessfully() throws Exception { MvcResult result = mvc() .perform(get("/api/teams/" + teamEntity.getId() + "/projects")) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo(document("teams/list/projects")) .andReturn(); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java index 7e6ee241a..3e93bbd00 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository; @@ -12,7 +13,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class ListTeamsControllerIntegrationTest extends ControllerTestTemplate { @@ -30,7 +30,7 @@ void listTeamsSuccessfully() throws Exception { MvcResult result = mvc() .perform(get("/api/teams/")) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo(document("teams/list")) .andReturn(); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java index f7de04846..c0b6e2cf2 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; @@ -16,7 +17,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class ListTeamsForProjectControllerIntegrationTest extends ControllerTestTemplate { @@ -49,7 +49,7 @@ void listTeamsForProjectSuccessfully() throws Exception { MvcResult result = mvc() .perform(get("/api/projects/" + testProject.getId() + "/teams")) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo(document("teams/list/project")) .andReturn(); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java index 8e50e241c..179243388 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; @@ -14,7 +15,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class ListTeamsForUserControllerIntegrationTest extends ControllerTestTemplate { @@ -40,7 +40,7 @@ void listTeamsForUserSuccessfully() throws Exception { MvcResult result = mvc() .perform(get("/api/users/" + testUser.getId() + "/teams")) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo(document("teams/list/user")) .andReturn(); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java index 45248412a..c628ad474 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java @@ -1,6 +1,7 @@ package io.reflectoring.coderadar.rest.useradministration.teams; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity; import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository; @@ -14,7 +15,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class RemoveTeamFromProjectControllerIntegrationTest extends ControllerTestTemplate { @@ -46,7 +46,7 @@ void setUp() { void removeTeamFromProjectSuccessfully() throws Exception { mvc() .perform(delete("/api/projects/" + testProject.getId() + "/teams/" + teamEntity.getId())) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo(document("teams/remove/project")) .andReturn(); diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java index 93f9732a2..8bc27abb2 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java @@ -2,6 +2,7 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity; import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity; @@ -16,7 +17,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; class RemoveUsersFromTeamControllerIntegrationTest extends ControllerTestTemplate { @@ -49,7 +49,7 @@ void removeUsersFromTeamSuccessfully() throws Exception { delete("/api/teams/" + teamEntity.getId() + "/users") .content(toJson(new JsonListWrapper<>(Collections.singletonList(testUser.getId())))) .contentType(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(status().isOk()) .andDo( document( "teams/remove/user", diff --git a/coderadar-ui/package-lock.json b/coderadar-ui/package-lock.json index 70b978ece..d20d2a93c 100644 --- a/coderadar-ui/package-lock.json +++ b/coderadar-ui/package-lock.json @@ -485,9 +485,9 @@ } }, "@angular/elements": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-10.0.2.tgz", - "integrity": "sha512-ZYOuDojWJCCiRoZYXPtGhVVPT1y75V/wktzaMKLcNY/MxnJYW984i/Ynv7gdeqC8kvf0v1s0FkF7t1xndUwbCA==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-10.0.4.tgz", + "integrity": "sha512-tVVyt1kCq0JEtrlDDzJv4GMXwLzXWQvpkWZrnLrnXHpiUaTB0KPExtzZhco7FKevmxsjtfmHst9es6ggNPu34w==", "requires": { "tslib": "^2.0.0" }, From 31d60f70bfdadbca28d3fff858a52dbb09845513 Mon Sep 17 00:00:00 2001 From: Maxim Atanasov Date: Fri, 24 Jul 2020 11:20:42 +0200 Subject: [PATCH 65/76] apply review changes --- .../PaySimProjectIntegrationTest.java | 32 +++++++++++-------- ...rFromProjectControllerIntegrationTest.java | 2 +- coderadar-ui/src/app/app.module.ts | 3 +- .../configure-project.component.ts | 24 ++------------ .../merge-dialog/merge-dialog-data.ts | 4 +++ .../merge-dialog.component.html} | 0 .../merge-dialog/merge-dialog.component.ts | 19 +++++++++++ .../view/file-view/file-view.component.css | 21 ++++++++++++ .../view/file-view/file-view.component.html | 8 ++--- .../main-dashboard.component.spec.ts | 2 +- 10 files changed, 72 insertions(+), 43 deletions(-) create mode 100644 coderadar-ui/src/app/view/configure-project/merge-dialog/merge-dialog-data.ts rename coderadar-ui/src/app/view/configure-project/{app-merge-dialog.html => merge-dialog/merge-dialog.component.html} (100%) create mode 100644 coderadar-ui/src/app/view/configure-project/merge-dialog/merge-dialog.component.ts diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java index e181114e5..bc996eb13 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java @@ -1,10 +1,5 @@ package io.reflectoring.coderadar.rest.analysis; -import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import com.fasterxml.jackson.core.type.TypeReference; import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity; import io.reflectoring.coderadar.graph.analyzer.domain.MetricValueEntity; @@ -29,17 +24,12 @@ import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitCommand; import io.reflectoring.coderadar.query.port.driver.deltatree.GetDeltaTreeForTwoCommitsCommand; import io.reflectoring.coderadar.rest.ControllerTestTemplate; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Collection; -import java.util.Comparator; -import java.util.List; import net.lingala.zip4j.ZipFile; import org.apache.tomcat.util.http.fileupload.FileUtils; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.neo4j.ogm.session.Session; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; @@ -48,6 +38,20 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.List; + +import static io.reflectoring.coderadar.rest.JsonHelper.fromJson; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + class PaySimProjectIntegrationTest extends ControllerTestTemplate { @Autowired private ProjectRepository projectRepository; diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java index 1867e00dc..6074d4799 100644 --- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java +++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java @@ -49,7 +49,7 @@ void removeUserFromProjectSuccessfully() throws Exception { .perform(delete("/api/projects/" + testProject.getId() + "/users/" + testUser.getId())) .andExpect(status().isOk()) .andDo(document("user/role/project/remove")) - .andReturn(); // TODO: Document + .andReturn(); Assertions.assertTrue(userRepository.listUsersForProject(testProject.getId()).isEmpty()); } diff --git a/coderadar-ui/src/app/app.module.ts b/coderadar-ui/src/app/app.module.ts index c4f89dfdc..50a8c1f26 100644 --- a/coderadar-ui/src/app/app.module.ts +++ b/coderadar-ui/src/app/app.module.ts @@ -12,7 +12,7 @@ import {FlexLayoutModule} from '@angular/flex-layout'; import {MainDashboardComponent} from './view/main-dashboard/main-dashboard.component'; import {LayoutModule} from '@angular/cdk/layout'; import {AuthInterceptor} from './auth.interceptor'; -import {ConfigureProjectComponent, MergeDialogComponent} from './view/configure-project/configure-project.component'; +import {ConfigureProjectComponent} from './view/configure-project/configure-project.component'; import {EditProjectComponent} from './view/edit-project/edit-project.component'; import {HeaderComponent} from './view/header/header.component'; import {FooterComponent} from './view/footer/footer.component'; @@ -70,6 +70,7 @@ import { AddTeamComponent } from './view/add-team/add-team.component'; import { SidenavContentComponent } from './view/sidenav-content/sidenav-content.component'; import {AddProjectToTeamDialogComponent} from "./view/main-dashboard/add-project-to-team-dialog.component"; import {ConfirmDeleteProjectDialogComponent} from "./view/main-dashboard/delete-project-dialog.component"; +import {MergeDialogComponent} from "./view/configure-project/merge-dialog/merge-dialog.component"; const appRoutes: Routes = [ {path: 'login', component: LoginComponent}, diff --git a/coderadar-ui/src/app/view/configure-project/configure-project.component.ts b/coderadar-ui/src/app/view/configure-project/configure-project.component.ts index c2a6c0872..be4048d65 100644 --- a/coderadar-ui/src/app/view/configure-project/configure-project.component.ts +++ b/coderadar-ui/src/app/view/configure-project/configure-project.component.ts @@ -7,31 +7,12 @@ import {FilePattern} from '../../model/file-pattern'; import {CONFLICT, FORBIDDEN, UNPROCESSABLE_ENTITY} from 'http-status-codes'; import {Module} from '../../model/module'; import {Title} from '@angular/platform-browser'; -import {MAT_DIALOG_DATA, MatDialog, MatDialogRef, MatSnackBar} from '@angular/material'; +import {MatDialog, MatSnackBar} from '@angular/material'; import {Contributor} from '../../model/contributor'; import {Branch} from '../../model/branch'; import {ContributorService} from '../../service/contributor.service'; +import {MergeDialogComponent} from "./merge-dialog/merge-dialog.component"; -export interface DialogData { - selected: string; - displayNames: string[]; -} - -@Component({ - selector: 'app-dialog-overview-example-dialog', - templateUrl: 'app-merge-dialog.html', -}) -export class MergeDialogComponent { - - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: DialogData) {} - - onNoClick(): void { - this.dialogRef.close(); - } - -} @Component({ @@ -357,7 +338,6 @@ export class ConfigureProjectComponent implements OnInit { }); } - openDialog(): void { const dialogRef = this.dialog.open(MergeDialogComponent, { width: '250px', diff --git a/coderadar-ui/src/app/view/configure-project/merge-dialog/merge-dialog-data.ts b/coderadar-ui/src/app/view/configure-project/merge-dialog/merge-dialog-data.ts new file mode 100644 index 000000000..91bbda8dd --- /dev/null +++ b/coderadar-ui/src/app/view/configure-project/merge-dialog/merge-dialog-data.ts @@ -0,0 +1,4 @@ +export interface DialogData { + selected: string; + displayNames: string[]; +} diff --git a/coderadar-ui/src/app/view/configure-project/app-merge-dialog.html b/coderadar-ui/src/app/view/configure-project/merge-dialog/merge-dialog.component.html similarity index 100% rename from coderadar-ui/src/app/view/configure-project/app-merge-dialog.html rename to coderadar-ui/src/app/view/configure-project/merge-dialog/merge-dialog.component.html diff --git a/coderadar-ui/src/app/view/configure-project/merge-dialog/merge-dialog.component.ts b/coderadar-ui/src/app/view/configure-project/merge-dialog/merge-dialog.component.ts new file mode 100644 index 000000000..ac09d4056 --- /dev/null +++ b/coderadar-ui/src/app/view/configure-project/merge-dialog/merge-dialog.component.ts @@ -0,0 +1,19 @@ +import {Component, Inject} from "@angular/core"; +import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; +import {DialogData} from "./merge-dialog-data"; + +@Component({ + selector: 'app-dialog-overview-example-dialog', + templateUrl: 'merge-dialog.component.html', +}) +export class MergeDialogComponent { + + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: DialogData) {} + + onNoClick(): void { + this.dialogRef.close(); + } + +} diff --git a/coderadar-ui/src/app/view/file-view/file-view.component.css b/coderadar-ui/src/app/view/file-view/file-view.component.css index 6e30543fa..50b6d81f6 100644 --- a/coderadar-ui/src/app/view/file-view/file-view.component.css +++ b/coderadar-ui/src/app/view/file-view/file-view.component.css @@ -33,3 +33,24 @@ float: right; margin-right: 20px } + +.fileTree { + overflow: scroll; + height: 100% +} + +.fileDeleted { + width: 50%; + font-size: larger; + margin-top: 5%; + margin-left: 30% +} + +.bgColor { + background-color: rgb(245, 242, 240); +} + +.fileNodeButton { + font-weight:normal; + margin-left: 0; +} diff --git a/coderadar-ui/src/app/view/file-view/file-view.component.html b/coderadar-ui/src/app/view/file-view/file-view.component.html index df0649688..e4520d23b 100644 --- a/coderadar-ui/src/app/view/file-view/file-view.component.html +++ b/coderadar-ui/src/app/view/file-view/file-view.component.html @@ -2,7 +2,7 @@ {location: '/project/' + projectId, name: project.name}, {location: '/project/'+projectId+'/'+commitHash+'/files', name: 'File tree for commit ' + commitHashAbbrev}]"> -
    +
    Show only files changed in this commit @@ -26,13 +26,13 @@

    -
    +
    • -
      • @@ -59,7 +59,7 @@

    -
    +
    File was deleted 
    diff --git a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.spec.ts b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.spec.ts
index 9f8a20517..b3b6ab852 100644
--- a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.spec.ts
+++ b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.spec.ts
@@ -1,7 +1,7 @@
 import {LayoutModule} from '@angular/cdk/layout';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {MatButtonModule, MatCardModule, MatGridListModule, MatIconModule, MatMenuModule, } from '@angular/material';
+import {MatButtonModule, MatCardModule, MatGridListModule, MatIconModule, MatMenuModule} from '@angular/material';
 
 import {MainDashboardComponent} from './main-dashboard.component';
 

From f1d79aa85d2632ba9b0d1ace56f59d1c63591c43 Mon Sep 17 00:00:00 2001
From: Maxim Atanasov 
Date: Fri, 24 Jul 2020 11:30:40 +0200
Subject: [PATCH 66/76] spotless

---
 .../PaySimProjectIntegrationTest.java         | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java
index bc996eb13..a803e83af 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/analysis/PaySimProjectIntegrationTest.java
@@ -1,5 +1,10 @@
 package io.reflectoring.coderadar.rest.analysis;
 
+import static io.reflectoring.coderadar.rest.JsonHelper.fromJson;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import io.reflectoring.coderadar.graph.analyzer.domain.AnalyzerConfigurationEntity;
 import io.reflectoring.coderadar.graph.analyzer.domain.MetricValueEntity;
@@ -24,6 +29,14 @@
 import io.reflectoring.coderadar.query.port.driver.commitmetrics.GetMetricValuesOfCommitCommand;
 import io.reflectoring.coderadar.query.port.driver.deltatree.GetDeltaTreeForTwoCommitsCommand;
 import io.reflectoring.coderadar.rest.ControllerTestTemplate;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
 import net.lingala.zip4j.ZipFile;
 import org.apache.tomcat.util.http.fileupload.FileUtils;
 import org.junit.jupiter.api.AfterAll;
@@ -38,20 +51,6 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-
-import static io.reflectoring.coderadar.rest.JsonHelper.fromJson;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 class PaySimProjectIntegrationTest extends ControllerTestTemplate {
 
   @Autowired private ProjectRepository projectRepository;

From e2643c5c729004664adea25f66576569a6fe3f07 Mon Sep 17 00:00:00 2001
From: Maxim Atanasov 
Date: Fri, 24 Jul 2020 11:35:28 +0200
Subject: [PATCH 67/76] change FilePatterns to FilePattern in
 file-patterns.spec.ts

---
 coderadar-ui/src/app/model/file-pattern.spec.ts  | 7 +++++++
 coderadar-ui/src/app/model/file-patterns.spec.ts | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 coderadar-ui/src/app/model/file-pattern.spec.ts
 delete mode 100644 coderadar-ui/src/app/model/file-patterns.spec.ts

diff --git a/coderadar-ui/src/app/model/file-pattern.spec.ts b/coderadar-ui/src/app/model/file-pattern.spec.ts
new file mode 100644
index 000000000..9c782b3b9
--- /dev/null
+++ b/coderadar-ui/src/app/model/file-pattern.spec.ts
@@ -0,0 +1,7 @@
+import {FilePattern} from './file-pattern';
+
+describe('FilePattern', () => {
+  it('should create an instance', () => {
+    expect(new FilePattern()).toBeTruthy();
+  });
+});
diff --git a/coderadar-ui/src/app/model/file-patterns.spec.ts b/coderadar-ui/src/app/model/file-patterns.spec.ts
deleted file mode 100644
index adf468771..000000000
--- a/coderadar-ui/src/app/model/file-patterns.spec.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import {FilePatterns} from './file-pattern';
-
-describe('FilePatterns', () => {
-  it('should create an instance', () => {
-    expect(new FilePatterns()).toBeTruthy();
-  });
-});

From 073caf47549adc5e7cad81b480e32d5c9cbbdfb2 Mon Sep 17 00:00:00 2001
From: Krause 
Date: Fri, 24 Jul 2020 15:56:04 +0200
Subject: [PATCH 68/76] add negative tests

---
 .../rest/ExceptionHandlerController.java      |  4 +--
 .../teams/RemoveUsersFromTeamController.java  | 12 +++++--
 .../RemoveUsersFromTeamControllerTest.java    |  3 +-
 .../CreateTeamControllerIntegrationTest.java  | 34 ++++++++++++++++++-
 ...mFromProjectControllerIntegrationTest.java | 27 +++++++++++++++
 ...sersFromTeamControllerIntegrationTest.java | 26 ++++++++++++++
 6 files changed, 99 insertions(+), 7 deletions(-)

diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ExceptionHandlerController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ExceptionHandlerController.java
index 5dcace53f..916b74d54 100644
--- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ExceptionHandlerController.java
+++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ExceptionHandlerController.java
@@ -23,13 +23,13 @@ public ResponseEntity projectProcessingException(
   }
 
   @ExceptionHandler(UserUnauthenticatedException.class)
-  public ResponseEntity entityNotFoundException(
+  public ResponseEntity userUnauthenticatedException(
       UserUnauthenticatedException e) {
     return new ResponseEntity<>(new ErrorMessageResponse(e.getMessage()), HttpStatus.FORBIDDEN);
   }
 
   @ExceptionHandler(UserUnauthorizedException.class)
-  public ResponseEntity entityNotFoundException(UserUnauthorizedException e) {
+  public ResponseEntity userUnauthorizedException(UserUnauthorizedException e) {
     return new ResponseEntity<>(new ErrorMessageResponse(e.getMessage()), HttpStatus.UNAUTHORIZED);
   }
 
diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamController.java
index 2eeaa3404..0132b34de 100644
--- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamController.java
+++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamController.java
@@ -2,6 +2,8 @@
 
 import io.reflectoring.coderadar.rest.AbstractBaseController;
 import io.reflectoring.coderadar.rest.JsonListWrapper;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
+import io.reflectoring.coderadar.useradministration.UserNotInTeamException;
 import io.reflectoring.coderadar.useradministration.port.driver.teams.RemoveUsersFromTeamUseCase;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -22,9 +24,13 @@ public RemoveUsersFromTeamController(RemoveUsersFromTeamUseCase removeUsersFromT
   }
 
   @DeleteMapping(path = "/teams/{teamId}/users", consumes = MediaType.APPLICATION_JSON_VALUE)
-  public ResponseEntity removeUsersFromTeam(
+  public ResponseEntity removeUsersFromTeam(
       @PathVariable long teamId, @RequestBody JsonListWrapper userIds) {
-    removeUsersFromTeamUseCase.removeUsersFromTeam(teamId, userIds.getElements());
-    return new ResponseEntity<>(HttpStatus.OK);
+    try {
+      removeUsersFromTeamUseCase.removeUsersFromTeam(teamId, userIds.getElements());
+      return new ResponseEntity<>(HttpStatus.OK);
+    } catch (UserNotInTeamException e) {
+      return new ResponseEntity<>(new ErrorMessageResponse(e.getMessage()), HttpStatus.BAD_REQUEST);
+    }
   }
 }
diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java
index 662ffd444..6e1f1cc60 100644
--- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java
+++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/teams/RemoveUsersFromTeamControllerTest.java
@@ -5,6 +5,7 @@
 import static org.mockito.Mockito.mock;
 
 import io.reflectoring.coderadar.rest.JsonListWrapper;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import io.reflectoring.coderadar.rest.unit.UnitTestTemplate;
 import io.reflectoring.coderadar.rest.useradministration.teams.RemoveUsersFromTeamController;
 import io.reflectoring.coderadar.useradministration.TeamNotFoundException;
@@ -25,7 +26,7 @@ class RemoveUsersFromTeamControllerTest extends UnitTestTemplate {
 
   @Test
   void testRemoveUsersFromTeam() {
-    ResponseEntity response =
+    ResponseEntity response =
         testController.removeUsersFromTeam(
             1L, new JsonListWrapper<>(Collections.singletonList(2L)));
     Assertions.assertEquals(HttpStatus.OK, response.getStatusCode());
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java
index 555ede7f8..4a9d7e6c6 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java
@@ -1,5 +1,6 @@
 package io.reflectoring.coderadar.rest.useradministration.teams;
 
+import static io.reflectoring.coderadar.rest.JsonHelper.fromJson;
 import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -9,6 +10,7 @@
 import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository;
 import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository;
 import io.reflectoring.coderadar.rest.ControllerTestTemplate;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import io.reflectoring.coderadar.useradministration.port.driver.teams.create.CreateTeamCommand;
 import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil;
 import java.util.Collections;
@@ -18,6 +20,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MvcResult;
 
 class CreateTeamControllerIntegrationTest extends ControllerTestTemplate {
 
@@ -66,7 +69,6 @@ void createTeamWithUsersSuccessfully() throws Exception {
 
   @Test
   void createTeamWithNoUsersSuccessfully() throws Exception {
-
     CreateTeamCommand createTeamCommand = new CreateTeamCommand();
     createTeamCommand.setName("testTeam");
 
@@ -82,4 +84,34 @@ void createTeamWithNoUsersSuccessfully() throws Exception {
     Assertions.assertEquals(1L, teams.size());
     Assertions.assertEquals("testTeam", teams.get(0).getName());
   }
+
+  @Test
+  void throwsExceptionWhenTeamAlreadyExists() throws Exception {
+    CreateTeamCommand createTeamCommand = new CreateTeamCommand();
+    createTeamCommand.setName("testTeam");
+
+    // create team
+    mvc()
+        .perform(
+            post("/api/teams")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(toJson(createTeamCommand)))
+        .andExpect(status().isCreated())
+        .andReturn();
+
+    // try to create team with the same name
+    MvcResult result =
+        mvc()
+            .perform(
+                post("/api/teams")
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(toJson(createTeamCommand)))
+            .andExpect(status().isConflict())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("Team with name testTeam already exists!", errorMessage);
+  }
 }
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java
index c628ad474..8d520a564 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java
@@ -1,5 +1,6 @@
 package io.reflectoring.coderadar.rest.useradministration.teams;
 
+import static io.reflectoring.coderadar.rest.JsonHelper.fromJson;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -8,6 +9,7 @@
 import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity;
 import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository;
 import io.reflectoring.coderadar.rest.ControllerTestTemplate;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -15,6 +17,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.web.servlet.MvcResult;
 
 class RemoveTeamFromProjectControllerIntegrationTest extends ControllerTestTemplate {
 
@@ -53,4 +56,28 @@ void removeTeamFromProjectSuccessfully() throws Exception {
     List teams = teamRepository.listTeamsByProjectIdWithMembers(testProject.getId());
     Assertions.assertTrue(teams.isEmpty());
   }
+
+  @Test
+  void throwsExceptionWhenTeamIsNotAssignedToProject() throws Exception {
+    teamEntity.setProjects(Collections.emptyList());
+    teamRepository.save(teamEntity, 1);
+
+    MvcResult result =
+        mvc()
+            .perform(
+                delete("/api/projects/" + testProject.getId() + "/teams/" + teamEntity.getId()))
+            .andExpect(status().isBadRequest())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+
+    Assertions.assertEquals(
+        "Team with id "
+            + teamEntity.getId()
+            + " is not assigned to project with id "
+            + testProject.getId(),
+        errorMessage);
+  }
 }
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java
index 8bc27abb2..2df60712d 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java
@@ -1,5 +1,6 @@
 package io.reflectoring.coderadar.rest.useradministration.teams;
 
+import static io.reflectoring.coderadar.rest.JsonHelper.fromJson;
 import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -10,6 +11,7 @@
 import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository;
 import io.reflectoring.coderadar.rest.ControllerTestTemplate;
 import io.reflectoring.coderadar.rest.JsonListWrapper;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import java.util.Collections;
 import java.util.List;
 import org.junit.jupiter.api.Assertions;
@@ -17,6 +19,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MvcResult;
 
 class RemoveUsersFromTeamControllerIntegrationTest extends ControllerTestTemplate {
 
@@ -60,4 +63,27 @@ void removeUsersFromTeamSuccessfully() throws Exception {
     List teams = teamRepository.listTeamsByUserId(testUser.getId());
     Assertions.assertEquals(0, teams.size());
   }
+
+  @Test
+  void throwsExceptionWhenUserIsNotInTeam() throws Exception {
+    teamEntity.setMembers(Collections.emptyList());
+    teamRepository.save(teamEntity, 1);
+
+    MvcResult result =
+        mvc()
+            .perform(
+                delete("/api/teams/" + teamEntity.getId() + "/users")
+                    .content(
+                        toJson(new JsonListWrapper<>(Collections.singletonList(testUser.getId()))))
+                    .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isBadRequest())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals(
+        "User with id " + testUser.getId() + " is not in team with id " + teamEntity.getId(),
+        errorMessage);
+  }
 }

From c38dce617545e45449eb8eb37596b2c7c5fbf404 Mon Sep 17 00:00:00 2001
From: Krause 
Date: Fri, 24 Jul 2020 16:04:38 +0200
Subject: [PATCH 69/76] apply spotless

---
 .../coderadar/rest/ExceptionHandlerController.java             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ExceptionHandlerController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ExceptionHandlerController.java
index 916b74d54..841dc937d 100644
--- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ExceptionHandlerController.java
+++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/ExceptionHandlerController.java
@@ -29,7 +29,8 @@ public ResponseEntity userUnauthenticatedException(
   }
 
   @ExceptionHandler(UserUnauthorizedException.class)
-  public ResponseEntity userUnauthorizedException(UserUnauthorizedException e) {
+  public ResponseEntity userUnauthorizedException(
+      UserUnauthorizedException e) {
     return new ResponseEntity<>(new ErrorMessageResponse(e.getMessage()), HttpStatus.UNAUTHORIZED);
   }
 

From 1bd5683decb5edf02f81ac899d729d9dea179d45 Mon Sep 17 00:00:00 2001
From: Kilian Krause 
Date: Mon, 27 Jul 2020 21:05:00 +0200
Subject: [PATCH 70/76] add some more negative tests

---
 ...jectsForUserControllerIntegrationTest.java | 12 ++++++
 ...rsForProjectControllerIntegrationTest.java | 15 ++++++++
 ...rFromProjectControllerIntegrationTest.java | 31 +++++++++++++++
 ...leForProjectControllerIntegrationTest.java | 37 ++++++++++++++++++
 ...eamToProjectControllerIntegrationTest.java | 37 ++++++++++++++++++
 ...dUsersToTeamControllerIntegrationTest.java | 38 +++++++++++++++++++
 .../CreateTeamControllerIntegrationTest.java  | 19 ++++++++++
 .../DeleteTeamControllerIntegrationTest.java  | 14 +++++++
 .../GetTeamControllerIntegrationTest.java     | 12 ++++++
 ...jectsForTeamControllerIntegrationTest.java | 12 ++++++
 ...msForProjectControllerIntegrationTest.java | 12 ++++++
 ...TeamsForUserControllerIntegrationTest.java | 12 ++++++
 ...mFromProjectControllerIntegrationTest.java | 28 ++++++++++++++
 ...sersFromTeamControllerIntegrationTest.java | 35 +++++++++++++++++
 14 files changed, 314 insertions(+)

diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java
index 7880333f2..5631b972a 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListProjectsForUserControllerIntegrationTest.java
@@ -9,6 +9,7 @@
 import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity;
 import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository;
 import io.reflectoring.coderadar.rest.ControllerTestTemplate;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import io.reflectoring.coderadar.rest.domain.GetProjectResponse;
 import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil;
 import java.util.Collections;
@@ -61,4 +62,15 @@ void listProjectsForUserSuccessfully() throws Exception {
     Assertions.assertEquals("project", projects[0].getName());
     Assertions.assertEquals(testProject.getId(), projects[0].getId());
   }
+
+  @Test
+  void throwsExceptionWhenUserDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc().perform(get("/api/users/1000/projects")).andExpect(status().isNotFound()).andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("User with id 1000 not found.", errorMessage);
+  }
 }
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java
index 03d0a1e7b..86ae31c4c 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/ListUsersForProjectControllerIntegrationTest.java
@@ -9,6 +9,7 @@
 import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity;
 import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository;
 import io.reflectoring.coderadar.rest.ControllerTestTemplate;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import io.reflectoring.coderadar.rest.domain.GetUserResponse;
 import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil;
 import java.util.Collections;
@@ -60,4 +61,18 @@ void listUsersForProjectSuccessfully() throws Exception {
     Assertions.assertEquals(1, users.length);
     Assertions.assertEquals("username", users[0].getUsername());
   }
+
+  @Test
+  void throwsExceptionWhenProjectDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc()
+            .perform(get("/api/projects/1000/users/"))
+            .andExpect(status().isNotFound())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("Project with id 1000 not found.", errorMessage);
+  }
 }
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java
index 6074d4799..e0d9d2a2d 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java
@@ -1,5 +1,6 @@
 package io.reflectoring.coderadar.rest.useradministration.permissions;
 
+import static io.reflectoring.coderadar.rest.JsonHelper.fromJson;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -8,6 +9,7 @@
 import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity;
 import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository;
 import io.reflectoring.coderadar.rest.ControllerTestTemplate;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil;
 import java.util.Collections;
 import java.util.Date;
@@ -15,6 +17,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.web.servlet.MvcResult;
 
 class RemoveUserFromProjectControllerIntegrationTest extends ControllerTestTemplate {
 
@@ -53,4 +56,32 @@ void removeUserFromProjectSuccessfully() throws Exception {
 
     Assertions.assertTrue(userRepository.listUsersForProject(testProject.getId()).isEmpty());
   }
+
+  @Test
+  void throwsExceptionWhenProjectDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc()
+            .perform(delete("/api/projects/1000/users/" + testUser.getId()))
+            .andExpect(status().isNotFound())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("Project with id 1000 not found.", errorMessage);
+  }
+
+  @Test
+  void throwsExceptionWhenUserDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc()
+            .perform(delete("/api/projects/" + testProject.getId() + "/users/1000"))
+            .andExpect(status().isNotFound())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("User with id 1000 not found.", errorMessage);
+  }
 }
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java
index dff13408d..d3d32978f 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java
@@ -1,5 +1,6 @@
 package io.reflectoring.coderadar.rest.useradministration.permissions;
 
+import static io.reflectoring.coderadar.rest.JsonHelper.fromJson;
 import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -10,6 +11,7 @@
 import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository;
 import io.reflectoring.coderadar.rest.ControllerTestTemplate;
 import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import io.reflectoring.coderadar.useradministration.domain.ProjectRole;
 import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil;
 import java.util.Date;
@@ -18,6 +20,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MvcResult;
 
 class SetUserRoleForProjectControllerIntegrationTest extends ControllerTestTemplate {
 
@@ -70,4 +73,38 @@ void setUserRoleForProjectSuccessfully() throws Exception {
     Assertions.assertEquals(
         "username", userRepository.listUsersForProject(testProject.getId()).get(0).getUsername());
   }
+
+  @Test
+  void throwsExceptionWhenProjectDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc()
+            .perform(
+                post("/api/projects/1000/users/" + testUser.getId())
+                    .content(toJson(new ProjectRoleJsonWrapper(ProjectRole.ADMIN)))
+                    .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isNotFound())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("Project with id 1000 not found.", errorMessage);
+  }
+
+  @Test
+  void throwsExceptionWhenUserDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc()
+            .perform(
+                post("/api/projects/" + testProject.getId() + "/users/1000")
+                    .content(toJson(new ProjectRoleJsonWrapper(ProjectRole.ADMIN)))
+                    .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isNotFound())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("User with id 1000 not found.", errorMessage);
+  }
 }
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java
index 90b503e04..f56ae9abc 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddTeamToProjectControllerIntegrationTest.java
@@ -1,5 +1,6 @@
 package io.reflectoring.coderadar.rest.useradministration.teams;
 
+import static io.reflectoring.coderadar.rest.JsonHelper.fromJson;
 import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -10,6 +11,7 @@
 import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository;
 import io.reflectoring.coderadar.rest.ControllerTestTemplate;
 import io.reflectoring.coderadar.rest.ProjectRoleJsonWrapper;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import io.reflectoring.coderadar.useradministration.domain.ProjectRole;
 import java.util.Date;
 import java.util.List;
@@ -18,6 +20,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MvcResult;
 
 class AddTeamToProjectControllerIntegrationTest extends ControllerTestTemplate {
 
@@ -66,4 +69,38 @@ void addTeamToProjectSuccessfully() throws Exception {
     Assertions.assertEquals(1L, teams.size());
     Assertions.assertEquals("testTeam", teams.get(0).getName());
   }
+
+  @Test
+  void throwsExceptionWhenProjectDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc()
+            .perform(
+                post("/api/projects/1000/teams/" + teamEntity.getId())
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(toJson(new ProjectRoleJsonWrapper(ProjectRole.ADMIN))))
+            .andExpect(status().isNotFound())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("Project with id 1000 not found.", errorMessage);
+  }
+
+  @Test
+  void throwsExceptionWhenTeamDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc()
+            .perform(
+                post("/api/projects/" + testProject.getId() + "/teams/1000")
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(toJson(new ProjectRoleJsonWrapper(ProjectRole.ADMIN))))
+            .andExpect(status().isNotFound())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("Team with id 1000 not found.", errorMessage);
+  }
 }
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java
index db6bc599f..33fc9c9e3 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/AddUsersToTeamControllerIntegrationTest.java
@@ -1,5 +1,6 @@
 package io.reflectoring.coderadar.rest.useradministration.teams;
 
+import static io.reflectoring.coderadar.rest.JsonHelper.fromJson;
 import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -10,6 +11,7 @@
 import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository;
 import io.reflectoring.coderadar.rest.ControllerTestTemplate;
 import io.reflectoring.coderadar.rest.JsonListWrapper;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import java.util.Collections;
 import java.util.List;
 import org.junit.jupiter.api.Assertions;
@@ -17,6 +19,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MvcResult;
 
 class AddUsersToTeamControllerIntegrationTest extends ControllerTestTemplate {
 
@@ -62,4 +65,39 @@ void addUsersToTeamSuccessfully() throws Exception {
     Assertions.assertEquals("testTeam", teams.get(0).getName());
     Assertions.assertEquals("username", teams.get(0).getMembers().get(0).getUsername());
   }
+
+  @Test
+  void throwsExceptionWhenTeamDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc()
+            .perform(
+                post("/api/teams/1000/users")
+                    .content(
+                        toJson(new JsonListWrapper<>(Collections.singletonList(testUser.getId()))))
+                    .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isNotFound())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("Team with id 1000 not found.", errorMessage);
+  }
+
+  @Test
+  void throwsExceptionWhenUserDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc()
+            .perform(
+                post("/api/teams/" + teamEntity.getId() + "/users")
+                    .content(toJson(new JsonListWrapper<>(Collections.singletonList(1000))))
+                    .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isNotFound())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("User with id 1000 not found.", errorMessage);
+  }
 }
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java
index 4a9d7e6c6..4a314cbb3 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/CreateTeamControllerIntegrationTest.java
@@ -114,4 +114,23 @@ void throwsExceptionWhenTeamAlreadyExists() throws Exception {
             .getErrorMessage();
     Assertions.assertEquals("Team with name testTeam already exists!", errorMessage);
   }
+
+  @Test
+  void throwsExceptionWhenUserNotFound() throws Exception {
+    CreateTeamCommand command = new CreateTeamCommand();
+    command.setName("testTeam");
+    command.setUserIds(Collections.singletonList(100L));
+
+    MvcResult result =
+        mvc()
+            .perform(
+                post("/api/teams").contentType(MediaType.APPLICATION_JSON).content(toJson(command)))
+            .andExpect(status().isNotFound())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("User with id 100 not found.", errorMessage);
+  }
 }
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java
index 38892e8c7..2d293e511 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/DeleteTeamControllerIntegrationTest.java
@@ -1,5 +1,6 @@
 package io.reflectoring.coderadar.rest.useradministration.teams;
 
+import static io.reflectoring.coderadar.rest.JsonHelper.fromJson;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -8,6 +9,7 @@
 import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository;
 import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository;
 import io.reflectoring.coderadar.rest.ControllerTestTemplate;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil;
 import java.util.Collections;
 import java.util.List;
@@ -15,6 +17,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.web.servlet.MvcResult;
 
 class DeleteTeamControllerIntegrationTest extends ControllerTestTemplate {
 
@@ -60,4 +63,15 @@ void deleteTeamWithNoUsersSuccessfully() throws Exception {
     List teams = teamRepository.findAllWithMembers();
     Assertions.assertTrue(teams.isEmpty());
   }
+
+  @Test
+  void throwsExceptionWhenTeamDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc().perform(delete("/api/teams/1000")).andExpect(status().isNotFound()).andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("Team with id 1000 not found.", errorMessage);
+  }
 }
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java
index 55cb1db62..ebb63fa47 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/GetTeamControllerIntegrationTest.java
@@ -7,6 +7,7 @@
 import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity;
 import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository;
 import io.reflectoring.coderadar.rest.ControllerTestTemplate;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import io.reflectoring.coderadar.rest.domain.GetTeamResponse;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -40,4 +41,15 @@ void getTeamSuccessfully() throws Exception {
         fromJson(result.getResponse().getContentAsString(), GetTeamResponse.class);
     Assertions.assertEquals("testTeam", response.getName());
   }
+
+  @Test
+  void throwsExceptionWhenTeamDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc().perform(get("/api/teams/1000")).andExpect(status().isNotFound()).andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("Team with id 1000 not found.", errorMessage);
+  }
 }
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java
index 11ae6e21d..dcecdc64a 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListProjectsForTeamControllerIntegrationTest.java
@@ -9,6 +9,7 @@
 import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity;
 import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository;
 import io.reflectoring.coderadar.rest.ControllerTestTemplate;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import io.reflectoring.coderadar.rest.domain.GetProjectResponse;
 import java.util.Collections;
 import java.util.Date;
@@ -58,4 +59,15 @@ void listProjectsForTeamSuccessfully() throws Exception {
     Assertions.assertEquals(1L, projects.length);
     Assertions.assertEquals("project", projects[0].getName());
   }
+
+  @Test
+  void throwsExceptionWhenTeamDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc().perform(get("/api/teams/1000/projects")).andExpect(status().isNotFound()).andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("Team with id 1000 not found.", errorMessage);
+  }
 }
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java
index c0b6e2cf2..6c39bde44 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForProjectControllerIntegrationTest.java
@@ -9,6 +9,7 @@
 import io.reflectoring.coderadar.graph.useradministration.domain.TeamEntity;
 import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository;
 import io.reflectoring.coderadar.rest.ControllerTestTemplate;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import io.reflectoring.coderadar.rest.domain.GetTeamResponse;
 import java.util.Collections;
 import java.util.Date;
@@ -58,4 +59,15 @@ void listTeamsForProjectSuccessfully() throws Exception {
     Assertions.assertEquals(1L, teams.length);
     Assertions.assertEquals("testTeam", teams[0].getName());
   }
+
+  @Test
+  void throwsExceptionWhenProjectDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc().perform(get("/api/projects/1000/teams")).andExpect(status().isNotFound()).andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("Project with id 1000 not found.", errorMessage);
+  }
 }
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java
index 179243388..bb1d3a773 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/ListTeamsForUserControllerIntegrationTest.java
@@ -8,6 +8,7 @@
 import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity;
 import io.reflectoring.coderadar.graph.useradministration.repository.TeamRepository;
 import io.reflectoring.coderadar.rest.ControllerTestTemplate;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import io.reflectoring.coderadar.rest.domain.GetTeamResponse;
 import java.util.Collections;
 import org.junit.jupiter.api.Assertions;
@@ -49,4 +50,15 @@ void listTeamsForUserSuccessfully() throws Exception {
     Assertions.assertEquals(1L, teams.length);
     Assertions.assertEquals("testTeam", teams[0].getName());
   }
+
+  @Test
+  void throwsExceptionWhenUserDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc().perform(get("/api/users/1000/teams")).andExpect(status().isNotFound()).andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("User with id 1000 not found.", errorMessage);
+  }
 }
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java
index 8d520a564..9c877c6a1 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveTeamFromProjectControllerIntegrationTest.java
@@ -80,4 +80,32 @@ void throwsExceptionWhenTeamIsNotAssignedToProject() throws Exception {
             + testProject.getId(),
         errorMessage);
   }
+
+  @Test
+  void throwsExceptionWhenProjectDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc()
+            .perform(delete("/api/projects/1000/teams/" + teamEntity.getId()))
+            .andExpect(status().isNotFound())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("Project with id 1000 not found.", errorMessage);
+  }
+
+  @Test
+  void throwsExceptionWhenTeamDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc()
+            .perform(delete("/api/projects/" + testProject.getId() + "/teams/1000"))
+            .andExpect(status().isNotFound())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("Team with id 1000 not found.", errorMessage);
+  }
 }
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java
index 2df60712d..c9b6ae571 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/teams/RemoveUsersFromTeamControllerIntegrationTest.java
@@ -86,4 +86,39 @@ void throwsExceptionWhenUserIsNotInTeam() throws Exception {
         "User with id " + testUser.getId() + " is not in team with id " + teamEntity.getId(),
         errorMessage);
   }
+
+  @Test
+  void throwsExceptionWhenTeamDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc()
+            .perform(
+                delete("/api/teams/1000/users")
+                    .content(
+                        toJson(new JsonListWrapper<>(Collections.singletonList(testUser.getId()))))
+                    .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isNotFound())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("Team with id 1000 not found.", errorMessage);
+  }
+
+  @Test
+  void throwsExceptionWhenUserDoesNotExist() throws Exception {
+    MvcResult result =
+        mvc()
+            .perform(
+                delete("/api/teams/" + teamEntity.getId() + "/users")
+                    .content(toJson(new JsonListWrapper<>(Collections.singletonList(1000))))
+                    .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isNotFound())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+    Assertions.assertEquals("User with id 1000 not found.", errorMessage);
+  }
 }

From 70e6a7cb72f60bef3e4e3fb8f2b57e656fbdeb4e Mon Sep 17 00:00:00 2001
From: Maxim Atanasov 
Date: Tue, 28 Jul 2020 17:49:44 +0200
Subject: [PATCH 71/76] minor fixes

---
 .../project/adapter/CommitAdapter.java        |  1 -
 .../repository/MetricQueryRepository.java     | 31 +------------------
 .../configure-project.component.ts            |  2 +-
 .../view-commit/view-commit.component.html    |  2 +-
 4 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/adapter/CommitAdapter.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/adapter/CommitAdapter.java
index 1e9b6a0d2..608301454 100644
--- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/adapter/CommitAdapter.java
+++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/projectadministration/project/adapter/CommitAdapter.java
@@ -284,7 +284,6 @@ private void addCommits(long projectId, List commits, List updat
     // Get all of the existing commits and save them in a map
     Map walkedCommits = new HashMap<>();
     IdentityHashMap walkedFiles = new IdentityHashMap<>();
-
     commitRepository.findByProjectId(projectId).forEach(c -> walkedCommits.put(c.getHash(), c));
 
     // Remove any already existing commits from the new commits passed into this method
diff --git a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/MetricQueryRepository.java b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/MetricQueryRepository.java
index 810fc5e7b..4ebe785d4 100644
--- a/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/MetricQueryRepository.java
+++ b/coderadar-graph/src/main/java/io/reflectoring/coderadar/graph/query/repository/MetricQueryRepository.java
@@ -69,35 +69,6 @@ List> getMetricTreeForCommit(
   @NonNull
   List getAvailableMetricsInProject(long projectId);
 
-  /**
-   * Metrics for each file are collected as string in the following format: "metricName=value" The
-   * string is then split in the adapter. This greatly reduces HashMap usage. File paths are
-   * returned along with their corresponding git hashes in the following format:
-   * "filePath=ObjectHash".
-   *
-   * 
    NOTE: uses APOC.
-   *
-   * @param projectId The project id.
-   * @param commitHash The hash of the commit.
-   * @param metricNames The names of the metrics needed.
-   * @return Metrics for each file in the given commit.
-   */
-  @Query(
-      "MATCH (p)-[:CONTAINS_COMMIT]->(c:CommitEntity) WHERE ID(p) = {0} AND c.hash = {1} WITH c LIMIT 1 "
-          + "CALL apoc.path.subgraphNodes(c, {relationshipFilter:'IS_CHILD_OF>'}) YIELD node WITH node as c ORDER BY c.timestamp DESC WITH collect(c) as commits "
-          + "CALL apoc.cypher.run('UNWIND commits as c OPTIONAL MATCH (f)<-[:RENAMED_FROM]-()-[:CHANGED_IN]->(c) RETURN collect(f) as renames', {commits: commits}) "
-          + "YIELD value WITH commits, value.renames as renames "
-          + "CALL apoc.cypher.run('UNWIND commits as c OPTIONAL MATCH (f)-[:CHANGED_IN {changeType: \"DELETE\"}]->(c) "
-          + "RETURN collect(f) as deletes', {commits: commits}) YIELD value WITH commits, renames, value.deletes as deletes "
-          + "UNWIND commits as c "
-          + "MATCH (f)-[:MEASURED_BY]->(m)-[:VALID_FOR]->(c) WHERE "
-          + "NOT(f IN deletes OR f IN renames) AND m.name IN {2} WITH f.path as path, head(collect(f.objectHash)) as hash, m.name as name, "
-          + "head(collect(m.value)) as value ORDER BY path, name WHERE value <> 0 "
-          + "RETURN path + \"=\" + head(collect(hash)) as path, collect(name + \"=\" + value) as metrics ORDER BY path")
-  @NonNull
-  List> getMetricTreeForCommitWithFileHashes(
-      long projectId, @NonNull String commitHash, @NonNull List metricNames);
-
   /**
    * NOTE: This query is currently unused, but I believe it might be useful in the future.
    *
@@ -161,7 +132,7 @@ List> getMetricsAndFindingsForCommitAndFilepath(
    */
   @Query(
       "MATCH (p)-[:CONTAINS_COMMIT]->(c:CommitEntity) WHERE ID(p) = {0} AND c.hash = {1} WITH c LIMIT 1 "
-          + "MATCH (f)-[r:CHANGED_IN]->(c) WHERE r.changeType <> \"DELETE\" "
+          + "MATCH (f)-[r:CHANGED_IN]->(c) "
           + "RETURN DISTINCT f.path as path")
   List getFilesChangedInCommit(long projectId, @NonNull String commitHash);
 }
diff --git a/coderadar-ui/src/app/view/configure-project/configure-project.component.ts b/coderadar-ui/src/app/view/configure-project/configure-project.component.ts
index 8c70da971..980074518 100644
--- a/coderadar-ui/src/app/view/configure-project/configure-project.component.ts
+++ b/coderadar-ui/src/app/view/configure-project/configure-project.component.ts
@@ -25,7 +25,7 @@ export class ConfigureProjectComponent implements OnInit {
 
   projectName: string;
   analyzers: AnalyzerConfiguration[] = [];
-  filePatterns: FilePattern[] = []
+  filePatterns: FilePattern[] = [];
   contributors: Contributor[] = [];
   branches: Branch[] = [];
   selectedContributors: Contributor[] = [];
diff --git a/coderadar-ui/src/app/view/view-commit/view-commit.component.html b/coderadar-ui/src/app/view/view-commit/view-commit.component.html
index e6ad3d647..d57faa861 100644
--- a/coderadar-ui/src/app/view/view-commit/view-commit.component.html
+++ b/coderadar-ui/src/app/view/view-commit/view-commit.component.html
@@ -11,7 +11,7 @@
 
   
     
-      {{commit.hash}}
+      {{commit.hash}}
       

    
       Metrics:
       

    

From 38648d23d03c3a1fc2622234e5fe6038e80b8f51 Mon Sep 17 00:00:00 2001
From: Kilian Krause 
Date: Thu, 6 Aug 2020 10:33:33 +0200
Subject: [PATCH 72/76] fix tslint errors and typos

---
 coderadar-ui/package-lock.json                |  6 +-
 coderadar-ui/src/app/app.module.ts            |  7 +-
 .../commit-chooser.component.ts               |  3 +-
 .../control-panel/search/search.component.ts  |  4 +-
 .../contributor-card.component.ts             | 67 +++++----------
 .../contributor-dialog.component.ts           | 35 ++++++++
 .../contributor-card/contributor-dialog.css   |  4 +
 .../contributor-card/contributor-dialog.html  |  4 +-
 .../contributor-merge-dialog.component.ts     |  2 +-
 .../src/app/service/project.service.ts        |  2 +-
 .../main-dashboard.component.ts               |  2 +-
 .../branch-view/branch-view.component.ts      | 81 ++++++++++---------
 12 files changed, 116 insertions(+), 101 deletions(-)
 create mode 100644 coderadar-ui/src/app/components/contributor-card/contributor-dialog.component.ts

diff --git a/coderadar-ui/package-lock.json b/coderadar-ui/package-lock.json
index 80aff4622..633c2d89e 100644
--- a/coderadar-ui/package-lock.json
+++ b/coderadar-ui/package-lock.json
@@ -485,9 +485,9 @@
       }
     },
     "@angular/elements": {
-      "version": "10.0.5",
-      "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-10.0.5.tgz",
-      "integrity": "sha512-TqAZYU3xs1ZsyyZZFi8oGg1x/on5A8BjIE0anMtTV/jgPvE5/tRW/eaMM4Odios+vdHpb1Yuc12l/Q3Xeo96bA==",
+      "version": "10.0.8",
+      "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-10.0.8.tgz",
+      "integrity": "sha512-LTWqNCqBPzKiTDAgFJMhX5nViYf12ufW4eVyUatvgHa3QpV1TEsou6c+q46sw6y9RoV87aRV3H+DnpaSuuQx8w==",
       "requires": {
         "tslib": "^2.0.0"
       },
diff --git a/coderadar-ui/src/app/app.module.ts b/coderadar-ui/src/app/app.module.ts
index cf416698f..c35017738 100644
--- a/coderadar-ui/src/app/app.module.ts
+++ b/coderadar-ui/src/app/app.module.ts
@@ -62,14 +62,15 @@ import {PinchZoomModule} from 'ngx-pinch-zoom';
 import {ScrollingModule} from '@angular/cdk/scrolling';
 import { ListViewComponent } from './view/project-dashboard/list-view/list-view.component';
 import { BranchViewComponent } from './view/project-dashboard/branch-view/branch-view.component';
-import {ContributorCardComponent, ContributorDialogComponent} from './components/contributor-card/contributor-card.component';
+import {ContributorCardComponent} from './components/contributor-card/contributor-card.component';
 import { FileViewComponent } from './view/file-view/file-view.component';
 import { TeamsDashboardComponent } from './view/teams-dashboard/teams-dashboard.component';
 import { AddTeamComponent } from './view/add-team/add-team.component';
 import { SidenavContentComponent } from './view/sidenav-content/sidenav-content.component';
 import {ContributorMergeDialogComponent} from './components/contributor-merge-dialog/contributor-merge-dialog.component';
-import {DeleteProjectDialogComponent} from "./components/delete-project-dialog/delete-project-dialog.component";
-import {AddProjectToTeamDialogComponent} from "./components/add-project-to-team-dialog/add-project-to-team-dialog.component";
+import {DeleteProjectDialogComponent} from './components/delete-project-dialog/delete-project-dialog.component';
+import {AddProjectToTeamDialogComponent} from './components/add-project-to-team-dialog/add-project-to-team-dialog.component';
+import {ContributorDialogComponent} from "./components/contributor-card/contributor-dialog.component";
 
 const appRoutes: Routes = [
   {path: 'login', component: LoginComponent},
diff --git a/coderadar-ui/src/app/city-map/control-panel/commit-chooser/commit-chooser.component.ts b/coderadar-ui/src/app/city-map/control-panel/commit-chooser/commit-chooser.component.ts
index f07ca298c..379bda4cf 100644
--- a/coderadar-ui/src/app/city-map/control-panel/commit-chooser/commit-chooser.component.ts
+++ b/coderadar-ui/src/app/city-map/control-panel/commit-chooser/commit-chooser.component.ts
@@ -33,7 +33,8 @@ export class CommitChooserComponent implements OnInit {
     if (commit === null || commit === undefined) {
       return 'empty';
     }
-    return commit.hash.substring(0, CommitChooserComponent.COMMIT_HASH_LENGTH) + ', ' + commit.author + ', ' + new Date(commit.timestamp).toUTCString();
+    return commit.hash.substring(0, CommitChooserComponent.COMMIT_HASH_LENGTH) + ', ' +
+      commit.author + ', ' + new Date(commit.timestamp).toUTCString();
   }
 
   filterCommitOptions(value: string, source: {value: Commit, displayValue: string}[]): {value: Commit, displayValue: string}[] {
diff --git a/coderadar-ui/src/app/city-map/control-panel/search/search.component.ts b/coderadar-ui/src/app/city-map/control-panel/search/search.component.ts
index ecb54bbba..692ca2c85 100644
--- a/coderadar-ui/src/app/city-map/control-panel/search/search.component.ts
+++ b/coderadar-ui/src/app/city-map/control-panel/search/search.component.ts
@@ -16,7 +16,9 @@ export class SearchComponent implements OnInit {
   constructor() {
   }
 
-  filterFileOptions(value: string, source: {value: string, displayValue: string, score: number}[]): {value: string, displayValue: string}[] {
+  filterFileOptions(value: string, source: {value: string, displayValue: string, score: number}[]):
+    {value: string, displayValue: string}[] {
+
     if (source === undefined) {
       return [];
     } else if (typeof value !== 'string') {
diff --git a/coderadar-ui/src/app/components/contributor-card/contributor-card.component.ts b/coderadar-ui/src/app/components/contributor-card/contributor-card.component.ts
index 45df2dbf3..6114051cc 100644
--- a/coderadar-ui/src/app/components/contributor-card/contributor-card.component.ts
+++ b/coderadar-ui/src/app/components/contributor-card/contributor-card.component.ts
@@ -1,10 +1,7 @@
-import {Component, ElementRef, HostListener, Inject, Input, OnInit} from '@angular/core';
+import {Component, HostListener, Input, OnInit} from '@angular/core';
 import {Contributor} from '../../model/contributor';
-import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material/dialog';
-
-interface ContributorDialogData{
-  contributor: Contributor;
-}
+import {MatDialog, MatDialogRef} from '@angular/material/dialog';
+import {ContributorDialogComponent} from './contributor-dialog.component';
 
 @Component({
   selector: 'app-contributor-card',
@@ -12,43 +9,43 @@ interface ContributorDialogData{
   styleUrls: ['./contributor-card.component.css']
 })
 export class ContributorCardComponent implements OnInit {
+  constructor(public dialog: MatDialog) { }
 
-  @HostListener('document:click',['$event'])
-  clickout(event){
-    if(this.clickoutHandler){
-      this.clickoutHandler(event);
-    }
-  }
-
-  clickoutHandler: Function;
+  clickoutHandler: (event: MouseEvent) => void;
 
   dialogRef: MatDialogRef;
 
   @Input()
   contributor: Contributor;
   @Input()
-  noAvatar: boolean = false;
-  constructor(public dialog: MatDialog) { }
+  noAvatar = false;
+
+  @HostListener('document:click', ['$event'])
+  clickout(event) {
+    if (this.clickoutHandler) {
+      this.clickoutHandler.call(event);
+    }
+  }
 
-  openDialog(): void{
+  openDialog(): void {
     setTimeout(() => {
       this.dialogRef = this.dialog.open(ContributorDialogComponent, {
         minWidth: '150px',
-        data:{contributor: this.contributor}
+        data: {contributor: this.contributor}
 
       });
 
-      this.dialogRef.afterOpened().subscribe(()=>{
+      this.dialogRef.afterOpened().subscribe(() => {
         this.clickoutHandler = this.closeDialogFromClickout;
       });
     });
   }
 
-  closeDialogFromClickout(event: MouseEvent){
-    if (!this.dialogRef.componentInstance)return;
+  closeDialogFromClickout(event: MouseEvent) {
+    if (!this.dialogRef.componentInstance) {return; }
     const matDialogContainer = this.dialogRef.componentInstance.hostElement.nativeElement.parentElement;
     const rect = matDialogContainer.getBoundingClientRect();
-    if(event.clientX <= rect.left || event.clientX >= rect.right || event.clientY <= rect.top || event.clientY >= rect.bottom){
+    if (event.clientX <= rect.left || event.clientX >= rect.right || event.clientY <= rect.top || event.clientY >= rect.bottom) {
       this.dialogRef.close();
     }
   }
@@ -60,29 +57,3 @@ export class ContributorCardComponent implements OnInit {
 
 }
 
-@Component({
-  selector: 'app-contributor-dialog',
-  templateUrl: './contributor-dialog.html',
-  styleUrls: ['contributor-dialog.css']
-})
-export class ContributorDialogComponent implements OnInit {
-
-  contributor: Contributor;
-  avatarUrl: string;
-
-  constructor(
-    public hostElement: ElementRef,
-    public dialogRef: MatDialogRef,
-    @Inject(MAT_DIALOG_DATA) public data: ContributorDialogData
-  ) {
-    this.contributor = data.contributor;
-  }
-
-  getAliases(): string[]{
-    return this.contributor.names.filter(value => value !== this.contributor.displayName);
-  }
-
-  ngOnInit() {
-  }
-
-}
diff --git a/coderadar-ui/src/app/components/contributor-card/contributor-dialog.component.ts b/coderadar-ui/src/app/components/contributor-card/contributor-dialog.component.ts
new file mode 100644
index 000000000..b8d625a96
--- /dev/null
+++ b/coderadar-ui/src/app/components/contributor-card/contributor-dialog.component.ts
@@ -0,0 +1,35 @@
+import {Contributor} from '../../model/contributor';
+import {Component, ElementRef, Inject, OnInit} from '@angular/core';
+import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
+
+interface ContributorDialogData {
+  contributor: Contributor;
+}
+
+
+@Component({
+  selector: 'app-contributor-dialog',
+  templateUrl: './contributor-dialog.html',
+  styleUrls: ['contributor-dialog.css']
+})
+export class ContributorDialogComponent implements OnInit {
+
+  contributor: Contributor;
+  avatarUrl: string;
+
+  constructor(
+    public hostElement: ElementRef,
+    public dialogRef: MatDialogRef,
+    @Inject(MAT_DIALOG_DATA) public data: ContributorDialogData
+  ) {
+    this.contributor = data.contributor;
+  }
+
+  getAliases(): string[] {
+    return this.contributor.names.filter(value => value !== this.contributor.displayName);
+  }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/coderadar-ui/src/app/components/contributor-card/contributor-dialog.css b/coderadar-ui/src/app/components/contributor-card/contributor-dialog.css
index 5ce057c7a..8435eab28 100644
--- a/coderadar-ui/src/app/components/contributor-card/contributor-dialog.css
+++ b/coderadar-ui/src/app/components/contributor-card/contributor-dialog.css
@@ -1,3 +1,7 @@
 ::ng-deep .contributor-name{
   margin: 0;
 }
+
+ul {
+  padding: 0 16px
+}
diff --git a/coderadar-ui/src/app/components/contributor-card/contributor-dialog.html b/coderadar-ui/src/app/components/contributor-card/contributor-dialog.html
index e1f112943..d84411cbc 100644
--- a/coderadar-ui/src/app/components/contributor-card/contributor-dialog.html
+++ b/coderadar-ui/src/app/components/contributor-card/contributor-dialog.html
@@ -5,14 +5,14 @@
   
    
     
    
     
    Alias{{getAliases().length>1?'es':''}}
    
-    
      
+    
        
       
      • 
         {{alias}}
       
        • 
     
      
     
    
     
    Email{{contributor.emailAddresses.length>1?'s':''}}:
    
-    
      
+    
        
       
      • 
         {{email}}
       
        • 
diff --git a/coderadar-ui/src/app/components/contributor-merge-dialog/contributor-merge-dialog.component.ts b/coderadar-ui/src/app/components/contributor-merge-dialog/contributor-merge-dialog.component.ts
index e933e4098..97cad3486 100644
--- a/coderadar-ui/src/app/components/contributor-merge-dialog/contributor-merge-dialog.component.ts
+++ b/coderadar-ui/src/app/components/contributor-merge-dialog/contributor-merge-dialog.component.ts
@@ -1,6 +1,6 @@
 import {Component, Inject} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material';
-import {DialogData} from "./merge-dialog-data";
+import {DialogData} from './merge-dialog-data';
 
 @Component({
   selector: 'app-contributor-merge-dialog',
diff --git a/coderadar-ui/src/app/service/project.service.ts b/coderadar-ui/src/app/service/project.service.ts
index 0c4805c17..1ffff1dcc 100644
--- a/coderadar-ui/src/app/service/project.service.ts
+++ b/coderadar-ui/src/app/service/project.service.ts
@@ -237,7 +237,7 @@ export class ProjectService {
   }
 
   /**
-   * Returns the delta three of a project given two commits and a metric mapping
+   * Returns the delta tree of a project given two commits and a metric mapping
    * @param firstCommit The first commit
    * @param secondCommit The second commit
    * @param metricMapping The metric mapping
diff --git a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts
index d9a4e34cc..6510c2480 100644
--- a/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts
+++ b/coderadar-ui/src/app/view/main-dashboard/main-dashboard.component.ts
@@ -12,7 +12,7 @@ import {Team} from '../../model/team';
 import {TeamService} from '../../service/team.service';
 import {HttpResponse} from '@angular/common/http';
 import {DeleteProjectDialogComponent} from '../../components/delete-project-dialog/delete-project-dialog.component';
-import {AddProjectToTeamDialogComponent} from "../../components/add-project-to-team-dialog/add-project-to-team-dialog.component";
+import {AddProjectToTeamDialogComponent} from '../../components/add-project-to-team-dialog/add-project-to-team-dialog.component';
 
 @Component({
   selector: 'app-main-dashboard',
diff --git a/coderadar-ui/src/app/view/project-dashboard/branch-view/branch-view.component.ts b/coderadar-ui/src/app/view/project-dashboard/branch-view/branch-view.component.ts
index 204c8ee30..6adb97d18 100644
--- a/coderadar-ui/src/app/view/project-dashboard/branch-view/branch-view.component.ts
+++ b/coderadar-ui/src/app/view/project-dashboard/branch-view/branch-view.component.ts
@@ -20,10 +20,10 @@ import * as _ from 'lodash';
   styleUrls: ['./branch-view.component.scss']
 })
 export class BranchViewComponent implements OnInit, OnChanges {
-  private renderedCommits: any;
 
   constructor(private cityEffects: AppEffects, private store: Store, private router: Router) {
   }
+  private renderedCommits: any;
 
   @ViewChild('graph', {read: ElementRef})graph: ElementRef;
 
@@ -44,6 +44,43 @@ export class BranchViewComponent implements OnInit, OnChanges {
 
   private selectedCommitColor = '#f60';
 
+  private static setCommitColor(hash: string, selectedCommitColor: string) {
+    const element = document.getElementById(hash);
+
+    // Color the commit dot
+    element.setAttribute('fill', selectedCommitColor);
+
+    const parent = element.parentElement.parentElement.parentElement;
+
+    // Color the text
+    parent.children.item(1)
+      .children.item(0).children.item(0).setAttribute('fill', selectedCommitColor);
+
+    // See if there is a branch (and tag)
+    if (parent.children.item(1).children.item(1) !== null) {
+      const elementToColor = parent.children.item(1)
+        .children.item(1).children.item(0);
+
+      elementToColor.children.item(0).setAttribute('stroke', selectedCommitColor);
+
+      // If there is a tag, color it
+      if (elementToColor.children.item(0).tagName === 'path') {
+        elementToColor.children.item(0).setAttribute('fill', selectedCommitColor);
+      } else {
+        elementToColor.children.item(1).setAttribute('fill', selectedCommitColor);
+      }
+    }
+
+    // Check if there is only a tag
+    if (parent.children.item(1).children.item(2) !== null) {
+      const elementToColor = parent.children.item(1)
+        .children.item(2).children.item(0).children.item(0);
+      elementToColor.setAttribute('stroke', selectedCommitColor);
+      elementToColor.setAttribute('fill', selectedCommitColor);
+    }
+
+  }
+
   ngOnInit() {
     this.initTree();
     this.showCommitsInRange();
@@ -66,51 +103,15 @@ export class BranchViewComponent implements OnInit, OnChanges {
       this.prevSelectedCommit2 = selectedCommit;
       BranchViewComponent.setCommitColor(commitElement.hash, commitElement.style.color);
     } else {
-      if(this.selectedCommit2 !== null) {
-        BranchViewComponent.setCommitColor(this.selectedCommit2.hash, this.renderedCommits.find(c => c.hash === this.selectedCommit2.hash).style.color);
+      if (this.selectedCommit2 !== null) {
+        BranchViewComponent.setCommitColor(this.selectedCommit2.hash,
+          this.renderedCommits.find(c => c.hash === this.selectedCommit2.hash).style.color);
       }
       this.selectedCommit2 = selectedCommit;
       BranchViewComponent.setCommitColor(commitElement.hash, this.selectedCommitColor);
     }
   }
 
-  private static setCommitColor(hash: string, selectedCommitColor: string) {
-    let element = document.getElementById(hash);
-
-    //Color the commit dot
-    element.setAttribute("fill", selectedCommitColor);
-
-    let parent = element.parentElement.parentElement.parentElement;
-
-    //Color the text
-    parent.children.item(1)
-      .children.item(0).children.item(0).setAttribute("fill", selectedCommitColor);
-
-    //See if there is a branch (and tag)
-    if(parent.children.item(1).children.item(1) !== null) {
-      let elementToColor = parent.children.item(1)
-        .children.item(1).children.item(0);
-
-      elementToColor.children.item(0).setAttribute("stroke", selectedCommitColor);
-
-      //If there is a tag, color it
-      if(elementToColor.children.item(0).tagName === "path") {
-        elementToColor.children.item(0).setAttribute("fill", selectedCommitColor);
-      } else {
-        elementToColor.children.item(1).setAttribute("fill", selectedCommitColor);
-      }
-    }
-
-    //Check if there is only a tag
-    if(parent.children.item(1).children.item(2) !== null) {
-      let elementToColor = parent.children.item(1)
-        .children.item(2).children.item(0).children.item(0);
-      elementToColor.setAttribute("stroke", selectedCommitColor);
-      elementToColor.setAttribute("fill", selectedCommitColor);
-    }
-
-  }
-
   showCommitsInRange() {
     this.selectedCommit1 = null;
     this.selectedCommit2 = null;

From 7cf85aad6210cdce756b3558bfc07323cc9d613b Mon Sep 17 00:00:00 2001
From: Maxim Atanasov 
Date: Fri, 7 Aug 2020 13:30:25 +0200
Subject: [PATCH 73/76] add tests for the AuthenticationService

---
 .../AuthenticationServiceIntegrationTest.java | 140 ++++++++++++++++++
 ...leForProjectControllerIntegrationTest.java |   1 -
 .../dependency-base.ts                        |   2 +-
 3 files changed, 141 insertions(+), 2 deletions(-)
 create mode 100644 coderadar-test/src/test/java/io/reflectoring/coderadar/rest/authentication/AuthenticationServiceIntegrationTest.java

diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/authentication/AuthenticationServiceIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/authentication/AuthenticationServiceIntegrationTest.java
new file mode 100644
index 000000000..2df947c54
--- /dev/null
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/authentication/AuthenticationServiceIntegrationTest.java
@@ -0,0 +1,140 @@
+package io.reflectoring.coderadar.rest.authentication;
+
+import io.reflectoring.coderadar.CoderadarConfigurationProperties;
+import io.reflectoring.coderadar.graph.projectadministration.domain.ProjectEntity;
+import io.reflectoring.coderadar.graph.projectadministration.project.repository.ProjectRepository;
+import io.reflectoring.coderadar.graph.useradministration.domain.UserEntity;
+import io.reflectoring.coderadar.graph.useradministration.repository.UserRepository;
+import io.reflectoring.coderadar.rest.ControllerTestTemplate;
+import io.reflectoring.coderadar.useradministration.domain.ProjectRole;
+import io.reflectoring.coderadar.useradministration.port.driver.login.LoginUserCommand;
+import io.reflectoring.coderadar.useradministration.service.UserUnauthenticatedException;
+import io.reflectoring.coderadar.useradministration.service.UserUnauthorizedException;
+import io.reflectoring.coderadar.useradministration.service.login.LoginUserService;
+import io.reflectoring.coderadar.useradministration.service.permissions.SetUserRoleForProjectService;
+import io.reflectoring.coderadar.useradministration.service.security.AuthenticationService;
+import io.reflectoring.coderadar.useradministration.service.security.PasswordUtil;
+import java.util.Date;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+class AuthenticationServiceIntegrationTest extends ControllerTestTemplate {
+
+  @Autowired private UserRepository userRepository;
+
+  @Autowired private ProjectRepository projectRepository;
+
+  @Autowired private AuthenticationService authenticationService;
+
+  @Autowired private SetUserRoleForProjectService setUserRoleForProjectService;
+
+  @Autowired private LoginUserService loginUserService;
+
+  @Autowired private CoderadarConfigurationProperties coderadarConfigurationProperties;
+
+  private ProjectEntity testProject;
+  private UserEntity testUser;
+
+  @BeforeEach
+  void setUp() {
+    coderadarConfigurationProperties.setAuthentication(
+        new CoderadarConfigurationProperties.Authentication().setEnabled(true));
+
+    testProject = new ProjectEntity();
+    testProject.setVcsUrl("https://valid.url");
+    testProject.setName("project");
+    testProject.setVcsStart(new Date());
+    testProject.setVcsOnline(true);
+    testProject.setVcsPassword("testPassword");
+    testProject.setVcsUsername("testUser");
+    projectRepository.save(testProject);
+
+    testUser = new UserEntity();
+    testUser.setUsername("username1");
+    testUser.setPassword(PasswordUtil.hash("password1"));
+    userRepository.save(testUser);
+    loginUserService.login(new LoginUserCommand("username1", "password1"));
+  }
+
+  @AfterEach
+  void tearDown() {
+    coderadarConfigurationProperties.setAuthentication(
+        new CoderadarConfigurationProperties.Authentication().setEnabled(false));
+    SecurityContextHolder.getContext().setAuthentication(null);
+  }
+
+  @Test
+  void testUserIsAuthenticatedAsAdmin() {
+    SecurityContextHolder.getContext()
+        .setAuthentication(new UsernamePasswordAuthenticationToken("username1", "password1"));
+
+    // Set up
+    setUserRoleForProjectService.setRole(testProject.getId(), testUser.getId(), ProjectRole.ADMIN);
+
+    // Test
+    Assertions.assertDoesNotThrow(
+        () -> authenticationService.authenticateAdmin(testProject.getId()));
+    Assertions.assertDoesNotThrow(
+        () -> authenticationService.authenticateMember(testProject.getId()));
+  }
+
+  @Test
+  void testUserIsAuthenticatedAsMember() {
+    SecurityContextHolder.getContext()
+        .setAuthentication(new UsernamePasswordAuthenticationToken("username1", "password1"));
+
+    // Set up
+    setUserRoleForProjectService.setRole(testProject.getId(), testUser.getId(), ProjectRole.MEMBER);
+
+    // Test
+    Assertions.assertDoesNotThrow(
+        () -> authenticationService.authenticateMember(testProject.getId()));
+    Assertions.assertThrows(
+        UserUnauthorizedException.class,
+        () -> authenticationService.authenticateAdmin(testProject.getId()));
+  }
+
+  @Test
+  void testThrowsExceptionWhenUserIsUnauthenticated() {
+    Assertions.assertThrows(
+        UserUnauthenticatedException.class,
+        () -> authenticationService.authenticateAdmin(testProject.getId()));
+    Assertions.assertThrows(
+        UserUnauthenticatedException.class,
+        () -> authenticationService.authenticateMember(testProject.getId()));
+  }
+
+  @Test
+  void testThrowsExceptionWhenUserIsNotAdmin() {
+    SecurityContextHolder.getContext()
+        .setAuthentication(new UsernamePasswordAuthenticationToken("username1", "password1"));
+
+    // Set up
+    setUserRoleForProjectService.setRole(testProject.getId(), testUser.getId(), ProjectRole.MEMBER);
+
+    // Test
+    Assertions.assertThrows(
+        UserUnauthorizedException.class,
+        () -> authenticationService.authenticateAdmin(testProject.getId()));
+    Assertions.assertDoesNotThrow(
+        () -> authenticationService.authenticateMember(testProject.getId()));
+  }
+
+  @Test
+  void testThrowsExceptionWhenUserHasNoRole() {
+    SecurityContextHolder.getContext()
+        .setAuthentication(new UsernamePasswordAuthenticationToken("username1", "password1"));
+
+    Assertions.assertThrows(
+        UserUnauthorizedException.class,
+        () -> authenticationService.authenticateAdmin(testProject.getId()));
+    Assertions.assertThrows(
+        UserUnauthorizedException.class,
+        () -> authenticationService.authenticateMember(testProject.getId()));
+  }
+}
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java
index d3d32978f..4d1250fe7 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/SetUserRoleForProjectControllerIntegrationTest.java
@@ -50,7 +50,6 @@ void setUp() {
 
   @Test
   void setUserRoleForProjectSuccessfully() throws Exception {
-
     ConstrainedFields fields = fields(ProjectRoleJsonWrapper.class);
 
     mvc()
diff --git a/coderadar-ui/src/app/levelized-structure-map/dependency-base.ts b/coderadar-ui/src/app/levelized-structure-map/dependency-base.ts
index 6a7c964ea..2dd03c6eb 100644
--- a/coderadar-ui/src/app/levelized-structure-map/dependency-base.ts
+++ b/coderadar-ui/src/app/levelized-structure-map/dependency-base.ts
@@ -197,7 +197,7 @@ export abstract class DependencyBase {
 
       currentNode.dependencies.forEach(dependency => {
         // find last visible element for dependency as end
-        const end = this.findLastHTMLElement(dependency.path) as HTMLElement;
+        const end = this.findLastHTMLElement(dependency.path);
 
         // if activeDependency is set, draw only activeDependency related dependencies
         if (this.activeDependency !== undefined) {

From 6e69300db51a05746d0911171973e87a22b7b334 Mon Sep 17 00:00:00 2001
From: Maxim Atanasov 
Date: Fri, 7 Aug 2020 13:44:12 +0200
Subject: [PATCH 74/76] fix code smells

---
 .../AuthenticationServiceIntegrationTest.java | 43 ++++++++-----------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/authentication/AuthenticationServiceIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/authentication/AuthenticationServiceIntegrationTest.java
index 2df947c54..b23682962 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/authentication/AuthenticationServiceIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/authentication/AuthenticationServiceIntegrationTest.java
@@ -40,6 +40,8 @@ class AuthenticationServiceIntegrationTest extends ControllerTestTemplate {
   private ProjectEntity testProject;
   private UserEntity testUser;
 
+  private Long projectId;
+
   @BeforeEach
   void setUp() {
     coderadarConfigurationProperties.setAuthentication(
@@ -52,7 +54,7 @@ void setUp() {
     testProject.setVcsOnline(true);
     testProject.setVcsPassword("testPassword");
     testProject.setVcsUsername("testUser");
-    projectRepository.save(testProject);
+    projectId = projectRepository.save(testProject).getId();
 
     testUser = new UserEntity();
     testUser.setUsername("username1");
@@ -70,71 +72,62 @@ void tearDown() {
 
   @Test
   void testUserIsAuthenticatedAsAdmin() {
+    // Set up
     SecurityContextHolder.getContext()
         .setAuthentication(new UsernamePasswordAuthenticationToken("username1", "password1"));
-
-    // Set up
     setUserRoleForProjectService.setRole(testProject.getId(), testUser.getId(), ProjectRole.ADMIN);
 
     // Test
-    Assertions.assertDoesNotThrow(
-        () -> authenticationService.authenticateAdmin(testProject.getId()));
-    Assertions.assertDoesNotThrow(
-        () -> authenticationService.authenticateMember(testProject.getId()));
+    Assertions.assertDoesNotThrow(() -> authenticationService.authenticateAdmin(projectId));
+    Assertions.assertDoesNotThrow(() -> authenticationService.authenticateMember(projectId));
   }
 
   @Test
   void testUserIsAuthenticatedAsMember() {
+    // Set up
     SecurityContextHolder.getContext()
         .setAuthentication(new UsernamePasswordAuthenticationToken("username1", "password1"));
-
-    // Set up
     setUserRoleForProjectService.setRole(testProject.getId(), testUser.getId(), ProjectRole.MEMBER);
 
     // Test
-    Assertions.assertDoesNotThrow(
-        () -> authenticationService.authenticateMember(testProject.getId()));
+    Assertions.assertDoesNotThrow(() -> authenticationService.authenticateMember(projectId));
     Assertions.assertThrows(
-        UserUnauthorizedException.class,
-        () -> authenticationService.authenticateAdmin(testProject.getId()));
+        UserUnauthorizedException.class, () -> authenticationService.authenticateAdmin(projectId));
   }
 
   @Test
   void testThrowsExceptionWhenUserIsUnauthenticated() {
     Assertions.assertThrows(
         UserUnauthenticatedException.class,
-        () -> authenticationService.authenticateAdmin(testProject.getId()));
+        () -> authenticationService.authenticateAdmin(projectId));
     Assertions.assertThrows(
         UserUnauthenticatedException.class,
-        () -> authenticationService.authenticateMember(testProject.getId()));
+        () -> authenticationService.authenticateMember(projectId));
   }
 
   @Test
   void testThrowsExceptionWhenUserIsNotAdmin() {
+    // Set up
     SecurityContextHolder.getContext()
         .setAuthentication(new UsernamePasswordAuthenticationToken("username1", "password1"));
-
-    // Set up
     setUserRoleForProjectService.setRole(testProject.getId(), testUser.getId(), ProjectRole.MEMBER);
 
     // Test
     Assertions.assertThrows(
-        UserUnauthorizedException.class,
-        () -> authenticationService.authenticateAdmin(testProject.getId()));
-    Assertions.assertDoesNotThrow(
-        () -> authenticationService.authenticateMember(testProject.getId()));
+        UserUnauthorizedException.class, () -> authenticationService.authenticateAdmin(projectId));
+    Assertions.assertDoesNotThrow(() -> authenticationService.authenticateMember(projectId));
   }
 
   @Test
   void testThrowsExceptionWhenUserHasNoRole() {
+    // Set up
     SecurityContextHolder.getContext()
         .setAuthentication(new UsernamePasswordAuthenticationToken("username1", "password1"));
 
+    // Test
     Assertions.assertThrows(
-        UserUnauthorizedException.class,
-        () -> authenticationService.authenticateAdmin(testProject.getId()));
+        UserUnauthorizedException.class, () -> authenticationService.authenticateAdmin(projectId));
     Assertions.assertThrows(
-        UserUnauthorizedException.class,
-        () -> authenticationService.authenticateMember(testProject.getId()));
+        UserUnauthorizedException.class, () -> authenticationService.authenticateMember(projectId));
   }
 }

From 0f5578b6ff0da2acd92e153201ecc60edcc00712 Mon Sep 17 00:00:00 2001
From: Maxim Atanasov 
Date: Fri, 7 Aug 2020 17:43:47 +0200
Subject: [PATCH 75/76] apply tslint

---
 coderadar-ui/src/app/app.module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coderadar-ui/src/app/app.module.ts b/coderadar-ui/src/app/app.module.ts
index c35017738..fa88c88e5 100644
--- a/coderadar-ui/src/app/app.module.ts
+++ b/coderadar-ui/src/app/app.module.ts
@@ -70,7 +70,7 @@ import { SidenavContentComponent } from './view/sidenav-content/sidenav-content.
 import {ContributorMergeDialogComponent} from './components/contributor-merge-dialog/contributor-merge-dialog.component';
 import {DeleteProjectDialogComponent} from './components/delete-project-dialog/delete-project-dialog.component';
 import {AddProjectToTeamDialogComponent} from './components/add-project-to-team-dialog/add-project-to-team-dialog.component';
-import {ContributorDialogComponent} from "./components/contributor-card/contributor-dialog.component";
+import {ContributorDialogComponent} from './components/contributor-card/contributor-dialog.component';
 
 const appRoutes: Routes = [
   {path: 'login', component: LoginComponent},

From b5867713546b4fbe7f210414eae4c7d100648932 Mon Sep 17 00:00:00 2001
From: Maxim Atanasov 
Date: Wed, 2 Sep 2020 19:09:19 +0200
Subject: [PATCH 76/76] throw an exception if a user is not assigned to a
 project when trying to remove the role and write a test for this case

---
 .../UserNotAssignedException.java             |  8 +++++++
 .../RemoveUserFromProjectService.java         | 14 +++++++++--
 .../RemoveUserFromProjectController.java      | 12 +++++++---
 .../RemoveUserFromProjectControllerTest.java  |  4 +++-
 ...rFromProjectControllerIntegrationTest.java | 23 +++++++++++++++++++
 coderadar-ui/package-lock.json                | 12 +++++-----
 6 files changed, 61 insertions(+), 12 deletions(-)
 create mode 100644 coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/UserNotAssignedException.java

diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/UserNotAssignedException.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/UserNotAssignedException.java
new file mode 100644
index 000000000..2d475cc79
--- /dev/null
+++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/UserNotAssignedException.java
@@ -0,0 +1,8 @@
+package io.reflectoring.coderadar.useradministration;
+
+public class UserNotAssignedException extends RuntimeException {
+  public UserNotAssignedException(Long projectId, Long userId) {
+    super(
+        String.format("User with id %d is not assigned to project with id %d", userId, projectId));
+  }
+}
diff --git a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/RemoveUserFromProjectService.java b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/RemoveUserFromProjectService.java
index faeb33f55..f8573c825 100644
--- a/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/RemoveUserFromProjectService.java
+++ b/coderadar-core/src/main/java/io/reflectoring/coderadar/useradministration/service/permissions/RemoveUserFromProjectService.java
@@ -2,8 +2,10 @@
 
 import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException;
 import io.reflectoring.coderadar.projectadministration.port.driven.project.GetProjectPort;
+import io.reflectoring.coderadar.useradministration.UserNotAssignedException;
 import io.reflectoring.coderadar.useradministration.UserNotFoundException;
 import io.reflectoring.coderadar.useradministration.port.driven.GetUserPort;
+import io.reflectoring.coderadar.useradministration.port.driven.ListUsersForProjectPort;
 import io.reflectoring.coderadar.useradministration.port.driven.RemoveUserFromProjectPort;
 import io.reflectoring.coderadar.useradministration.port.driver.permissions.RemoveUserFromProjectUseCase;
 import org.springframework.stereotype.Service;
@@ -14,14 +16,17 @@ public class RemoveUserFromProjectService implements RemoveUserFromProjectUseCas
   private final GetProjectPort getProjectPort;
   private final GetUserPort getUserPort;
   private final RemoveUserFromProjectPort removeUserFromProjectPort;
+  private final ListUsersForProjectPort listUsersForProjectPort;
 
   public RemoveUserFromProjectService(
       GetProjectPort getProjectPort,
       GetUserPort getUserPort,
-      RemoveUserFromProjectPort removeUserFromProjectPort) {
+      RemoveUserFromProjectPort removeUserFromProjectPort,
+      ListUsersForProjectPort listUsersForProjectPort) {
     this.getProjectPort = getProjectPort;
     this.getUserPort = getUserPort;
     this.removeUserFromProjectPort = removeUserFromProjectPort;
+    this.listUsersForProjectPort = listUsersForProjectPort;
   }
 
   @Override
@@ -32,6 +37,11 @@ public void removeUserFromProject(long projectId, long userId) {
     if (!getUserPort.existsById(userId)) {
       throw new UserNotFoundException(userId);
     }
-    removeUserFromProjectPort.removeUserFromProject(projectId, userId);
+    if (listUsersForProjectPort.listUsers(projectId).stream()
+        .anyMatch(user -> user.getId() == userId)) {
+      removeUserFromProjectPort.removeUserFromProject(projectId, userId);
+    } else {
+      throw new UserNotAssignedException(projectId, userId);
+    }
   }
 }
diff --git a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectController.java b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectController.java
index 31bedb9e9..e7c648b26 100644
--- a/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectController.java
+++ b/coderadar-rest/src/main/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectController.java
@@ -1,6 +1,8 @@
 package io.reflectoring.coderadar.rest.useradministration.permissions;
 
 import io.reflectoring.coderadar.rest.AbstractBaseController;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
+import io.reflectoring.coderadar.useradministration.UserNotAssignedException;
 import io.reflectoring.coderadar.useradministration.port.driver.permissions.RemoveUserFromProjectUseCase;
 import io.reflectoring.coderadar.useradministration.service.security.AuthenticationService;
 import org.springframework.http.HttpStatus;
@@ -24,10 +26,14 @@ public RemoveUserFromProjectController(
   }
 
   @DeleteMapping(path = "/projects/{projectId}/users/{userId}")
-  public ResponseEntity removeUserRoleFromProject(
+  public ResponseEntity removeUserRoleFromProject(
       @PathVariable long projectId, @PathVariable long userId) {
     authenticationService.authenticateAdmin(projectId);
-    removeUserFromProjectUseCase.removeUserFromProject(projectId, userId);
-    return new ResponseEntity<>(HttpStatus.OK);
+    try {
+      removeUserFromProjectUseCase.removeUserFromProject(projectId, userId);
+      return new ResponseEntity<>(HttpStatus.OK);
+    } catch (UserNotAssignedException e) {
+      return new ResponseEntity<>(new ErrorMessageResponse(e.getMessage()), HttpStatus.BAD_REQUEST);
+    }
   }
 }
diff --git a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java
index eef0970b2..6da7eff1d 100644
--- a/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java
+++ b/coderadar-rest/src/test/java/io/reflectoring/coderadar/rest/unit/useradministration/permissions/RemoveUserFromProjectControllerTest.java
@@ -3,6 +3,7 @@
 import static org.mockito.Mockito.mock;
 
 import io.reflectoring.coderadar.projectadministration.ProjectNotFoundException;
+import io.reflectoring.coderadar.rest.domain.ErrorMessageResponse;
 import io.reflectoring.coderadar.rest.unit.UnitTestTemplate;
 import io.reflectoring.coderadar.rest.useradministration.permissions.RemoveUserFromProjectController;
 import io.reflectoring.coderadar.useradministration.UserNotFoundException;
@@ -21,7 +22,8 @@ class RemoveUserFromProjectControllerTest extends UnitTestTemplate {
 
   @Test
   void testRemoveUserFromProjectController() {
-    ResponseEntity response = testController.removeUserRoleFromProject(1L, 2L);
+    ResponseEntity response =
+        testController.removeUserRoleFromProject(1L, 2L);
     Assertions.assertEquals(HttpStatus.OK, response.getStatusCode());
   }
 
diff --git a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java
index e0d9d2a2d..27118f4de 100644
--- a/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java
+++ b/coderadar-test/src/test/java/io/reflectoring/coderadar/rest/useradministration/permissions/RemoveUserFromProjectControllerIntegrationTest.java
@@ -57,6 +57,29 @@ void removeUserFromProjectSuccessfully() throws Exception {
     Assertions.assertTrue(userRepository.listUsersForProject(testProject.getId()).isEmpty());
   }
 
+  @Test
+  void throwsExceptionWhenUserIsNotAssignedToProject() throws Exception {
+    testUser.setProjects(Collections.emptyList());
+    userRepository.save(testUser, 1);
+
+    MvcResult result =
+        mvc()
+            .perform(delete("/api/projects/" + testProject.getId() + "/users/" + testUser.getId()))
+            .andExpect(status().isBadRequest())
+            .andReturn();
+
+    String errorMessage =
+        fromJson(result.getResponse().getContentAsString(), ErrorMessageResponse.class)
+            .getErrorMessage();
+
+    Assertions.assertEquals(
+        "User with id "
+            + testUser.getId()
+            + " is not assigned to project with id "
+            + testProject.getId(),
+        errorMessage);
+  }
+
   @Test
   void throwsExceptionWhenProjectDoesNotExist() throws Exception {
     MvcResult result =
diff --git a/coderadar-ui/package-lock.json b/coderadar-ui/package-lock.json
index 8889918a5..d26454889 100644
--- a/coderadar-ui/package-lock.json
+++ b/coderadar-ui/package-lock.json
@@ -485,17 +485,17 @@
       }
     },
     "@angular/elements": {
-      "version": "10.0.8",
-      "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-10.0.8.tgz",
-      "integrity": "sha512-LTWqNCqBPzKiTDAgFJMhX5nViYf12ufW4eVyUatvgHa3QpV1TEsou6c+q46sw6y9RoV87aRV3H+DnpaSuuQx8w==",
+      "version": "10.0.14",
+      "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-10.0.14.tgz",
+      "integrity": "sha512-oT9/yXwTPX+SFXXVCe0eRK5uFVefKVWPcS+s/LvpFehWPt80p5CSFbeo5+BICcaRLQltVWi09wjwUF/9fcvzmA==",
       "requires": {
         "tslib": "^2.0.0"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz",
-          "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g=="
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
+          "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
         }
       }
     },