From d9fba741a818306e50b1df39c3892a9152c214b0 Mon Sep 17 00:00:00 2001
From: Christoph <churl100@hhu.de>
Date: Thu, 16 Apr 2020 01:28:52 +0200
Subject: [PATCH] fix check

---
 .../mops/gruppen2/domain/service/helper/ProjectionHelper.java | 2 --
 .../gruppen2/infrastructure/controller/APIController.java     | 2 --
 .../infrastructure/controller/GroupCreationController.java    | 3 ---
 src/test/java/mops/gruppen2/architecture/ControllerTest.java  | 2 +-
 src/test/java/mops/gruppen2/architecture/ServiceTest.java     | 4 ++--
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/main/java/mops/gruppen2/domain/service/helper/ProjectionHelper.java b/src/main/java/mops/gruppen2/domain/service/helper/ProjectionHelper.java
index 6052e8e..b01b1aa 100644
--- a/src/main/java/mops/gruppen2/domain/service/helper/ProjectionHelper.java
+++ b/src/main/java/mops/gruppen2/domain/service/helper/ProjectionHelper.java
@@ -6,7 +6,6 @@ import lombok.extern.log4j.Log4j2;
 import mops.gruppen2.domain.event.Event;
 import mops.gruppen2.domain.model.group.Group;
 import mops.gruppen2.infrastructure.GroupCache;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
@@ -18,7 +17,6 @@ import java.util.UUID;
  */
 @Log4j2
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-@Service
 public final class ProjectionHelper {
 
     public static void project(Map<UUID, Group> groups, List<Event> events, GroupCache cache) {
diff --git a/src/main/java/mops/gruppen2/infrastructure/controller/APIController.java b/src/main/java/mops/gruppen2/infrastructure/controller/APIController.java
index 66ec325..662bf99 100644
--- a/src/main/java/mops/gruppen2/infrastructure/controller/APIController.java
+++ b/src/main/java/mops/gruppen2/infrastructure/controller/APIController.java
@@ -8,7 +8,6 @@ import lombok.extern.log4j.Log4j2;
 import mops.gruppen2.aspect.annotation.TraceMethodCalls;
 import mops.gruppen2.domain.service.EventStoreService;
 import mops.gruppen2.domain.service.helper.CommonHelper;
-import mops.gruppen2.domain.service.helper.ProjectionHelper;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -30,7 +29,6 @@ public class APIController {
     //TODO: redo api
 
     private final EventStoreService eventStoreService;
-    private final ProjectionHelper projectionHelper;
 
     /**
      * Erzeugt eine Liste aus Gruppen, welche sich seit einer übergebenen Event-Id geändert haben.
diff --git a/src/main/java/mops/gruppen2/infrastructure/controller/GroupCreationController.java b/src/main/java/mops/gruppen2/infrastructure/controller/GroupCreationController.java
index b7bbe9d..84d4e1e 100644
--- a/src/main/java/mops/gruppen2/infrastructure/controller/GroupCreationController.java
+++ b/src/main/java/mops/gruppen2/infrastructure/controller/GroupCreationController.java
@@ -12,7 +12,6 @@ import mops.gruppen2.domain.model.group.wrapper.Parent;
 import mops.gruppen2.domain.model.group.wrapper.Title;
 import mops.gruppen2.domain.service.GroupService;
 import mops.gruppen2.domain.service.helper.CsvHelper;
-import mops.gruppen2.domain.service.helper.ProjectionHelper;
 import mops.gruppen2.domain.service.helper.ValidationHelper;
 import mops.gruppen2.infrastructure.GroupCache;
 import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
@@ -36,9 +35,7 @@ import javax.validation.Valid;
 public class GroupCreationController {
 
     private final GroupCache groupCache;
-
     private final GroupService groupService;
-    private final ProjectionHelper projectionHelper;
 
     @RolesAllowed({"ROLE_orga", "ROLE_studentin"})
     @GetMapping("/create")
diff --git a/src/test/java/mops/gruppen2/architecture/ControllerTest.java b/src/test/java/mops/gruppen2/architecture/ControllerTest.java
index 0920791..5867549 100644
--- a/src/test/java/mops/gruppen2/architecture/ControllerTest.java
+++ b/src/test/java/mops/gruppen2/architecture/ControllerTest.java
@@ -30,7 +30,7 @@ class ControllerTest {
     public static final ArchRule controllerClassesShouldBeInControllerPackage = classes()
             .that().areAnnotatedWith(Controller.class)
             .or().areAnnotatedWith(RestController.class)
-            .should().resideInAPackage("..web");
+            .should().resideInAPackage("..controller");
 
     @ArchTest
     public static final ArchRule classesInControllerPackageShouldHaveControllerInName = classes()
diff --git a/src/test/java/mops/gruppen2/architecture/ServiceTest.java b/src/test/java/mops/gruppen2/architecture/ServiceTest.java
index f71a9aa..84477a6 100644
--- a/src/test/java/mops/gruppen2/architecture/ServiceTest.java
+++ b/src/test/java/mops/gruppen2/architecture/ServiceTest.java
@@ -25,11 +25,11 @@ class ServiceTest {
     @ArchTest
     public static final ArchRule serviceClassesShouldBeInServicePackage = classes()
             .that().areAnnotatedWith(Service.class)
-            .should().resideInAPackage("..service..");
+            .should().resideInAPackage("..service");
 
     @ArchTest
     public static final ArchRule classesInServicePackageShouldHaveServiceInName = classes()
-            .that().resideInAPackage("..service..")
+            .that().resideInAPackage("..service")
             .should().haveSimpleNameEndingWith("Service");
 
     @ArchIgnore