diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index e547bee..e199dee 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -6,7 +6,7 @@ import mops.gruppen2.domain.Role; import mops.gruppen2.domain.User; import mops.gruppen2.domain.exception.EventException; import mops.gruppen2.domain.exception.GroupNotFoundException; -import mops.gruppen2.domain.exception.NoAdminAfterActionExeption; +import mops.gruppen2.domain.exception.NoAdminAfterActionException; import mops.gruppen2.security.Account; import mops.gruppen2.service.ControllerService; import mops.gruppen2.service.CsvService; @@ -234,7 +234,7 @@ public class Gruppen2Controller { Account account = keyCloakService.createAccountFromPrincipal(token); if (userId.equals(account.getName())) { if (controllerService.passIfLastAdmin(account, groupId)){ - throw new NoAdminAfterActionExeption("Du otto bist letzter Admin"); + throw new NoAdminAfterActionException("Du otto bist letzter Admin"); } controllerService.updateRole(userId, groupId); return "redirect:/gruppen2/details/" + groupId; diff --git a/src/main/java/mops/gruppen2/domain/exception/NoAdminAfterActionExeption.java b/src/main/java/mops/gruppen2/domain/exception/NoAdminAfterActionException.java similarity index 63% rename from src/main/java/mops/gruppen2/domain/exception/NoAdminAfterActionExeption.java rename to src/main/java/mops/gruppen2/domain/exception/NoAdminAfterActionException.java index d01186d..f0b170b 100644 --- a/src/main/java/mops/gruppen2/domain/exception/NoAdminAfterActionExeption.java +++ b/src/main/java/mops/gruppen2/domain/exception/NoAdminAfterActionException.java @@ -2,9 +2,9 @@ package mops.gruppen2.domain.exception; import org.springframework.http.HttpStatus; -public class NoAdminAfterActionExeption extends EventException { +public class NoAdminAfterActionException extends EventException { - public NoAdminAfterActionExeption (String info) { + public NoAdminAfterActionException(String info) { super(HttpStatus.INTERNAL_SERVER_ERROR, "Nach dieser Aktion hätte die Gruppe keinen Admin mehr", info); } } diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java index 349f329..5bcd423 100644 --- a/src/main/java/mops/gruppen2/service/ControllerService.java +++ b/src/main/java/mops/gruppen2/service/ControllerService.java @@ -13,12 +13,9 @@ import mops.gruppen2.domain.event.UpdateGroupDescriptionEvent; import mops.gruppen2.domain.event.UpdateGroupTitleEvent; import mops.gruppen2.domain.event.UpdateRoleEvent; import mops.gruppen2.domain.exception.EventException; -import mops.gruppen2.domain.exception.NoAdminAfterActionExeption; import mops.gruppen2.domain.exception.UserNotFoundException; import mops.gruppen2.security.Account; -import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; import org.springframework.stereotype.Service; -import springfox.documentation.schema.Entry; import java.util.List; import java.util.Map;