christoph/lecture-professional-software-development
1
Fork 0
Code Activity

fix check

Browse Source
This commit is contained in:
Christoph
2020-04-16 01:28:52 +02:00
parent 9abde7e1b4
commit d9fba741a8
5 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/mops/gruppen2/domain/service/helper/ProjectionHelper.java
View File

@ -6,7 +6,6 @@ import lombok.extern.log4j.Log4j2;
import mops.gruppen2.domain.event.Event; import mops.gruppen2.domain.event.Event;
import mops.gruppen2.domain.model.group.Group; import mops.gruppen2.domain.model.group.Group;
import mops.gruppen2.infrastructure.GroupCache; import mops.gruppen2.infrastructure.GroupCache;
import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -18,7 +17,6 @@ import java.util.UUID;
*/ */
@Log4j2 @Log4j2
@NoArgsConstructor(access = AccessLevel.PRIVATE) @NoArgsConstructor(access = AccessLevel.PRIVATE)
@Service
public final class ProjectionHelper { public final class ProjectionHelper {
public static void project(Map<UUID, Group> groups, List<Event> events, GroupCache cache) { public static void project(Map<UUID, Group> groups, List<Event> events, GroupCache cache) {

2
src/main/java/mops/gruppen2/infrastructure/controller/APIController.java
View File

@ -8,7 +8,6 @@ import lombok.extern.log4j.Log4j2;
import mops.gruppen2.aspect.annotation.TraceMethodCalls; import mops.gruppen2.aspect.annotation.TraceMethodCalls;
import mops.gruppen2.domain.service.EventStoreService; import mops.gruppen2.domain.service.EventStoreService;
import mops.gruppen2.domain.service.helper.CommonHelper; import mops.gruppen2.domain.service.helper.CommonHelper;
import mops.gruppen2.domain.service.helper.ProjectionHelper;
import org.springframework.security.access.annotation.Secured; import org.springframework.security.access.annotation.Secured;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
@ -30,7 +29,6 @@ public class APIController {
//TODO: redo api //TODO: redo api
private final EventStoreService eventStoreService; private final EventStoreService eventStoreService;
private final ProjectionHelper projectionHelper;
/** /**
* Erzeugt eine Liste aus Gruppen, welche sich seit einer übergebenen Event-Id geändert haben. * Erzeugt eine Liste aus Gruppen, welche sich seit einer übergebenen Event-Id geändert haben.

3
src/main/java/mops/gruppen2/infrastructure/controller/GroupCreationController.java
View File

@ -12,7 +12,6 @@ import mops.gruppen2.domain.model.group.wrapper.Parent;
import mops.gruppen2.domain.model.group.wrapper.Title; import mops.gruppen2.domain.model.group.wrapper.Title;
import mops.gruppen2.domain.service.GroupService; import mops.gruppen2.domain.service.GroupService;
import mops.gruppen2.domain.service.helper.CsvHelper; import mops.gruppen2.domain.service.helper.CsvHelper;
import mops.gruppen2.domain.service.helper.ProjectionHelper;
import mops.gruppen2.domain.service.helper.ValidationHelper; import mops.gruppen2.domain.service.helper.ValidationHelper;
import mops.gruppen2.infrastructure.GroupCache; import mops.gruppen2.infrastructure.GroupCache;
import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
@ -36,9 +35,7 @@ import javax.validation.Valid;
public class GroupCreationController { public class GroupCreationController {
private final GroupCache groupCache; private final GroupCache groupCache;
private final GroupService groupService; private final GroupService groupService;
private final ProjectionHelper projectionHelper;
@RolesAllowed({"ROLE_orga", "ROLE_studentin"}) @RolesAllowed({"ROLE_orga", "ROLE_studentin"})
@GetMapping("/create") @GetMapping("/create")

2
src/test/java/mops/gruppen2/architecture/ControllerTest.java
View File

@ -30,7 +30,7 @@ class ControllerTest {
public static final ArchRule controllerClassesShouldBeInControllerPackage = classes() public static final ArchRule controllerClassesShouldBeInControllerPackage = classes()
.that().areAnnotatedWith(Controller.class) .that().areAnnotatedWith(Controller.class)
.or().areAnnotatedWith(RestController.class) .or().areAnnotatedWith(RestController.class)
.should().resideInAPackage("..web"); .should().resideInAPackage("..controller");
@ArchTest @ArchTest
public static final ArchRule classesInControllerPackageShouldHaveControllerInName = classes() public static final ArchRule classesInControllerPackageShouldHaveControllerInName = classes()

4
src/test/java/mops/gruppen2/architecture/ServiceTest.java
View File

@ -25,11 +25,11 @@ class ServiceTest {
@ArchTest @ArchTest
public static final ArchRule serviceClassesShouldBeInServicePackage = classes() public static final ArchRule serviceClassesShouldBeInServicePackage = classes()
.that().areAnnotatedWith(Service.class) .that().areAnnotatedWith(Service.class)
.should().resideInAPackage("..service.."); .should().resideInAPackage("..service");
@ArchTest @ArchTest
public static final ArchRule classesInServicePackageShouldHaveServiceInName = classes() public static final ArchRule classesInServicePackageShouldHaveServiceInName = classes()
.that().resideInAPackage("..service..") .that().resideInAPackage("..service")
.should().haveSimpleNameEndingWith("Service"); .should().haveSimpleNameEndingWith("Service");
@ArchIgnore @ArchIgnore