From 9abde7e1b4a16c9fc0a4e8cad23386d1496aa95b Mon Sep 17 00:00:00 2001 From: Christoph Date: Thu, 16 Apr 2020 01:25:06 +0200 Subject: [PATCH] remove old caching --- src/main/java/mops/gruppen2/config/SwaggerConfig.java | 2 -- .../java/mops/gruppen2/domain/service/SearchService.java | 2 -- .../controller/GroupCreationController.java | 2 -- .../controller/GroupDetailsController.java | 9 --------- 4 files changed, 15 deletions(-) diff --git a/src/main/java/mops/gruppen2/config/SwaggerConfig.java b/src/main/java/mops/gruppen2/config/SwaggerConfig.java index 4c13329..fb3c81d 100644 --- a/src/main/java/mops/gruppen2/config/SwaggerConfig.java +++ b/src/main/java/mops/gruppen2/config/SwaggerConfig.java @@ -1,6 +1,5 @@ package mops.gruppen2.config; -import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; @@ -16,7 +15,6 @@ import java.util.Collections; @Profile("dev") @Configuration -@EnableCaching @EnableSwagger2 public class SwaggerConfig { diff --git a/src/main/java/mops/gruppen2/domain/service/SearchService.java b/src/main/java/mops/gruppen2/domain/service/SearchService.java index 3e03aaf..f87bf1b 100644 --- a/src/main/java/mops/gruppen2/domain/service/SearchService.java +++ b/src/main/java/mops/gruppen2/domain/service/SearchService.java @@ -5,7 +5,6 @@ import lombok.extern.log4j.Log4j2; import mops.gruppen2.domain.exception.EventException; import mops.gruppen2.domain.model.group.Group; import mops.gruppen2.infrastructure.GroupCache; -import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import java.util.List; @@ -30,7 +29,6 @@ public class SearchService { * @throws EventException Projektionsfehler */ //TODO: search in lectures - @Cacheable("groups") public List searchPublicGroups(String search, String principal) { List groups = groupCache.publics(); diff --git a/src/main/java/mops/gruppen2/infrastructure/controller/GroupCreationController.java b/src/main/java/mops/gruppen2/infrastructure/controller/GroupCreationController.java index db304d4..b7bbe9d 100644 --- a/src/main/java/mops/gruppen2/infrastructure/controller/GroupCreationController.java +++ b/src/main/java/mops/gruppen2/infrastructure/controller/GroupCreationController.java @@ -16,7 +16,6 @@ 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; -import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; @@ -52,7 +51,6 @@ public class GroupCreationController { @RolesAllowed({"ROLE_orga", "ROLE_studentin"}) @PostMapping("/create") - @CacheEvict(value = "groups", allEntries = true) public String postCreateOrga(KeycloakAuthenticationToken token, @RequestParam("type") Type type, @RequestParam("parent") @Valid Parent parent, diff --git a/src/main/java/mops/gruppen2/infrastructure/controller/GroupDetailsController.java b/src/main/java/mops/gruppen2/infrastructure/controller/GroupDetailsController.java index 767cb93..7aa5879 100644 --- a/src/main/java/mops/gruppen2/infrastructure/controller/GroupDetailsController.java +++ b/src/main/java/mops/gruppen2/infrastructure/controller/GroupDetailsController.java @@ -13,7 +13,6 @@ import mops.gruppen2.domain.service.helper.CsvHelper; import mops.gruppen2.domain.service.helper.ValidationHelper; import mops.gruppen2.infrastructure.GroupCache; import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; -import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; @@ -67,7 +66,6 @@ public class GroupDetailsController { @RolesAllowed({"ROLE_orga", "ROLE_studentin"}) @PostMapping("/details/{id}/join") - @CacheEvict(value = "groups", allEntries = true) public String postDetailsJoin(KeycloakAuthenticationToken token, @PathVariable("id") String groupId) { @@ -85,7 +83,6 @@ public class GroupDetailsController { @RolesAllowed({"ROLE_orga", "ROLE_studentin"}) @PostMapping("/details/{id}/leave") - @CacheEvict(value = "groups", allEntries = true) public String postDetailsLeave(KeycloakAuthenticationToken token, @PathVariable("id") String groupId) { @@ -122,7 +119,6 @@ public class GroupDetailsController { @RolesAllowed({"ROLE_orga", "ROLE_studentin"}) @PostMapping("/details/{id}/edit/meta") - @CacheEvict(value = "groups", allEntries = true) public String postDetailsEditMeta(KeycloakAuthenticationToken token, @PathVariable("id") String groupId, @Valid Title title, @@ -141,7 +137,6 @@ public class GroupDetailsController { @RolesAllowed({"ROLE_orga", "ROLE_studentin"}) @PostMapping("/details/{id}/edit/userlimit") - @CacheEvict(value = "groups", allEntries = true) public String postDetailsEditUserLimit(KeycloakAuthenticationToken token, @PathVariable("id") String groupId, @Valid Limit limit) { @@ -155,7 +150,6 @@ public class GroupDetailsController { @RolesAllowed("ROLE_orga") @PostMapping("/details/{id}/edit/csv") - @CacheEvict(value = "groups", allEntries = true) public String postDetailsEditCsv(KeycloakAuthenticationToken token, @PathVariable("id") String groupId, @RequestParam(value = "file", required = false) MultipartFile file) { @@ -170,7 +164,6 @@ public class GroupDetailsController { @RolesAllowed({"ROLE_orga", "ROLE_studentin"}) @PostMapping("/details/{id}/edit/role/{userid}") - @CacheEvict(value = "groups", allEntries = true) public String postDetailsEditRole(KeycloakAuthenticationToken token, @PathVariable("id") String groupId, @PathVariable("userid") String target) { @@ -192,7 +185,6 @@ public class GroupDetailsController { @RolesAllowed({"ROLE_orga", "ROLE_studentin"}) @PostMapping("/details/{id}/edit/delete/{userid}") - @CacheEvict(value = "groups", allEntries = true) public String postDetailsEditDelete(KeycloakAuthenticationToken token, @PathVariable("id") String groupId, @PathVariable("userid") String target) { @@ -212,7 +204,6 @@ public class GroupDetailsController { @RolesAllowed({"ROLE_orga", "ROLE_studentin"}) @PostMapping("/details/{id}/edit/destroy") - @CacheEvict(value = "groups", allEntries = true) public String postDetailsEditDestroy(KeycloakAuthenticationToken token, @PathVariable("id") String groupid) {