From b0091a52dd5d5ab9041e9b4467e2500a5cedc5aa Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Tue, 12 Feb 2013 13:37:23 +0100
Subject: [PATCH] LegacyController improvements.
---
.../arsnova/controller/LegacyController.java | 37 ++++++++++++-------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/LegacyController.java b/src/main/java/de/thm/arsnova/controller/LegacyController.java
index c19039ba8..ee6ede51a 100644
--- a/src/main/java/de/thm/arsnova/controller/LegacyController.java
+++ b/src/main/java/de/thm/arsnova/controller/LegacyController.java
@@ -18,7 +18,6 @@
*/
package de.thm.arsnova.controller;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
@@ -37,25 +36,41 @@ public class LegacyController extends AbstractController {
@RequestMapping(value = "/session/{sessionKey}/question")
public final String redirectQuestionByLecturer(
@PathVariable final String sessionKey,
- HttpServletRequest request,
final HttpServletResponse response
) {
- request.setAttribute("sessionkey", sessionKey);
response.addHeader("X-Deprecated-API", "1");
- return "forward:/question/bylecturer/";
+ return String.format("forward:/question/bylecturer/?sessionkey=%s", sessionKey);
}
@RequestMapping(value = "/session/{sessionKey}/skillquestions")
public final String redirectQuestionByLecturerList(
@PathVariable final String sessionKey,
- HttpServletRequest request,
final HttpServletResponse response
) {
- request.setAttribute("sessionkey", sessionKey);
response.addHeader("X-Deprecated-API", "1");
- return "forward:/question/bylecturer/list";
+ return String.format("forward:/question/bylecturer/list?sessionkey=%s", sessionKey);
+ }
+
+ @RequestMapping(value = "/session/{sessionKey}/skillquestioncount")
+ public final String redirectQuestionByLecturerCount(
+ @PathVariable final String sessionKey,
+ final HttpServletResponse response
+ ) {
+ response.addHeader("X-Deprecated-API", "1");
+
+ return String.format("forward:/question/bylecturer/count?sessionkey=%s", sessionKey);
+ }
+
+ @RequestMapping(value = "/session/{sessionKey}/answercount")
+ public final String redirectQuestionByLecturerAnswerCount(
+ @PathVariable final String sessionKey,
+ final HttpServletResponse response
+ ) {
+ response.addHeader("X-Deprecated-API", "1");
+
+ return String.format("forward:/question/bylecturer/answercount?sessionkey=%s", sessionKey);
}
/* generalized routes */
@@ -64,13 +79,11 @@ public class LegacyController extends AbstractController {
public final String redirectQuestionByLecturerWithOneArgument(
@PathVariable final String sessionKey,
@PathVariable final String arg1,
- HttpServletRequest request,
final HttpServletResponse response
) {
- request.setAttribute("sessionkey", sessionKey);
response.addHeader("X-Deprecated-API", "1");
- return String.format("forward:/question/bylecturer/%s", arg1);
+ return String.format("forward:/question/bylecturer/%s?sessionkey=%s", arg1, sessionKey);
}
@RequestMapping(value = "/session/{sessionKey}/question/{arg1}/{arg2}")
@@ -78,13 +91,11 @@ public class LegacyController extends AbstractController {
@PathVariable final String sessionKey,
@PathVariable final String arg1,
@PathVariable final String arg2,
- HttpServletRequest request,
final HttpServletResponse response
) {
- request.setAttribute("sessionkey", sessionKey);
response.addHeader("X-Deprecated-API", "1");
- return String.format("forward:/question/bylecturer/%s/%s", arg1, arg2);
+ return String.format("forward:/question/bylecturer/%s/%s?sessionkey=%s", arg1, arg2, sessionKey);
}
}
--
GitLab