Merge branch 'pcvolkmer-issue_fixes'

src/main/java/de/thm/arsnova/aop/RangeAspect.java

@@ -75,8 +75,8 @@ public class RangeAspect {
 		}
 
 		if (matcher != null && matcher.matches()) {
-			start = matcher.group(1) != null ? Integer.valueOf(matcher.group(1)) : -1;
-			end = matcher.group(2) != null ? Integer.valueOf(matcher.group(2)) : -1;
+			start = matcher.group(1) != null ? Integer.parseInt(matcher.group(1)) : -1;
+			end = matcher.group(2) != null ? Integer.parseInt(matcher.group(2)) : -1;
 			logger.debug("Pagination: {}-{}", start, end);
 		}
 		controller.setRange(start, end);

src/main/java/de/thm/arsnova/entities/Question.java

@@ -17,8 +17,10 @@
  */
 package de.thm.arsnova.entities;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -26,7 +28,7 @@ import io.swagger.annotations.ApiModelProperty;
  * A question the teacher is asking.
  */
 @ApiModel(value = "lecturerquestion", description = "the Question API")
-public class Question {
+public class Question implements Serializable {
 
 	private String type;
 	private String questionType;

src/main/java/de/thm/arsnova/web/CorsFilter.java

@@ -41,9 +41,13 @@ public class CorsFilter extends OncePerRequestFilter {
 		response.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization, X-Requested-With");
 
 		if (request.getHeader("origin") != null) {
-			response.addHeader("Access-Control-Allow-Origin", request.getHeader("origin"));
+			response.addHeader("Access-Control-Allow-Origin", sanitizeOriginUrl(request.getHeader("origin")));
 		}
 
 		filterChain.doFilter(request, response);
 	}
+
+	private String sanitizeOriginUrl(String originUrl) {
+		return originUrl.replaceAll("[\n\r]+"," ");
+	}
 }

src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java

@@ -34,9 +34,9 @@ import de.thm.arsnova.entities.LoggedIn;
 import de.thm.arsnova.entities.Question;
 import de.thm.arsnova.entities.Session;
 import de.thm.arsnova.entities.SessionInfo;
+import de.thm.arsnova.entities.SortOrder;
 import de.thm.arsnova.entities.Statistics;
 import de.thm.arsnova.entities.User;
-import de.thm.arsnova.entities.SortOrder;
 import de.thm.arsnova.entities.transport.ImportExportSession;
 import de.thm.arsnova.exceptions.NoContentException;
 import de.thm.arsnova.exceptions.NotFoundException;
@@ -126,7 +126,7 @@ public class StubDatabaseDao implements IDatabaseDao {
 
 	@Override
 	public Question saveQuestion(Session session, Question question) {
-		List<Question> questions = stubQuestions.get(session.get_id());
+		List<Question> questions = stubQuestions.get(session.getKeyword());
 		questions.add(question);
 		stubQuestions.put(session.get_id(), questions);
 
@@ -141,11 +141,13 @@ public class StubDatabaseDao implements IDatabaseDao {
 
 	@Override
 	public List<Question> getSkillQuestions(User user, Session session) {
-		if (session == null)
+		if (session == null) {
 			throw new NotFoundException();
-		List<Question> questions = stubQuestions.get(session);
-		if (questions == null)
+		}
+		List<Question> questions = stubQuestions.get(session.getKeyword());
+		if (questions == null) {
 			throw new NoContentException();
+		}
 		return questions;
 	}
 

src/test/java/de/thm/arsnova/services/UserServiceTest.java

@@ -54,7 +54,7 @@ public class UserServiceTest {
 		objOut.writeObject(socketid2user);
 		objOut.close();
 		ObjectInputStream objIn = new ObjectInputStream(new ByteArrayInputStream(out.toByteArray()));
-		Map<UUID, String> actual = (Map<UUID, String>) objIn.readObject();
+		Map<UUID, User> actual = (Map<UUID, User>) objIn.readObject();
 		assertEquals(actual, socketid2user);
 	}