From f504ce2e1f7b26f9204d12988b205a685f107ad7 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Wed, 4 Jun 2014 08:34:04 +0200
Subject: [PATCH] Removed obsolete methods in StatisticsController
---
.../controller/StatisticsController.java | 4 ++--
.../arsnova/services/IStatisticsService.java | 5 -----
.../arsnova/services/StatisticsService.java | 21 +++++++------------
.../services/StatisticsServiceTest.java | 14 -------------
4 files changed, 9 insertions(+), 35 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/StatisticsController.java b/src/main/java/de/thm/arsnova/controller/StatisticsController.java
index d14769c5d..1a2237d0c 100644
--- a/src/main/java/de/thm/arsnova/controller/StatisticsController.java
+++ b/src/main/java/de/thm/arsnova/controller/StatisticsController.java
@@ -25,13 +25,13 @@ public class StatisticsController extends AbstractController {
@DeprecatedApi
@RequestMapping(method = RequestMethod.GET, value = "/statistics/activeusercount", produces = "text/plain")
public final String countActiveUsers() {
- return Integer.toString(statisticsService.countActiveUsers());
+ return Integer.toString(statisticsService.getStatistics().getActiveUsers());
}
@DeprecatedApi
@RequestMapping(method = RequestMethod.GET, value = "/statistics/loggedinusercount", produces = "text/plain")
public final String countLoggedInUsers() {
- return Integer.toString(statisticsService.countLoggedInUsers());
+ return Integer.toString(statisticsService.getStatistics().getLoggedinUsers());
}
@DeprecatedApi
diff --git a/src/main/java/de/thm/arsnova/services/IStatisticsService.java b/src/main/java/de/thm/arsnova/services/IStatisticsService.java
index e6a30b07a..0aa89e09d 100644
--- a/src/main/java/de/thm/arsnova/services/IStatisticsService.java
+++ b/src/main/java/de/thm/arsnova/services/IStatisticsService.java
@@ -3,10 +3,5 @@ package de.thm.arsnova.services;
import de.thm.arsnova.entities.Statistics;
public interface IStatisticsService {
-
- int countActiveUsers();
-
- int countLoggedInUsers();
-
Statistics getStatistics();
}
diff --git a/src/main/java/de/thm/arsnova/services/StatisticsService.java b/src/main/java/de/thm/arsnova/services/StatisticsService.java
index f4727b9d2..435e249cf 100644
--- a/src/main/java/de/thm/arsnova/services/StatisticsService.java
+++ b/src/main/java/de/thm/arsnova/services/StatisticsService.java
@@ -18,20 +18,6 @@ public class StatisticsService implements IStatisticsService {
@Autowired
private SessionRegistry sessionRegistry;
- @Override
- public final int countActiveUsers() {
- final long since = System.currentTimeMillis() - DURATION_IN_MILLIS;
- return databaseDao.countActiveUsers(since);
- }
-
- @Override
- public int countLoggedInUsers() {
- if (sessionRegistry == null) {
- return 0;
- }
- return sessionRegistry.getAllPrincipals().size();
- }
-
@Override
public final Statistics getStatistics() {
final long since = System.currentTimeMillis() - DURATION_IN_MILLIS;
@@ -45,4 +31,11 @@ public class StatisticsService implements IStatisticsService {
statistics.setLoggedinUsers(countLoggedInUsers());
return statistics;
}
+
+ private int countLoggedInUsers() {
+ if (sessionRegistry == null) {
+ return 0;
+ }
+ return sessionRegistry.getAllPrincipals().size();
+ }
}
diff --git a/src/test/java/de/thm/arsnova/services/StatisticsServiceTest.java b/src/test/java/de/thm/arsnova/services/StatisticsServiceTest.java
index ce514f69e..0ed3179fb 100644
--- a/src/test/java/de/thm/arsnova/services/StatisticsServiceTest.java
+++ b/src/test/java/de/thm/arsnova/services/StatisticsServiceTest.java
@@ -48,20 +48,6 @@ public class StatisticsServiceTest {
public final void cleanup() {
}
- @Test
- public final void testShouldReturnNoActiveUsers() {
- when(databaseDao.countActiveUsers(anyInt())).thenReturn(0);
-
- final int actual = statisticsService.countActiveUsers();
- assertEquals(0, actual);
- }
-
- @Test
- public final void testShouldReturnCurrentActiveUsers() {
- final int actual = statisticsService.countActiveUsers();
- assertEquals(42, actual);
- }
-
@Test
public final void testShouldReturnEqualStatistics() {
final Statistics actual = statisticsService.getStatistics();
--
GitLab