From 761a56a51a55cbdb9798fbfed8b8f74c9a707130 Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Tue, 7 May 2013 13:40:40 +0200
Subject: [PATCH] Changed name to reflect that IDs are returned only
---
.../de/thm/arsnova/controller/LecturerQuestionController.java | 4 ++--
src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 2 +-
src/main/java/de/thm/arsnova/dao/IDatabaseDao.java | 2 +-
src/main/java/de/thm/arsnova/services/IQuestionService.java | 2 +-
src/main/java/de/thm/arsnova/services/QuestionService.java | 4 ++--
src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
index e6968a9f2..5fa519c1c 100644
--- a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
@@ -181,11 +181,11 @@ public class LecturerQuestionController extends AbstractController {
@RequestMapping(value = "/unanswered", method = RequestMethod.GET)
@ResponseBody
- public final List<String> getUnAnsweredSkillQuestions(
+ public final List<String> getUnAnsweredSkillQuestionIds(
@RequestParam final String sessionkey,
final HttpServletResponse response
) {
- List<String> answers = questionService.getUnAnsweredQuestions(sessionkey);
+ List<String> answers = questionService.getUnAnsweredQuestionIds(sessionkey);
if (answers == null || answers.isEmpty()) {
throw new NoContentException();
}
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index ff41705bb..956a45ae1 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -803,7 +803,7 @@ public class CouchDBDao implements IDatabaseDao {
}
@Override
- public final List<String> getUnAnsweredQuestions(final Session session, final User user) {
+ public final List<String> getUnAnsweredQuestionIds(final Session session, final User user) {
try {
View view = new View("answer/by_user");
view.setKey(
diff --git a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
index 10f30b505..e9ce0c34e 100644
--- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
+++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
@@ -70,7 +70,7 @@ public interface IDatabaseDao {
void deleteQuestion(Question question);
- List<String> getUnAnsweredQuestions(Session session, User user);
+ List<String> getUnAnsweredQuestionIds(Session session, User user);
Answer getMyAnswer(String questionId, int piRound);
diff --git a/src/main/java/de/thm/arsnova/services/IQuestionService.java b/src/main/java/de/thm/arsnova/services/IQuestionService.java
index b51281e46..389e1442a 100644
--- a/src/main/java/de/thm/arsnova/services/IQuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/IQuestionService.java
@@ -41,7 +41,7 @@ public interface IQuestionService {
void deleteQuestion(String questionId);
- List<String> getUnAnsweredQuestions(String sessionKey);
+ List<String> getUnAnsweredQuestionIds(String sessionKey);
Answer getMyAnswer(String questionId);
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index acb949662..35ab9abc1 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -182,7 +182,7 @@ public class QuestionService implements IQuestionService {
@Override
@Authenticated
- public List<String> getUnAnsweredQuestions(String sessionKey) {
+ public List<String> getUnAnsweredQuestionIds(String sessionKey) {
User user = userService.getCurrentUser();
if (user == null) {
throw new UnauthorizedException();
@@ -191,7 +191,7 @@ public class QuestionService implements IQuestionService {
if (session == null) {
throw new NotFoundException();
}
- return databaseDao.getUnAnsweredQuestions(session, user);
+ return databaseDao.getUnAnsweredQuestionIds(session, user);
}
@Override
diff --git a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
index 1aed9229d..af6a51ffe 100644
--- a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
+++ b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
@@ -367,7 +367,7 @@ public class StubDatabaseDao implements IDatabaseDao {
}
@Override
- public List<String> getUnAnsweredQuestions(Session session, User user) {
+ public List<String> getUnAnsweredQuestionIds(Session session, User user) {
// TODO Auto-generated method stub
return null;
}
--
GitLab