From 83df11ab37ecbbebfdccba9152408bde655977fd Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Tue, 14 Jan 2014 14:42:08 +0100
Subject: [PATCH] Removed unused methods
---
src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 13 -------------
src/main/java/de/thm/arsnova/dao/IDatabaseDao.java | 2 --
.../de/thm/arsnova/services/ISessionService.java | 2 --
.../de/thm/arsnova/services/SessionService.java | 7 -------
.../java/de/thm/arsnova/dao/StubDatabaseDao.java | 6 ------
5 files changed, 30 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 4860ceec..bb13f085 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -582,19 +582,6 @@ public class CouchDBDao implements IDatabaseDao {
return 0;
}
- @Override
- public final int countActiveUsers(Session session, long since) {
- if (session == null) throw new NotFoundException();
- NovaView view = new NovaView("logged_in/count");
- view.setStartKey(session.get_id(), String.valueOf(since));
- view.setEndKey(session.get_id(), "{}");
- ViewResults results = this.getDatabase().view(view);
- if (isEmptyResults(results)) {
- return 0;
- }
- return results.getJSONArray("rows").optJSONObject(0).getInt("value");
- }
-
private boolean isEmptyResults(ViewResults results) {
return results == null || results.getResults().isEmpty() || results.getJSONArray("rows").size() == 0;
}
diff --git a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
index 46e2e1a5..06481fc7 100644
--- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
+++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
@@ -74,8 +74,6 @@ public interface IDatabaseDao {
int countActiveUsers(long since);
- int countActiveUsers(Session session, long since);
-
List<Answer> getMyAnswers(String sessionKey);
int getTotalAnswerCount(String sessionKey);
diff --git a/src/main/java/de/thm/arsnova/services/ISessionService.java b/src/main/java/de/thm/arsnova/services/ISessionService.java
index 7a54db07..d868e4bc 100644
--- a/src/main/java/de/thm/arsnova/services/ISessionService.java
+++ b/src/main/java/de/thm/arsnova/services/ISessionService.java
@@ -42,8 +42,6 @@ public interface ISessionService {
LoggedIn registerAsOnlineUser(User user, String sessionkey);
- int countActiveUsers(String sessionkey);
-
int countSessions(List<Course> courses);
Session setActive(String sessionkey, Boolean lock);
diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index c96e7066..50bb137f 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -196,13 +196,6 @@ public class SessionService implements ISessionService {
return databaseDao.registerAsOnlineUser(user, session);
}
- @Override
- public int countActiveUsers(String sessionkey) {
- final long since = System.currentTimeMillis() - DURATION_IN_MILLIS;
- Session session = databaseDao.getSessionFromKeyword(sessionkey);
- return databaseDao.countActiveUsers(session, since);
- }
-
public static class SessionNameComperator implements Comparator<Session>, Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
index a648568b..3134df58 100644
--- a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
+++ b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
@@ -274,12 +274,6 @@ public class StubDatabaseDao implements IDatabaseDao {
return null;
}
- @Override
- public int countActiveUsers(Session session, long since) {
- // TODO Auto-generated method stub
- return 0;
- }
-
@Override
public int countAnswers() {
// TODO Auto-generated method stub
--
GitLab