get single interposed question

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

@@ -269,7 +269,6 @@ public class QuestionController extends AbstractController {
 		return questionService.getInterposedQuestions(sessionKey);
 	}
 	
-<<<<<<< HEAD
 	@RequestMapping(value = "/session/{sessionKey}/interposed/{documentId}", method = RequestMethod.GET)
 	@ResponseBody
 	public final Question getInterposedQuestion(
@@ -278,7 +277,7 @@ public class QuestionController extends AbstractController {
 			final HttpServletResponse response
 	) {
 		return questionService.getInterposedQuestion(sessionKey, documentId);
-=======
+	}
 	
 	@RequestMapping(value = "/session/{sessionkey}/interposed", method = RequestMethod.POST)
 	@ResponseBody
@@ -299,7 +298,6 @@ public class QuestionController extends AbstractController {
 
 		response.setStatus(HttpStatus.BAD_REQUEST.value());
 		return;
->>>>>>> 83eba294f9a7f8a8250127f8b5673aff0fc04663
 	}
 
 }

src/main/java/de/thm/arsnova/dao/CouchDBDao.java

@@ -1079,10 +1079,11 @@ public class CouchDBDao implements IDatabaseDao {
 	
 	public Question getInterposedQuestion(String sessionKey, String documentId) {
 		try {
-			Document document = this.getDatabase().getDocument(documentId);
 			
+			Document document = this.getDatabase().getDocument(documentId);
+			LOGGER.error("bla test" + document.toString());
 			if(document != null) {
-				Question question = (Question) JSONObject.toBean(document.getJSONObject().getJSONObject("value"), Question.class);
+				Question question = (Question) JSONObject.toBean(document.getJSONObject(), Question.class);
 				question.setQuestionType("interposed_question");
 				
 				return question;

src/main/java/de/thm/arsnova/services/IQuestionService.java

@@ -56,8 +56,6 @@ public interface IQuestionService {
 
 	int getInterposedCount(String sessionKey);
 
-	List<Question> getInterposedQuestions(String sessionKey);
-
 	Question getInterposedQuestion(String sessionKey, String documentId);
 
 	List<InterposedQuestion> getInterposedQuestions(String sessionKey);