src/main/java/de/thm/arsnova/controller/v2/AuthenticationController.java

+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2019 The ARSnova Team and Contributors
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.thm.arsnova.controller.v2;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.PostConstruct;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.pac4j.core.context.J2EContext;
+import org.pac4j.core.exception.HttpAction;
+import org.pac4j.oauth.client.FacebookClient;
+import org.pac4j.oauth.client.TwitterClient;
+import org.pac4j.oidc.client.GoogleOidcClient;
+import org.pac4j.oidc.client.OidcClient;
+import org.pac4j.saml.client.SAML2Client;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.cas.authentication.CasAuthenticationToken;
+import org.springframework.security.cas.web.CasAuthenticationEntryPoint;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.util.UrlUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.View;
+import org.springframework.web.servlet.view.RedirectView;
+
+import de.thm.arsnova.config.SecurityConfig;
+import de.thm.arsnova.config.properties.AuthenticationProviderProperties;
+import de.thm.arsnova.config.properties.SystemProperties;
+import de.thm.arsnova.controller.AbstractController;
+import de.thm.arsnova.model.ServiceDescription;
+import de.thm.arsnova.model.UserProfile;
+import de.thm.arsnova.model.migration.v2.ClientAuthentication;
+import de.thm.arsnova.security.LoginAuthenticationFailureHandler;
+import de.thm.arsnova.security.LoginAuthenticationSucessHandler;
+import de.thm.arsnova.security.User;
+import de.thm.arsnova.service.UserService;
+import de.thm.arsnova.web.exceptions.UnauthorizedException;
+
+/**
+ * Handles authentication specific requests.
+ */
+@Controller("v2AuthenticationController")
+@RequestMapping("/v2/auth")
+public class AuthenticationController extends AbstractController {
+	private String apiPath;
+	@Value("${customization.path}") private String customizationPath;
+
+	private AuthenticationProviderProperties.Guest guestProperties;
+	private AuthenticationProviderProperties.Registered registeredProperties;
+	private List<AuthenticationProviderProperties.Ldap> ldapProperties;
+	private List<AuthenticationProviderProperties.Oidc> oidcProperties;
+	private AuthenticationProviderProperties.Saml samlProperties;
+	private AuthenticationProviderProperties.Cas casProperties;
+	private Map<String, AuthenticationProviderProperties.Oauth> oauthProperties;
+
+	@Autowired
+	private ServletContext servletContext;
+
+	@Autowired
+	private AuthenticationProviderProperties providerProperties;
+
+	@Autowired(required = false)
+	private OidcClient oidcClient;
+
+	@Autowired(required = false)
+	private TwitterClient twitterClient;
+
+	@Autowired(required = false)
+	private GoogleOidcClient googleOidcClient;
+
+	@Autowired(required = false)
+	private FacebookClient facebookClient;
+
+	@Autowired(required = false)
+	private SAML2Client saml2Client;
+
+	@Autowired(required = false)
+	private CasAuthenticationEntryPoint casEntryPoint;
+
+	@Autowired
+	private UserService userService;
+
+	private static final Logger logger = LoggerFactory.getLogger(AuthenticationController.class);
+
+	public AuthenticationController(final SystemProperties systemProperties,
+			final AuthenticationProviderProperties authenticationProviderProperties) {
+		apiPath = systemProperties.getApi().getProxyPath();
+		guestProperties = authenticationProviderProperties.getGuest();
+		registeredProperties = authenticationProviderProperties.getRegistered();
+		ldapProperties = authenticationProviderProperties.getLdap();
+		oidcProperties = authenticationProviderProperties.getOidc();
+		samlProperties = authenticationProviderProperties.getSaml();
+		casProperties = authenticationProviderProperties.getCas();
+		oauthProperties = authenticationProviderProperties.getOauth();
+	}
+
+	@PostConstruct
+	private void init() {
+		if (apiPath == null || "".equals(apiPath)) {
+			apiPath = servletContext.getContextPath();
+		}
+	}
+
+	@PostMapping({ "/login", "/doLogin" })
+	public void doLogin(
+			@RequestParam("type") final String type,
+			@RequestParam(value = "user", required = false) final String username,
+			@RequestParam(required = false) final String password,
+			final HttpServletRequest request,
+			final HttpServletResponse response
+	) throws IOException {
+		final String address = request.getRemoteAddr();
+		if (userService.isBannedFromLogin(address)) {
+			response.sendError(429, "Too Many Requests");
+
+			return;
+		}
+		final UsernamePasswordAuthenticationToken authRequest =
+				new UsernamePasswordAuthenticationToken(username, password);
+
+		if (registeredProperties.isEnabled() && "arsnova".equals(type)) {
+			try {
+				userService.authenticate(authRequest, UserProfile.AuthProvider.ARSNOVA, address);
+			} catch (final AuthenticationException e) {
+				logger.info("Database authentication failed.", e);
+				response.setStatus(HttpStatus.UNAUTHORIZED.value());
+			}
+		} else if (ldapProperties.stream().anyMatch(p -> p.isEnabled()) && "ldap".equals(type)) {
+			try {
+				userService.authenticate(authRequest, UserProfile.AuthProvider.LDAP, address);
+			} catch (final AuthenticationException e) {
+				logger.info("LDAP authentication failed.", e);
+				response.setStatus(HttpStatus.UNAUTHORIZED.value());
+			}
+		} else if (guestProperties.isEnabled() && "guest".equals(type)) {
+			try {
+				userService.authenticate(authRequest, UserProfile.AuthProvider.ARSNOVA_GUEST, address);
+			} catch (final AuthenticationException e) {
+				logger.debug("Guest authentication failed.", e);
+				response.setStatus(HttpStatus.UNAUTHORIZED.value());
+			}
+		} else {
+			response.setStatus(HttpStatus.BAD_REQUEST.value());
+		}
+	}
+
+	@GetMapping("/dialog")
+	@ResponseBody
+	public View dialog(
+			@RequestParam("type") final String type,
+			@RequestParam(value = "successurl", defaultValue = "/") String successUrl,
+			@RequestParam(value = "failureurl", defaultValue = "/") String failureUrl,
+			final HttpServletRequest request,
+			final HttpServletResponse response
+	) throws HttpAction, IOException, ServletException {
+		View result = null;
+
+		/* Use URLs from a request parameters for redirection as long as the
+		 * URL is not absolute (to prevent abuse of the redirection). */
+		if (UrlUtils.isAbsoluteUrl(successUrl)) {
+			successUrl = "/";
+		}
+		if (UrlUtils.isAbsoluteUrl(failureUrl)) {
+			failureUrl = "/";
+		}
+
+		final String host = request.getServerName();
+		final int port = request.getServerPort();
+		final String scheme = request.getScheme();
+
+		String serverUrl = scheme + "://" + host;
+		if ("https".equals(scheme)) {
+			if (443 != port) {
+				serverUrl = serverUrl + ":" + String.valueOf(port);
+			}
+		} else {
+			if (80 != port) {
+				serverUrl = serverUrl + ":" + String.valueOf(port);
+			}
+		}
+
+		request.getSession().setAttribute(LoginAuthenticationSucessHandler.URL_ATTRIBUTE, serverUrl + successUrl);
+		request.getSession().setAttribute(LoginAuthenticationFailureHandler.URL_ATTRIBUTE, serverUrl + failureUrl);
+
+		if (casProperties.isEnabled() && "cas".equals(type)) {
+			casEntryPoint.commence(request, response, null);
+		} else if (saml2Client != null && "saml".equals(type)) {
+			result = new RedirectView(
+					saml2Client.getRedirectAction(new J2EContext(request, response)).getLocation());
+		} else if (oidcProperties.stream().anyMatch(p -> p.isEnabled()) && "oidc".equals(type)) {
+			result = new RedirectView(
+					oidcClient.getRedirectAction(new J2EContext(request, response)).getLocation());
+		} else if (twitterClient != null && "twitter".equals(type)) {
+			result = new RedirectView(
+					twitterClient.getRedirectAction(new J2EContext(request, response)).getLocation());
+		} else if (facebookClient != null && "facebook".equals(type)) {
+			facebookClient.setFields("id");
+			facebookClient.setScope("");
+			result = new RedirectView(
+					facebookClient.getRedirectAction(new J2EContext(request, response)).getLocation());
+		} else if (googleOidcClient != null && "google".equals(type)) {
+			result = new RedirectView(
+					googleOidcClient.getRedirectAction(new J2EContext(request, response)).getLocation());
+		} else {
+			response.setStatus(HttpStatus.BAD_REQUEST.value());
+		}
+
+		return result;
+	}
+
+	@GetMapping({ "/", "/whoami" })
+	@ResponseBody
+	public ClientAuthentication whoami(@AuthenticationPrincipal final User user) {
+		if (user == null) {
+			throw new UnauthorizedException();
+		}
+		return new ClientAuthentication(user);
+	}
+
+	@PostMapping("/logout")
+	public String doLogout(final HttpServletRequest request) {
+		final Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+		userService.removeUserIdFromMaps(userService.getCurrentUser().getId());
+		request.getSession().invalidate();
+		SecurityContextHolder.clearContext();
+		if (auth instanceof CasAuthenticationToken) {
+			return "redirect:" + apiPath + SecurityConfig.CAS_LOGOUT_PATH;
+		}
+		return "redirect:" + (request.getHeader("referer") != null ? request.getHeader("referer") : "/");
+	}
+
+	@GetMapping("/services")
+	@ResponseBody
+	public List<ServiceDescription> getServices(final HttpServletRequest request) {
+		final List<ServiceDescription> services = new ArrayList<>();
+
+		/* The first parameter is replaced by the backend, the second one by the frondend */
+		final String dialogUrl = apiPath + "/v2/auth/dialog?type={0}&successurl='{0}'";
+
+		if (guestProperties.isEnabled()) {
+			final ServiceDescription sdesc = new ServiceDescription(
+					"guest",
+					"Guest",
+					null,
+					guestProperties.getAllowedRoles()
+			);
+			sdesc.setOrder(guestProperties.getOrder());
+			services.add(sdesc);
+		}
+
+		if (registeredProperties.isEnabled()) {
+			final ServiceDescription sdesc = new ServiceDescription(
+					"arsnova",
+					registeredProperties.getTitle(),
+					customizationPath + "/login?provider=arsnova&redirect={0}",
+					registeredProperties.getAllowedRoles()
+			);
+			sdesc.setOrder(registeredProperties.getOrder());
+			services.add(sdesc);
+		}
+
+		if (ldapProperties.get(0).isEnabled()) {
+			final ServiceDescription sdesc = new ServiceDescription(
+					SecurityConfig.LDAP_PROVIDER_ID,
+					ldapProperties.get(0).getTitle(),
+					customizationPath + "/login?provider=" + SecurityConfig.LDAP_PROVIDER_ID + "&redirect={0}",
+					ldapProperties.get(0).getAllowedRoles()
+			);
+			sdesc.setOrder(ldapProperties.get(0).getOrder());
+			services.add(sdesc);
+		}
+
+		if (samlProperties.isEnabled()) {
+			final ServiceDescription sdesc = new ServiceDescription(
+					SecurityConfig.SAML_PROVIDER_ID,
+					samlProperties.getTitle(),
+					MessageFormat.format(dialogUrl, SecurityConfig.SAML_PROVIDER_ID),
+					samlProperties.getAllowedRoles()
+			);
+			sdesc.setOrder(samlProperties.getOrder());
+			services.add(sdesc);
+		}
+
+		if (casProperties.isEnabled()) {
+			final ServiceDescription sdesc = new ServiceDescription(
+					SecurityConfig.CAS_PROVIDER_ID,
+					casProperties.getTitle(),
+					MessageFormat.format(dialogUrl, SecurityConfig.CAS_PROVIDER_ID),
+					casProperties.getAllowedRoles()
+			);
+			sdesc.setOrder(casProperties.getOrder());
+			services.add(sdesc);
+		}
+
+		if (oidcProperties.get(0).isEnabled()) {
+			final ServiceDescription sdesc = new ServiceDescription(
+					SecurityConfig.OIDC_PROVIDER_ID,
+					oidcProperties.get(0).getTitle(),
+					MessageFormat.format(dialogUrl, SecurityConfig.OIDC_PROVIDER_ID),
+					oidcProperties.get(0).getAllowedRoles()
+			);
+			sdesc.setOrder(oidcProperties.get(0).getOrder());
+			services.add(sdesc);
+		}
+
+		final AuthenticationProviderProperties.Oauth facebookProperties =
+				oauthProperties.get(SecurityConfig.FACEBOOK_PROVIDER_ID);
+		if (facebookProperties != null && facebookProperties.isEnabled()) {
+			final ServiceDescription sdesc = new ServiceDescription(
+					SecurityConfig.FACEBOOK_PROVIDER_ID,
+					"Facebook",
+					MessageFormat.format(dialogUrl, SecurityConfig.FACEBOOK_PROVIDER_ID),
+					facebookProperties.getAllowedRoles()
+			);
+			sdesc.setOrder(facebookProperties.getOrder());
+			services.add(sdesc);
+		}
+
+		final AuthenticationProviderProperties.Oauth googleProperties =
+				oauthProperties.get(SecurityConfig.GOOGLE_PROVIDER_ID);
+		if (googleProperties != null && googleProperties.isEnabled()) {
+			final ServiceDescription sdesc = new ServiceDescription(
+					SecurityConfig.GOOGLE_PROVIDER_ID,
+					"Google",
+					MessageFormat.format(dialogUrl, SecurityConfig.GOOGLE_PROVIDER_ID),
+					googleProperties.getAllowedRoles()
+			);
+			sdesc.setOrder(googleProperties.getOrder());
+			services.add(sdesc);
+		}
+
+		final AuthenticationProviderProperties.Oauth twitterProperties =
+				oauthProperties.get(SecurityConfig.TWITTER_PROVIDER_ID);
+		if (twitterProperties != null && twitterProperties.isEnabled()) {
+			final ServiceDescription sdesc = new ServiceDescription(
+					SecurityConfig.TWITTER_PROVIDER_ID,
+					"Twitter",
+					MessageFormat.format(dialogUrl, SecurityConfig.TWITTER_PROVIDER_ID),
+					twitterProperties.getAllowedRoles()
+			);
+			sdesc.setOrder(twitterProperties.getOrder());
+			services.add(sdesc);
+		}
+
+		return services;
+	}
+
+	private Collection<GrantedAuthority> getAuthorities(final boolean admin) {
+		final List<GrantedAuthority> authList = new ArrayList<>();
+		authList.add(new SimpleGrantedAuthority("ROLE_USER"));
+		if (admin) {
+			authList.add(new SimpleGrantedAuthority("ROLE_ADMIN"));
+		}
+
+		return authList;
+	}
+}

src/main/java/de/thm/arsnova/controller/v2/CommentController.java

+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2019 The ARSnova Team and Contributors
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.thm.arsnova.controller.v2;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+import de.thm.arsnova.controller.PaginationController;
+import de.thm.arsnova.model.Room;
+import de.thm.arsnova.model.migration.FromV2Migrator;
+import de.thm.arsnova.model.migration.ToV2Migrator;
+import de.thm.arsnova.model.migration.v2.Comment;
+import de.thm.arsnova.model.migration.v2.CommentReadingCount;
+import de.thm.arsnova.service.CommentService;
+import de.thm.arsnova.service.RoomService;
+import de.thm.arsnova.service.UserService;
+import de.thm.arsnova.web.DeprecatedApi;
+import de.thm.arsnova.web.Pagination;
+
+/**
+ * Handles requests related to comments.
+ */
+@RestController("v2CommentController")
+@RequestMapping("/v2/audiencequestion")
+@Api(value = "/audiencequestion", description = "Comment (Interposed/Audience Question) API")
+public class CommentController extends PaginationController {
+
+	@Autowired
+	private CommentService commentService;
+
+	@Autowired
+	private RoomService roomService;
+
+	@Autowired
+	private UserService userService;
+
+	@Autowired
+	private ToV2Migrator toV2Migrator;
+
+	@Autowired
+	private FromV2Migrator fromV2Migrator;
+
+	@ApiOperation(value = "Count all the comments in current room",
+			nickname = "getCommentCount")
+	@GetMapping(value = "/count", produces = MediaType.TEXT_PLAIN_VALUE)
+	@DeprecatedApi
+	@Deprecated
+	public String getCommentCount(
+			@ApiParam(value = "Room-Key from current room", required = true)
+			@RequestParam("sessionkey")
+			final String roomShortId) {
+		return String.valueOf(commentService.count(roomService.getIdByShortId(roomShortId)));
+	}
+
+	@ApiOperation(value = "count all unread comments",
+			nickname = "getUnreadCommentCount")
+	@GetMapping("/readcount")
+	@DeprecatedApi
+	@Deprecated
+	public CommentReadingCount getUnreadCommentCount(
+			@ApiParam(value = "Room-Key from current room", required = true)
+			@RequestParam("sessionkey") final String roomShortId, final String user) {
+		return commentService.countRead(roomService.getIdByShortId(roomShortId), user);
+	}
+
+	@ApiOperation(value = "Retrieves all Comments for a Room",
+			nickname = "getComments")
+	@GetMapping("/")
+	@Pagination
+	public List<Comment> getComments(
+			@ApiParam(value = "Room-Key from current room", required = true)
+			@RequestParam("sessionkey")
+			final String roomShortId) {
+		return commentService.getByRoomId(roomService.getIdByShortId(roomShortId), offset, limit).stream()
+				.map(toV2Migrator::migrate).collect(Collectors.toList());
+	}
+
+	@ApiOperation(value = "Retrieves an Comment",
+			nickname = "getComment")
+	@GetMapping("/{commentId}")
+	public Comment getComment(
+			@ApiParam(value = "ID of the Comment that needs to be deleted", required = true)
+			@PathVariable
+			final String commentId)
+			throws IOException {
+		return toV2Migrator.migrate(commentService.getAndMarkRead(commentId));
+	}
+
+	@ApiOperation(value = "Creates a new Comment for a Room and returns the Comment's data",
+			nickname = "postComment")
+	@ApiResponses(value = {
+			@ApiResponse(code = 400, message = HTML_STATUS_400)
+	})
+	@PostMapping("/")
+	@ResponseStatus(HttpStatus.CREATED)
+	public void postComment(
+			@ApiParam(value = "Room-Key from current room", required = true)
+			@RequestParam("sessionkey")
+			final String roomShortId,
+			@ApiParam(value = "the body from the new comment", required = true)
+			@RequestBody
+			final Comment comment) {
+		final de.thm.arsnova.model.Comment commentV3 = fromV2Migrator.migrate(comment);
+		final Room roomV3 = roomService.getByShortId(roomShortId);
+		commentV3.setRoomId(roomV3.getId());
+		commentService.create(commentV3);
+	}
+
+	@ApiOperation(value = "Deletes a Comment",
+			nickname = "deleteComment")
+	@DeleteMapping("/{commentId}")
+	public void deleteComment(
+			@ApiParam(value = "ID of the comment that needs to be deleted", required = true)
+			@PathVariable
+			final String commentId) {
+		commentService.delete(commentService.get(commentId));
+	}
+}

src/main/java/de/thm/arsnova/controller/v2/ConfigurationController.java

+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2019 The ARSnova Team and Contributors
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.thm.arsnova.controller.v2;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.PostConstruct;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import de.thm.arsnova.config.properties.SystemProperties;
+import de.thm.arsnova.controller.AbstractController;
+
+/**
+ * The ConfigurationController provides frontend clients with information necessary to correctly interact with the
+ * backend and other frontends as well as settings for ARSnova. The the alternative /arsnova-config route is necessary
+ * in case the backend application is deployed as root context.
+ */
+@Controller("v2ConfigurationController")
+@RequestMapping({"/v2/configuration", "/v2/arsnova-config"})
+public class ConfigurationController extends AbstractController {
+	private static final Logger logger = LoggerFactory
+			.getLogger(ConfigurationController.class);
+
+	private ServletContext servletContext;
+	private String apiPath;
+	private String socketioPath;
+
+	@Value("${customization.path}")
+	private String customizationPath;
+
+	@Value("${mobile.path}")
+	private String mobilePath;
+
+	@Value("${presenter.path}")
+	private String presenterPath;
+
+	@Value("${ui.links.overlay.url}")
+	private String overlayUrl;
+
+	@Value("${ui.links.organization.url}")
+	private String organizationUrl;
+
+	@Value("${ui.links.imprint.url}")
+	private String imprintUrl;
+
+	@Value("${ui.links.blog.url:}")
+	private String blogUrl;
+
+	@Value("${ui.links.privacy-policy.url}")
+	private String privacyPolicyUrl;
+
+	@Value("${ui.links.documentation.url}")
+	private String documentationUrl;
+
+	@Value("${ui.links.presenter-documentation.url}")
+	private String presenterDocumentationUrl;
+
+	@Value("${ui.feedback.warning:5}")
+	private String feedbackWarningOffset;
+
+	@Value("${ui.mathjax.enabled:true}")
+	private String mathJaxEnabled;
+
+	@Value("${ui.mathjax.src:}")
+	private String mathJaxSrc;
+
+	@Value("${features.contents.formats.freetext.imageanswer.enabled:false}")
+	private String imageAnswerEnabled;
+
+	@Value("${features.contents.formats.grid-square.enabled:false}")
+	private String gridSquareEnabled;
+
+	private String roomImportExportEnabled = "true";
+
+	@Value("${features.content-pool.enabled:false}")
+	private String publicPoolEnabled;
+
+	@Value("${features.contents.answer-option-limit:8}")
+	private String answerOptionLimit;
+
+	@Value("${system.uploads.max-filesize:}")
+	private String maxUploadFilesize;
+
+	@Value("${ui.parse-answer-option-formatting:false}")
+	private String parseAnswerOptionFormatting;
+
+	@Value("${features.content-pool.subjects}")
+	private String ppSubjects;
+
+	@Value("${features.content-pool.licenses}")
+	private String ppLicenses;
+
+	@Value("${features.content-pool.logo-max-filesize}")
+	private String ppLogoMaxFilesize;
+
+	@Value("${system.uploads.max-filesize}")
+	private String gridImageMaxFileSize;
+
+	@Value("${ui.tracking.provider}")
+	private String trackingProvider;
+
+	@Value("${ui.tracking.tracker-url}")
+	private String trackingTrackerUrl;
+
+	@Value("${ui.tracking.site-id}")
+	private String trackingSiteId;
+
+	@Value("${ui.demo-room-id:}")
+	private String demoRoomShortId;
+
+	@Value("${ui.slogan:}")
+	private String arsnovaSlogan;
+
+	@Value("${ui.splashscreen.logo-path:}")
+	private String splashscreenLogo;
+
+	@Value("${ui.splashscreen.slogan:}")
+	private String splashscreenSlogan;
+
+	@Value("${ui.splashscreen.slogan-color:}")
+	private String splashscreenSloganColor;
+
+	@Value("${ui.splashscreen.background-color:}")
+	private String splashscreenBgColor;
+
+	@Value("${ui.splashscreen.loading-ind-color:}")
+	private String splashscreenLoadingIndColor;
+
+	@Value("${ui.splashscreen.min-delay:}")
+	private String splashscreenDelay;
+
+	@Value("${features.content-pool.session-levels.de}")
+	private String ppLevelsDe;
+
+	@Value("${features.content-pool.session-levels.en}")
+	private String ppLevelsEn;
+
+	public ConfigurationController(final SystemProperties systemProperties, final ServletContext servletContext) {
+		apiPath = systemProperties.getApi().getProxyPath();
+		socketioPath = systemProperties.getSocketio().getProxyPath();
+		this.servletContext = servletContext;
+	}
+
+	@PostConstruct
+	private void init() {
+		if (apiPath == null || "".equals(apiPath)) {
+			apiPath = servletContext.getContextPath();
+		}
+	}
+
+	@GetMapping
+	@ResponseBody
+	public Map<String, Object> getConfiguration(final HttpServletRequest request) {
+		final Map<String, Object> config = new HashMap<>();
+		final Map<String, Boolean> features = new HashMap<>();
+		final Map<String, String> publicPool = new HashMap<>();
+		final Map<String, Object> splashscreen = new HashMap<>();
+
+		config.put("apiPath", apiPath + "/v2");
+
+		if (!"".equals(socketioPath)) {
+			config.put("socketioPath", socketioPath);
+		}
+		if (!"".equals(customizationPath)) {
+			config.put("customizationPath", customizationPath);
+		}
+		if (!"".equals(mobilePath)) {
+			config.put("mobilePath", mobilePath);
+		}
+		if (!"".equals(presenterPath)) {
+			config.put("presenterPath", presenterPath);
+		}
+
+		if (!"".equals(documentationUrl)) {
+			config.put("documentationUrl", documentationUrl);
+		}
+		if (!"".equals(blogUrl)) {
+			config.put("blogUrl", blogUrl);
+		}
+		if (!"".equals(presenterDocumentationUrl)) {
+			config.put("presenterDocumentationUrl", presenterDocumentationUrl);
+		}
+		if (!"".equals(overlayUrl)) {
+			config.put("overlayUrl", overlayUrl);
+		}
+		if (!"".equals(organizationUrl)) {
+			config.put("organizationUrl", organizationUrl);
+		}
+		if (!"".equals(imprintUrl)) {
+			config.put("imprintUrl", imprintUrl);
+		}
+		if (!"".equals(privacyPolicyUrl)) {
+			config.put("privacyPolicyUrl", privacyPolicyUrl);
+		}
+		if (!"".equals(demoRoomShortId)) {
+			config.put("demoRoomShortId", demoRoomShortId);
+		}
+		if (!"".equals(arsnovaSlogan)) {
+			config.put("arsnovaSlogan", arsnovaSlogan);
+		}
+		if (!"".equals(maxUploadFilesize)) {
+			config.put("maxUploadFilesize", maxUploadFilesize);
+		}
+		if (!"".equals(mathJaxSrc) && "true".equals(mathJaxEnabled)) {
+			config.put("mathJaxSrc", mathJaxSrc);
+		}
+
+		config.put("answerOptionLimit", Integer.valueOf(answerOptionLimit));
+		config.put("feedbackWarningOffset", Integer.valueOf(feedbackWarningOffset));
+		config.put("parseAnswerOptionFormatting", Boolean.valueOf(parseAnswerOptionFormatting));
+
+		config.put("features", features);
+
+		features.put("mathJax", "true".equals(mathJaxEnabled));
+		/* Keep the markdown property for now since the frontend still depends on it */
+		features.put("markdown", true);
+		features.put("imageAnswer", "true".equals(imageAnswerEnabled));
+		features.put("gridSquare", "true".equals(gridSquareEnabled));
+		features.put("sessionImportExport", "true".equals(roomImportExportEnabled));
+		features.put("publicPool", "true".equals(publicPoolEnabled));
+		features.put("exportToClick", false);
+
+		// add public pool configuration on demand
+		if (features.get("publicPool")) {
+			config.put("publicPool", publicPool);
+			publicPool.put("subjects", ppSubjects);
+			publicPool.put("licenses", ppLicenses);
+			publicPool.put("logoMaxFilesize", ppLogoMaxFilesize);
+			publicPool.put("levelsDe", ppLevelsDe);
+			publicPool.put("levelsEn", ppLevelsEn);
+		}
+
+		config.put("splashscreen", splashscreen);
+
+		if (!"".equals(splashscreenLogo)) {
+			splashscreen.put("logo", splashscreenLogo);
+		}
+		if (!"".equals(splashscreenSlogan)) {
+			splashscreen.put("slogan", splashscreenSlogan);
+		}
+		if (!"".equals(splashscreenSloganColor)) {
+			splashscreen.put("sloganColor", splashscreenSloganColor);
+		}
+		if (!"".equals(splashscreenBgColor)) {
+			splashscreen.put("bgcolor", splashscreenBgColor);
+		}
+		if (!"".equals(splashscreenLoadingIndColor)) {
+			splashscreen.put("loadIndColor", splashscreenLoadingIndColor);
+		}
+		if (!"".equals(splashscreenDelay)) {
+			splashscreen.put("minDelay", Integer.valueOf(splashscreenDelay));
+		}
+
+		if (!"".equals(trackingTrackerUrl)) {
+			final Map<String, String> tracking = new HashMap<>();
+			config.put("tracking", tracking);
+
+			tracking.put("provider", trackingProvider);
+			tracking.put("trackerUrl", trackingTrackerUrl);
+			tracking.put("siteId", trackingSiteId);
+		}
+
+		config.put("grid", gridImageMaxFileSize);
+
+		return config;
+	}
+}

src/main/java/de/thm/arsnova/controller/v2/ContentController.java

+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2019 The ARSnova Team and Contributors
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.thm.arsnova.controller.v2;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+import javax.naming.OperationNotSupportedException;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+import de.thm.arsnova.controller.PaginationController;
+import de.thm.arsnova.model.ChoiceAnswer;
+import de.thm.arsnova.model.ChoiceQuestionContent;
+import de.thm.arsnova.model.ContentGroup;
+import de.thm.arsnova.model.GridImageContent;
+import de.thm.arsnova.model.TextAnswer;
+import de.thm.arsnova.model.migration.FromV2Migrator;
+import de.thm.arsnova.model.migration.ToV2Migrator;
+import de.thm.arsnova.model.migration.v2.Answer;
+import de.thm.arsnova.model.migration.v2.Content;
+import de.thm.arsnova.service.AnswerService;
+import de.thm.arsnova.service.ContentGroupService;
+import de.thm.arsnova.service.ContentService;
+import de.thm.arsnova.service.RoomService;
+import de.thm.arsnova.service.TimerService;
+import de.thm.arsnova.util.PaginationListDecorator;
+import de.thm.arsnova.web.DeprecatedApi;
+import de.thm.arsnova.web.Pagination;
+import de.thm.arsnova.web.exceptions.BadRequestException;
+import de.thm.arsnova.web.exceptions.ForbiddenException;
+import de.thm.arsnova.web.exceptions.NoContentException;
+import de.thm.arsnova.web.exceptions.NotFoundException;
+import de.thm.arsnova.web.exceptions.NotImplementedException;
+
+/**
+ * Handles requests related to contents.
+ */
+@RestController("v2ContentController")
+@RequestMapping("/v2/lecturerquestion")
+@Api(value = "/lecturerquestion", description = "Content (Skill/Lecturer Question) API")
+public class ContentController extends PaginationController {
+	@Autowired
+	private ContentService contentService;
+
+	@Autowired
+	private ContentGroupService contentGroupService;
+
+	@Autowired
+	private AnswerService answerService;
+
+	@Autowired
+	private RoomService roomService;
+
+	@Autowired
+	private TimerService timerService;
+
+	@Autowired
+	private ToV2Migrator toV2Migrator;
+
+	@Autowired
+	private FromV2Migrator fromV2Migrator;
+
+	@ApiOperation(value = "Get content with provided content Id",
+			nickname = "getContent")
+	@ApiResponses(value = {
+			@ApiResponse(code = 404, message = HTML_STATUS_404)
+	})
+	@GetMapping("/{contentId}")
+	public Content getContent(@PathVariable final String contentId) {
+		final de.thm.arsnova.model.Content content = contentService.get(contentId);
+		if (content != null) {
+			final Optional<ContentGroup> contentGroup = contentGroupService.getByRoomId(content.getRoomId()).stream()
+					.filter(cg -> cg.getContentIds().contains(contentId)).findFirst();
+			final Content contentV2 = toV2Migrator.migrate(content);
+			contentGroup.ifPresent(cg -> contentV2.setQuestionVariant(cg.getName()));
+
+			return contentV2;
+		}
+
+		throw new NotFoundException();
+	}
+
+	@ApiOperation(value = "Post provided content",
+			nickname = "postContent")
+	@ApiResponses(value = {
+			@ApiResponse(code = 400, message = HTML_STATUS_400)
+	})
+	@PostMapping("/")
+	@ResponseStatus(HttpStatus.CREATED)
+	public Content postContent(@RequestBody final Content content) {
+		final de.thm.arsnova.model.Content contentV3 = fromV2Migrator.migrate(content);
+		final String roomId = roomService.getIdByShortId(content.getSessionKeyword());
+		contentV3.setRoomId(roomId);
+		contentService.create(contentV3);
+		contentGroupService.addContentToGroup(roomId, content.getQuestionVariant(), contentV3.getId());
+
+		return toV2Migrator.migrate(contentV3);
+	}
+
+	@ApiOperation(value = "Post provided contents", nickname = "bulkPostContents")
+	@ApiResponses(value = {
+			@ApiResponse(code = 400, message = HTML_STATUS_400)
+	})
+	@PostMapping("/bulk")
+	@ResponseStatus(HttpStatus.CREATED)
+	public List<Content> bulkPostContents(@RequestBody final List<Content> contents) {
+		final List<de.thm.arsnova.model.Content> contentsV3 =
+				contents.stream().map(c -> contentService.create(fromV2Migrator.migrate(c))).collect(Collectors.toList());
+		return contentsV3.stream().map(toV2Migrator::migrate).collect(Collectors.toList());
+	}
+
+	@ApiOperation(value = "Update the content, identified by provided id, with the provided content in the Request Body",
+			nickname = "updateContent")
+	@ApiResponses(value = {
+			@ApiResponse(code = 400, message = HTML_STATUS_400)
+	})
+	@PutMapping("/{contentId}")
+	public Content updateContent(
+			@PathVariable final String contentId,
+			@RequestBody final Content content) {
+		return toV2Migrator.migrate(contentService.update(fromV2Migrator.migrate(content)));
+	}
+
+	@ApiOperation(value = "Start new Pi Round on content, identified by provided id, with an optional time",
+			nickname = "startPiRound")
+	@GetMapping("/{contentId}/questionimage")
+	public String getContentImage(
+			@PathVariable final String contentId,
+			@RequestParam(value = "fcImage", defaultValue = "false", required = false) final boolean fcImage) {
+
+		throw new NotImplementedException();
+	}
+
+	@PostMapping("/{contentId}/startnewpiround")
+	public void startPiRound(
+			@PathVariable final String contentId,
+			@RequestParam(value = "time", defaultValue = "0", required = false) final int time) {
+
+		if (time == 0) {
+			timerService.startNewRound(contentId);
+		} else {
+			timerService.startNewRoundDelayed(contentId, time);
+		}
+	}
+
+	@PostMapping("/{contentId}/canceldelayedpiround")
+	@ApiOperation(value = "Cancel Pi Round on content, identified by provided id",
+			nickname = "cancelPiRound")
+	public void cancelPiRound(
+			@PathVariable final String contentId) {
+		timerService.cancelRoundChange(contentId);
+	}
+
+	@PostMapping("/{contentId}/resetpiroundstate")
+	@ApiOperation(value = "Reset Pi Round on content, identified by provided id",
+			nickname = "resetPiContent")
+	public void resetPiContent(
+			@PathVariable final String contentId) {
+		timerService.resetRoundState(contentId);
+	}
+
+	@ApiOperation(value = "Set voting admission on content, identified by provided id",
+			nickname = "setVotingAdmission")
+	@PostMapping("/{contentId}/disablevote")
+	public void setVotingAdmission(
+			@PathVariable final String contentId,
+			@RequestParam(value = "disable", defaultValue = "false", required = false) final Boolean disableVote) {
+		boolean disable = false;
+
+		if (disableVote != null) {
+			disable = disableVote;
+		}
+
+		contentService.setVotingAdmission(contentId, disable);
+	}
+
+	@ApiOperation(value = "Set voting admission for all contents",
+			nickname = "setVotingAdmissionForAllContents")
+	@PostMapping("/disablevote")
+	public void setVotingAdmissionForAllContents(
+			@RequestParam(value = "sessionkey")
+			final String roomShortId,
+			@RequestParam(value = "disable", defaultValue = "false", required = false)
+			final Boolean disableVote,
+			@RequestParam(value = "lecturequestionsonly", defaultValue = "false", required = false) final
+			boolean lectureContentsOnly,
+			@RequestParam(value = "preparationquestionsonly", defaultValue = "false", required = false) final
+			boolean preparationContentsOnly) {
+		final String roomId = roomService.getIdByShortId(roomShortId);
+		boolean disable = false;
+		final Iterable<de.thm.arsnova.model.Content> contents;
+
+		if (disableVote != null) {
+			disable = disableVote;
+		}
+
+		if (lectureContentsOnly) {
+			contents = contentService.getByRoomIdAndGroup(roomId, "lecture");
+			contentService.setVotingAdmissions(roomId, disable, contents);
+		} else if (preparationContentsOnly) {
+			contents = contentService.getByRoomIdAndGroup(roomId, "preparation");
+			contentService.setVotingAdmissions(roomId, disable, contents);
+		} else {
+			contents = contentService.getByRoomId(roomId);
+			contentService.setVotingAdmissions(roomId, disable, contents);
+		}
+	}
+
+	@ApiOperation(value = "Publish a content, identified by provided id and content in Request Body.",
+			nickname = "publishContent")
+	@PostMapping("/{contentId}/publish")
+	public void publishContent(
+			@PathVariable final String contentId,
+			@RequestParam(defaultValue = "true", required = false) final boolean publish,
+			@RequestBody final Content content
+	) throws IOException {
+		final de.thm.arsnova.model.Content contentV3 = fromV2Migrator.migrate(content);
+		boolean p = publish;
+		if (content != null) {
+			p = contentV3.getState().isVisible();
+		}
+		contentService.patch(contentV3, Collections.singletonMap("visible", p), de.thm.arsnova.model.Content::getState);
+	}
+
+	@ApiOperation(value = "Publish all contents",
+			nickname = "publishAllContents")
+	@PostMapping("/publish")
+	public void publishAllContents(
+			@RequestParam(value = "sessionkey")
+			final String roomShortId,
+			@RequestParam(required = false)
+			final Boolean publish,
+			@RequestParam(value = "lecturequestionsonly", defaultValue = "false", required = false) final
+			boolean lectureContentsOnly,
+			@RequestParam(value = "preparationquestionsonly", defaultValue = "false", required = false) final
+			boolean preparationContentsOnly
+	) throws IOException {
+		final String roomId = roomService.getIdByShortId(roomShortId);
+		final boolean p = publish == null || publish;
+		final Iterable<de.thm.arsnova.model.Content> contents;
+
+		if (lectureContentsOnly) {
+			contents = contentService.getByRoomIdAndGroup(roomId, "lecture");
+			contentService.publishContents(roomId, p, contents);
+		} else if (preparationContentsOnly) {
+			contents = contentService.getByRoomIdAndGroup(roomId, "preparation");
+			contentService.publishContents(roomId, p, contents);
+		} else {
+			contentService.publishAll(roomId, p);
+		}
+	}
+
+	@ApiOperation(value = "Publish statistics from content with provided id",
+			nickname = "publishStatistics")
+	@PostMapping("/{contentId}/publishstatistics")
+	public void publishStatistics(
+			@PathVariable final String contentId,
+			@RequestParam(defaultValue = "true", required = false) final Boolean showStatistics,
+			@RequestBody final Content content
+	) throws IOException {
+		final de.thm.arsnova.model.Content contentV3 = fromV2Migrator.migrate(content);
+		boolean p = showStatistics;
+		if (content != null) {
+			p = contentV3.getState().isResponsesVisible();
+		}
+		contentService.patch(contentV3, Collections.singletonMap("responsesVisible", p),
+				de.thm.arsnova.model.Content::getState);
+	}
+
+	@ApiOperation(value = "Publish correct answer from content with provided id",
+			nickname = "publishCorrectAnswer")
+	@PostMapping("/{contentId}/publishcorrectanswer")
+	public void publishCorrectAnswer(
+			@PathVariable final String contentId,
+			@RequestParam(defaultValue = "true", required = false) final boolean showCorrectAnswer,
+			@RequestBody final Content content
+	) throws IOException {
+		final de.thm.arsnova.model.Content contentV3 = fromV2Migrator.migrate(content);
+		boolean p = showCorrectAnswer;
+		if (content != null) {
+			p = contentV3.getState().isAdditionalTextVisible();
+		}
+		contentService.patch(contentV3, Collections.singletonMap("solutionVisible", p),
+				de.thm.arsnova.model.Content::getState);
+	}
+
+	@ApiOperation(value = "Get contents",
+			nickname = "getContents")
+	@GetMapping("/")
+	@Pagination
+	public List<Content> getContents(
+			@RequestParam(value = "sessionkey") final String roomShortId,
+			@RequestParam(value = "lecturequestionsonly", defaultValue = "false") final boolean lectureContentsOnly,
+			@RequestParam(value = "flashcardsonly", defaultValue = "false") final boolean flashcardsOnly,
+			@RequestParam(value = "preparationquestionsonly", defaultValue = "false") final boolean preparationContentsOnly,
+			@RequestParam(value = "requestImageData", defaultValue = "false") final boolean requestImageData,
+			final HttpServletResponse response) {
+		final String roomId = roomService.getIdByShortId(roomShortId);
+		final Iterable<de.thm.arsnova.model.Content> contents;
+		if (lectureContentsOnly) {
+			contents = contentService.getByRoomIdAndGroup(roomId, "lecture");
+		} else if (flashcardsOnly) {
+			contents = contentService.getByRoomIdAndGroup(roomId, "flashcard");
+		} else if (preparationContentsOnly) {
+			contents = contentService.getByRoomIdAndGroup(roomId, "preparation");
+		} else {
+			contents = contentService.getByRoomId(roomId);
+		}
+		if (contents == null || !contents.iterator().hasNext()) {
+			response.setStatus(HttpStatus.NO_CONTENT.value());
+			return null;
+		}
+
+		return new PaginationListDecorator<>(StreamSupport.stream(contents.spliterator(), false)
+				.map(toV2Migrator::migrate).collect(Collectors.toList()), offset, limit);
+	}
+
+	@ApiOperation(value = "Delete contents",
+			nickname = "deleteContents")
+	@DeleteMapping("/")
+	public void deleteContents(
+			@RequestParam(value = "sessionkey")
+			final String roomShortId,
+			@RequestParam(value = "lecturequestionsonly", defaultValue = "false")
+			final boolean lectureContentsOnly,
+			@RequestParam(value = "flashcardsonly", defaultValue = "false")
+			final boolean flashcardsOnly,
+			@RequestParam(value = "preparationquestionsonly", defaultValue = "false")
+			final boolean preparationContentsOnly,
+			final HttpServletResponse response) {
+		final String roomId = roomService.getIdByShortId(roomShortId);
+		if (lectureContentsOnly) {
+			contentService.deleteLectureContents(roomId);
+		} else if (preparationContentsOnly) {
+			contentService.deletePreparationContents(roomId);
+		} else if (flashcardsOnly) {
+			contentService.deleteFlashcards(roomId);
+		} else {
+			contentService.deleteAllContents(roomId);
+		}
+	}
+
+	@ApiOperation(value = "Get the amount of contents by the room-key",
+			nickname = "getContentCount")
+	@DeprecatedApi
+	@Deprecated
+	@GetMapping(value = "/count", produces = MediaType.TEXT_PLAIN_VALUE)
+	public String getContentCount(
+			@RequestParam(value = "sessionkey") final String roomShortId,
+			@RequestParam(value = "lecturequestionsonly", defaultValue = "false") final boolean lectureContentsOnly,
+			@RequestParam(value = "flashcardsonly", defaultValue = "false") final boolean flashcardsOnly,
+			@RequestParam(value = "preparationquestionsonly", defaultValue = "false") final boolean preparationContentsOnly) {
+		final String roomId = roomService.getIdByShortId(roomShortId);
+		final int count;
+		if (lectureContentsOnly) {
+			count = contentService.countByRoomIdAndGroup(roomId, "lecture");
+		} else if (preparationContentsOnly) {
+			count = contentService.countByRoomIdAndGroup(roomId, "preparation");
+		} else if (flashcardsOnly) {
+			count = contentService.countByRoomIdAndGroup(roomId, "flashcard");
+		} else {
+			count = contentService.countByRoomId(roomId);
+		}
+
+		return String.valueOf(count);
+	}
+
+	@ApiOperation(value = "Delete answers and content",
+			nickname = "deleteAnswersAndContent")
+	@DeleteMapping("/{contentId}")
+	public void deleteAnswersAndContent(
+			@PathVariable final String contentId) {
+		contentService.delete(contentId);
+	}
+
+	@ApiOperation(value = "Get unanswered content IDs by provided room short ID",
+			nickname = "getUnAnsweredContentIds")
+	@DeprecatedApi
+	@Deprecated
+	@GetMapping("/unanswered")
+	public List<String> getUnAnsweredContentIds(
+			@RequestParam(value = "sessionkey")
+			final String roomShortId,
+			@RequestParam(value = "lecturequestionsonly", defaultValue = "false")
+			final boolean lectureContentsOnly,
+			@RequestParam(value = "preparationquestionsonly", defaultValue = "false")
+			final boolean preparationContentsOnly) {
+		final String roomId = roomService.getIdByShortId(roomShortId);
+		final List<String> answers;
+		if (lectureContentsOnly) {
+			answers = contentService.getUnAnsweredLectureContentIds(roomId);
+		} else if (preparationContentsOnly) {
+			answers = contentService.getUnAnsweredPreparationContentIds(roomId);
+		} else {
+			answers = contentService.getUnAnsweredContentIds(roomId);
+		}
+		if (answers == null || answers.isEmpty()) {
+			throw new NoContentException();
+		}
+
+		return answers;
+	}
+
+	/**
+	 * Returns a JSON document which represents the given answer of a content.
+	 *
+	 * @param contentId
+	 *            CouchDB Content ID for which the given answer should be
+	 *            retrieved
+	 * @return JSON Document of {@link Answer} or {@link NotFoundException}
+	 * @throws NotFoundException
+	 *             if wrong room, wrong content or no answer was given by
+	 *             the current user
+	 * @throws ForbiddenException
+	 *             if not logged in
+	 */
+	@ApiOperation(value = "Get my answer for a content, identified by provided content ID",
+			nickname = "getMyAnswer")
+	@DeprecatedApi
+	@Deprecated
+	@GetMapping("/{contentId}/myanswer")
+	public Answer getMyAnswer(
+			@PathVariable final String contentId,
+			final HttpServletResponse response) {
+		final de.thm.arsnova.model.Content content = contentService.get(contentId);
+		final de.thm.arsnova.model.Answer answer = answerService.getMyAnswer(contentId);
+		if (answer == null) {
+			response.setStatus(HttpStatus.NO_CONTENT.value());
+			return null;
+		}
+
+		if (content.getFormat().equals(de.thm.arsnova.model.Content.Format.TEXT)) {
+			return toV2Migrator.migrate((TextAnswer) answer);
+		} else {
+			return toV2Migrator.migrate((ChoiceAnswer) answer, content);
+		}
+	}
+
+	/**
+	 * Returns a list of {@link Answer}s encoded as a JSON document for a given
+	 * content id. In this case only {@link Answer} <tt>contentId</tt>,
+	 * <tt>answerText</tt>, <tt>answerSubject</tt> and <tt>answerCount</tt>
+	 * properties are set.
+	 *
+	 * @param contentId
+	 *            CouchDB Content ID for which the given answers should be
+	 *            retrieved
+	 * @throws NotFoundException
+	 *             if wrong room, wrong content or no answers was given
+	 * @throws ForbiddenException
+	 *             if not logged in
+	 */
+	@ApiOperation(value = "Get answers for a content, identified by provided content ID",
+			nickname = "getAnswers")
+	@GetMapping("/{contentId}/answer/")
+	public List<Answer> getAnswers(
+			@PathVariable final String contentId,
+			@RequestParam(value = "piround", required = false) final Integer piRound,
+			@RequestParam(value = "all", required = false, defaultValue = "false") final Boolean allAnswers,
+			final HttpServletResponse response) {
+		final de.thm.arsnova.model.Content content = contentService.get(contentId);
+		if (content instanceof ChoiceQuestionContent || content instanceof GridImageContent) {
+			return toV2Migrator.migrate(answerService.getAllStatistics(contentId),
+					content, content.getState().getRound());
+		} else {
+			final List<de.thm.arsnova.model.TextAnswer> answers;
+			if (allAnswers) {
+				answers = answerService.getAllTextAnswers(contentId, -1, -1);
+			} else if (null == piRound) {
+				answers = answerService.getTextAnswers(contentId, offset, limit);
+			} else {
+				if (piRound < 1 || piRound > 2) {
+					response.setStatus(HttpStatus.BAD_REQUEST.value());
+
+					return null;
+				}
+				answers = answerService.getTextAnswers(contentId, piRound, offset, limit);
+			}
+			if (answers == null) {
+				return new ArrayList<>();
+			}
+			return answers.stream().map(toV2Migrator::migrate).collect(Collectors.toList());
+		}
+	}
+
+	@ApiOperation(value = "Save answer, provided in the Request Body, for a content, identified by provided content ID",
+			nickname = "saveAnswer")
+	@PostMapping("/{contentId}/answer/")
+	public Answer saveAnswer(
+			@PathVariable final String contentId,
+			@RequestBody final Answer answer,
+			final HttpServletResponse response) {
+		final de.thm.arsnova.model.Content content = contentService.get(contentId);
+		final de.thm.arsnova.model.Answer answerV3 = fromV2Migrator.migrate(answer, content);
+		if (answerV3.getContentId() == null) {
+			answerV3.setContentId(contentId);
+		}
+		if (!contentId.equals(answerV3.getContentId())) {
+			throw new BadRequestException("Mismatching content IDs.");
+		}
+
+		if (answerV3 instanceof TextAnswer) {
+			return toV2Migrator.migrate((TextAnswer) answerService.create(answerV3));
+		} else {
+			return  toV2Migrator.migrate((ChoiceAnswer) answerService.create(answerV3), content);
+		}
+	}
+
+	@ApiOperation(value = "Update answer, provided in Request Body, identified by content ID and answer ID",
+			nickname = "updateAnswer")
+	@PutMapping("/{contentId}/answer/{answerId}")
+	public Answer updateAnswer(
+			@PathVariable final String contentId,
+			@PathVariable final String answerId,
+			@RequestBody final Answer answer,
+			final HttpServletResponse response) {
+		final de.thm.arsnova.model.Content content = contentService.get(contentId);
+		final de.thm.arsnova.model.Answer answerV3 = fromV2Migrator.migrate(answer, content);
+
+		if (answerV3 instanceof TextAnswer) {
+			return toV2Migrator.migrate((TextAnswer) answerService.update(answerV3));
+		} else {
+			return  toV2Migrator.migrate((ChoiceAnswer) answerService.update(answerV3), content);
+		}
+	}
+
+	@ApiOperation(value = "Get Image, identified by content ID and answer ID",
+			nickname = "getImage")
+	@GetMapping("/{contentId}/answer/{answerId}/image")
+	public String getImage(
+			@PathVariable final String contentId,
+			@PathVariable final String answerId,
+			final HttpServletResponse response) {
+
+		throw new NotImplementedException();
+	}
+
+	@ApiOperation(value = "Delete answer, identified by content ID and answer ID",
+			nickname = "deleteAnswer")
+	@DeleteMapping("/{contentId}/answer/{answerId}")
+	public void deleteAnswer(
+			@PathVariable final String contentId,
+			@PathVariable final String answerId,
+			final HttpServletResponse response) {
+		answerService.delete(answerService.get(answerId));
+	}
+
+	@ApiOperation(value = "Delete answers from a content, identified by content ID",
+			nickname = "deleteAnswers")
+	@DeleteMapping("/{contentId}/answer/")
+	public void deleteAnswers(
+			@PathVariable final String contentId,
+			final HttpServletResponse response) {
+		answerService.deleteAnswers(contentId);
+	}
+
+	@ApiOperation(value = "Delete all answers and contents from a room, identified by room short ID",
+			nickname = "deleteAllContentsAnswers")
+	@DeleteMapping("/answers")
+	public void deleteAllContentsAnswers(
+			@RequestParam(value = "sessionkey")
+			final String roomShortId,
+			@RequestParam(value = "lecturequestionsonly", defaultValue = "false")
+			final boolean lectureContentsOnly,
+			@RequestParam(value = "preparationquestionsonly", defaultValue = "false")
+			final boolean preparationContentsOnly,
+			final HttpServletResponse response) {
+		final String roomId = roomService.getIdByShortId(roomShortId);
+		if (lectureContentsOnly) {
+			contentService.deleteAllLectureAnswers(roomId);
+		} else if (preparationContentsOnly) {
+			contentService.deleteAllPreparationAnswers(roomId);
+		} else {
+			contentService.deleteAllContentsAnswers(roomId);
+		}
+	}
+
+	/**
+	 * Returns the count of answers for given content ID.
+	 *
+	 * @param contentId
+	 *            Content ID for which the given answers should be
+	 *            retrieved
+	 * @throws NotFoundException
+	 *             if wrong room or wrong content
+	 * @throws ForbiddenException
+	 *             if not logged in
+	 */
+	@ApiOperation(value = "Get the amount of answers for a content, identified by content ID",
+			nickname = "getAnswerCount")
+	@DeprecatedApi
+	@Deprecated
+	@GetMapping(value = "/{contentId}/answercount", produces = MediaType.TEXT_PLAIN_VALUE)
+	public String getAnswerCount(@PathVariable final String contentId) {
+		return String.valueOf(answerService.countAnswersByContentIdAndRound(contentId));
+	}
+
+	@ApiOperation(value = "Get the amount of answers for a content, identified by the content ID",
+			nickname = "getAllAnswerCount")
+	@GetMapping("/{contentId}/allroundanswercount")
+	public List<Integer> getAllAnswerCount(@PathVariable final String contentId) {
+		return Arrays.asList(
+				answerService.countAnswersByContentIdAndRound(contentId, 1),
+				answerService.countAnswersByContentIdAndRound(contentId, 2)
+		);
+	}
+
+	@ApiOperation(value = "Get the total amount of answers by a content, identified by the content ID",
+			nickname = "getTotalAnswerCountByContent")
+	@GetMapping(value = "/{contentId}/totalanswercount", produces = MediaType.TEXT_PLAIN_VALUE)
+	public String getTotalAnswerCountByContent(@PathVariable final String contentId) {
+		return String.valueOf(answerService.countTotalAnswersByContentId(contentId));
+	}
+
+	@ApiOperation(value = "Get the amount of answers and abstention answers by a content, identified by the content ID",
+			nickname = "getAnswerAndAbstentionCount")
+	@GetMapping("/{contentId}/answerandabstentioncount")
+	public List<Integer> getAnswerAndAbstentionCount(@PathVariable final String contentId) {
+		return Arrays.asList(
+				answerService.countAnswersByContentIdAndRound(contentId),
+				answerService.countTotalAbstentionsByContentId(contentId)
+		);
+	}
+
+	@ApiOperation(value = "Get all Freetext answers by a content, identified by the content ID",
+			nickname = "getFreetextAnswers")
+	@GetMapping("/{contentId}/freetextanswer/")
+	@Pagination
+	public List<Answer> getFreetextAnswers(@PathVariable final String contentId) {
+		return answerService.getTextAnswersByContentId(contentId, offset, limit).stream()
+				.map(toV2Migrator::migrate).collect(Collectors.toList());
+	}
+
+	@ApiOperation(value = "Get my answers of an room, identified by the room short ID",
+			nickname = "getMyAnswers")
+	@DeprecatedApi
+	@Deprecated
+	@GetMapping("/myanswers")
+	public List<Answer> getMyAnswers(@RequestParam(value = "sessionkey") final String roomShortId)
+			throws OperationNotSupportedException {
+		return answerService.getMyAnswersByRoomId(roomService.getIdByShortId(roomShortId)).stream()
+				.map(a -> {
+					if (a instanceof ChoiceAnswer) {
+						return toV2Migrator.migrate(
+								(ChoiceAnswer) a, contentService.get(a.getContentId()));
+					} else {
+						return toV2Migrator.migrate((TextAnswer) a);
+					}
+				}).collect(Collectors.toList());
+	}
+
+	@ApiOperation(value = "Get the total amount of answers of a room, identified by the room short ID",
+			nickname = "getTotalAnswerCount")
+	@DeprecatedApi
+	@Deprecated
+	@GetMapping(value = "/answercount", produces = MediaType.TEXT_PLAIN_VALUE)
+	public String getTotalAnswerCount(
+			@RequestParam(value = "sessionkey")
+			final String roomShortId,
+			@RequestParam(value = "lecturequestionsonly", defaultValue = "false")
+			final boolean lectureContentsOnly,
+			@RequestParam(value = "preparationquestionsonly", defaultValue = "false")
+			final boolean preparationContentsOnly) {
+		final String roomId = roomService.getIdByShortId(roomShortId);
+		int count = 0;
+		if (lectureContentsOnly) {
+			count = answerService.countLectureContentAnswers(roomId);
+		} else if (preparationContentsOnly) {
+			count = answerService.countPreparationContentAnswers(roomId);
+		} else {
+			count = answerService.countTotalAnswersByRoomId(roomId);
+		}
+
+		return String.valueOf(count);
+	}
+}

src/main/java/de/thm/arsnova/controller/CourseController.java → src/main/java/de/thm/arsnova/controller/v2/CourseController.java

 /*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2019 The ARSnova Team and Contributors
  *
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -16,45 +15,44 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package de.thm.arsnova.controller;
 
+package de.thm.arsnova.controller.v2;
+
+import io.swagger.annotations.ApiParam;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import de.thm.arsnova.connector.client.ConnectorClient;
 import de.thm.arsnova.connector.model.Course;
 import de.thm.arsnova.connector.model.UserRole;
-import de.thm.arsnova.entities.User;
-import de.thm.arsnova.exceptions.NotImplementedException;
-import de.thm.arsnova.exceptions.UnauthorizedException;
-import de.thm.arsnova.services.IUserService;
-
-@RestController
+import de.thm.arsnova.controller.AbstractController;
+import de.thm.arsnova.security.User;
+import de.thm.arsnova.service.UserService;
+import de.thm.arsnova.web.exceptions.NotImplementedException;
+import de.thm.arsnova.web.exceptions.UnauthorizedException;
+
+/**
+ * Provides access to a user's courses in an LMS such as Moodle.
+ */
+@RestController("v2CourseController")
 public class CourseController extends AbstractController {
-
-	public static final Logger LOGGER = LoggerFactory.getLogger(CourseController.class);
-
 	@Autowired(required = false)
 	private ConnectorClient connectorClient;
 
 	@Autowired
-	private IUserService userService;
+	private UserService userService;
 
-	@RequestMapping(value = "/mycourses", method = RequestMethod.GET)
-	public final List<Course> myCourses(
-			@RequestParam(value = "sortby", defaultValue = "name") final String sortby
-			) {
+	@GetMapping("/v2/mycourses")
+	public List<Course> myCourses(
+			@ApiParam(value = "sort my courses by name", required = true)
+			@RequestParam(value = "sortby", defaultValue = "name") final String sortby) {
 
 		final User currentUser = userService.getCurrentUser();
 
@@ -66,13 +64,12 @@ public class CourseController extends AbstractController {
 			throw new NotImplementedException();
 		}
 
-		final List<Course> result = new ArrayList<Course>();
+		final List<Course> result = new ArrayList<>();
 
 		for (final Course course : connectorClient.getCourses(currentUser.getUsername()).getCourse()) {
 			if (
 					course.getMembership().isMember()
-					&& course.getMembership().getUserrole().equals(UserRole.TEACHER)
-					) {
+					&& course.getMembership().getUserrole().equals(UserRole.TEACHER)) {
 				result.add(course);
 			}
 		}

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

 /*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2019 The ARSnova Team and Contributors
  *
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -16,87 +15,100 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package de.thm.arsnova.controller;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+package de.thm.arsnova.controller.v2;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import de.thm.arsnova.entities.Feedback;
-import de.thm.arsnova.entities.User;
-import de.thm.arsnova.exceptions.NotFoundException;
-import de.thm.arsnova.services.IFeedbackService;
-import de.thm.arsnova.services.IUserService;
+import de.thm.arsnova.controller.AbstractController;
+import de.thm.arsnova.model.Feedback;
+import de.thm.arsnova.security.User;
+import de.thm.arsnova.service.FeedbackService;
+import de.thm.arsnova.service.RoomService;
+import de.thm.arsnova.service.UserService;
 import de.thm.arsnova.web.DeprecatedApi;
+import de.thm.arsnova.web.exceptions.NotFoundException;
+import de.thm.arsnova.websocket.ArsnovaSocketioServerImpl;
 
-@RestController
+/**
+ * Handles requests concerning the user's feedback, i.e., "too fast" or "faster, please". This HTTP API is
+ * deprecated in favor of the socket implementation.
+ *
+ * @see ArsnovaSocketioServerImpl
+ */
+@RestController("v2FeedbackController")
+@RequestMapping("/v2/session/{shortId}")
 public class FeedbackController extends AbstractController {
-
-	public static final Logger LOGGER = LoggerFactory.getLogger(FeedbackController.class);
+	@Autowired
+	private FeedbackService feedbackService;
 
 	@Autowired
-	private IFeedbackService feedbackService;
+	private RoomService roomService;
 
 	@Autowired
-	private IUserService userService;
+	private UserService userService;
 
 	@DeprecatedApi
-	@RequestMapping(value = "/session/{sessionkey}/feedback", method = RequestMethod.GET)
-	public final Feedback getFeedback(@PathVariable final String sessionkey) {
-		return feedbackService.getFeedback(sessionkey);
+	@Deprecated
+	@GetMapping("/feedback")
+	public Feedback getFeedback(@PathVariable final String shortId) {
+		return feedbackService.getByRoomId(roomService.getIdByShortId(shortId));
 	}
 
 	@DeprecatedApi
-	@RequestMapping(value = "/session/{sessionkey}/myfeedback", method = RequestMethod.GET)
-	public final Integer getMyFeedback(@PathVariable final String sessionkey) {
-		Integer value = feedbackService.getMyFeedback(sessionkey, userService.getCurrentUser());
+	@Deprecated
+	@GetMapping(value = "/myfeedback", produces = MediaType.TEXT_PLAIN_VALUE)
+	public String getMyFeedback(@PathVariable final String shortId) {
+		final String roomId = roomService.getIdByShortId(shortId);
+		final Integer value = feedbackService.getByRoomIdAndUserId(roomId, userService.getCurrentUser().getId());
 		if (value != null && value >= Feedback.MIN_FEEDBACK_TYPE && value <= Feedback.MAX_FEEDBACK_TYPE) {
-			return value;
+			return value.toString();
 		}
 		throw new NotFoundException();
 	}
 
 	@DeprecatedApi
-	@RequestMapping(value = "/session/{sessionkey}/feedbackcount", method = RequestMethod.GET)
-	public final int getFeedbackCount(@PathVariable final String sessionkey) {
-		return feedbackService.getFeedbackCount(sessionkey);
+	@Deprecated
+	@GetMapping(value = "/feedbackcount", produces = MediaType.TEXT_PLAIN_VALUE)
+	public String getFeedbackCount(@PathVariable final String shortId) {
+		return String.valueOf(feedbackService.countFeedbackByRoomId(roomService.getIdByShortId(shortId)));
 	}
 
 	@DeprecatedApi
-	@RequestMapping(value = "/session/{sessionkey}/roundedaveragefeedback", method = RequestMethod.GET)
-	public final long getAverageFeedbackRounded(@PathVariable final String sessionkey) {
-		return feedbackService.getAverageFeedbackRounded(sessionkey);
+	@Deprecated
+	@GetMapping(value = "/roundedaveragefeedback", produces = MediaType.TEXT_PLAIN_VALUE)
+	public String getAverageFeedbackRounded(@PathVariable final String shortId) {
+		return String.valueOf(feedbackService.calculateRoundedAverageFeedback(roomService.getIdByShortId(shortId)));
 	}
 
 	@DeprecatedApi
-	@RequestMapping(value = "/session/{sessionkey}/averagefeedback", method = RequestMethod.GET)
-	public final double getAverageFeedback(@PathVariable final String sessionkey) {
-		return feedbackService.getAverageFeedback(sessionkey);
+	@Deprecated
+	@GetMapping(value = "/averagefeedback", produces = MediaType.TEXT_PLAIN_VALUE)
+	public String getAverageFeedback(@PathVariable final String shortId) {
+		return String.valueOf(feedbackService.calculateAverageFeedback(roomService.getIdByShortId(shortId)));
 	}
 
 	@DeprecatedApi
-	@RequestMapping(value = "/session/{sessionkey}/feedback", method = RequestMethod.POST)
+	@Deprecated
+	@PostMapping("/feedback")
 	@ResponseStatus(HttpStatus.CREATED)
-	public final Feedback postFeedback(
-			@PathVariable final String sessionkey,
-			@RequestBody final int value
-			) {
-		User user = userService.getCurrentUser();
-		if (feedbackService.saveFeedback(sessionkey, value, user)) {
-			Feedback feedback = feedbackService.getFeedback(sessionkey);
-			if (feedback != null) {
-				return feedback;
-			}
-			throw new RuntimeException();
-		}
+	public Feedback postFeedback(
+			@PathVariable final String shortId,
+			@RequestBody final int value) {
+		final String roomId = roomService.getIdByShortId(shortId);
+		final User user = userService.getCurrentUser();
+		feedbackService.save(roomId, value, user.getId());
+		final Feedback feedback = feedbackService.getByRoomId(roomId);
 
-		throw new NotFoundException();
+		return feedback;
 	}
 }

src/main/java/de/thm/arsnova/controller/v2/LegacyController.java

+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2019 The ARSnova Team and Contributors
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.thm.arsnova.controller.v2;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import de.thm.arsnova.controller.AbstractController;
+import de.thm.arsnova.service.CommentService;
+import de.thm.arsnova.service.ContentService;
+import de.thm.arsnova.web.DeprecatedApi;
+
+/**
+ * This controller forwards requests from deprecated URLs to their new controller, where the requests are handled.
+ */
+@Controller("v2LegacyController")
+@RequestMapping("/v2")
+public class LegacyController extends AbstractController {
+
+	@Autowired
+	private ContentService contentService;
+
+	@Autowired
+	private CommentService commentService;
+
+	/* specific routes */
+
+	@DeprecatedApi
+	@GetMapping("/session/mysessions")
+	public String redirectSessionMy() {
+		return "forward:/v2/session/?ownedonly=true";
+	}
+
+	@DeprecatedApi
+	@GetMapping("/session/visitedsessions")
+	public String redirectSessionVisited() {
+		return "forward:/v2/session/?visitedonly=true";
+	}
+
+	@DeprecatedApi
+	@RequestMapping(value = "/session/{shortId}/question")
+	public String redirectQuestionByLecturer(@PathVariable final String shortId) {
+		return String.format("forward:/v2/lecturerquestion/?sessionkey=%s", shortId);
+	}
+
+	@DeprecatedApi
+	@GetMapping("/session/{shortId}/skillquestions")
+	public String redirectQuestionByLecturerList(@PathVariable final String shortId) {
+		return String.format("forward:/v2/lecturerquestion/?sessionkey=%s", shortId);
+	}
+
+	@DeprecatedApi
+	@GetMapping("/session/{shortId}/skillquestioncount")
+	public String redirectQuestionByLecturerCount(@PathVariable final String shortId) {
+		return String.format("forward:/v2/lecturerquestion/count?sessionkey=%s", shortId);
+	}
+
+	@DeprecatedApi
+	@GetMapping("/session/{shortId}/answercount")
+	public String redirectQuestionByLecturerAnswerCount(@PathVariable final String shortId) {
+		return String.format("forward:/v2/lecturerquestion/answercount?sessionkey=%s", shortId);
+	}
+
+	@DeprecatedApi
+	@GetMapping("/session/{shortId}/unanswered")
+	public String redirectQuestionByLecturerUnnsweredCount(@PathVariable final String shortId) {
+		return String.format("forward:/v2/lecturerquestion/answercount?sessionkey=%s", shortId);
+	}
+
+	@DeprecatedApi
+	@GetMapping("/session/{shortId}/myanswers")
+	public String redirectQuestionByLecturerMyAnswers(@PathVariable final String shortId) {
+		return String.format("forward:/v2/lecturerquestion/myanswers?sessionkey=%s", shortId);
+	}
+
+	@DeprecatedApi
+	@RequestMapping(value = "/session/{shortId}/interposed")
+	public String redirectQuestionByAudience(@PathVariable final String shortId) {
+		return String.format("forward:/v2/audiencequestion/?sessionkey=%s", shortId);
+	}
+
+	@DeprecatedApi
+	@DeleteMapping("/session/{shortId}/interposed")
+	@ResponseBody
+	public void deleteAllInterposedQuestions(@PathVariable final String shortId) {
+		commentService.deleteByRoomId(shortId);
+	}
+
+	@DeprecatedApi
+	@GetMapping("/session/{shortId}/interposedcount")
+	public String redirectQuestionByAudienceCount(@PathVariable final String shortId) {
+		return String.format("forward:/v2/audiencequestion/count?sessionkey=%s", shortId);
+	}
+
+	@DeprecatedApi
+	@GetMapping("/session/{shortId}/interposedreadingcount")
+	public String redirectQuestionByAudienceReadCount(@PathVariable final String shortId) {
+		return String.format("forward:/v2/audiencequestion/readcount?sessionkey=%s", shortId);
+	}
+
+	@DeprecatedApi
+	@GetMapping(value = { "/whoami", "/whoami.json" })
+	public String redirectWhoami() {
+		return "forward:/v2/auth/whoami";
+	}
+
+	@DeprecatedApi
+	@PostMapping(value = "/doLogin")
+	public String redirectLogin() {
+		return "forward:/v2/auth/login";
+	}
+
+	/* generalized routes */
+
+	@DeprecatedApi
+	@RequestMapping(value = { "/session/{shortId}/question/{arg1}", "/session/{shortId}/questions/{arg1}" })
+	public String redirectQuestionByLecturerWithOneArgument(
+			@PathVariable final String shortId,
+			@PathVariable final String arg1) {
+		return String.format("forward:/v2/lecturerquestion/%s/?sessionkey=%s", arg1, shortId);
+	}
+
+	@DeprecatedApi
+	@RequestMapping(
+			value = { "/session/{shortId}/question/{arg1}/{arg2}", "/session/{shortId}/questions/{arg1}/{arg2}" }
+			)
+	public String redirectQuestionByLecturerWithTwoArguments(
+			@PathVariable final String shortId,
+			@PathVariable final String arg1,
+			@PathVariable final String arg2) {
+		return String.format("forward:/v2/lecturerquestion/%s/%s/?sessionkey=%s", arg1, arg2, shortId);
+	}
+
+	@DeprecatedApi
+	@RequestMapping(value = "/session/{shortId}/interposed/{arg1}")
+	public String redirectQuestionByAudienceWithOneArgument(
+			@PathVariable final String shortId,
+			@PathVariable final String arg1) {
+		return String.format("forward:/v2/audiencequestion/%s/?sessionkey=%s", arg1, shortId);
+	}
+
+	@DeprecatedApi
+	@RequestMapping(value = "/session/{shortId}/interposed/{arg1}/{arg2}")
+	public String redirectQuestionByAudienceWithTwoArguments(
+			@PathVariable final String shortId,
+			@PathVariable final String arg1,
+			@PathVariable final String arg2) {
+		return String.format("forward:/v2/audiencequestion/%s/%s/?sessionkey=%s", arg1, arg2, shortId);
+	}
+}

src/main/java/de/thm/arsnova/controller/v2/MotdController.java

+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2019 The ARSnova Team and Contributors
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.thm.arsnova.controller.v2;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+import de.thm.arsnova.controller.AbstractController;
+import de.thm.arsnova.model.UserProfile;
+import de.thm.arsnova.model.migration.FromV2Migrator;
+import de.thm.arsnova.model.migration.ToV2Migrator;
+import de.thm.arsnova.model.migration.v2.Motd;
+import de.thm.arsnova.model.migration.v2.MotdList;
+import de.thm.arsnova.security.User;
+import de.thm.arsnova.service.MotdService;
+import de.thm.arsnova.service.RoomService;
+import de.thm.arsnova.service.UserService;
+import de.thm.arsnova.web.exceptions.ForbiddenException;
+
+@RestController("v2MotdController")
+@RequestMapping("/v2/motd")
+@Api(value = "/motd", description = "Message of the Day API")
+public class MotdController extends AbstractController {
+	@Autowired
+	private MotdService motdService;
+
+	@Autowired
+	private RoomService roomService;
+
+	@Autowired
+	private UserService userService;
+
+	@Autowired
+	private ToV2Migrator toV2Migrator;
+
+	@Autowired
+	private FromV2Migrator fromV2Migrator;
+
+	@ApiOperation(value = "get messages. if adminview=false,"
+			+ " only messages with startdate<clientdate<enddate are returned")
+	@GetMapping("/")
+	@ApiResponses(value = {
+			@ApiResponse(code = 204, message = HTML_STATUS_204),
+			@ApiResponse(code = 501, message = HTML_STATUS_501)
+	})
+	public List<Motd> getMotd(
+			@ApiParam(value = "clientdate", required = false)
+			@RequestParam(value = "clientdate", defaultValue = "")
+			final String clientdate,
+			@ApiParam(value = "adminview", required = false)
+			@RequestParam(value = "adminview", defaultValue = "false")
+			final Boolean adminview,
+			@ApiParam(value = "audience", required = false)
+			@RequestParam(value = "audience", defaultValue = "all")
+			final String audience,
+			@ApiParam(value = "sessionkey", required = false)
+			@RequestParam(value = "sessionkey", required = false)
+			final String roomShortId) {
+		final List<de.thm.arsnova.model.Motd> motds;
+		final Date date = new Date(System.currentTimeMillis());
+		if (!clientdate.isEmpty()) {
+			date.setTime(Long.parseLong(clientdate));
+		}
+		String roomId = "";
+		if (roomShortId != null) {
+			roomId = roomService.getIdByShortId(roomShortId);
+		}
+		if (adminview) {
+			motds = roomShortId != null
+					? motdService.getAllRoomMotds(roomId)
+					: motdService.getAdminMotds();
+		} else {
+			motds = roomShortId != null
+					? motdService.getCurrentRoomMotds(date, roomId)
+					: motdService.getCurrentMotds(date, audience);
+		}
+
+		return motds.stream().map(toV2Migrator::migrate).collect(Collectors.toList());
+	}
+
+	@ApiOperation(value = "create a new message of the day", nickname = "createMotd")
+	@ApiResponses(value = {
+			@ApiResponse(code = 201, message = HTML_STATUS_201),
+			@ApiResponse(code = 503, message = HTML_STATUS_503)
+	})
+	@PostMapping("/")
+	@ResponseStatus(HttpStatus.CREATED)
+	public Motd postNewMotd(
+			@ApiParam(value = "current motd", required = true) @RequestBody final Motd motd,
+			final HttpServletResponse response) {
+		final de.thm.arsnova.model.Motd motdV3 = fromV2Migrator.migrate(motd);
+		final String roomId = roomService.getIdByShortId(motd.getSessionkey());
+		if (de.thm.arsnova.model.Motd.Audience.ROOM == motdV3.getAudience() && roomId != null) {
+			motdService.save(roomId, motdV3);
+		} else {
+			motdService.save(motdV3);
+		}
+
+		return toV2Migrator.migrate(motdV3);
+	}
+
+	@ApiOperation(value = "update a message of the day", nickname = "updateMotd")
+	@PutMapping("/{motdId}")
+	public Motd updateMotd(
+				@ApiParam(value = "motdkey from current motd", required = true) @PathVariable final String motdId,
+				@ApiParam(value = "current motd", required = true) @RequestBody final Motd motd) {
+		final de.thm.arsnova.model.Motd motdV3 = fromV2Migrator.migrate(motd);
+		final String roomId = roomService.getIdByShortId(motd.getSessionkey());
+		if (motdV3.getAudience() == de.thm.arsnova.model.Motd.Audience.ROOM && roomId != null) {
+			motdService.update(roomId, motdV3);
+		} else {
+			motdService.update(motdV3);
+		}
+
+		return toV2Migrator.migrate(motdV3);
+	}
+
+	@ApiOperation(value = "deletes a message of the day", nickname = "deleteMotd")
+	@DeleteMapping("/{motdId}")
+	public void deleteMotd(
+			@ApiParam(value = "Motd-key from the message that shall be deleted", required = true)
+			@PathVariable
+			final String motdId) {
+		final de.thm.arsnova.model.Motd motd = motdService.get(motdId);
+		motdService.delete(motd);
+	}
+
+	@GetMapping("/userlist")
+	public MotdList getAcknowledgedIds(@AuthenticationPrincipal final User user, @RequestParam final String username) {
+		if (user == null || !user.getUsername().equals(username)) {
+			throw new ForbiddenException();
+		}
+		final UserProfile profile = userService.get(user.getId());
+
+		return toV2Migrator.migrateMotdList(profile);
+	}
+
+	@PutMapping("/userlist")
+	public void putAcknowledgedIds(@AuthenticationPrincipal final User user, @RequestBody final MotdList motdList) {
+		if (user == null || !user.getUsername().equals(motdList.getUsername())) {
+			throw new ForbiddenException();
+		}
+		final UserProfile profile = userService.get(user.getId());
+		profile.setAcknowledgedMotds(fromV2Migrator.migrate(motdList));
+		userService.update(profile);
+	}
+}

src/main/java/de/thm/arsnova/controller/v2/RoomController.java

+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2019 The ARSnova Team and Contributors
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.thm.arsnova.controller.v2;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+import de.thm.arsnova.controller.PaginationController;
+import de.thm.arsnova.model.migration.FromV2Migrator;
+import de.thm.arsnova.model.migration.ToV2Migrator;
+import de.thm.arsnova.model.migration.v2.Room;
+import de.thm.arsnova.model.migration.v2.RoomFeature;
+import de.thm.arsnova.model.migration.v2.RoomInfo;
+import de.thm.arsnova.model.transport.ImportExportContainer;
+import de.thm.arsnova.model.transport.ScoreStatistics;
+import de.thm.arsnova.service.RoomService;
+import de.thm.arsnova.service.RoomServiceImpl;
+import de.thm.arsnova.service.RoomServiceImpl.RoomNameComparator;
+import de.thm.arsnova.service.RoomServiceImpl.RoomShortNameComparator;
+import de.thm.arsnova.service.UserService;
+import de.thm.arsnova.web.DeprecatedApi;
+import de.thm.arsnova.web.Pagination;
+import de.thm.arsnova.web.exceptions.NotImplementedException;
+import de.thm.arsnova.web.exceptions.UnauthorizedException;
+
+/**
+ * Handles requests related to ARSnova Rooms.
+ */
+@RestController("v2RoomController")
+@RequestMapping("/v2/session")
+@Api(value = "/session", description = "Room (Session) API")
+public class RoomController extends PaginationController {
+	@Autowired
+	private RoomService roomService;
+
+	@Autowired
+	private UserService userService;
+
+	@Autowired
+	private ToV2Migrator toV2Migrator;
+
+	@Autowired
+	private FromV2Migrator fromV2Migrator;
+
+	@ApiOperation(value = "join a Room",
+			nickname = "joinRoom")
+	@DeprecatedApi
+	@Deprecated
+	@GetMapping("/{shortId}")
+	public Room joinRoom(
+				@ApiParam(value = "Room-Key from current Room", required = true)
+				@PathVariable final String shortId,
+				@ApiParam(value = "Adminflag", required = false)
+				@RequestParam(value = "admin", defaultValue = "false")
+				final boolean admin) {
+		if (admin) {
+			return toV2Migrator.migrate(roomService.getForAdmin(shortId));
+		} else {
+			return toV2Migrator.migrate(roomService.getByShortId(shortId));
+		}
+	}
+
+	@ApiOperation(value = "deletes a Room",
+			nickname = "deleteRoom")
+	@DeleteMapping("/{shortId}")
+	public void deleteRoom(
+			@ApiParam(value = "Room-Key from current Room", required = true)
+			@PathVariable
+			final String shortId) {
+		final de.thm.arsnova.model.Room room = roomService.getByShortId(shortId);
+		roomService.delete(room);
+	}
+
+	@ApiOperation(value = "count active users",
+			nickname = "countActiveUsers")
+	@DeprecatedApi
+	@Deprecated
+	@GetMapping(value = "/{shortId}/activeusercount", produces = MediaType.TEXT_PLAIN_VALUE)
+	public String countActiveUsers(
+			@ApiParam(value = "Room-Key from current Room", required = true) @PathVariable final String shortId) {
+		return String.valueOf(roomService.activeUsers(roomService.getIdByShortId(shortId)));
+	}
+
+	@ApiOperation(value = "Creates a new Room and returns the Room's data",
+			nickname = "postNewRoom")
+	@ApiResponses(value = {
+			@ApiResponse(code = 201, message = HTML_STATUS_201),
+			@ApiResponse(code = 503, message = HTML_STATUS_503)
+	})
+	@PostMapping("/")
+	@ResponseStatus(HttpStatus.CREATED)
+	public Room postNewRoom(
+			@ApiParam(value = "current Room", required = true)
+			@RequestBody
+			final Room room,
+			final HttpServletResponse response) {
+		/* FIXME: migrate LMS course support
+		if (room != null && room.isCourseSession()) {
+			final List<Course> courses = new ArrayList<>();
+			final Course course = new Course();
+			course.setId(room.getCourseId());
+			courses.add(course);
+			final int sessionCount = roomService.countSessionsByCourses(courses);
+			if (sessionCount > 0) {
+				final String appendix = " (" + (sessionCount + 1) + ")";
+				room.setName(room.getName() + appendix);
+				room.setAbbreviation(room.getAbbreviation() + appendix);
+			}
+		}
+		*/
+
+		return toV2Migrator.migrate(roomService.create(fromV2Migrator.migrate(room)));
+	}
+
+	@ApiOperation(value = "updates a Room",
+			nickname = "postNewRoom")
+	@PutMapping("/{shortId}")
+	public Room updateRoom(
+			@ApiParam(value = "Room-Key from current Room", required = true) @PathVariable final String shortId,
+			@ApiParam(value = "current room", required = true) @RequestBody final Room room) {
+		return toV2Migrator.migrate(roomService.update(fromV2Migrator.migrate(room)));
+	}
+
+	@ApiOperation(value = "change the Room creator (owner)", nickname = "changeRoomCreator")
+	@RequestMapping(value = "/{shortId}/changecreator", method = RequestMethod.PUT)
+	public Room changeRoomCreator(
+				@ApiParam(value = "Room-key from current Room", required = true) @PathVariable final String shortId,
+				@ApiParam(value = "new Room creator", required = true) @RequestBody final String newCreator) {
+		return toV2Migrator.migrate(roomService.updateCreator(roomService.getIdByShortId(shortId), newCreator));
+	}
+
+	@ApiOperation(value = "Retrieves a list of Rooms",
+			nickname = "getRooms")
+	@ApiResponses(value = {
+			@ApiResponse(code = 204, message = HTML_STATUS_204),
+			@ApiResponse(code = 501, message = HTML_STATUS_501)
+	})
+	@GetMapping("/")
+	@Pagination
+	public List<Room> getRooms(
+			@ApiParam(value = "ownedOnly", required = true)
+			@RequestParam(value = "ownedonly", defaultValue = "false")
+			final boolean ownedOnly,
+			@ApiParam(value = "visitedOnly", required = true)
+			@RequestParam(value = "visitedonly", defaultValue = "false")
+			final boolean visitedOnly,
+			@ApiParam(value = "sortby", required = true)
+			@RequestParam(value = "sortby", defaultValue = "name")
+			final String sortby,
+			@ApiParam(value = "for a given username. admin rights needed", required = false)
+			@RequestParam(value = "username", defaultValue = "")
+			final String username,
+			final HttpServletResponse response) {
+		final List<de.thm.arsnova.model.Room> rooms;
+
+		if (!"".equals(username)) {
+			final String userId = userService.getByUsername(username).getId();
+			try {
+				if (ownedOnly && !visitedOnly) {
+					rooms = roomService.getUserRooms(userId);
+				} else if (visitedOnly && !ownedOnly) {
+					rooms = roomService.getUserRoomHistory(username);
+				} else {
+					response.setStatus(HttpStatus.NOT_IMPLEMENTED.value());
+					return null;
+				}
+			} catch (final AccessDeniedException e) {
+				throw new UnauthorizedException();
+			}
+		} else {
+			/* TODO implement all parameter combinations, implement use of user parameter */
+			try {
+				if (ownedOnly && !visitedOnly) {
+					rooms = roomService.getMyRooms(offset, limit);
+				} else if (visitedOnly && !ownedOnly) {
+					rooms = roomService.getMyRoomHistory(offset, limit);
+				} else {
+					response.setStatus(HttpStatus.NOT_IMPLEMENTED.value());
+					return null;
+				}
+			} catch (final AccessDeniedException e) {
+				throw new UnauthorizedException();
+			}
+		}
+
+		if (rooms == null || rooms.isEmpty()) {
+			response.setStatus(HttpServletResponse.SC_NO_CONTENT);
+			return null;
+		}
+
+		if ("shortname".equals(sortby)) {
+			Collections.sort(rooms, new RoomShortNameComparator());
+		} else {
+			Collections.sort(rooms, new RoomServiceImpl.RoomNameComparator());
+		}
+
+		return rooms.stream().map(toV2Migrator::migrate).collect(Collectors.toList());
+	}
+
+	/**
+	 * Returns a list of my own Rooms with only the necessary information like name, keyword, or counters.
+	 */
+	@ApiOperation(value = "Retrieves a Room",
+			nickname = "getMyRooms")
+	@ApiResponses(value = {
+			@ApiResponse(code = 204, message = HTML_STATUS_204)
+	})
+	@GetMapping(value = "/", params = "statusonly=true")
+	@Pagination
+	public List<RoomInfo> getMyRooms(
+			@ApiParam(value = "visitedOnly", required = true)
+			@RequestParam(value = "visitedonly", defaultValue = "false")
+			final boolean visitedOnly,
+			@ApiParam(value = "sort by", required = false)
+			@RequestParam(value = "sortby", defaultValue = "name")
+			final String sortby,
+			final HttpServletResponse response) {
+		final List<de.thm.arsnova.model.Room> rooms;
+		if (!visitedOnly) {
+			rooms = roomService.getMyRoomsInfo(offset, limit);
+		} else {
+			rooms = roomService.getMyRoomHistoryInfo(offset, limit);
+		}
+
+		if (rooms == null || rooms.isEmpty()) {
+			response.setStatus(HttpServletResponse.SC_NO_CONTENT);
+			return null;
+		}
+
+		if ("shortname".equals(sortby)) {
+			Collections.sort(rooms, new RoomShortNameComparator());
+		} else {
+			Collections.sort(rooms, new RoomNameComparator());
+		}
+
+		return rooms.stream().map(toV2Migrator::migrateStats).collect(Collectors.toList());
+	}
+
+	@ApiOperation(value = "Retrieves all public pool Rooms for the current user",
+			nickname = "getMyPublicPoolRooms")
+	@ApiResponses(value = {
+			@ApiResponse(code = 204, message = HTML_STATUS_204)
+	})
+	@GetMapping(value = "/publicpool", params = "statusonly=true")
+	public List<RoomInfo> getMyPublicPoolRooms(
+			final HttpServletResponse response) {
+		final List<de.thm.arsnova.model.Room> rooms = roomService.getMyPublicPoolRoomsInfo();
+
+		if (rooms == null || rooms.isEmpty()) {
+			response.setStatus(HttpServletResponse.SC_NO_CONTENT);
+			return null;
+		}
+
+		return rooms.stream().map(toV2Migrator::migrateStats).collect(Collectors.toList());
+	}
+
+	@ApiOperation(value = "Retrieves all public pool Rooms",
+			nickname = "getMyPublicPoolRooms")
+	@ApiResponses(value = {
+			@ApiResponse(code = 204, message = HTML_STATUS_204)
+	})
+	@GetMapping("/publicpool")
+	public List<Room> getPublicPoolRooms(
+			final HttpServletResponse response) {
+		final List<de.thm.arsnova.model.Room> rooms = roomService.getPublicPoolRoomsInfo();
+
+		if (rooms == null || rooms.isEmpty()) {
+			response.setStatus(HttpServletResponse.SC_NO_CONTENT);
+			return null;
+		}
+
+		return rooms.stream().map(toV2Migrator::migrate).collect(Collectors.toList());
+	}
+
+	@ApiOperation(value = "imports a Room",
+			nickname = "importRoom")
+	@PostMapping("/import")
+	public Room importRoom(
+			@ApiParam(value = "current Room", required = true) @RequestBody final ImportExportContainer room,
+			final HttpServletResponse response) {
+		return toV2Migrator.migrate(roomService.importRooms(room));
+	}
+
+	@ApiOperation(value = "export Rooms", nickname = "exportRoom")
+	@GetMapping("/export")
+	public List<ImportExportContainer> getExport(
+			@ApiParam(value = "Room-Key", required = true)
+			@RequestParam(value = "sessionkey", defaultValue = "")
+			final List<String> shortIds,
+			@ApiParam(value = "wether statistics shall be exported", required = true)
+			@RequestParam(value = "withAnswerStatistics", defaultValue = "false")
+			final Boolean withAnswerStatistics,
+			@ApiParam(value = "wether comments shall be exported", required = true)
+			@RequestParam(value = "withFeedbackQuestions", defaultValue = "false")
+			final Boolean withFeedbackQuestions,
+			final HttpServletResponse response) throws IOException {
+		final List<ImportExportContainer> rooms = new ArrayList<>();
+		ImportExportContainer temp;
+		for (final String shortId : shortIds) {
+			final String id = roomService.getIdByShortId(shortId);
+			roomService.setActive(id, false);
+			temp = roomService.exportRoom(id, withAnswerStatistics, withFeedbackQuestions);
+			if (temp != null) {
+				rooms.add(temp);
+			}
+			roomService.setActive(id, true);
+		}
+		return rooms;
+	}
+
+	@ApiOperation(value = "copy a Rooms to the public pool if enabled")
+	@PostMapping("/{shortId}/copytopublicpool")
+	public Room copyToPublicPool(
+			@ApiParam(value = "Room-Key from current Room", required = true)
+			@PathVariable
+			final String shortId,
+			@ApiParam(value = "public pool attributes for Room", required = true)
+			@RequestBody
+			final ImportExportContainer.PublicPool publicPool)
+			throws IOException {
+		final String id = roomService.getIdByShortId(shortId);
+		roomService.setActive(id, false);
+		final de.thm.arsnova.model.Room roomInfo = roomService.copyRoomToPublicPool(shortId, publicPool);
+		roomService.setActive(id, true);
+
+		return toV2Migrator.migrate(roomInfo);
+	}
+
+	@ApiOperation(value = "copy a Room from the public pool if enabled")
+	@PostMapping("/{shortId}/copyfrompublicpool")
+	public Room copyFromPublicPool(
+			@ApiParam(value = "Short ID of the Room", required = true) @PathVariable final String shortId,
+			@ApiParam(value = "custom attributes for Room", required = true) @RequestBody final Room sessionAttributes) {
+		throw new NotImplementedException();
+	}
+
+	@ApiOperation(value = "Locks or unlocks a Room",
+			nickname = "lockRoom")
+	@ApiResponses(value = {
+			@ApiResponse(code = 404, message = HTML_STATUS_404)
+	})
+	@PostMapping("/{shortId}/lock")
+	public Room lockRoom(
+			@ApiParam(value = "Room-Key from current Room", required = true) @PathVariable final String shortId,
+			@ApiParam(value = "lock", required = true) @RequestParam(required = false) final Boolean lock,
+			final HttpServletResponse response) throws IOException {
+		if (lock != null) {
+			return toV2Migrator.migrate(roomService.setActive(roomService.getIdByShortId(shortId), lock));
+		}
+		response.setStatus(HttpStatus.NOT_FOUND.value());
+		return null;
+	}
+
+	@ApiOperation(value = "retrieves a value for the score",
+			nickname = "getLearningProgress")
+	@GetMapping("/{shortId}/learningprogress")
+	public ScoreStatistics getLearningProgress(
+			@ApiParam(value = "Room-Key from current Room", required = true)
+			@PathVariable
+			final String shortId,
+			@ApiParam(value = "type", required = false)
+			@RequestParam(value = "type", defaultValue = "questions")
+			final String type,
+			@ApiParam(value = "question variant", required = false)
+			@RequestParam(value = "questionVariant", required = false)
+			final String questionVariant,
+			final HttpServletResponse response) {
+		return roomService.getLearningProgress(roomService.getIdByShortId(shortId), type, questionVariant);
+	}
+
+	@ApiOperation(value = "retrieves a value for the learning progress for the current user",
+			nickname = "getMyLearningProgress")
+	@GetMapping("/{shortId}/mylearningprogress")
+	public ScoreStatistics getMyLearningProgress(
+			@ApiParam(value = "Room-Key from current Room", required = true) @PathVariable final String shortId,
+			@RequestParam(value = "type", defaultValue = "questions") final String type,
+			@RequestParam(value = "questionVariant", required = false) final String questionVariant,
+			final HttpServletResponse response) {
+		return roomService.getMyLearningProgress(roomService.getIdByShortId(shortId), type, questionVariant);
+	}
+
+	@ApiOperation(value = "retrieves all Room features",
+			nickname = "getRoomFeatures")
+	@GetMapping("/{shortId}/features")
+	public RoomFeature getRoomFeatures(
+			@ApiParam(value = "Room-Key from current Room", required = true) @PathVariable final String shortId,
+			final HttpServletResponse response) {
+		final de.thm.arsnova.model.Room room = roomService.getByShortId(shortId);
+		return toV2Migrator.migrate(room.getSettings());
+	}
+
+	@PutMapping("/{shortId}/features")
+	@ApiOperation(value = "change all Room features",
+			nickname = "changeRoomFeatures")
+	public RoomFeature changeRoomFeatures(
+			@ApiParam(value = "Room-Key from current Room", required = true) @PathVariable final String shortId,
+			@ApiParam(value = "Room feature", required = true) @RequestBody final RoomFeature features,
+			final HttpServletResponse response) {
+		final de.thm.arsnova.model.Room room = roomService.getByShortId(shortId);
+		room.setSettings(fromV2Migrator.migrate(features));
+		roomService.update(room);
+
+		return toV2Migrator.migrate(room.getSettings());
+	}
+
+	@PostMapping(value = "/{shortId}/lockfeedbackinput", produces = MediaType.TEXT_PLAIN_VALUE)
+	@ApiOperation(value = "locks input of user live feedback",
+			nickname = "lockFeedbackInput")
+	public String lockFeedbackInput(
+			@ApiParam(value = "Room-Key from current Room", required = true) @PathVariable final String shortId,
+			@ApiParam(value = "lock", required = true) @RequestParam(required = true) final Boolean lock,
+			final HttpServletResponse response) throws IOException {
+		return String.valueOf(roomService.lockFeedbackInput(roomService.getIdByShortId(shortId), lock));
+	}
+
+	@PostMapping(value = "/{shortId}/flipflashcards", produces = MediaType.TEXT_PLAIN_VALUE)
+	@ApiOperation(value = "flip all flashcards in Room",
+			nickname = "lockFeedbackInput")
+	public String flipFlashcards(
+			@ApiParam(value = "Room-Key from current Room", required = true) @PathVariable final String shortId,
+			@ApiParam(value = "flip", required = true) @RequestParam(required = true) final Boolean flip,
+			final HttpServletResponse response) {
+		return String.valueOf(roomService.flipFlashcards(roomService.getIdByShortId(shortId), flip));
+	}
+
+	/* internal redirections */
+
+	@RequestMapping(value = "/{shortId}/lecturerquestion")
+	public String redirectLecturerQuestion(
+			@PathVariable final String shortId,
+			final HttpServletResponse response) {
+		response.addHeader(X_FORWARDED, "1");
+
+		return String.format("forward:/lecturerquestion/?sessionkey=%s", shortId);
+	}
+
+	@RequestMapping(value = "/{shortId}/lecturerquestion/{arg1}")
+	public String redirectLecturerQuestionWithOneArgument(
+			@PathVariable final String shortId,
+			@PathVariable final String arg1,
+			final HttpServletResponse response) {
+		response.addHeader(X_FORWARDED, "1");
+
+		return String.format("forward:/lecturerquestion/%s/?sessionkey=%s", arg1, shortId);
+	}
+
+	@RequestMapping(value = "/{shortId}/lecturerquestion/{arg1}/{arg2}")
+	public String redirectLecturerQuestionWithTwoArguments(
+			@PathVariable final String shortId,
+			@PathVariable final String arg1,
+			@PathVariable final String arg2,
+			final HttpServletResponse response) {
+		response.addHeader(X_FORWARDED, "1");
+
+		return String.format("forward:/lecturerquestion/%s/%s/?sessionkey=%s", arg1, arg2, shortId);
+	}
+
+	@RequestMapping(value = "/{shortId}/lecturerquestion/{arg1}/{arg2}/{arg3}")
+	public String redirectLecturerQuestionWithThreeArguments(
+			@PathVariable final String shortId,
+			@PathVariable final String arg1,
+			@PathVariable final String arg2,
+			@PathVariable final String arg3,
+			final HttpServletResponse response) {
+		response.addHeader(X_FORWARDED, "1");
+
+		return String.format("forward:/lecturerquestion/%s/%s/%s/?sessionkey=%s", arg1, arg2, arg3, shortId);
+	}
+
+	@RequestMapping(value = "/{shortId}/audiencequestion")
+	public String redirectAudienceQuestion(
+			@PathVariable final String shortId,
+			final HttpServletResponse response) {
+		response.addHeader(X_FORWARDED, "1");
+
+		return String.format("forward:/audiencequestion/?sessionkey=%s", shortId);
+	}
+
+	@RequestMapping(value = "/{shortId}/audiencequestion/{arg1}")
+	public String redirectAudienceQuestionWithOneArgument(
+			@PathVariable final String shortId,
+			@PathVariable final String arg1,
+			final HttpServletResponse response) {
+		response.addHeader(X_FORWARDED, "1");
+
+		return String.format("forward:/audiencequestion/%s/?sessionkey=%s", arg1, shortId);
+	}
+}

src/main/java/de/thm/arsnova/controller/SocketController.java → src/main/java/de/thm/arsnova/controller/v2/SocketController.java

 /*
- * Copyright (C) 2012 THM webMedia
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2019 The ARSnova Team and Contributors
  *
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
+ * ARSnova Backend is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * ARSnova is distributed in the hope that it will be useful,
+ * ARSnova Backend is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -16,72 +15,82 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package de.thm.arsnova.controller;
 
+package de.thm.arsnova.controller.v2;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import java.util.Map;
 import java.util.UUID;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import de.thm.arsnova.entities.User;
-import de.thm.arsnova.services.IUserService;
-import de.thm.arsnova.services.UserSessionService;
-import de.thm.arsnova.socket.ARSnovaSocketIOServer;
+import de.thm.arsnova.controller.AbstractController;
+import de.thm.arsnova.security.User;
+import de.thm.arsnova.service.UserService;
+import de.thm.arsnova.websocket.ArsnovaSocketioServer;
 
-@RestController
-@RequestMapping("/socket")
+/**
+ * Initiates the socket communication.
+ */
+@RestController("v2SocketController")
+@RequestMapping("/v2/socket")
+@Api(value = "/socket", description = "WebSocket Initialization API")
 public class SocketController extends AbstractController {
 
 	@Autowired
-	private IUserService userService;
+	private UserService userService;
 
 	@Autowired
-	private UserSessionService userSessionService;
-
-	@Autowired
-	private ARSnovaSocketIOServer server;
+	private ArsnovaSocketioServer server;
 
 	private static final Logger logger = LoggerFactory.getLogger(SocketController.class);
 
-	@RequestMapping(method = RequestMethod.POST, value = "/assign")
-	public final void authorize(@RequestBody final Map<String, String> sessionMap, final HttpServletResponse response) {
-		String socketid = sessionMap.get("session");
+	@ApiOperation(value = "requested to assign Websocket session",
+			nickname = "authorize")
+	@ApiResponses(value = {
+			@ApiResponse(code = 204, message = HTML_STATUS_204),
+			@ApiResponse(code = 400, message = HTML_STATUS_400),
+			@ApiResponse(code = 403, message = HTML_STATUS_403)
+	})
+	@PostMapping("/assign")
+	public void authorize(
+			@ApiParam(value = "sessionMap", required = true) @RequestBody final Map<String, String> sessionMap,
+			@ApiParam(value = "response", required = true) final HttpServletResponse response) {
+		final String socketid = sessionMap.get("session");
 		if (null == socketid) {
-			logger.debug("Expected property 'session' missing", socketid);
+			logger.debug("Expected property 'session' missing.");
 			response.setStatus(HttpStatus.BAD_REQUEST.value());
-
 			return;
 		}
-		User u = userService.getCurrentUser();
-		if (null == u) {
-			logger.debug("Client {} requested to assign Websocket session but has not authenticated", socketid);
+		final User user = userService.getCurrentUser();
+		if (null == user) {
+			logger.debug("Client {} requested to assign Websocket session but has not authenticated.", socketid);
 			response.setStatus(HttpStatus.FORBIDDEN.value());
-
 			return;
 		}
-		userService.putUser2SocketId(UUID.fromString(socketid), u);
-		userSessionService.setSocketId(UUID.fromString(socketid));
+		userService.putUserIdToSocketId(UUID.fromString(socketid), user.getId());
 		response.setStatus(HttpStatus.NO_CONTENT.value());
 	}
 
-	@RequestMapping(value = "/url", method = RequestMethod.GET)
-	public final String getSocketUrl(final HttpServletRequest request) {
-		StringBuilder url = new StringBuilder();
-
-		url.append(server.isUseSSL() ? "https://" : "http://");
-		url.append(request.getServerName() + ":" + server.getPortNumber());
-
-		return url.toString();
+	@ApiOperation(value = "retrieves a socket url",
+			nickname = "getSocketUrl")
+	@GetMapping(value = "/url", produces = MediaType.TEXT_PLAIN_VALUE)
+	public String getSocketUrl(final HttpServletRequest request) {
+		return (server.isUseSsl() ? "https://" : "http://") + request.getServerName() + ":" + server.getPortNumber();
 	}
 
 }

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

+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2019 The ARSnova Team and Contributors
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.thm.arsnova.controller.v2;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import de.thm.arsnova.controller.AbstractController;
+import de.thm.arsnova.model.Statistics;
+import de.thm.arsnova.service.StatisticsService;
+import de.thm.arsnova.web.CacheControl;
+import de.thm.arsnova.web.DeprecatedApi;
+
+/**
+ * Allows retrieval of several statistics such as the number of active users.
+ */
+@RestController("v2StatisticsController")
+@Api(value = "/statistics", description = "Statistics API")
+@RequestMapping("/v2/statistics")
+public class StatisticsController extends AbstractController {
+
+	@Autowired
+	private StatisticsService statisticsService;
+
+	@ApiOperation(value = "Retrieves global statistics",
+			nickname = "getStatistics")
+	@GetMapping("/")
+	@CacheControl(maxAge = 60, policy = CacheControl.Policy.PUBLIC)
+	public Statistics getStatistics() {
+		return statisticsService.getStatistics();
+	}
+
+	@ApiOperation(value = "Retrieves the amount of all active users",
+			nickname = "countActiveUsers")
+	@DeprecatedApi
+	@Deprecated
+	@GetMapping(value = "/activeusercount", produces = MediaType.TEXT_PLAIN_VALUE)
+	public String countActiveUsers() {
+		return String.valueOf(statisticsService.getStatistics().getActiveUsers());
+	}
+
+	@ApiOperation(value = "Retrieves the amount of all currently logged in users",
+			nickname = "countLoggedInUsers")
+	@DeprecatedApi
+	@Deprecated
+	@GetMapping(value = "/loggedinusercount", produces = MediaType.TEXT_PLAIN_VALUE)
+	public String countLoggedInUsers() {
+		return String.valueOf(statisticsService.getStatistics().getLoggedinUsers());
+	}
+
+	@ApiOperation(value = "Retrieves the total amount of all sessions",
+			nickname = "countSessions")
+	@DeprecatedApi
+	@Deprecated
+	@GetMapping(value = "/sessioncount", produces = MediaType.TEXT_PLAIN_VALUE)
+	public String countSessions() {
+		return String.valueOf(statisticsService.getStatistics().getOpenSessions()
+				+ statisticsService.getStatistics().getClosedSessions());
+	}
+}

src/main/java/de/thm/arsnova/controller/v2/UserController.java

+/*
+ * This file is part of ARSnova Backend.
+ * Copyright (C) 2012-2019 The ARSnova Team and Contributors
+ *
+ * ARSnova Backend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ARSnova Backend is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.thm.arsnova.controller.v2;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import de.thm.arsnova.controller.AbstractController;
+import de.thm.arsnova.model.UserProfile;
+import de.thm.arsnova.service.UserService;
+
+/**
+ * Handles requests related to ARSnova's own user registration and login process.
+ */
+@Controller("v2UserController")
+@RequestMapping("/v2/user")
+public class UserController extends AbstractController {
+	@Autowired
+	private DaoAuthenticationProvider daoProvider;
+
+	@Autowired
+	private UserService userService;
+
+	@PostMapping(value = "/register")
+	public void register(@RequestParam final String username,
+			@RequestParam final String password,
+			final HttpServletRequest request, final HttpServletResponse response) {
+		if (null != userService.create(username, password)) {
+			return;
+		}
+
+		/* TODO: Improve error handling: send reason to client */
+		response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+	}
+
+	@PostMapping(value = "/{username}/activate")
+	public void activate(
+			@PathVariable final String username,
+			@RequestParam final String key,
+			final HttpServletRequest request,
+			final HttpServletResponse response) {
+		final UserProfile userProfile = userService.getByUsername(username);
+		if (userProfile == null || !userService.activateAccount(userProfile.getId(), key, request.getRemoteAddr())) {
+			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+		}
+	}
+
+	@DeleteMapping(value = "/{username}/")
+	public void activate(
+			@PathVariable final String username,
+			final HttpServletRequest request,
+			final HttpServletResponse response) {
+		if (null == userService.deleteByUsername(username)) {
+			response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+		}
+	}
+
+	@PostMapping(value = "/{username}/resetpassword")
+	public void resetPassword(
+			@PathVariable final String username,
+			@RequestParam(required = false) final String key,
+			@RequestParam(required = false) final String password,
+			final HttpServletRequest request,
+			final HttpServletResponse response) {
+		final UserProfile userProfile = userService.getByUsername(username);
+		if (null == userProfile) {
+			response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+
+			return;
+		}
+
+		if (null != key) {
+			if (!userService.resetPassword(userProfile, key, password)) {
+				response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+			}
+		} else {
+			userService.initiatePasswordReset(username);
+		}
+	}
+}

src/main/java/de/thm/arsnova/controller/v2/WelcomeController.java

+package de.thm.arsnova.controller.v2;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller("v2WelcomeController")
+@RequestMapping("/v2")
+public class WelcomeController {
+	@GetMapping(value = "/")
+	public String forwardHome() {
+		return "forward:/";
+	}
+}

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

-/*
- * Copyright (C) 2012 THM webMedia
- *
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ARSnova is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package de.thm.arsnova.dao;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.AbstractMap;
-import java.util.AbstractMap.SimpleEntry;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
-import net.sf.ezmorph.Morpher;
-import net.sf.ezmorph.MorpherRegistry;
-import net.sf.ezmorph.bean.BeanMorpher;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import net.sf.json.util.JSONUtils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.fourspaces.couchdb.Database;
-import com.fourspaces.couchdb.Document;
-import com.fourspaces.couchdb.View;
-import com.fourspaces.couchdb.ViewResults;
-
-import de.thm.arsnova.connector.model.Course;
-import de.thm.arsnova.entities.Answer;
-import de.thm.arsnova.entities.DbUser;
-import de.thm.arsnova.entities.InterposedQuestion;
-import de.thm.arsnova.entities.InterposedReadingCount;
-import de.thm.arsnova.entities.LoggedIn;
-import de.thm.arsnova.entities.PossibleAnswer;
-import de.thm.arsnova.entities.Question;
-import de.thm.arsnova.entities.Session;
-import de.thm.arsnova.entities.User;
-import de.thm.arsnova.entities.VisitedSession;
-import de.thm.arsnova.exceptions.NotFoundException;
-import de.thm.arsnova.services.ISessionService;
-
-@Component("databaseDao")
-public class CouchDBDao implements IDatabaseDao {
-
-	@Autowired
-	private ISessionService sessionService;
-
-	private String databaseHost;
-	private int databasePort;
-	private String databaseName;
-	private Database database;
-
-	public static final Logger LOGGER = LoggerFactory.getLogger(CouchDBDao.class);
-
-	@Value("${couchdb.host}")
-	public final void setDatabaseHost(final String newDatabaseHost) {
-		databaseHost = newDatabaseHost;
-	}
-
-	@Value("${couchdb.port}")
-	public final void setDatabasePort(final String newDatabasePort) {
-		databasePort = Integer.parseInt(newDatabasePort);
-	}
-
-	@Value("${couchdb.name}")
-	public final void setDatabaseName(final String newDatabaseName) {
-		databaseName = newDatabaseName;
-	}
-
-	public final void setSessionService(final ISessionService service) {
-		sessionService = service;
-	}
-
-	@Override
-	public final Session getSession(final String keyword) {
-		final Session result = getSessionFromKeyword(keyword);
-		if (result != null) {
-			return result;
-		}
-
-		throw new NotFoundException();
-	}
-
-	@Override
-	public final List<Session> getMySessions(final User user) {
-		final NovaView view = new NovaView("session/by_creator");
-		view.setStartKeyArray(user.getUsername());
-		view.setEndKeyArray(user.getUsername(), "{}");
-
-		final ViewResults sessions = getDatabase().view(view);
-
-		final List<Session> result = new ArrayList<Session>();
-		for (final Document d : sessions.getResults()) {
-			final Session session = (Session) JSONObject.toBean(
-					d.getJSONObject().getJSONObject("value"),
-					Session.class
-					);
-			session.setCreator(d.getJSONObject().getJSONArray("key").getString(0));
-			session.setName(d.getJSONObject().getJSONArray("key").getString(1));
-			session.set_id(d.getId());
-			result.add(session);
-		}
-		return result;
-	}
-
-	@Override
-	public final List<Question> getSkillQuestions(final User user, final Session session) {
-		String viewName;
-		if (session.getCreator().equals(user.getUsername())) {
-			viewName = "skill_question/by_session_sorted_by_subject_and_text";
-		} else {
-			if (user.getType().equals(User.THM)) {
-				viewName = "skill_question/by_session_for_thm_full";
-			} else {
-				viewName = "skill_question/by_session_for_all_full";
-			}
-		}
-		return getQuestions(new NovaView(viewName), session);
-	}
-
-	@Override
-	public final int getSkillQuestionCount(final Session session) {
-		return getQuestionCount(new NovaView("skill_question/count_by_session"), session);
-	}
-
-	@Override
-	public final Session getSessionFromKeyword(final String keyword) {
-		final NovaView view = new NovaView("session/by_keyword");
-		view.setKey(keyword);
-		final ViewResults results = getDatabase().view(view);
-
-		if (results.getJSONArray("rows").optJSONObject(0) == null) {
-			throw new NotFoundException();
-		}
-		return (Session) JSONObject.toBean(
-				results.getJSONArray("rows").optJSONObject(0).optJSONObject("value"),
-				Session.class
-				);
-	}
-
-	@Override
-	public final Session getSessionFromId(final String sessionId) {
-		final NovaView view = new NovaView("session/by_id");
-		view.setKey(sessionId);
-
-		final ViewResults sessions = getDatabase().view(view);
-
-		if (sessions.getJSONArray("rows").optJSONObject(0) == null) {
-			return null;
-		}
-		return (Session) JSONObject.toBean(
-				sessions.getJSONArray("rows").optJSONObject(0).optJSONObject("value"),
-				Session.class
-				);
-	}
-
-	@Override
-	public final Session saveSession(final User user, final Session session) {
-		final Document sessionDocument = new Document();
-		sessionDocument.put("type", "session");
-		sessionDocument.put("name", session.getName());
-		sessionDocument.put("shortName", session.getShortName());
-		sessionDocument.put("keyword", sessionService.generateKeyword());
-		sessionDocument.put("creator", user.getUsername());
-		sessionDocument.put("active", true);
-		sessionDocument.put("courseType", session.getCourseType());
-		sessionDocument.put("courseId", session.getCourseId());
-		try {
-			database.saveDocument(sessionDocument);
-		} catch (final IOException e) {
-			return null;
-		}
-		return getSession(sessionDocument.getString("keyword"));
-	}
-
-	@Override
-	@Transactional(isolation = Isolation.READ_COMMITTED)
-	public final boolean sessionKeyAvailable(final String keyword) {
-		final View view = new View("session/by_keyword");
-		final ViewResults results = getDatabase().view(view);
-
-		return !results.containsKey(keyword);
-	}
-
-	private String getSessionKeyword(final String internalSessionId) throws IOException {
-		final Document document = getDatabase().getDocument(internalSessionId);
-		if (document.has("keyword")) {
-			return (String) document.get("keyword");
-		}
-		LOGGER.error("No session found for internal id: {}", internalSessionId);
-		return null;
-	}
-
-	private Database getDatabase() {
-		if (database == null) {
-			try {
-				final com.fourspaces.couchdb.Session session = new com.fourspaces.couchdb.Session(
-						databaseHost,
-						databasePort
-						);
-				database = session.getDatabase(databaseName);
-			} catch (final Exception e) {
-				LOGGER.error(
-						"Cannot connect to CouchDB database '" + databaseName
-						+ "' on host '" + databaseHost
-						+ "' using port " + databasePort
-						);
-			}
-		}
-
-		return database;
-	}
-
-	@Override
-	public final Question saveQuestion(final Session session, final Question question) {
-		final Document q = toQuestionDocument(session, question);
-		try {
-			database.saveDocument(q);
-			question.set_id(q.getId());
-			question.set_rev(q.getRev());
-			return question;
-		} catch (final IOException e) {
-			LOGGER.error("Could not save question {}", question);
-		}
-		return null;
-	}
-
-	private Document toQuestionDocument(final Session session, final Question question) {
-		final Document q = new Document();
-		q.put("type", "skill_question");
-		q.put("questionType", question.getQuestionType());
-		q.put("questionVariant", question.getQuestionVariant());
-		q.put("sessionId", session.get_id());
-		q.put("subject", question.getSubject());
-		q.put("text", question.getText());
-		q.put("active", question.isActive());
-		q.put("number", 0); // TODO: This number is now unused. A clean up is necessary.
-		q.put("releasedFor", question.getReleasedFor());
-		q.put("possibleAnswers", question.getPossibleAnswers());
-		q.put("noCorrect", question.isNoCorrect());
-		q.put("piRound", question.getPiRound());
-		q.put("showStatistic", question.isShowStatistic());
-		q.put("showAnswer", question.isShowAnswer());
-		q.put("abstention", question.isAbstention());
-		q.put("image", question.getImage());
-		q.put("gridSize", question.getGridSize());
-		q.put("offsetX", question.getOffsetX());
-		q.put("offsetY", question.getOffsetY());
-		q.put("zoomLvl", question.getZoomLvl());
-		q.put("gridOffsetX", question.getGridOffsetX());
-		q.put("gridOffsetY", question.getGridOffsetY());
-		q.put("gridZoomLvl", question.getGridZoomLvl());
-		q.put("gridSizeX", question.getGridSizeX());
-		q.put("gridSizeY", question.getGridSizeY());
-		q.put("gridIsHidden", question.getGridIsHidden());
-		q.put("imgRotation", question.getImgRotation());
-		q.put("toggleFieldsLeft", question.getToggleFieldsLeft());
-		q.put("numClickableFields", question.getNumClickableFields());
-		q.put("thresholdCorrectAnswers", question.getThresholdCorrectAnswers());
-		q.put("cvIsColored", question.getCvIsColored());
-
-		return q;
-	}
-
-	@Override
-	public final Question updateQuestion(final Question question) {
-		try {
-			final Document q = database.getDocument(question.get_id());
-			q.put("subject", question.getSubject());
-			q.put("text", question.getText());
-			q.put("active", question.isActive());
-			q.put("releasedFor", question.getReleasedFor());
-			q.put("possibleAnswers", question.getPossibleAnswers());
-			q.put("noCorrect", question.isNoCorrect());
-			q.put("piRound", question.getPiRound());
-			q.put("showStatistic", question.isShowStatistic());
-			q.put("showAnswer", question.isShowAnswer());
-			q.put("abstention", question.isAbstention());
-			q.put("image", question.getImage());
-			q.put("gridSize", question.getGridSize());
-			q.put("offsetX", question.getOffsetX());
-			q.put("offsetY", question.getOffsetY());
-			q.put("zoomLvl", question.getZoomLvl());
-			q.put("gridOffsetX", question.getGridOffsetX());
-			q.put("gridOffsetY", question.getGridOffsetY());
-			q.put("gridZoomLvl", question.getGridZoomLvl());
-			q.put("gridSizeX", question.getGridSizeX());
-			q.put("gridSizeY", question.getGridSizeY());
-			q.put("gridIsHidden", question.getGridIsHidden());
-			q.put("imgRotation", question.getImgRotation());
-			q.put("toggleFieldsLeft", question.getToggleFieldsLeft());
-			q.put("numClickableFields", question.getNumClickableFields());
-			q.put("thresholdCorrectAnswers", question.getThresholdCorrectAnswers());
-			q.put("cvIsColored", question.getCvIsColored());
-			database.saveDocument(q);
-			question.set_rev(q.getRev());
-
-			return question;
-		} catch (final IOException e) {
-			LOGGER.error("Could not update question {}", question);
-		}
-
-		return null;
-	}
-
-	@Override
-	public final InterposedQuestion saveQuestion(final Session session, final InterposedQuestion question, User user) {
-		final Document q = new Document();
-		q.put("type", "interposed_question");
-		q.put("sessionId", session.get_id());
-		q.put("subject", question.getSubject());
-		q.put("text", question.getText());
-		q.put("timestamp", System.currentTimeMillis());
-		q.put("read", false);
-		q.put("creator", user.getUsername());
-		try {
-			database.saveDocument(q);
-			question.set_id(q.getId());
-			question.set_rev(q.getRev());
-
-			return question;
-		} catch (final IOException e) {
-			LOGGER.error("Could not save interposed question {}", question);
-		}
-
-		return null;
-	}
-
-	@Override
-	public final Question getQuestion(final String id) {
-		try {
-			final NovaView view = new NovaView("skill_question/by_id");
-			view.setKey(id);
-			final ViewResults results = getDatabase().view(view);
-
-			if (results.getJSONArray("rows").optJSONObject(0) == null) {
-				return null;
-			}
-
-			final Question q = (Question) JSONObject.toBean(
-					results.getJSONArray("rows").optJSONObject(0).optJSONObject("value"),
-					Question.class
-					);
-			final JSONArray possibleAnswers = results.getJSONArray("rows").optJSONObject(0).optJSONObject("value")
-					.getJSONArray("possibleAnswers");
-			final Collection<PossibleAnswer> answers = JSONArray.toCollection(
-					possibleAnswers,
-					PossibleAnswer.class
-					);
-			q.setPossibleAnswers(new ArrayList<PossibleAnswer>(answers));
-			q.setSessionKeyword(getSessionKeyword(q.getSessionId()));
-			return q;
-		} catch (final IOException e) {
-			LOGGER.error("Could not get question with id {}", id);
-		}
-		return null;
-	}
-
-	@Override
-	public final LoggedIn registerAsOnlineUser(final User user, final Session session) {
-		try {
-			final NovaView view = new NovaView("logged_in/all");
-			view.setKey(user.getUsername());
-			final ViewResults results = getDatabase().view(view);
-
-			LoggedIn loggedIn = new LoggedIn();
-			if (results.getJSONArray("rows").optJSONObject(0) != null) {
-				final JSONObject json = results.getJSONArray("rows").optJSONObject(0).optJSONObject("value");
-				loggedIn = (LoggedIn) JSONObject.toBean(json, LoggedIn.class);
-				final JSONArray vs = json.optJSONArray("visitedSessions");
-				if (vs != null) {
-					final Collection<VisitedSession> visitedSessions = JSONArray.toCollection(vs, VisitedSession.class);
-					loggedIn.setVisitedSessions(new ArrayList<VisitedSession>(visitedSessions));
-				}
-
-				/* Do not clutter CouchDB. Only update once every 3 hours per session. */
-				if (loggedIn.getSessionId().equals(session.get_id()) && loggedIn.getTimestamp() > System.currentTimeMillis() - 3 * 3600000) {
-					return loggedIn;
-				}
-			}
-
-			loggedIn.setUser(user.getUsername());
-			loggedIn.setSessionId(session.get_id());
-			loggedIn.addVisitedSession(session);
-			loggedIn.updateTimestamp();
-
-			final JSONObject json = JSONObject.fromObject(loggedIn);
-			final Document doc = new Document(json);
-			if (doc.getId().isEmpty()) {
-				// If this is a new user without a logged_in document, we have
-				// to remove the following
-				// pre-filled fields. Otherwise, CouchDB will take these empty
-				// fields as genuine
-				// identifiers, and will throw errors afterwards.
-				doc.remove("_id");
-				doc.remove("_rev");
-			}
-			getDatabase().saveDocument(doc);
-
-			final LoggedIn l = (LoggedIn) JSONObject.toBean(doc.getJSONObject(), LoggedIn.class);
-			final JSONArray vs = doc.getJSONObject().optJSONArray("visitedSessions");
-			if (vs != null) {
-				final Collection<VisitedSession> visitedSessions = JSONArray.toCollection(vs, VisitedSession.class);
-				l.setVisitedSessions(new ArrayList<VisitedSession>(visitedSessions));
-			}
-			return l;
-		} catch (final IOException e) {
-			return null;
-		}
-	}
-
-	@Override
-	public final void updateSessionOwnerActivity(final Session session) {
-		try {
-			/* Do not clutter CouchDB. Only update once every 3 hours. */
-			if (session.getLastOwnerActivity() > System.currentTimeMillis() - 3 * 3600000) {
-				return;
-			}
-
-			session.setLastOwnerActivity(System.currentTimeMillis());
-			final JSONObject json = JSONObject.fromObject(session);
-			getDatabase().saveDocument(new Document(json));
-		} catch (final IOException e) {
-			LOGGER.error("Failed to update lastOwnerActivity for Session {}", session);
-			return;
-		}
-	}
-
-	@Override
-	public final List<String> getQuestionIds(final Session session, final User user) {
-		NovaView view;
-		if (user.getType().equals("thm")) {
-			view = new NovaView("skill_question/by_session_only_id_for_thm");
-		} else {
-			view = new NovaView("skill_question/by_session_only_id_for_all");
-		}
-		view.setKey(session.get_id());
-		return collectQuestionIds(view);
-	}
-
-	@Override
-	public final void deleteQuestionWithAnswers(final Question question) {
-		try {
-			deleteAnswers(question);
-			deleteDocument(question.get_id());
-		} catch (final IOException e) {
-			LOGGER.error("IOException: Could not delete question {}", question.get_id());
-		}
-	}
-
-	@Override
-	public final void deleteAllQuestionsWithAnswers(final Session session) {
-		final NovaView view = new NovaView("skill_question/by_session");
-		deleteAllQuestionDocumentsWithAnswers(session, view);
-	}
-
-	private void deleteAllQuestionDocumentsWithAnswers(final Session session, final NovaView view) {
-		view.setStartKeyArray(session.get_id());
-		view.setEndKey(session.get_id(), "{}");
-		final ViewResults results = getDatabase().view(view);
-
-		for (final Document d : results.getResults()) {
-			final Question q = new Question();
-			q.set_id(d.getId());
-			deleteQuestionWithAnswers(q);
-		}
-	}
-
-	private void deleteDocument(final String documentId) throws IOException {
-		final Document d = getDatabase().getDocument(documentId);
-		getDatabase().deleteDocument(d);
-	}
-
-	@Override
-	public final void deleteAnswers(final Question question) {
-		try {
-			final NovaView view = new NovaView("answer/cleanup");
-			view.setKey(question.get_id());
-			final ViewResults results = getDatabase().view(view);
-
-			for (final Document d : results.getResults()) {
-				deleteDocument(d.getId());
-			}
-		} catch (final IOException e) {
-			LOGGER.error("IOException: Could not delete answers for question {}", question.get_id());
-		}
-	}
-
-	@Override
-	public final List<String> getUnAnsweredQuestionIds(final Session session, final User user) {
-		final NovaView view = new NovaView("answer/by_user");
-		view.setKey(user.getUsername(), session.get_id());
-		return collectUnansweredQuestionIds(getQuestionIds(session, user), view);
-	}
-
-	@Override
-	public final Answer getMyAnswer(final User me, final String questionId, final int piRound) {
-
-		final NovaView view = new NovaView("answer/by_question_and_user_and_piround");
-		if (2 == piRound) {
-			view.setKey(questionId, me.getUsername(), "2");
-		} else {
-			/* needed for legacy questions whose piRound property has not been set */
-			view.setStartKey(questionId, me.getUsername());
-			view.setEndKey(questionId, me.getUsername(), "1");
-		}
-		final ViewResults results = getDatabase().view(view);
-		if (results.getResults().isEmpty()) {
-			return null;
-		}
-		return (Answer) JSONObject.toBean(
-				results.getJSONArray("rows").optJSONObject(0).optJSONObject("value"),
-				Answer.class
-				);
-	}
-
-	@Override
-	public final List<Answer> getAnswers(final String questionId, final int piRound) {
-		final NovaView view = new NovaView("skill_question/count_answers_by_question_and_piround");
-		if (2 == piRound) {
-			view.setStartKey(questionId, "2");
-			view.setEndKey(questionId, "2", "{}");
-		} else {
-			/* needed for legacy questions whose piRound property has not been set */
-			view.setStartKeyArray(questionId);
-			view.setEndKeyArray(questionId, "1", "{}");
-		}
-		view.setGroup(true);
-		final ViewResults results = getDatabase().view(view);
-		final int abstentionCount = getAbstentionAnswerCount(questionId);
-		final List<Answer> answers = new ArrayList<Answer>();
-		for (final Document d : results.getResults()) {
-			final Answer a = new Answer();
-			a.setAnswerCount(d.getInt("value"));
-			a.setAbstentionCount(abstentionCount);
-			a.setQuestionId(d.getJSONObject().getJSONArray("key").getString(0));
-			a.setPiRound(piRound);
-			final String answerText = d.getJSONObject().getJSONArray("key").getString(2);
-			a.setAnswerText("null".equals(answerText) ? null : answerText);
-			answers.add(a);
-		}
-		return answers;
-	}
-
-	private int getAbstentionAnswerCount(final String questionId) {
-		final NovaView view = new NovaView("skill_question/count_abstention_answers_by_question");
-		view.setKey(questionId);
-		view.setGroup(true);
-		final ViewResults results = getDatabase().view(view);
-		if (results.getResults().size() == 0) {
-			return 0;
-		}
-		return results.getJSONArray("rows").optJSONObject(0).optInt("value");
-	}
-
-	@Override
-	public final int getAnswerCount(final Question question, final int piRound) {
-		final NovaView view = new NovaView("skill_question/count_total_answers_by_question_and_piround");
-		view.setGroup(true);
-		view.setStartKey(question.get_id(), String.valueOf(piRound));
-		view.setEndKey(question.get_id(), String.valueOf(piRound), "{}");
-		final ViewResults results = getDatabase().view(view);
-		if (results.getResults().size() == 0) {
-			return 0;
-		}
-		return results.getJSONArray("rows").optJSONObject(0).optInt("value");
-	}
-
-	@Override
-	public final int countActiveUsers(final long since) {
-		try {
-			final View view = new View("statistic/count_active_users");
-			view.setStartKey(String.valueOf(since));
-			final ViewResults results = getDatabase().view(view);
-			if (isEmptyResults(results)) {
-				return 0;
-			}
-			return results.getJSONArray("rows").optJSONObject(0).getInt("value");
-		} catch (final Exception e) {
-			LOGGER.error("Error while retrieving active users count", e);
-		}
-		return 0;
-	}
-
-	private boolean isEmptyResults(final ViewResults results) {
-		return results == null || results.getResults().isEmpty() || results.getJSONArray("rows").size() == 0;
-	}
-
-	@Override
-	public List<Answer> getFreetextAnswers(final String questionId) {
-		final List<Answer> answers = new ArrayList<Answer>();
-		final NovaView view = new NovaView("skill_question/freetext_answers_full");
-		view.setKey(questionId);
-		final ViewResults results = getDatabase().view(view);
-		if (results.getResults().isEmpty()) {
-			return answers;
-		}
-		for (final Document d : results.getResults()) {
-			final Answer a = (Answer) JSONObject.toBean(d.getJSONObject().getJSONObject("value"), Answer.class);
-			a.setQuestionId(questionId);
-			answers.add(a);
-		}
-		return answers;
-	}
-
-	@Override
-	public List<Answer> getMyAnswers(final User me, final String sessionKey) {
-		final Session s = getSessionFromKeyword(sessionKey);
-		if (s == null) {
-			throw new NotFoundException();
-		}
-
-		final NovaView view = new NovaView("answer/by_user_and_session_full");
-		view.setKey(me.getUsername(), s.get_id());
-		final ViewResults results = getDatabase().view(view);
-		final List<Answer> answers = new ArrayList<Answer>();
-		if (results == null || results.getResults() == null || results.getResults().isEmpty()) {
-			return answers;
-		}
-		for (final Document d : results.getResults()) {
-			final Answer a = (Answer) JSONObject.toBean(d.getJSONObject().getJSONObject("value"), Answer.class);
-			a.set_id(d.getId());
-			a.set_rev(d.getRev());
-			a.setUser(me.getUsername());
-			a.setSessionId(s.get_id());
-			answers.add(a);
-		}
-		return answers;
-	}
-
-	@Override
-	public int getTotalAnswerCount(final String sessionKey) {
-		final Session s = getSessionFromKeyword(sessionKey);
-		if (s == null) {
-			throw new NotFoundException();
-		}
-
-		final NovaView view = new NovaView("skill_question/count_answers_by_session");
-		view.setKey(s.get_id());
-		final ViewResults results = getDatabase().view(view);
-		if (results.getResults().size() == 0) {
-			return 0;
-		}
-		return results.getJSONArray("rows").optJSONObject(0).optInt("value");
-	}
-
-	@Override
-	public int getInterposedCount(final String sessionKey) {
-		final Session s = getSessionFromKeyword(sessionKey);
-		if (s == null) {
-			throw new NotFoundException();
-		}
-
-		final NovaView view = new NovaView("interposed_question/count_by_session");
-		view.setKey(s.get_id());
-		view.setGroup(true);
-		final ViewResults results = getDatabase().view(view);
-		if (results.size() == 0 || results.getResults().size() == 0) {
-			return 0;
-		}
-		return results.getJSONArray("rows").optJSONObject(0).optInt("value");
-	}
-
-	@Override
-	public InterposedReadingCount getInterposedReadingCount(final Session session) {
-		final NovaView view = new NovaView("interposed_question/count_by_session_reading");
-		view.setStartKeyArray(session.get_id());
-		view.setEndKeyArray(session.get_id(), "{}");
-		view.setGroup(true);
-		return getInterposedReadingCount(view);
-	}
-
-	@Override
-	public InterposedReadingCount getInterposedReadingCount(final Session session, final User user) {
-		final NovaView view = new NovaView("interposed_question/count_by_session_reading_for_creator");
-		view.setStartKeyArray(session.get_id(), user.getUsername());
-		view.setEndKeyArray(session.get_id(), user.getUsername(), "{}");
-		view.setGroup(true);
-		return getInterposedReadingCount(view);
-	}
-
-	private InterposedReadingCount getInterposedReadingCount(final NovaView view) {
-		final ViewResults results = getDatabase().view(view);
-		if (results.size() == 0 || results.getResults().size() == 0) {
-			return new InterposedReadingCount();
-		}
-		// A complete result looks like this. Note that the second row is optional, and that the first one may be
-		// 'unread' or 'read', i.e., results may be switched around or only one result may be present.
-		// count = {"rows":[
-		// {"key":["cecebabb21b096e592d81f9c1322b877","Guestc9350cf4a3","read"],"value":1},
-		// {"key":["cecebabb21b096e592d81f9c1322b877","Guestc9350cf4a3","unread"],"value":1}
-		// ]}
-		int read = 0, unread = 0;
-		String type = "";
-		final JSONObject fst = results.getJSONArray("rows").getJSONObject(0);
-		final JSONObject snd = results.getJSONArray("rows").optJSONObject(1);
-
-		final JSONArray fstkey = fst.getJSONArray("key");
-		if (fstkey.size() == 2) {
-			type = fstkey.getString(1);
-		} else if (fstkey.size() == 3) {
-			type = fstkey.getString(2);
-		}
-		if (type.equals("read")) {
-			read = fst.optInt("value");
-		} else if (type.equals("unread")) {
-			unread = fst.optInt("value");
-		}
-
-		if (snd != null) {
-			final JSONArray sndkey = snd.getJSONArray("key");
-			if (sndkey.size() == 2) {
-				type = sndkey.getString(1);
-			} else {
-				type = sndkey.getString(2);
-			}
-			if (type.equals("read")) {
-				read = snd.optInt("value");
-			} else if (type.equals("unread")) {
-				unread = snd.optInt("value");
-			}
-		}
-		return new InterposedReadingCount(read, unread);
-	}
-
-	@Override
-	public List<InterposedQuestion> getInterposedQuestions(final Session session) {
-		final NovaView view = new NovaView("interposed_question/by_session");
-		view.setKey(session.get_id());
-		final ViewResults questions = getDatabase().view(view);
-		if (questions == null || questions.isEmpty()) {
-			return null;
-		}
-		return createInterposedList(session, questions);
-	}
-
-	@Override
-	public List<InterposedQuestion> getInterposedQuestions(final Session session, final User user) {
-		final NovaView view = new NovaView("interposed_question/by_session_and_creator");
-		view.setKey(session.get_id(), user.getUsername());
-		final ViewResults questions = getDatabase().view(view);
-		if (questions == null || questions.isEmpty()) {
-			return null;
-		}
-		return createInterposedList(session, questions);
-	}
-
-	private List<InterposedQuestion> createInterposedList(
-			final Session session, final ViewResults questions) {
-		final List<InterposedQuestion> result = new ArrayList<InterposedQuestion>();
-		for (final Document document : questions.getResults()) {
-			final InterposedQuestion question = (InterposedQuestion) JSONObject.toBean(
-					document.getJSONObject().getJSONObject("value"),
-					InterposedQuestion.class
-					);
-			question.setSessionId(session.getKeyword());
-			question.set_id(document.getId());
-			result.add(question);
-		}
-		return result;
-	}
-
-	public InterposedQuestion getInterposedQuestion(final String sessionKey, final String documentId) {
-		try {
-			final Document document = getDatabase().getDocument(documentId);
-			if (document == null) {
-				LOGGER.error("Document is NULL");
-				return null;
-			}
-			return (InterposedQuestion) JSONObject.toBean(document.getJSONObject(), InterposedQuestion.class);
-		} catch (final IOException e) {
-			LOGGER.error("Error while retrieving interposed question", e);
-		}
-		return null;
-	}
-
-	@Override
-	public void vote(final User me, final String menu) {
-		final String date = new SimpleDateFormat("dd-mm-yyyyy").format(new Date());
-		try {
-			final NovaView view = new NovaView("food_vote/get_user_vote");
-			view.setKey(date, me.getUsername());
-			final ViewResults results = getDatabase().view(view);
-
-			if (results.getResults().isEmpty()) {
-				final Document vote = new Document();
-				vote.put("type", "food_vote");
-				vote.put("name", menu);
-				vote.put("user", me.getUsername());
-				vote.put("day", date);
-				database.saveDocument(vote);
-			} else {
-				final Document vote = results.getResults().get(0);
-				vote.put("name", menu);
-				database.saveDocument(vote);
-			}
-		} catch (final IOException e) {
-			LOGGER.error("Error while saving user food vote", e);
-		}
-	}
-
-	@Override
-	public int countSessions() {
-		return sessionsCountValue("openSessions")
-				+ sessionsCountValue("closedSessions");
-	}
-
-	@Override
-	public int countClosedSessions() {
-		return sessionsCountValue("closedSessions");
-	}
-
-	@Override
-	public int countOpenSessions() {
-		return sessionsCountValue("openSessions");
-	}
-
-	@Override
-	public int countAnswers() {
-		return sessionsCountValue("answers");
-	}
-
-	@Override
-	public int countQuestions() {
-		return sessionsCountValue("questions");
-	}
-
-	private int sessionsCountValue(final String key) {
-		try {
-			final View view = new View("statistic/count_sessions");
-			view.setGroup(true);
-
-			final ViewResults results = getDatabase().view(view);
-			if (isEmptyResults(results)) {
-				return 0;
-			}
-
-			int result = 0;
-			final JSONArray rows = results.getJSONArray("rows");
-
-			for (int i = 0; i < rows.size(); i++) {
-				final JSONObject row = rows.getJSONObject(i);
-				if (
-						row.getString("key").equals(key)
-						) {
-					result += row.getInt("value");
-				}
-			}
-			return result;
-		} catch (final Exception e) {
-			LOGGER.error("Error while retrieving session count", e);
-		}
-		return 0;
-	}
-
-	@Override
-	public InterposedQuestion getInterposedQuestion(final String questionId) {
-		try {
-			final Document document = getDatabase().getDocument(questionId);
-			final InterposedQuestion question = (InterposedQuestion) JSONObject.toBean(document.getJSONObject(),
-					InterposedQuestion.class);
-			question.setSessionId(getSessionKeyword(question.getSessionId()));
-			return question;
-		} catch (final IOException e) {
-			LOGGER.error("Could not load interposed question {}", questionId);
-		}
-		return null;
-	}
-
-	@Override
-	public void markInterposedQuestionAsRead(final InterposedQuestion question) {
-		try {
-			question.setRead(true);
-			final Document document = getDatabase().getDocument(question.get_id());
-			document.put("read", question.isRead());
-			getDatabase().saveDocument(document);
-		} catch (final IOException e) {
-			LOGGER.error("Coulg not mark interposed question as read {}", question.get_id());
-		}
-	}
-
-	@Override
-	public List<Session> getMyVisitedSessions(final User user) {
-		final NovaView view = new NovaView("logged_in/visited_sessions_by_user");
-		view.setKey(user.getUsername());
-		final ViewResults sessions = getDatabase().view(view);
-		final List<Session> allSessions = new ArrayList<Session>();
-		for (final Document d : sessions.getResults()) {
-			// Not all users have visited sessions
-			if (d.getJSONObject().optJSONArray("value") != null) {
-				@SuppressWarnings("unchecked")
-				final
-				Collection<Session> visitedSessions =  JSONArray.toCollection(
-						d.getJSONObject().getJSONArray("value"),
-						Session.class
-						);
-				allSessions.addAll(visitedSessions);
-			}
-		}
-		// Do these sessions still exist?
-		final List<Session> result = new ArrayList<Session>();
-		for (final Session s : allSessions) {
-			try {
-				final Session session = getSessionFromKeyword(s.getKeyword());
-				if (session != null) {
-					result.add(session);
-				}
-			} catch (final NotFoundException e) {
-				// TODO Remove non existant session
-			}
-		}
-		return result;
-	}
-
-	@Override
-	public Answer saveAnswer(final Answer answer, final User user) {
-		try {
-			final Document a = new Document();
-			a.put("type", "skill_question_answer");
-			a.put("sessionId", answer.getSessionId());
-			a.put("questionId", answer.getQuestionId());
-			a.put("answerSubject", answer.getAnswerSubject());
-			a.put("questionVariant", answer.getQuestionVariant());
-			a.put("questionValue", answer.getQuestionValue());
-			a.put("answerText", answer.getAnswerText());
-			a.put("timestamp", answer.getTimestamp());
-			a.put("user", user.getUsername());
-			a.put("piRound", answer.getPiRound());
-			a.put("abstention", answer.isAbstention());
-			database.saveDocument(a);
-			answer.set_id(a.getId());
-			answer.set_rev(a.getRev());
-			return answer;
-		} catch (final IOException e) {
-			LOGGER.error("Could not save answer {}", answer);
-		}
-		return null;
-	}
-
-	@Override
-	public Answer updateAnswer(final Answer answer) {
-		try {
-			final Document a = database.getDocument(answer.get_id());
-			a.put("answerSubject", answer.getAnswerSubject());
-			a.put("answerText", answer.getAnswerText());
-			a.put("timestamp", answer.getTimestamp());
-			a.put("abstention", answer.isAbstention());
-			a.put("questionValue", answer.getQuestionValue());
-			database.saveDocument(a);
-			answer.set_rev(a.getRev());
-			return answer;
-		} catch (final IOException e) {
-			LOGGER.error("Could not save answer {}", answer);
-		}
-		return null;
-	}
-
-	@Override
-	public void deleteAnswer(final String answerId) {
-		try {
-			database.deleteDocument(database.getDocument(answerId));
-		} catch (final IOException e) {
-			LOGGER.error("Could not delete answer {} because of {}", answerId, e.getMessage());
-		}
-	}
-
-	@Override
-	public void deleteInterposedQuestion(final InterposedQuestion question) {
-		try {
-			deleteDocument(question.get_id());
-		} catch (final IOException e) {
-			LOGGER.error("Could not delete interposed question {} because of {}", question.get_id(), e.getMessage());
-		}
-	}
-
-	@Override
-	public List<Session> getCourseSessions(final List<Course> courses) {
-		final ExtendedView view = new ExtendedView("session/by_courseid");
-		view.setCourseIdKeys(courses);
-
-		final ViewResults sessions = getDatabase().view(view);
-
-		final List<Session> result = new ArrayList<Session>();
-		for (final Document d : sessions.getResults()) {
-			final Session session = (Session) JSONObject.toBean(
-					d.getJSONObject().getJSONObject("value"),
-					Session.class
-					);
-			result.add(session);
-		}
-		return result;
-	}
-
-	@Override
-	public final List<String> getActiveUsers(final int timeDifference) {
-		final long inactiveBeforeTimestamp = new Date().getTime() - timeDifference * 1000;
-
-		final NovaView view = new NovaView("logged_in/by_and_only_timestamp_and_username");
-		view.setStartKeyArray(String.valueOf(inactiveBeforeTimestamp));
-		final ViewResults results = getDatabase().view(view);
-
-		final List<String> result = new ArrayList<String>();
-		for (final Document d : results.getResults()) {
-			result.add(d.getJSONObject().getJSONArray("key").getString(1));
-		}
-		return result;
-	}
-
-	private static class ExtendedView extends View {
-
-		private String keys;
-
-		public ExtendedView(final String fullname) {
-			super(fullname);
-		}
-
-		public void setKeys(final String newKeys) {
-			keys = newKeys;
-		}
-
-		public void setCourseIdKeys(final List<Course> courses) {
-			if (courses.isEmpty()) {
-				keys = "[]";
-				return;
-			}
-
-			final StringBuilder sb = new StringBuilder();
-			sb.append("[");
-			for (int i = 0; i < courses.size() - 1; i++) {
-				sb.append("\"" + courses.get(i).getId() + "\",");
-			}
-			sb.append("\"" + courses.get(courses.size() - 1).getId() + "\"");
-			sb.append("]");
-			try {
-				setKeys(URLEncoder.encode(sb.toString(), "UTF-8"));
-			} catch (final UnsupportedEncodingException e) {
-				LOGGER.error("Error while encoding course ID keys", e);
-			}
-		}
-
-		@Override
-		public String getQueryString() {
-			final StringBuilder query = new StringBuilder();
-			if (super.getQueryString() != null) {
-				query.append(super.getQueryString());
-			}
-			if (keys != null) {
-				if (query.toString().isEmpty()) {
-					query.append("&");
-				}
-
-				query.append("keys=" + keys);
-			}
-
-			if (query.toString().isEmpty()) {
-				return null;
-			}
-			return query.toString();
-		}
-	}
-
-	@Override
-	public Session lockSession(final Session session, final Boolean lock) {
-		try {
-			final Document s = database.getDocument(session.get_id());
-			s.put("active", lock);
-			database.saveDocument(s);
-			session.set_rev(s.getRev());
-			return session;
-		} catch (final IOException e) {
-			LOGGER.error("Could not lock session {}", session);
-		}
-		return null;
-	}
-
-	@Override
-	public Session updateSession(final Session session) {
-		try {
-			final Document s = database.getDocument(session.get_id());
-			s.put("name", session.getName());
-			s.put("shortName", session.getShortName());
-			s.put("active", session.isActive());
-			database.saveDocument(s);
-			session.set_rev(s.getRev());
-
-			return session;
-		} catch (final IOException e) {
-			LOGGER.error("Could not lock session {}", session);
-		}
-
-		return null;
-	}
-
-	@Override
-	public void deleteSession(final Session session) {
-		try {
-			deleteDocument(session.get_id());
-		} catch (final IOException e) {
-			LOGGER.error("Could not delete session {}", session);
-		}
-	}
-
-	@Override
-	public List<Question> getLectureQuestions(final User user, final Session session) {
-		String viewName;
-		if (session.isCreator(user)) {
-			viewName = "skill_question/lecture_question_by_session";
-		} else {
-			if (user.getType().equals(User.THM)) {
-				viewName = "skill_question/lecture_question_by_session_for_thm";
-			} else {
-				viewName = "skill_question/lecture_question_by_session_for_all";
-			}
-		}
-		return getQuestions(new NovaView(viewName), session);
-	}
-
-	@Override
-	public List<Question> getFlashcards(final User user, final Session session) {
-		String viewName;
-		if (session.isCreator(user)) {
-			viewName = "skill_question/flashcard_by_session";
-		} else {
-			if (user.getType().equals(User.THM)) {
-				viewName = "skill_question/flashcard_by_session_for_thm";
-			} else {
-				viewName = "skill_question/flashcard_by_session_for_all";
-			}
-		}
-		return getQuestions(new NovaView(viewName), session);
-	}
-
-	@Override
-	public List<Question> getPreparationQuestions(final User user, final Session session) {
-		String viewName;
-		if (session.isCreator(user)) {
-			viewName = "skill_question/preparation_question_by_session";
-		} else {
-			if (user.getType().equals(User.THM)) {
-				viewName = "skill_question/preparation_question_by_session_for_thm";
-			} else {
-				viewName = "skill_question/preparation_question_by_session_for_all";
-			}
-		}
-		return getQuestions(new NovaView(viewName), session);
-
-	}
-
-	private List<Question> getQuestions(final NovaView view, final Session session) {
-		view.setStartKeyArray(session.get_id());
-		view.setEndKeyArray(session.get_id(), "{}");
-		final ViewResults questions = getDatabase().view(view);
-		if (questions == null || questions.isEmpty()) {
-			return null;
-		}
-		final List<Question> result = new ArrayList<Question>();
-
-		final MorpherRegistry morpherRegistry = JSONUtils.getMorpherRegistry();
-		final Morpher dynaMorpher = new BeanMorpher(PossibleAnswer.class, morpherRegistry);
-		morpherRegistry.registerMorpher(dynaMorpher);
-		for (final Document document : questions.getResults()) {
-			final Question question = (Question) JSONObject.toBean(
-					document.getJSONObject().getJSONObject("value"),
-					Question.class
-					);
-			@SuppressWarnings("unchecked")
-			final
-			Collection<PossibleAnswer> answers = JSONArray.toCollection(
-					document.getJSONObject().getJSONObject("value").getJSONArray("possibleAnswers"),
-					PossibleAnswer.class
-					);
-			question.setPossibleAnswers(new ArrayList<PossibleAnswer>(answers));
-			question.setSessionKeyword(session.getKeyword());
-			if (!"freetext".equals(question.getQuestionType()) && 0 == question.getPiRound()) {
-				/* needed for legacy questions whose piRound property has not been set */
-				question.setPiRound(1);
-			}
-			result.add(question);
-		}
-		return result;
-	}
-
-	@Override
-	public int getLectureQuestionCount(final Session session) {
-		return getQuestionCount(new NovaView("skill_question/lecture_question_count_by_session"), session);
-	}
-
-	@Override
-	public int getFlashcardCount(final Session session) {
-		return getQuestionCount(new NovaView("skill_question/flashcard_count_by_session"), session);
-	}
-
-	@Override
-	public int getPreparationQuestionCount(final Session session) {
-		return getQuestionCount(new NovaView("skill_question/preparation_question_count_by_session"), session);
-	}
-
-	private int getQuestionCount(final NovaView view, final Session session) {
-		view.setKey(session.get_id());
-		final ViewResults results = getDatabase().view(view);
-		if (results.getJSONArray("rows").optJSONObject(0) == null) {
-			return 0;
-		}
-		return results.getJSONArray("rows").optJSONObject(0).optInt("value");
-	}
-
-	@Override
-	public int countLectureQuestionAnswers(final Session session) {
-		return countQuestionVariantAnswers(session, "lecture");
-	}
-
-	@Override
-	public int countPreparationQuestionAnswers(final Session session) {
-		return countQuestionVariantAnswers(session, "preparation");
-	}
-
-	private int countQuestionVariantAnswers(final Session session, final String variant) {
-		final NovaView view = new NovaView("skill_question/count_answers_by_session_and_question_variant");
-		view.setKey(session.get_id(), variant);
-		final ViewResults results = getDatabase().view(view);
-		if (results.getResults().size() == 0) {
-			return 0;
-		}
-		return results.getJSONArray("rows").optJSONObject(0).optInt("value");
-	}
-
-	@Override
-	public void deleteAllLectureQuestionsWithAnswers(final Session session) {
-		final NovaView view = new NovaView("skill_question/lecture_question_by_session");
-		deleteAllQuestionDocumentsWithAnswers(session, view);
-	}
-
-	@Override
-	public void deleteAllFlashcardsWithAnswers(final Session session) {
-		final NovaView view = new NovaView("skill_question/flashcard_by_session");
-		deleteAllQuestionDocumentsWithAnswers(session, view);
-	}
-
-	@Override
-	public void deleteAllPreparationQuestionsWithAnswers(final Session session) {
-		final NovaView view = new NovaView("skill_question/preparation_question_by_session");
-		deleteAllQuestionDocumentsWithAnswers(session, view);
-	}
-
-	@Override
-	public List<String> getUnAnsweredLectureQuestionIds(final Session session, final User user) {
-		final NovaView view = new NovaView("answer/variant_by_user");
-		view.setKey(user.getUsername(), session.get_id(), "lecture");
-		return collectUnansweredQuestionIds(getLectureQuestionIds(session, user), view);
-	}
-
-	private List<String> getLectureQuestionIds(final Session session, final User user) {
-		NovaView view;
-		if (user.getType().equals("thm")) {
-			view = new NovaView("skill_question/lecture_question_by_session_for_thm");
-		} else {
-			view = new NovaView("skill_question/lecture_question_by_session_for_all");
-		}
-		view.setStartKeyArray(session.get_id());
-		view.setEndKeyArray(session.get_id(), "{}");
-		return collectQuestionIds(view);
-	}
-
-	@Override
-	public List<String> getUnAnsweredPreparationQuestionIds(final Session session, final User user) {
-		final NovaView view = new NovaView("answer/variant_by_user");
-		view.setKey(user.getUsername(), session.get_id(), "preparation");
-		return collectUnansweredQuestionIds(getPreparationQuestionIds(session, user), view);
-	}
-
-	private List<String> getPreparationQuestionIds(final Session session, final User user) {
-		NovaView view;
-		if (user.getType().equals("thm")) {
-			view = new NovaView("skill_question/preparation_question_by_session_for_thm");
-		} else {
-			view = new NovaView("skill_question/preparation_question_by_session_for_all");
-		}
-		view.setStartKeyArray(session.get_id());
-		view.setEndKeyArray(session.get_id(), "{}");
-		return collectQuestionIds(view);
-	}
-
-	private List<String> collectUnansweredQuestionIds(
-			final List<String> questions,
-			final NovaView view
-			) {
-		final ViewResults answeredQuestions = getDatabase().view(view);
-
-		final List<String> answered = new ArrayList<String>();
-		for (final Document d : answeredQuestions.getResults()) {
-			answered.add(d.getString("value"));
-		}
-
-		final List<String> unanswered = new ArrayList<String>();
-		for (final String questionId : questions) {
-			if (!answered.contains(questionId)) {
-				unanswered.add(questionId);
-			}
-		}
-		return unanswered;
-	}
-
-	private List<String> collectQuestionIds(final NovaView view) {
-		final ViewResults results = getDatabase().view(view);
-		if (results.getResults().size() == 0) {
-			return new ArrayList<String>();
-		}
-		final List<String> ids = new ArrayList<String>();
-		for (final Document d : results.getResults()) {
-			ids.add(d.getId());
-		}
-		return ids;
-	}
-
-	@Override
-	public void deleteAllInterposedQuestions(final Session session) {
-		final NovaView view = new NovaView("interposed_question/by_session");
-		view.setKey(session.get_id());
-		final ViewResults questions = getDatabase().view(view);
-		deleteAllInterposedQuestions(session, questions);
-	}
-
-	@Override
-	public void deleteAllInterposedQuestions(final Session session, final User user) {
-		final NovaView view = new NovaView("interposed_question/by_session_and_creator");
-		view.setKey(session.get_id(), user.getUsername());
-		final ViewResults questions = getDatabase().view(view);
-		deleteAllInterposedQuestions(session, questions);
-	}
-
-	private void deleteAllInterposedQuestions(final Session session, final ViewResults questions) {
-		if (questions == null || questions.isEmpty()) {
-			return;
-		}
-		for (final Document document : questions.getResults()) {
-			try {
-				deleteDocument(document.getId());
-			} catch (final IOException e) {
-				LOGGER.error("Could not delete all interposed questions {}", session);
-			}
-		}
-	}
-
-	@Override
-	public void publishAllQuestions(final Session session, final boolean publish) {
-		final List<Question> questions = getQuestions(new NovaView("skill_question/by_session"), session);
-		for (final Question q : questions) {
-			q.setActive(publish);
-		}
-		final List<Document> documents = new ArrayList<Document>();
-		for (final Question q : questions) {
-			final Document d = toQuestionDocument(session, q);
-			d.setId(q.get_id());
-			d.setRev(q.get_rev());
-			documents.add(d);
-		}
-		try {
-			database.bulkSaveDocuments(documents.toArray(new Document[documents.size()]));
-		} catch (final IOException e) {
-			LOGGER.error("Could not bulk publish all questions: {}", e.getMessage());
-		}
-	}
-
-	@Override
-	public void deleteAllQuestionsAnswers(final Session session) {
-		final List<Question> questions = getQuestions(new NovaView("skill_question/by_session"), session);
-		for (final Question q : questions) {
-			deleteAnswers(q);
-		}
-	}
-
-	@Override
-	public int getLearningProgress(final Session session) {
-		// Note: we have to use this many views because our CouchDB version does not support
-		// advanced features like summing over lists. Thus, we have to do it all by ourselves...
-		final NovaView maximumValueView = new NovaView("learning_progress_maximum_value/max");
-		final NovaView answerSumView = new NovaView("learning_progress_user_values/sum");
-		final NovaView answerDocumentCountView = new NovaView("learning_progress_course_answers/count");
-		maximumValueView.setKey(session.get_id());
-		answerSumView.setStartKeyArray(session.get_id());
-		answerSumView.setEndKeyArray(session.get_id(), "{}");
-		answerDocumentCountView.setStartKeyArray(session.get_id());
-		answerDocumentCountView.setEndKeyArray(session.get_id(), "{}");
-		answerDocumentCountView.setGroup(true);
-
-		final List<Document> maximumValueResult = getDatabase().view(maximumValueView).getResults();
-		final List<Document> answerSumResult = getDatabase().view(answerSumView).getResults();
-		final List<Document> answerDocumentCountResult = getDatabase().view(answerDocumentCountView).getResults();
-
-		if (maximumValueResult.isEmpty() || answerSumResult.isEmpty() || answerDocumentCountResult.isEmpty()) {
-			return 0;
-		}
-
-		final double courseMaximumValue = maximumValueResult.get(0).getInt("value");
-		final double userTotalValue = answerSumResult.get(0).getInt("value");
-		final double numUsers = answerDocumentCountResult.size();
-		if (courseMaximumValue == 0 || numUsers == 0) {
-			return 0;
-		}
-		final double courseAverageValue = userTotalValue / numUsers;
-		final double courseProgress = courseAverageValue / courseMaximumValue;
-		return (int)Math.round(courseProgress * 100);
-	}
-
-	@Override
-	public SimpleEntry<Integer,Integer> getMyLearningProgress(final Session session, final User user) {
-		final int courseProgress = getLearningProgress(session);
-
-		final NovaView maximumValueView = new NovaView("learning_progress_maximum_value/max");
-		final NovaView answerSumView = new NovaView("learning_progress_user_values/sum");
-		maximumValueView.setKey(session.get_id());
-		answerSumView.setKey(session.get_id(), user.getUsername());
-
-		final List<Document> maximumValueResult = getDatabase().view(maximumValueView).getResults();
-		final List<Document> answerSumResult = getDatabase().view(answerSumView).getResults();
-
-		if (maximumValueResult.isEmpty() || answerSumResult.isEmpty()) {
-			return new AbstractMap.SimpleEntry<Integer, Integer>(0, courseProgress);
-		}
-
-		final double courseMaximumValue = maximumValueResult.get(0).getInt("value");
-		final double userTotalValue = answerSumResult.get(0).getInt("value");
-
-		if (courseMaximumValue == 0) {
-			return new AbstractMap.SimpleEntry<Integer, Integer>(0, courseProgress);
-		}
-		final double myProgress = userTotalValue / courseMaximumValue;
-
-		return new AbstractMap.SimpleEntry<Integer, Integer>((int)Math.round(myProgress*100), courseProgress);
-	}
-
-	@Override
-	public DbUser createOrUpdateUser(DbUser user) {
-		try {
-			String id = user.getId();
-			String rev = user.getRev();
-			Document d = new Document();
-
-			if (null != id) {
-				d = database.getDocument(id, rev);
-			}
-
-			d.put("type", "userdetails");
-			d.put("username", user.getUsername());
-			d.put("password", user.getPassword());
-			d.put("activationKey", user.getActivationKey());
-			d.put("passwordResetKey", user.getPasswordResetKey());
-			d.put("passwordResetTime", user.getPasswordResetTime());
-			d.put("creation", user.getCreation());
-			d.put("lastLogin", user.getLastLogin());
-
-			database.saveDocument(d, id);
-			user.setId(d.getId());
-			user.setRev(d.getRev());
-
-			return user;
-		} catch (IOException e) {
-			LOGGER.error("Could not save user {}", user);
-		}
-
-		return null;
-	}
-
-	@Override
-	public DbUser getUser(String username) {
-		NovaView view = new NovaView("user/all");
-		view.setKey(username);
-		ViewResults results = this.getDatabase().view(view);
-
-		if (results.getJSONArray("rows").optJSONObject(0) == null) {
-			return null;
-		}
-
-		return (DbUser) JSONObject.toBean(
-			results.getJSONArray("rows").optJSONObject(0).optJSONObject("value"),
-			DbUser.class
-		);
-	}
-
-	@Override
-	public boolean deleteUser(DbUser dbUser) {
-		try {
-			this.deleteDocument(dbUser.getId());
-
-			return true;
-		} catch (IOException e) {
-			LOGGER.error("Could not delete user {}", dbUser.getId());
-		}
-
-		return false;
-	}
-}

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

-/*
- * Copyright (C) 2012 THM webMedia
- *
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ARSnova is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package de.thm.arsnova.dao;
-
-import java.util.AbstractMap.SimpleEntry;
-import java.util.List;
-
-import de.thm.arsnova.connector.model.Course;
-import de.thm.arsnova.entities.Answer;
-import de.thm.arsnova.entities.DbUser;
-import de.thm.arsnova.entities.InterposedQuestion;
-import de.thm.arsnova.entities.InterposedReadingCount;
-import de.thm.arsnova.entities.LoggedIn;
-import de.thm.arsnova.entities.Question;
-import de.thm.arsnova.entities.Session;
-import de.thm.arsnova.entities.User;
-
-public interface IDatabaseDao {
-	Session getSessionFromKeyword(String keyword);
-
-	Session getSession(String keyword);
-
-	List<Session> getMySessions(User user);
-
-	Session saveSession(User user, Session session);
-
-	boolean sessionKeyAvailable(String keyword);
-
-	Question saveQuestion(Session session, Question question);
-
-	InterposedQuestion saveQuestion(Session session, InterposedQuestion question, User user);
-
-	Question getQuestion(String id);
-
-	List<Question> getSkillQuestions(User user, Session session);
-
-	int getSkillQuestionCount(Session session);
-
-	LoggedIn registerAsOnlineUser(User u, Session s);
-
-	void updateSessionOwnerActivity(Session session);
-
-	List<String> getQuestionIds(Session session, User user);
-
-	void deleteQuestionWithAnswers(Question question);
-
-	void deleteAllQuestionsWithAnswers(Session session);
-
-	List<String> getUnAnsweredQuestionIds(Session session, User user);
-
-	Answer getMyAnswer(User me, String questionId, int piRound);
-
-	List<Answer> getAnswers(String questionId, int piRound);
-
-	int getAnswerCount(Question question, int piRound);
-
-	List<Answer> getFreetextAnswers(String questionId);
-
-	int countActiveUsers(long since);
-
-	List<Answer> getMyAnswers(User me, String sessionKey);
-
-	int getTotalAnswerCount(String sessionKey);
-
-	int getInterposedCount(String sessionKey);
-
-	InterposedReadingCount getInterposedReadingCount(Session session);
-
-	InterposedReadingCount getInterposedReadingCount(Session session, User user);
-
-	List<InterposedQuestion> getInterposedQuestions(Session session);
-
-	List<InterposedQuestion> getInterposedQuestions(Session session, User user);
-
-	void vote(User me, String menu);
-
-	int countSessions();
-
-	int countOpenSessions();
-
-	int countClosedSessions();
-
-	int countAnswers();
-
-	int countQuestions();
-
-	InterposedQuestion getInterposedQuestion(String questionId);
-
-	void markInterposedQuestionAsRead(InterposedQuestion question);
-
-	List<Session> getMyVisitedSessions(User user);
-
-	Question updateQuestion(Question question);
-
-	void deleteAnswers(Question question);
-
-	Answer saveAnswer(Answer answer, User user);
-
-	Answer updateAnswer(Answer answer);
-
-	Session getSessionFromId(String sessionId);
-
-	void deleteAnswer(String answerId);
-
-	void deleteInterposedQuestion(InterposedQuestion question);
-
-	List<Session> getCourseSessions(List<Course> courses);
-
-	Session lockSession(Session session, Boolean lock);
-
-	List<String> getActiveUsers(int timeDifference);
-
-	Session updateSession(Session session);
-
-	void deleteSession(Session session);
-
-	List<Question> getLectureQuestions(User user, Session session);
-
-	List<Question> getFlashcards(User user, Session session);
-
-	List<Question> getPreparationQuestions(User user, Session session);
-
-	int getLectureQuestionCount(Session session);
-
-	int getFlashcardCount(Session session);
-
-	int getPreparationQuestionCount(Session session);
-
-	int countLectureQuestionAnswers(Session session);
-
-	int countPreparationQuestionAnswers(Session session);
-
-	void deleteAllLectureQuestionsWithAnswers(Session session);
-
-	void deleteAllFlashcardsWithAnswers(Session session);
-
-	void deleteAllPreparationQuestionsWithAnswers(Session session);
-
-	List<String> getUnAnsweredLectureQuestionIds(Session session, User user);
-
-	List<String> getUnAnsweredPreparationQuestionIds(Session session, User user);
-
-	void deleteAllInterposedQuestions(Session session);
-
-	void deleteAllInterposedQuestions(Session session, User user);
-
-	void publishAllQuestions(Session session, boolean publish);
-
-	void deleteAllQuestionsAnswers(Session session);
-
-	DbUser createOrUpdateUser(DbUser user);
-
-	DbUser getUser(String username);
-
-	boolean deleteUser(DbUser dbUser);
-
-	int getLearningProgress(Session session);
-
-	SimpleEntry<Integer, Integer> getMyLearningProgress(Session session, User user);
-}

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

-/*
- * Copyright (C) 2012 THM webMedia
- *
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ARSnova is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package de.thm.arsnova.dao;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-import com.fourspaces.couchdb.View;
-
-public class NovaView extends View {
-
-	public NovaView(final String fullname) {
-		super(fullname);
-	}
-
-	@Override
-	public void setStartKey(final String key) {
-		startKey = quote(key);
-	}
-
-	public void setStartKeyArray(final String key) {
-		if (isNumber(key)) {
-			startKey = encode("[" + key + "]");
-		} else {
-			startKey = encode("[\"" + key + "\"]");
-		}
-	}
-
-	public void setStartKeyArray(final String... keys) {
-		this.setStartKey(keys);
-	}
-
-	@Override
-	public void setEndKey(final String key) {
-		endKey = quote(key);
-	}
-
-	public void setEndKeyArray(final String key) {
-		if (isNumber(key)) {
-			endKey = encode("[" + key + "]");
-		} else {
-			endKey = encode("[\"" + key + "\"]");
-		}
-	}
-
-	public void setEndKeyArray(final String... keys) {
-		this.setEndKey(keys);
-	}
-
-	public void setStartKey(final String... keys) {
-		startKey = toJsonArray(keys);
-	}
-
-	public void setEndKey(final String... keys) {
-		endKey = toJsonArray(keys);
-	}
-
-	@Override
-	public void setKey(final String key) {
-		this.key = quote(key);
-	}
-
-	public void setKey(final String... keys) {
-		key = toJsonArray(keys);
-	}
-
-	private String toJsonArray(final String[] strings) {
-		final StringBuilder sb = new StringBuilder();
-		for (final String str : strings) {
-			if (isNumber(str)) {
-				sb.append(str + ",");
-			} else if (str.equals("{}")) {
-				sb.append(str + ",");
-			} else {
-				sb.append("\"" + str + "\"" + ",");
-			}
-		}
-		// remove final comma
-		sb.replace(sb.length() - 1, sb.length(), "");
-		sb.insert(0, "[");
-		sb.append("]");
-		return encode(sb.toString());
-	}
-
-	private String quote(final String string) {
-		return encode("\"" + string + "\"");
-	}
-
-	private boolean isNumber(final String string) {
-		return string.matches("^[0-9]+$");
-	}
-
-	private String encode(final String string) {
-		try {
-			return URLEncoder.encode(string, "UTF-8");
-		} catch (final UnsupportedEncodingException e) {
-			// Since we're using 'UTF-8', this should Exception should never occur.
-			return "";
-		}
-	}
-}

src/main/java/de/thm/arsnova/dao/package-info.java

-package de.thm.arsnova.dao;

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

-package de.thm.arsnova.entities;
-
-public class Answer {
-
-	private String _id;
-	private String _rev;
-	private String type;
-	private String sessionId;
-	private String questionId;
-	private String answerText;
-	private String answerSubject;
-	private String questionVariant;
-	private int questionValue;
-	private int piRound;
-	private String user;
-	private long timestamp;
-	private int answerCount = 1;
-	private boolean abstention;
-	private int abstentionCount;
-
-	public Answer() {
-		this.type = "skill_question_answer";
-	}
-
-	public final String get_id() {
-		return _id;
-	}
-
-	public final void set_id(String _id) {
-		this._id = _id;
-	}
-
-	public final String get_rev() {
-		return _rev;
-	}
-
-	public final void set_rev(final String _rev) {
-		this._rev = _rev;
-	}
-
-	public final String getType() {
-		return type;
-	}
-
-	public final void setType(final String type) {
-		this.type = type;
-	}
-
-	public final String getSessionId() {
-		return sessionId;
-	}
-
-	public final void setSessionId(final String sessionId) {
-		this.sessionId = sessionId;
-	}
-
-	public final String getQuestionId() {
-		return questionId;
-	}
-
-	public final void setQuestionId(final String questionId) {
-		this.questionId = questionId;
-	}
-
-	public final String getAnswerText() {
-		return answerText;
-	}
-
-	public final void setAnswerText(final String answerText) {
-		this.answerText = answerText;
-	}
-
-	public final String getAnswerSubject() {
-		return answerSubject;
-	}
-
-	public final void setAnswerSubject(final String answerSubject) {
-		this.answerSubject = answerSubject;
-	}
-
-	public int getPiRound() {
-		return piRound;
-	}
-
-	public void setPiRound(int piRound) {
-		this.piRound = piRound;
-	}
-
-	public final String getUser() {
-		return user;
-	}
-
-	public final void setUser(final String user) {
-		this.user = user;
-	}
-
-	public long getTimestamp() {
-		return timestamp;
-	}
-
-	public void setTimestamp(long timestamp) {
-		this.timestamp = timestamp;
-	}
-
-	public final int getAnswerCount() {
-		return answerCount;
-	}
-
-	public final void setAnswerCount(final int answerCount) {
-		this.answerCount = answerCount;
-	}
-
-	public boolean isAbstention() {
-		return abstention;
-	}
-
-	public void setAbstention(boolean abstention) {
-		this.abstention = abstention;
-	}
-
-	public int getAbstentionCount() {
-		return abstentionCount;
-	}
-
-	public void setAbstentionCount(int abstentionCount) {
-		this.abstentionCount = abstentionCount;
-	}
-
-	public String getQuestionVariant() {
-		return questionVariant;
-	}
-
-	public void setQuestionVariant(String questionVariant) {
-		this.questionVariant = questionVariant;
-	}
-
-	public int getQuestionValue() {
-		return questionValue;
-	}
-
-	public void setQuestionValue(int questionValue) {
-		this.questionValue = questionValue;
-	}
-
-	@Override
-	public final String toString() {
-		return "Answer type:'" + type + "'"
-				+ ", session: " + sessionId
-				+ ", question: " + questionId
-				+ ", subject: " + answerSubject
-				+ ", answerCount: " + answerCount
-				+ ", answer: " + answerText
-				+ ", user: " + user;
-	}
-
-}

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

-package de.thm.arsnova.entities;
-
-public class Authorize {
-	private String user;
-	private String socketid;
-
-	public final String getUser() {
-		return user;
-	}
-
-	public final void setUser(final String user) {
-		this.user = user;
-	}
-
-	public final String getSocketid() {
-		return socketid;
-	}
-
-	public final void setSocketid(final String socketid) {
-		this.socketid = socketid;
-	}
-
-	@Override
-	public final String toString() {
-		return "user: " + user + ", socketid: " + socketid;
-
-	}
-}

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

-/*
- * Copyright (C) 2012 THM webMedia
- *
- * This file is part of ARSnova.
- *
- * ARSnova is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ARSnova is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package de.thm.arsnova.entities;
-
-import java.util.List;
-
-public class Question {
-
-	private String type;
-	private String questionType;
-	private String questionVariant;
-	private String subject;
-	private String text;
-	private boolean active;
-	private String releasedFor;
-	private List<PossibleAnswer> possibleAnswers;
-	private boolean noCorrect;
-	// TODO: We currently need both sessionId and sessionKeyword, but sessionKeyword will not be persisted.
-	private String sessionId;
-	private String sessionKeyword;
-	private long timestamp;
-	private int number;
-	private int duration;
-	private int piRound;
-	private boolean showStatistic; // sic
-	private boolean showAnswer;
-	private boolean abstention;
-	private String _id;
-	private String _rev;
-
-	private String image;
-	private int gridSize;
-	private int offsetX;
-	private int offsetY;
-	private int zoomLvl;
-	private int gridOffsetX;
-	private int gridOffsetY;
-	private int gridZoomLvl;
-	private int gridSizeX;
-	private int gridSizeY;
-	private boolean gridIsHidden;
-	private int imgRotation;
-	private boolean toggleFieldsLeft;
-	private int numClickableFields;
-	private int thresholdCorrectAnswers;
-	private boolean cvIsColored;
-
-	public final String getType() {
-		return type;
-	}
-
-	public final void setType(final String type) {
-		this.type = type;
-	}
-
-	public final String getQuestionType() {
-		return questionType;
-	}
-
-	public final void setQuestionType(final String questionType) {
-		this.questionType = questionType;
-	}
-
-	public final String getQuestionVariant() {
-		return questionVariant;
-	}
-
-	public final void setQuestionVariant(final String questionVariant) {
-		this.questionVariant = questionVariant;
-	}
-
-	public final String getSubject() {
-		return subject;
-	}
-
-	public final void setSubject(final String subject) {
-		this.subject = subject;
-	}
-
-	public final String getText() {
-		return text;
-	}
-
-	public final void setText(final String text) {
-		this.text = text;
-	}
-
-	public final boolean isActive() {
-		return active;
-	}
-
-	public final void setActive(final boolean active) {
-		this.active = active;
-	}
-
-	public final String getReleasedFor() {
-		return releasedFor;
-	}
-
-	public final void setReleasedFor(final String releasedFor) {
-		this.releasedFor = releasedFor;
-	}
-
-	public final List<PossibleAnswer> getPossibleAnswers() {
-		return possibleAnswers;
-	}
-
-	public final void setPossibleAnswers(final List<PossibleAnswer> possibleAnswers) {
-		this.possibleAnswers = possibleAnswers;
-	}
-
-	public final boolean isNoCorrect() {
-		return noCorrect;
-	}
-
-	public final void setNoCorrect(final boolean noCorrect) {
-		this.noCorrect = noCorrect;
-	}
-
-	public final String getSessionId() {
-		return sessionId;
-	}
-
-	public final void setSessionId(final String sessionId) {
-		this.sessionId = sessionId;
-	}
-
-	public final String getSession() {
-		return sessionId;
-	}
-
-	public final void setSession(final String session) {
-		sessionId = session;
-	}
-
-	public final String getSessionKeyword() {
-		return sessionKeyword;
-	}
-
-	public final void setSessionKeyword(final String keyword) {
-		sessionKeyword = keyword;
-	}
-
-	public final long getTimestamp() {
-		return timestamp;
-	}
-
-	public final void setTimestamp(final long timestamp) {
-		this.timestamp = timestamp;
-	}
-
-	public final int getNumber() {
-		return number;
-	}
-
-	public final void setNumber(final int number) {
-		this.number = number;
-	}
-
-	public final int getDuration() {
-		return duration;
-	}
-
-	public final void setDuration(final int duration) {
-		this.duration = duration;
-	}
-
-	public int getPiRound() {
-		return piRound;
-	}
-
-	public void setPiRound(final int piRound) {
-		this.piRound = piRound;
-	}
-
-	public boolean isShowStatistic() {
-		return showStatistic;
-	}
-
-	public void setShowStatistic(final boolean showStatistic) {
-		this.showStatistic = showStatistic;
-	}
-
-	public boolean getCvIsColored() {
-		return cvIsColored;
-	}
-
-	public void setCvIsColored(boolean cvIsColored) {
-		this.cvIsColored = cvIsColored;
-	}
-
-	public boolean isShowAnswer() {
-		return showAnswer;
-	}
-
-	public void setShowAnswer(final boolean showAnswer) {
-		this.showAnswer = showAnswer;
-	}
-
-	public boolean isAbstention() {
-		return abstention;
-	}
-
-	public void setAbstention(final boolean abstention) {
-		this.abstention = abstention;
-	}
-
-	public final String get_id() {
-		return _id;
-	}
-
-	public final void set_id(final String _id) {
-		this._id = _id;
-	}
-
-	public final String get_rev() {
-		return _rev;
-	}
-
-	public final void set_rev(final String _rev) {
-		this._rev = _rev;
-	}
-
-	public String getImage() {
-		return image;
-	}
-
-	public void setImage(final String image) {
-		this.image = image;
-	}
-
-	public int getGridSize() {
-		return gridSize;
-	}
-
-	public void setGridSize(final int gridSize) {
-		this.gridSize = gridSize;
-	}
-
-	public int getOffsetX() {
-		return offsetX;
-	}
-
-	public void setOffsetX(final int offsetX) {
-		this.offsetX = offsetX;
-	}
-
-	public int getOffsetY() {
-		return offsetY;
-	}
-
-	public void setOffsetY(final int offsetY) {
-		this.offsetY = offsetY;
-	}
-
-	public int getZoomLvl() {
-		return zoomLvl;
-	}
-
-	public void setZoomLvl(final int zoomLvl) {
-		this.zoomLvl = zoomLvl;
-	}
-
-	public int getGridOffsetX() {
-		return gridOffsetX;
-	}
-
-	public void setGridOffsetX(int gridOffsetX) {
-		this.gridOffsetX = gridOffsetX;
-	}
-
-	public int getGridOffsetY() {
-		return gridOffsetY;
-	}
-
-	public void setGridOffsetY(int gridOffsetY) {
-		this.gridOffsetY = gridOffsetY;
-	}
-
-	public int getGridZoomLvl() {
-		return gridZoomLvl;
-	}
-
-	public void setGridZoomLvl(int gridZoomLvl) {
-		this.gridZoomLvl = gridZoomLvl;
-	}
-
-	public int getGridSizeX() {
-		return gridSizeX;
-	}
-
-	public void setGridSizeX(int gridSizeX) {
-		this.gridSizeX = gridSizeX;
-	}
-
-	public int getGridSizeY() {
-		return gridSizeY;
-	}
-
-	public void setGridSizeY(int gridSizeY) {
-		this.gridSizeY = gridSizeY;
-	}
-
-	public boolean getGridIsHidden() {
-		return gridIsHidden;
-	}
-
-	public void setGridIsHidden(boolean gridIsHidden) {
-		this.gridIsHidden = gridIsHidden;
-	}
-
-	public int getImgRotation() {
-		return imgRotation;
-	}
-
-	public void setImgRotation(int imgRotation) {
-		this.imgRotation = imgRotation;
-	}
-
-	public boolean getToggleFieldsLeft() {
-		return toggleFieldsLeft;
-	}
-
-	public void setToggleFieldsLeft(boolean toggleFieldsLeft) {
-		this.toggleFieldsLeft = toggleFieldsLeft;
-	}
-
-	public int getNumClickableFields() {
-		return numClickableFields;
-	}
-
-	public void setNumClickableFields(int numClickableFields) {
-		this.numClickableFields = numClickableFields;
-	}
-
-	public int getThresholdCorrectAnswers() {
-		return thresholdCorrectAnswers;
-	}
-
-	public void setThresholdCorrectAnswers(int thresholdCorrectAnswers) {
-		this.thresholdCorrectAnswers = thresholdCorrectAnswers;
-	}
-
-
-	@Override
-	public final String toString() {
-		return "Question type '" + type + "': " + subject + ";\n" + text + possibleAnswers;
-	}
-}