Added X-Deprecated-API HTTP header flag to URLs not conforming with the

API specification.
Changed StatisticsController to allow requests without a trailing slash
to be consistent with the other **/statistics paths.

src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java

@@ -56,6 +56,8 @@ public class AudienceQuestionController extends AbstractController {
 			@RequestParam final String sessionkey,
 			final HttpServletResponse response
 	) {
+		response.addHeader("X-Deprecated-API", "1");
+		
 		return questionService.getInterposedCount(sessionkey);
 	}
 
@@ -65,6 +67,8 @@ public class AudienceQuestionController extends AbstractController {
 			@RequestParam final String sessionkey,
 			final HttpServletResponse response
 	) {
+		response.addHeader("X-Deprecated-API", "1");
+		
 		return questionService.getInterposedReadingCount(sessionkey);
 	}
 

src/main/java/de/thm/arsnova/controller/FeedbackController.java

@@ -51,7 +51,9 @@ public class FeedbackController extends AbstractController {
 
 	@RequestMapping(value = "/session/{sessionkey}/feedback", method = RequestMethod.GET)
 	@ResponseBody
-	public final Feedback getFeedback(@PathVariable final String sessionkey) {
+	public final Feedback getFeedback(@PathVariable final String sessionkey, final HttpServletResponse response) {
+		response.addHeader("X-Deprecated-API", "1");
+		
 		return feedbackService.getFeedback(sessionkey);
 	}
 
@@ -59,6 +61,8 @@ public class FeedbackController extends AbstractController {
 	@ResponseBody
 	public final Integer getMyFeedback(@PathVariable final String sessionkey, final HttpServletResponse response) {
 		Integer value = feedbackService.getMyFeedback(sessionkey, userService.getCurrentUser());
+		
+		response.addHeader("X-Deprecated-API", "1");
 
 		if (value != null && value >= Feedback.MIN_FEEDBACK_TYPE && value <= Feedback.MAX_FEEDBACK_TYPE) {
 			return value;
@@ -68,19 +72,25 @@ public class FeedbackController extends AbstractController {
 
 	@RequestMapping(value = "/session/{sessionkey}/feedbackcount", method = RequestMethod.GET)
 	@ResponseBody
-	public final int getFeedbackCount(@PathVariable final String sessionkey) {
+	public final int getFeedbackCount(@PathVariable final String sessionkey, final HttpServletResponse response) {
+		response.addHeader("X-Deprecated-API", "1");
+		
 		return feedbackService.getFeedbackCount(sessionkey);
 	}
 
 	@RequestMapping(value = "/session/{sessionkey}/roundedaveragefeedback", method = RequestMethod.GET)
 	@ResponseBody
-	public final long getAverageFeedbackRounded(@PathVariable final String sessionkey) {
+	public final long getAverageFeedbackRounded(@PathVariable final String sessionkey, final HttpServletResponse response) {
+		response.addHeader("X-Deprecated-API", "1");
+		
 		return feedbackService.getAverageFeedbackRounded(sessionkey);
 	}
 
 	@RequestMapping(value = "/session/{sessionkey}/averagefeedback", method = RequestMethod.GET)
 	@ResponseBody
-	public final double getAverageFeedback(@PathVariable final String sessionkey) {
+	public final double getAverageFeedback(@PathVariable final String sessionkey, final HttpServletResponse response) {
+		response.addHeader("X-Deprecated-API", "1");
+		
 		return feedbackService.getAverageFeedback(sessionkey);
 	}
 
@@ -92,6 +102,8 @@ public class FeedbackController extends AbstractController {
 			@RequestBody final int value,
 			final HttpServletResponse response
 	) {
+		response.addHeader("X-Deprecated-API", "1");
+		
 		User user = userService.getCurrentUser();
 		if (feedbackService.saveFeedback(sessionkey, value, user)) {
 			Feedback feedback = feedbackService.getFeedback(sessionkey);

src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java

@@ -149,6 +149,8 @@ public class LecturerQuestionController extends AbstractController {
 	@RequestMapping(value = "/count", method = RequestMethod.GET)
 	@ResponseBody
 	public final int getSkillQuestionCount(@RequestParam final String sessionkey, final HttpServletResponse response) {
+		response.addHeader("X-Deprecated-API", "1");
+		
 		return questionService.getSkillQuestionCount(sessionkey);
 	}
 
@@ -187,6 +189,9 @@ public class LecturerQuestionController extends AbstractController {
 		if (answers == null || answers.isEmpty()) {
 			throw new NoContentException();
 		}
+		
+		response.addHeader("X-Deprecated-API", "1");
+		
 		return answers;
 	}
 
@@ -216,6 +221,9 @@ public class LecturerQuestionController extends AbstractController {
 			response.setStatus(HttpStatus.NO_CONTENT.value());
 			return null;
 		}
+		
+		response.addHeader("X-Deprecated-API", "1");
+		
 		return answer;
 	}
 
@@ -308,6 +316,8 @@ public class LecturerQuestionController extends AbstractController {
 			@PathVariable final String questionId,
 			final HttpServletResponse response
 	) {
+		response.addHeader("X-Deprecated-API", "1");
+		
 		return questionService.getAnswerCount(questionId);
 	}
 
@@ -326,6 +336,8 @@ public class LecturerQuestionController extends AbstractController {
 			@RequestParam final String sessionkey,
 			final HttpServletResponse response
 	) {
+		response.addHeader("X-Deprecated-API", "1");
+		
 		return questionService.getMytAnswers(sessionkey);
 	}
 
@@ -335,6 +347,8 @@ public class LecturerQuestionController extends AbstractController {
 			@RequestParam final String sessionkey,
 			final HttpServletResponse response
 	) {
+		response.addHeader("X-Deprecated-API", "1");
+		
 		return questionService.getTotalAnswerCount(sessionkey);
 	}
 

src/main/java/de/thm/arsnova/controller/SessionController.java

@@ -71,6 +71,8 @@ public class SessionController extends AbstractController {
 			@PathVariable final String sessionkey,
 			final HttpServletResponse response
 	) {
+		response.addHeader("X-Deprecated-API", "1");
+		
 		User user = userService.getCurrentUser();
 		LoggedIn loggedIn = sessionService.registerAsOnlineUser(user, sessionkey);
 		if (loggedIn != null) {
@@ -86,6 +88,8 @@ public class SessionController extends AbstractController {
 			@PathVariable final String sessionkey,
 			final HttpServletResponse response
 	) {
+		response.addHeader("X-Deprecated-API", "1");
+		
 		return sessionService.countActiveUsers(sessionkey);
 	}
 

src/main/java/de/thm/arsnova/controller/StatisticsController.java

 package de.thm.arsnova.controller;
 
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -10,27 +12,30 @@ import de.thm.arsnova.entities.Statistics;
 import de.thm.arsnova.services.IStatisticsService;
 
 @Controller
-@RequestMapping("/statistics")
 public class StatisticsController {
 
 	@Autowired
 	private IStatisticsService statisticsService;
 
-	@RequestMapping(method = RequestMethod.GET, value = "/")
+	@RequestMapping(method = RequestMethod.GET, value = "/statistics")
 	@ResponseBody
 	public final Statistics getStatistics() {
 		return statisticsService.getStatistics();
 	}
 
-	@RequestMapping(method = RequestMethod.GET, value = "/activeusercount", produces = "text/plain")
+	@RequestMapping(method = RequestMethod.GET, value = "/statistics/activeusercount", produces = "text/plain")
 	@ResponseBody
-	public final String countActiveUsers() {
+	public final String countActiveUsers(HttpServletResponse response) {
+		response.addHeader("X-Deprecated-API", "1");
+		
 		return Integer.toString(statisticsService.countActiveUsers());
 	}
 
-	@RequestMapping(method = RequestMethod.GET, value = "/sessioncount", produces = "text/plain")
+	@RequestMapping(method = RequestMethod.GET, value = "/statistics/sessioncount", produces = "text/plain")
 	@ResponseBody
-	public final String countSessions() {
+	public final String countSessions(HttpServletResponse response) {
+		response.addHeader("X-Deprecated-API", "1");
+		
 		return Integer.toString(statisticsService.getStatistics().getOpenSessions()
 				+ statisticsService.getStatistics().getClosedSessions());
 	}