Skip to content
Snippets Groups Projects
Commit 404954bd authored by Daniel Gerhardt's avatar Daniel Gerhardt
Browse files

Fix white spaces

parent 4c34c060
Branches
Tags
No related merge requests found
Showing with 57 additions and 57 deletions
......@@ -102,16 +102,16 @@ public class ConfigurationController extends AbstractController {
@Value("${question.answer-option-limit:8}")
private String answerOptionLimit;
@Value("${upload.filesize_b:}")
private String maxUploadFilesize;
@Value("${question.parse-answer-option-formatting:false}")
private String parseAnswerOptionFormatting;
@Value("${pp.subjects}")
private String ppSubjects;
@Value("${pp.licenses}")
private String ppLicenses;
......@@ -129,7 +129,7 @@ public class ConfigurationController extends AbstractController {
@Value("${tracking.site-id}")
private String trackingSiteId;
@Value("${optional.demoSessionKey:}")
private String demoSessionKey;
......@@ -138,7 +138,7 @@ public class ConfigurationController extends AbstractController {
@Value("${pp.session-levels.en}")
private String ppLevelsEn;
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public final HashMap<String, Object> getConfiguration(HttpServletRequest request) {
......@@ -168,7 +168,7 @@ public class ConfigurationController extends AbstractController {
if (!"".equals(blogUrl)) {
config.put("blogUrl", blogUrl);
}
if (!"".equals(presenterDocumentationUrl)) {
if (!"".equals(presenterDocumentationUrl)) {
config.put("presenterDocumentationUrl", presenterDocumentationUrl);
}
if (!"".equals(overlayUrl)) {
......@@ -203,7 +203,7 @@ public class ConfigurationController extends AbstractController {
features.put("gridSquare", "true".equals(gridSquareEnabled));
features.put("sessionImportExport", "true".equals(sessionImportExportEnabled));
features.put("publicPool", "true".equals(publicPoolEnabled));
// add public pool configuration on demand
if (features.get("publicPool")) {
config.put("publicPool", publicPool);
......
......@@ -105,11 +105,11 @@ public class LecturerQuestionController extends AbstractController {
) {
boolean p = true;
List<Question> questions;
if (publish != null) {
p = publish;
}
if (lectureQuestionsOnly) {
questions = questionService.getLectureQuestions(sessionkey);
questionService.publishQuestions(sessionkey, publish, questions);
......@@ -384,10 +384,10 @@ public class LecturerQuestionController extends AbstractController {
questionService.getAnswerCount(questionId),
questionService.getAbstentionAnswerCount(questionId)
);
return list;
}
@RequestMapping(value = "/{questionId}/freetextanswer/", method = RequestMethod.GET)
public final List<Answer> getFreetextAnswers(@PathVariable final String questionId) {
return questionService.getFreetextAnswers(questionId);
......
......@@ -99,7 +99,7 @@ public class SecurityExceptionControllerAdvice {
@ExceptionHandler(NotImplementedException.class)
public void handleNotImplementedException(final Exception e, final HttpServletRequest request) {
}
@ResponseStatus(HttpStatus.REQUEST_ENTITY_TOO_LARGE)
@ExceptionHandler(RequestEntityTooLargeException.class)
public void handleRequestEntityTooLargeException(final Exception e, final HttpServletRequest request) {
......
......@@ -101,8 +101,8 @@ public class SessionController extends AbstractController {
session.setName(session.getName() + appendix);
session.setShortName(session.getShortName() + appendix);
}
}
}
final Session newSession = sessionService.saveSession(session);
if (newSession == null) {
......@@ -195,7 +195,7 @@ public class SessionController extends AbstractController {
final HttpServletResponse response
) {
List<SessionInfo> sessions = sessionService.getMyPublicPoolSessionsInfo();
if (sessions == null || sessions.isEmpty()) {
response.setStatus(HttpServletResponse.SC_NO_CONTENT);
return null;
......@@ -203,13 +203,13 @@ public class SessionController extends AbstractController {
return sessions;
}
@RequestMapping(value = "/publicpool", method = RequestMethod.GET)
public final List<SessionInfo> getPublicPoolSessions(
final HttpServletResponse response
) {
List<SessionInfo> sessions = sessionService.getPublicPoolSessionsInfo();
if (sessions == null || sessions.isEmpty()) {
response.setStatus(HttpServletResponse.SC_NO_CONTENT);
return null;
......
......@@ -126,7 +126,7 @@ public class CouchDBDao implements IDatabaseDao {
}
return result;
}
@Override
public final List<Session> getPublicPoolSessions() {
final NovaView view = new NovaView("session/public_pool_by_subject");
......@@ -134,7 +134,7 @@ public class CouchDBDao implements IDatabaseDao {
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"),
......@@ -145,19 +145,19 @@ public class CouchDBDao implements IDatabaseDao {
}
return result;
}
@Override
public final List<SessionInfo> getPublicPoolSessionsInfo() {
final List<Session> sessions = this.getPublicPoolSessions();
return getInfosForSessions(sessions);
}
@Override
public final List<Session> getMyPublicPoolSessions(final User user) {
final NovaView view = new NovaView("session/public_pool_by_creator");
view.setStartKeyArray(user.getUsername());
view.setEndKeyArray(user.getUsername(), "{}");
final ViewResults sessions = getDatabase().view(view);
final List<Session> result = new ArrayList<Session>();
......@@ -173,13 +173,13 @@ public class CouchDBDao implements IDatabaseDao {
}
return result;
}
@Override
public final List<SessionInfo> getMyPublicPoolSessionsInfo(final User user) {
final List<Session> sessions = this.getMyPublicPoolSessions(user);
return getInfosForSessions(sessions);
}
@Override
public final List<SessionInfo> getMySessionsInfo(final User user) {
final List<Session> sessions = this.getMySessions(user);
......@@ -191,7 +191,7 @@ public class CouchDBDao implements IDatabaseDao {
final ExtendedView answerCountView = new ExtendedView("skill_question/count_answers_by_session");
final ExtendedView interposedCountView = new ExtendedView("interposed_question/count_by_session");
final ExtendedView unredInterposedCountView = new ExtendedView("interposed_question/count_by_session_reading");
interposedCountView.setSessionIdKeys(sessions);
interposedCountView.setGroup(true);
questionCountView.setSessionIdKeys(sessions);
......@@ -283,7 +283,7 @@ public class CouchDBDao implements IDatabaseDao {
private List<SessionInfo> getSessionInfoData(final List<Session> sessions,
final ExtendedView questionCountView,
final ExtendedView answerCountView,
final ExtendedView interposedCountView,
final ExtendedView interposedCountView,
final ExtendedView unredInterposedCountView) {
final ViewResults questionCountViewResults = getDatabase().view(questionCountView);
final ViewResults answerCountViewResults = getDatabase().view(answerCountView);
......@@ -306,7 +306,7 @@ public class CouchDBDao implements IDatabaseDao {
for (final Document d : unredInterposedCountViewResults.getResults()) {
unredInterposedCountMap.put(d.getJSONArray("key").getString(0), d.getInt("value"));
}
List<SessionInfo> sessionInfos = new ArrayList<SessionInfo>();
for (Session session : sessions) {
int numQuestions = 0;
......@@ -325,7 +325,7 @@ public class CouchDBDao implements IDatabaseDao {
if (unredInterposedCountMap.containsKey(session.get_id())) {
numUnredInterposed = unredInterposedCountMap.get(session.get_id());
}
SessionInfo info = new SessionInfo(session);
info.setNumQuestions(numQuestions);
info.setNumAnswers(numAnswers);
......@@ -816,7 +816,7 @@ public class CouchDBDao implements IDatabaseDao {
if (results.getResults().size() == 0) {
return 0;
}
return results.getJSONArray("rows").optJSONObject(0).optInt("value");
}
......@@ -1525,7 +1525,7 @@ public class CouchDBDao implements IDatabaseDao {
final List<Question> questions = getQuestions(new NovaView("skill_question/by_session"), session);
publishQuestions(session, publish, questions);
}
@Override
public void publishQuestions(final Session session, final boolean publish, List<Question> questions) {
for (final Question q : questions) {
......
......@@ -249,7 +249,7 @@ public class Question {
public void setImage(final String image) {
this.image = image;
}
public String getFcImage() {
return fcImage;
}
......@@ -373,39 +373,39 @@ public class Question {
public String getGridLineColor() {
return gridLineColor;
}
public void setGridLineColor(String gridLineColor) {
this.gridLineColor = gridLineColor;
}
public int getNumberOfDots() {
return numberOfDots;
}
public void setNumberOfDots(int numberOfDots) {
this.numberOfDots = numberOfDots;
}
public String getGridType() {
return gridType;
}
public void setGridType(String gridType) {
this.gridType = gridType;
}
public void setScaleFactor(String scaleFactor) {
this.scaleFactor = scaleFactor;
}
public String getScaleFactor() {
return this.scaleFactor;
}
public void setGridScaleFactor(String scaleFactor) {
this.gridScaleFactor = scaleFactor;
}
public String getGridScaleFactor() {
return this.gridScaleFactor;
}
......
......@@ -57,9 +57,9 @@ public interface ISessionService {
SimpleEntry<Integer, Integer> getMyLearningProgress(String sessionkey);
List<SessionInfo> getMySessionsInfo();
List<SessionInfo> getPublicPoolSessionsInfo();
List<SessionInfo> getMyPublicPoolSessionsInfo();
List<SessionInfo> getMyVisitedSessionsInfo();
......
......@@ -270,10 +270,10 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
if (question == null) {
return 0;
}
return databaseDao.getAnswerCount(question, question.getPiRound());
}
@Override
@PreAuthorize("isAuthenticated()")
public int getAbstentionAnswerCount(final String questionId) {
......@@ -281,7 +281,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
if (question == null) {
return 0;
}
return databaseDao.getAbstentionAnswerCount(questionId);
}
......@@ -410,14 +410,14 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
} else if (question.getPiRound() < 1 || question.getPiRound() > 2) {
question.setPiRound(oldQuestion.getPiRound() > 0 ? oldQuestion.getPiRound() : 1);
}
final Question result = databaseDao.updateQuestion(question);
if(!oldQuestion.isActive() && question.isActive()) {
final NewQuestionEvent event = new NewQuestionEvent(this, result, session);
this.publisher.publishEvent(event);
}
return result;
}
......@@ -520,7 +520,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
public int getPreparationQuestionCount(final String sessionkey) {
return databaseDao.getPreparationQuestionCount(getSession(sessionkey));
}
@Override
@PreAuthorize("isAuthenticated()")
public SimpleEntry<String,List<Integer>> getAnswerAndAbstentionCountByQuestion(final String questionid) {
......@@ -528,7 +528,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
getAnswerCount(questionid),
getAbstentionAnswerCount(questionid)
);
return new AbstractMap.SimpleEntry<String, List<Integer>>(questionid, countList);
}
......@@ -619,7 +619,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
}
databaseDao.publishAllQuestions(session, publish);
}
@Override
@PreAuthorize("isAuthenticated()")
public void publishQuestions(final String sessionkey, final boolean publish, List<Question> questions) {
......
......@@ -97,10 +97,10 @@ public class SessionService implements ISessionService {
@Autowired(required = false)
private ConnectorClient connectorClient;
@Value("${pp.logofilesize_b}")
private int uploadFileSizeByte;
public static final Logger LOGGER = LoggerFactory.getLogger(SessionService.class);
public void setDatabaseDao(final IDatabaseDao newDatabaseDao) {
......@@ -165,13 +165,13 @@ public class SessionService implements ISessionService {
public final List<Session> getMySessions() {
return databaseDao.getMySessions(userService.getCurrentUser());
}
@Override
@PreAuthorize("isAuthenticated()")
public final List<SessionInfo> getPublicPoolSessionsInfo() {
return databaseDao.getPublicPoolSessionsInfo();
}
@Override
@PreAuthorize("isAuthenticated()")
public final List<SessionInfo> getMyPublicPoolSessionsInfo() {
......@@ -222,7 +222,7 @@ public class SessionService implements ISessionService {
throw new RequestEntityTooLargeException();
}
}
return databaseDao.saveSession(userService.getCurrentUser(), session);
}
......
......@@ -14,7 +14,7 @@
<fluidoSkin>
<topBarEnabled>false</topBarEnabled>
<topBar>
</topBar>
<sideBarEnabled>true</sideBarEnabled>
<profile>release</profile>
......@@ -63,6 +63,6 @@
<item name="Source Repository" href="source-repository.html" />
<item name="Metrics" href="cobertura/index.html" />
</menu>
</body>
</project>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment