From 9bb068d906e6d81ba4f78160fd4640d12bf47230 Mon Sep 17 00:00:00 2001
From: dgrh99 <daniel.gerhardt@mni.thm.de>
Date: Tue, 5 Feb 2013 12:53:22 +0100
Subject: [PATCH] Controller methods previously returning primitive types now
return Strings. This fixes incorrect content types being set in the response
header.
---
.../thm/arsnova/controller/FoodVoteController.java | 6 +++---
.../arsnova/controller/StatisticsController.java | 14 +++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/FoodVoteController.java b/src/main/java/de/thm/arsnova/controller/FoodVoteController.java
index 592822dc0..0f2772d18 100644
--- a/src/main/java/de/thm/arsnova/controller/FoodVoteController.java
+++ b/src/main/java/de/thm/arsnova/controller/FoodVoteController.java
@@ -60,10 +60,10 @@ public class FoodVoteController extends AbstractController {
return foodService.getFoodVote();
}
- @RequestMapping(value = "/canteen/menu/vote/count", method = RequestMethod.GET)
+ @RequestMapping(value = "/canteen/menu/vote/count", method = RequestMethod.GET, produces = "text/plain")
@ResponseBody
- public final int getFoodVoteCount() {
- return foodService.getFoodVoteCount();
+ public final String getFoodVoteCount() {
+ return Integer.toString(foodService.getFoodVoteCount());
}
diff --git a/src/main/java/de/thm/arsnova/controller/StatisticsController.java b/src/main/java/de/thm/arsnova/controller/StatisticsController.java
index 999652151..e6da10337 100644
--- a/src/main/java/de/thm/arsnova/controller/StatisticsController.java
+++ b/src/main/java/de/thm/arsnova/controller/StatisticsController.java
@@ -21,16 +21,16 @@ public class StatisticsController {
return statisticsService.getStatistics();
}
- @RequestMapping(method = RequestMethod.GET, value = "/statistics/activeusercount")
+ @RequestMapping(method = RequestMethod.GET, value = "/statistics/activeusercount", produces = "text/plain")
@ResponseBody
- public final int countActiveUsers() {
- return statisticsService.countActiveUsers();
+ public final String countActiveUsers() {
+ return Integer.toString(statisticsService.countActiveUsers());
}
- @RequestMapping(method = RequestMethod.GET, value = "/statistics/sessioncount")
+ @RequestMapping(method = RequestMethod.GET, value = "/statistics/sessioncount", produces = "text/plain")
@ResponseBody
- public final int countSessions() {
- return statisticsService.getStatistics().getOpenSessions()
- + statisticsService.getStatistics().getClosedSessions();
+ public final String countSessions() {
+ return Integer.toString(statisticsService.getStatistics().getOpenSessions()
+ + statisticsService.getStatistics().getClosedSessions());
}
}
--
GitLab