From e14dc5b0a5853b6565e9dcfe3b0c12ca620cb04a Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Tue, 19 Feb 2013 19:56:27 +0100
Subject: [PATCH] Renamed question controllers and test to be consistent with
API paths.
---
...nceController.java => AudienceQuestionController.java} | 4 ++--
...rerController.java => LecturerQuestionController.java} | 4 ++--
...ollerTest.java => LecturerQuestionControllerTest.java} | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
rename src/main/java/de/thm/arsnova/controller/{QuestionByAudienceController.java => AudienceQuestionController.java} (95%)
rename src/main/java/de/thm/arsnova/controller/{QuestionByLecturerController.java => LecturerQuestionController.java} (98%)
rename src/test/java/de/thm/arsnova/controller/{QuestionByLecturerControllerTest.java => LecturerQuestionControllerTest.java} (93%)
diff --git a/src/main/java/de/thm/arsnova/controller/QuestionByAudienceController.java b/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java
similarity index 95%
rename from src/main/java/de/thm/arsnova/controller/QuestionByAudienceController.java
rename to src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java
index 2490a062..3739548f 100644
--- a/src/main/java/de/thm/arsnova/controller/QuestionByAudienceController.java
+++ b/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java
@@ -43,9 +43,9 @@ import de.thm.arsnova.services.IQuestionService;
@Controller
@RequestMapping("/audiencequestion")
-public class QuestionByAudienceController extends AbstractController {
+public class AudienceQuestionController extends AbstractController {
- public static final Logger LOGGER = LoggerFactory.getLogger(QuestionByAudienceController.class);
+ public static final Logger LOGGER = LoggerFactory.getLogger(AudienceQuestionController.class);
@Autowired
private IQuestionService questionService;
diff --git a/src/main/java/de/thm/arsnova/controller/QuestionByLecturerController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
similarity index 98%
rename from src/main/java/de/thm/arsnova/controller/QuestionByLecturerController.java
rename to src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
index 7a6c1be4..281cc599 100644
--- a/src/main/java/de/thm/arsnova/controller/QuestionByLecturerController.java
+++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
@@ -45,9 +45,9 @@ import de.thm.arsnova.services.IQuestionService;
@Controller
@RequestMapping("/lecturerquestion")
-public class QuestionByLecturerController extends AbstractController {
+public class LecturerQuestionController extends AbstractController {
- public static final Logger LOGGER = LoggerFactory.getLogger(QuestionByLecturerController.class);
+ public static final Logger LOGGER = LoggerFactory.getLogger(LecturerQuestionController.class);
@Autowired
private IQuestionService questionService;
diff --git a/src/test/java/de/thm/arsnova/controller/QuestionByLecturerControllerTest.java b/src/test/java/de/thm/arsnova/controller/LecturerQuestionControllerTest.java
similarity index 93%
rename from src/test/java/de/thm/arsnova/controller/QuestionByLecturerControllerTest.java
rename to src/test/java/de/thm/arsnova/controller/LecturerQuestionControllerTest.java
index bed22194..3ea9fb83 100644
--- a/src/test/java/de/thm/arsnova/controller/QuestionByLecturerControllerTest.java
+++ b/src/test/java/de/thm/arsnova/controller/LecturerQuestionControllerTest.java
@@ -30,7 +30,7 @@ import de.thm.arsnova.services.StubUserService;
"file:src/main/webapp/WEB-INF/spring/arsnova-servlet.xml",
"file:src/main/webapp/WEB-INF/spring/spring-main.xml",
"file:src/test/resources/test-config.xml" })
-public class QuestionByLecturerControllerTest {
+public class LecturerQuestionControllerTest {
@Inject
private ApplicationContext applicationContext;
@@ -39,7 +39,7 @@ public class QuestionByLecturerControllerTest {
private HandlerAdapter handlerAdapter;
@Autowired
- private QuestionByLecturerController questionByLecturerController;
+ private LecturerQuestionController lecturerQuestionController;
@Autowired
private StubUserService userService;
@@ -68,7 +68,7 @@ public class QuestionByLecturerControllerTest {
request.setMethod("GET");
request.setRequestURI("/session/00000000/questionids");
- final ModelAndView mav = handlerAdapter.handle(request, response, questionByLecturerController);
+ final ModelAndView mav = handlerAdapter.handle(request, response, lecturerQuestionController);
assertNull(mav);
assertTrue(response.getStatus() == 404);
@@ -82,7 +82,7 @@ public class QuestionByLecturerControllerTest {
request.setMethod("GET");
request.setRequestURI("/session/00000000/questionids");
- final ModelAndView mav = handlerAdapter.handle(request, response, questionByLecturerController);
+ final ModelAndView mav = handlerAdapter.handle(request, response, lecturerQuestionController);
assertNull(mav);
assertTrue(response.getStatus() == 401);
--
GitLab