From 6db7cd18d964973056110e41821203848dcc44e4 Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Mon, 17 Feb 2014 14:49:39 +0100
Subject: [PATCH] Removed debug output, removed unused variables
---
src/main/java/de/thm/arsnova/FeedbackStorage.java | 3 ---
src/main/java/de/thm/arsnova/aop/UserSessionAspect.java | 2 --
.../de/thm/arsnova/controller/FeedbackControllerTest.java | 4 ----
.../java/de/thm/arsnova/services/FeedbackServiceTest.java | 3 ---
4 files changed, 12 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/FeedbackStorage.java b/src/main/java/de/thm/arsnova/FeedbackStorage.java
index 7f62d24c3..dd46e15ef 100644
--- a/src/main/java/de/thm/arsnova/FeedbackStorage.java
+++ b/src/main/java/de/thm/arsnova/FeedbackStorage.java
@@ -1,7 +1,6 @@
package de.thm.arsnova;
import java.util.Date;
-import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -104,8 +103,6 @@ public class FeedbackStorage {
data.put(keyword, new ConcurrentHashMap<String, FeedbackStorageObject>());
}
- System.out.println(user.getUsername());
-
data.get(keyword).put(user.getUsername(), new FeedbackStorageObject(value, user));
return true;
}
diff --git a/src/main/java/de/thm/arsnova/aop/UserSessionAspect.java b/src/main/java/de/thm/arsnova/aop/UserSessionAspect.java
index 56f1158cd..bfe0dad44 100644
--- a/src/main/java/de/thm/arsnova/aop/UserSessionAspect.java
+++ b/src/main/java/de/thm/arsnova/aop/UserSessionAspect.java
@@ -1,7 +1,5 @@
package de.thm.arsnova.aop;
-import java.util.UUID;
-
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.Aspect;
diff --git a/src/test/java/de/thm/arsnova/controller/FeedbackControllerTest.java b/src/test/java/de/thm/arsnova/controller/FeedbackControllerTest.java
index 9a9ef5bd8..2cf9ff61f 100644
--- a/src/test/java/de/thm/arsnova/controller/FeedbackControllerTest.java
+++ b/src/test/java/de/thm/arsnova/controller/FeedbackControllerTest.java
@@ -20,7 +20,6 @@ import org.springframework.web.servlet.HandlerAdapter;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter;
-import de.thm.arsnova.FeedbackStorage;
import de.thm.arsnova.dao.StubDatabaseDao;
import de.thm.arsnova.exceptions.NoContentException;
import de.thm.arsnova.exceptions.NotFoundException;
@@ -49,8 +48,6 @@ public class FeedbackControllerTest {
@Autowired
private StubDatabaseDao databaseDao;
- private FeedbackStorage feedbackStorage;
-
@After
public final void cleanup() {
databaseDao.cleanupTestData();
@@ -61,7 +58,6 @@ public class FeedbackControllerTest {
this.request = new MockHttpServletRequest();
this.response = new MockHttpServletResponse();
handlerAdapter = applicationContext.getBean(AnnotationMethodHandlerAdapter.class);
- this.feedbackStorage = new FeedbackStorage(databaseDao);
}
@Test(expected = NotFoundException.class)
diff --git a/src/test/java/de/thm/arsnova/services/FeedbackServiceTest.java b/src/test/java/de/thm/arsnova/services/FeedbackServiceTest.java
index e96de49ee..06409e42b 100644
--- a/src/test/java/de/thm/arsnova/services/FeedbackServiceTest.java
+++ b/src/test/java/de/thm/arsnova/services/FeedbackServiceTest.java
@@ -166,9 +166,6 @@ public class FeedbackServiceTest {
public static class TestUser extends User {
private static final long serialVersionUID = 1L;
- private String username;
- private String type;
-
public TestUser(String username) {
super( new UsernamePasswordAuthenticationToken(username, "secret") );
}
--
GitLab