From 84d5a26f9087be2089dbc62eacd36e2fbbdc6951 Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Wed, 21 Aug 2013 12:34:02 +0200
Subject: [PATCH] Removed obsolete methods
Feedback is stored in memory on the server, and not inside
CouchDB any more.
---
.../java/de/thm/arsnova/dao/CouchDBDao.java | 53 -------------------
.../java/de/thm/arsnova/dao/IDatabaseDao.java | 2 -
.../de/thm/arsnova/dao/StubDatabaseDao.java | 5 --
3 files changed, 60 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index a5c7aa57..17e9c133 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -114,59 +114,6 @@ public class CouchDBDao implements IDatabaseDao {
this.userService = service;
}
- /**
- * This method cleans up old feedback votes at the scheduled interval.
- */
- @Override
- public final void cleanFeedbackVotes(final int cleanupFeedbackDelay) {
- final long timelimitInMillis = 60000 * (long) cleanupFeedbackDelay;
- final long maxAllowedTimeInMillis = System.currentTimeMillis() - timelimitInMillis;
-
- Map<String, Set<String>> affectedUsers = new HashMap<String, Set<String>>();
- Set<String> allAffectedSessions = new HashSet<String>();
-
- List<Document> results = findFeedbackForDeletion(maxAllowedTimeInMillis);
- for (Document d : results) {
- try {
- // Read the required document data
- Document feedback = this.getDatabase().getDocument(d.getId());
- String arsInternalSessionId = feedback.getString("sessionId");
- String user = feedback.getString("user");
-
- // Store user and session data for later. We need this to
- // communicate the changes back to the users.
- Set<String> affectedArsSessions = affectedUsers.get(user);
- if (affectedArsSessions == null) {
- affectedArsSessions = new HashSet<String>();
- }
- affectedArsSessions.add(getSessionKeyword(arsInternalSessionId));
- affectedUsers.put(user, affectedArsSessions);
- allAffectedSessions.addAll(affectedArsSessions);
-
- this.database.deleteDocument(feedback);
- LOGGER.debug("Cleaning up Feedback document " + d.getId());
- } catch (IOException e) {
- LOGGER.error("Could not delete Feedback document " + d.getId());
- } catch (JSONException e) {
- LOGGER.error(
- "Could not delete Feedback document {}, error is: {} ",
- new Object[] {d.getId(), e}
- );
- }
- }
- if (!results.isEmpty()) {
- feedbackService.broadcastFeedbackChanges(affectedUsers, allAffectedSessions);
- }
- }
-
- private List<Document> findFeedbackForDeletion(final long maxAllowedTimeInMillis) {
- View cleanupFeedbackView = new View("understanding/cleanup");
- cleanupFeedbackView.setStartKey("null");
- cleanupFeedbackView.setEndKey(String.valueOf(maxAllowedTimeInMillis));
- ViewResults feedbackForCleanup = this.getDatabase().view(cleanupFeedbackView);
- return feedbackForCleanup.getResults();
- }
-
@Override
public final Session getSession(final String keyword) {
Session result = this.getSessionFromKeyword(keyword);
diff --git a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
index 73c786ee..f22a3906 100644
--- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
+++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
@@ -33,8 +33,6 @@ import de.thm.arsnova.entities.Session;
import de.thm.arsnova.entities.User;
public interface IDatabaseDao {
- void cleanFeedbackVotes(int cleanupFeedbackDelay);
-
Session getSessionFromKeyword(String keyword);
Session getSession(String keyword);
diff --git a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
index bbf6a89a..98301367 100644
--- a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
+++ b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
@@ -104,11 +104,6 @@ public class StubDatabaseDao implements IDatabaseDao {
stubQuestions.put("12345678", questions);
}
- @Override
- public void cleanFeedbackVotes(int cleanupFeedbackDelay) {
- stubSessions.clear();
- }
-
@Override
public Session getSession(String keyword) {
// Magic keyword for forbidden session
--
GitLab