From e6c8765ecb5e94e45648c8971e63f036c0480351 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Thu, 15 Nov 2018 21:13:32 +0100
Subject: [PATCH] Fix SpEL for score cache keys
This was broken by refactoring of events.
---
.../score/ScoreCalculatorFactoryImpl.java | 26 +++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/service/score/ScoreCalculatorFactoryImpl.java b/src/main/java/de/thm/arsnova/service/score/ScoreCalculatorFactoryImpl.java
index 4f29f03e7..908c17bcc 100644
--- a/src/main/java/de/thm/arsnova/service/score/ScoreCalculatorFactoryImpl.java
+++ b/src/main/java/de/thm/arsnova/service/score/ScoreCalculatorFactoryImpl.java
@@ -53,79 +53,79 @@ public class ScoreCalculatorFactoryImpl implements ScoreCalculatorFactory, Appli
return scoreCalculator;
}
- @CacheEvict(value = "score", key = "#event.Room")
+ @CacheEvict(value = "score", key = "#event.entity.roomId")
@EventListener
public void handleAfterContentCreation(AfterCreationEvent<Content> event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getEntity().getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.Room")
+ @CacheEvict(value = "score", key = "#event.roomId")
@EventListener
public void handleUnlockQuestion(UnlockQuestionEvent event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.Room")
+ @CacheEvict(value = "score", key = "#event.roomId")
@EventListener
public void handleUnlockQuestions(UnlockQuestionsEvent event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.Room")
+ @CacheEvict(value = "score", key = "#event.roomId")
@EventListener
public void handleLockQuestion(LockQuestionEvent event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.Room")
+ @CacheEvict(value = "score", key = "#event.roomId")
@EventListener
public void handleLockQuestions(LockQuestionsEvent event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.Room")
+ @CacheEvict(value = "score", key = "#event.entity.roomId")
@EventListener
public void handleNewAnswer(AfterCreationEvent<Answer> event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getEntity().getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.Room")
+ @CacheEvict(value = "score", key = "#event.entity.roomId")
@EventListener
public void handleDeleteAnswer(AfterDeletionEvent<Answer> event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getEntity().getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.Room")
+ @CacheEvict(value = "score", key = "#event.entity.roomId")
@EventListener
public void handleDeleteQuestion(AfterDeletionEvent<Content> event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getEntity().getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.Room")
+ @CacheEvict(value = "score", key = "#event.roomId")
@EventListener
public void handleDeleteAllQuestions(DeleteAllQuestionsEvent event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.Room")
+ @CacheEvict(value = "score", key = "#event.roomId")
@EventListener
public void handleDeleteAllQuestionsAnswers(DeleteAllQuestionsAnswersEvent event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.Room")
+ @CacheEvict(value = "score", key = "#event.roomId")
@EventListener
public void handleDeleteAllPreparationAnswers(DeleteAllPreparationAnswersEvent event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.Room")
+ @CacheEvict(value = "score", key = "#event.roomId")
@EventListener
public void handleDeleteAllLectureAnswers(DeleteAllLectureAnswersEvent event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getRoomId()));
}
- @CacheEvict(value = "score", key = "#event.Room")
+ @CacheEvict(value = "score", key = "#event.roomId")
@EventListener
public void handlePiRoundReset(PiRoundResetEvent event) {
this.publisher.publishEvent(new ChangeScoreEvent(this, event.getRoomId()));
--
GitLab