From 2b18d0a51594e94bea2b103264847038dac13995 Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Thu, 1 Nov 2012 16:05:56 +0100
Subject: [PATCH] Checkstyle changes
---
.../arsnova/controller/LoginController.java | 2 +-
.../controller/QuestionController.java | 16 +++++----
.../java/de/thm/arsnova/dao/CouchDBDao.java | 34 +++++++++----------
.../java/de/thm/arsnova/entities/Answer.java | 10 +++---
.../thm/arsnova/entities/PossibleAnswer.java | 2 +-
.../de/thm/arsnova/entities/Question.java | 2 +-
.../java/de/thm/arsnova/entities/Session.java | 2 +-
.../java/de/thm/arsnova/entities/User.java | 6 ++--
.../thm/arsnova/entities/VisitedSession.java | 2 +-
.../thm/arsnova/socket/message/Feedback.java | 3 +-
.../arsnova/socket/message/package-info.java | 2 +-
11 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/LoginController.java b/src/main/java/de/thm/arsnova/controller/LoginController.java
index 8c608e01..9bbe7830 100644
--- a/src/main/java/de/thm/arsnova/controller/LoginController.java
+++ b/src/main/java/de/thm/arsnova/controller/LoginController.java
@@ -57,7 +57,7 @@ import de.thm.arsnova.services.IUserService;
public class LoginController extends AbstractController {
private static final int MAX_USERNAME_LENGTH = 15;
-
+
@Autowired
private TwitterProvider twitterProvider;
diff --git a/src/main/java/de/thm/arsnova/controller/QuestionController.java b/src/main/java/de/thm/arsnova/controller/QuestionController.java
index 406368c1..64074fa7 100644
--- a/src/main/java/de/thm/arsnova/controller/QuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/QuestionController.java
@@ -35,7 +35,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import de.thm.arsnova.entities.Answer;
import de.thm.arsnova.entities.Question;
-import de.thm.arsnova.exceptions.ForbiddenException;
import de.thm.arsnova.exceptions.NotFoundException;
import de.thm.arsnova.services.IQuestionService;
@@ -84,7 +83,10 @@ public class QuestionController extends AbstractController {
return;
}
- @RequestMapping(value = { "/getSkillQuestions/{sessionkey}", "/session/{sessionkey}/skillquestions" }, method = RequestMethod.GET)
+ @RequestMapping(
+ value = { "/getSkillQuestions/{sessionkey}", "/session/{sessionkey}/skillquestions" },
+ method = RequestMethod.GET
+ )
@ResponseBody
public final List<Question> getSkillQuestions(
@PathVariable final String sessionkey,
@@ -219,7 +221,7 @@ public class QuestionController extends AbstractController {
) {
return questionService.getAnswerCount(sessionKey, questionId);
}
-
+
@RequestMapping(value = "/session/{sessionKey}/question/{questionId}/freetextanswers", method = RequestMethod.GET)
@ResponseBody
public final List<Answer> getFreetextAnswers(
@@ -229,7 +231,7 @@ public class QuestionController extends AbstractController {
) {
return questionService.getFreetextAnswers(sessionKey, questionId);
}
-
+
@RequestMapping(value = "/session/{sessionKey}/myanswers", method = RequestMethod.GET)
@ResponseBody
public final List<Answer> getMyAnswers(
@@ -238,7 +240,7 @@ public class QuestionController extends AbstractController {
) {
return questionService.getMytAnswers(sessionKey);
}
-
+
@RequestMapping(value = "/session/{sessionKey}/answercount", method = RequestMethod.GET)
@ResponseBody
public final int getTotalAnswerCount(
@@ -247,7 +249,7 @@ public class QuestionController extends AbstractController {
) {
return questionService.getTotalAnswerCount(sessionKey);
}
-
+
@RequestMapping(value = "/session/{sessionKey}/interposedcount", method = RequestMethod.GET)
@ResponseBody
public final int getInterposedCount(
@@ -256,7 +258,7 @@ public class QuestionController extends AbstractController {
) {
return questionService.getInterposedCount(sessionKey);
}
-
+
@RequestMapping(value = "/session/{sessionKey}/interposed", method = RequestMethod.GET)
@ResponseBody
public final List<Question> getInterposedQuestions(
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 1936e18b..63fac235 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -204,18 +204,18 @@ public class CouchDBDao implements IDatabaseDao {
if (session == null) {
throw new NotFoundException();
}
-
+
User user = this.userService.getCurrentUser();
View view = null;
try {
- if(session.getCreator().equals(user.getUsername())) {
+ if (session.getCreator().equals(user.getUsername())) {
view = new View("skill_question/by_session_sorted_by_subject_and_text");
view.setStartKey("[" + URLEncoder.encode("\"" + session.get_id() + "\"", "UTF-8") + "]");
view.setEndKey("[" + URLEncoder.encode("\"" + session.get_id() + "\",{}", "UTF-8") + "]");
} else {
- if(user.getType().equals(User.THM)) {
+ if (user.getType().equals(User.THM)) {
view = new View("skill_question/by_session_for_thm");
} else {
view = new View("skill_question/by_session_for_all");
@@ -891,7 +891,9 @@ public class CouchDBDao implements IDatabaseDao {
public final int countActiveUsers(Session session, long since) {
try {
View view = new View("logged_in/count");
- view.setStartKey(URLEncoder.encode("[\"" + session.get_id() + "\", " + String.valueOf(since) + "]", "UTF-8"));
+ view.setStartKey(
+ URLEncoder.encode("[\"" + session.get_id() + "\", " + String.valueOf(since) + "]", "UTF-8")
+ );
view.setEndKey(URLEncoder.encode("[\"" + session.get_id() + "\", {}]", "UTF-8"));
ViewResults results = this.getDatabase().view(view);
if (isEmptyResults(results)) {
@@ -934,19 +936,19 @@ public class CouchDBDao implements IDatabaseDao {
}
return null;
}
-
+
@Override
public List<Answer> getMyAnswers(String sessionKey) {
Session s = this.getSessionFromKeyword(sessionKey);
if (s == null) {
throw new NotFoundException();
}
-
+
User user = userService.getCurrentUser();
- if(user == null) {
+ if (user == null) {
throw new UnauthorizedException();
}
-
+
try {
View view = new View("answer/by_user_and_session");
view.setKey("[" + URLEncoder.encode("\"" + user.getUsername() + "\",\"" + s.get_id() + "\"", "UTF-8") + "]");
@@ -962,15 +964,12 @@ public class CouchDBDao implements IDatabaseDao {
answers.add(a);
}
return answers;
-
} catch (UnsupportedEncodingException e) {
LOGGER.error("Error while retrieving user answers", e);
}
-
-
return null;
}
-
+
@Override
public int getTotalAnswerCount(String sessionKey) {
Session s = this.getSessionFromKeyword(sessionKey);
@@ -982,7 +981,7 @@ public class CouchDBDao implements IDatabaseDao {
View view = new View("skill_question/count_answers_by_session");
view.setKey(URLEncoder.encode("\"" + s.get_id() + "\"", "UTF-8"));
ViewResults results = this.getDatabase().view(view);
- if(results.size() == 0) {
+ if (results.size() == 0) {
return 0;
}
return results.getJSONArray("rows").optJSONObject(0).optInt("value");
@@ -991,7 +990,7 @@ public class CouchDBDao implements IDatabaseDao {
}
return 0;
}
-
+
@Override
public int getInterposedCount(String sessionKey) {
Session s = this.getSessionFromKeyword(sessionKey);
@@ -1004,7 +1003,7 @@ public class CouchDBDao implements IDatabaseDao {
view.setKey(URLEncoder.encode("\"" + s.get_id() + "\"", "UTF-8"));
view.setGroup(true);
ViewResults results = this.getDatabase().view(view);
- if(results.size() == 0 || results.getResults().size() == 0) {
+ if (results.size() == 0 || results.getResults().size() == 0) {
return 0;
}
return results.getJSONArray("rows").optJSONObject(0).optInt("value");
@@ -1013,14 +1012,14 @@ public class CouchDBDao implements IDatabaseDao {
}
return 0;
}
-
+
@Override
public List<Question> getInterposedQuestions(String sessionKey) {
Session s = this.getSessionFromKeyword(sessionKey);
if (s == null) {
throw new NotFoundException();
}
-
+
try {
View view = new View("interposed_question/by_session");
view.setKey(URLEncoder.encode("\"" + s.get_id() + "\"", "UTF-8"));
@@ -1038,7 +1037,6 @@ public class CouchDBDao implements IDatabaseDao {
question.setSession(s.get_id());
result.add(question);
}
-
return result;
} catch (UnsupportedEncodingException e) {
LOGGER.error("Error while retrieving interposed questions", e);
diff --git a/src/main/java/de/thm/arsnova/entities/Answer.java b/src/main/java/de/thm/arsnova/entities/Answer.java
index 4159ea62..9649d5bf 100644
--- a/src/main/java/de/thm/arsnova/entities/Answer.java
+++ b/src/main/java/de/thm/arsnova/entities/Answer.java
@@ -2,7 +2,7 @@ package de.thm.arsnova.entities;
public class Answer {
-
+
private String _id;
private String _rev;
private String type;
@@ -17,7 +17,7 @@ public class Answer {
public Answer() {
this.type = "skill_question_answer";
}
-
+
public final String get_id() {
return _id;
}
@@ -74,7 +74,7 @@ public class Answer {
this.answerText = answerText;
}
-
+
public final String getAnswerSubject() {
return answerSubject;
}
@@ -82,7 +82,7 @@ public class Answer {
public final void setAnswerSubject(final String answerSubject) {
this.answerSubject = answerSubject;
}
-
+
public final String getSubject() {
return answerSubject;
}
@@ -118,7 +118,7 @@ public class Answer {
@Override
public final String toString() {
return "Answer type:'" + type + "'"
- + ", session: " + sessionId
+ + ", session: " + sessionId
+ ", question: " + questionId
+ ", subject: " + answerSubject
+ ", answerCount: " + answerCount
diff --git a/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java b/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java
index e81f3c56..f0c01e1f 100644
--- a/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java
+++ b/src/main/java/de/thm/arsnova/entities/PossibleAnswer.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2012 THM webMedia
- *
+ *
* This file is part of ARSnova.
*
* ARSnova is free software: you can redistribute it and/or modify
diff --git a/src/main/java/de/thm/arsnova/entities/Question.java b/src/main/java/de/thm/arsnova/entities/Question.java
index 67830492..803c3a99 100644
--- a/src/main/java/de/thm/arsnova/entities/Question.java
+++ b/src/main/java/de/thm/arsnova/entities/Question.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2012 THM webMedia
- *
+ *
* This file is part of ARSnova.
*
* ARSnova is free software: you can redistribute it and/or modify
diff --git a/src/main/java/de/thm/arsnova/entities/Session.java b/src/main/java/de/thm/arsnova/entities/Session.java
index 2d7eefd9..a9a508a3 100644
--- a/src/main/java/de/thm/arsnova/entities/Session.java
+++ b/src/main/java/de/thm/arsnova/entities/Session.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2012 THM webMedia
- *
+ *
* This file is part of ARSnova.
*
* ARSnova is free software: you can redistribute it and/or modify
diff --git a/src/main/java/de/thm/arsnova/entities/User.java b/src/main/java/de/thm/arsnova/entities/User.java
index 5fe1ece5..bbe76a58 100644
--- a/src/main/java/de/thm/arsnova/entities/User.java
+++ b/src/main/java/de/thm/arsnova/entities/User.java
@@ -16,9 +16,7 @@ public class User implements Serializable {
public static final String THM = "thm";
public static final String LDAP = "ldap";
public static final String ANONYMOUS = "anonymous";
-
-
-
+
private static final long serialVersionUID = 1L;
private String username;
private String type;
@@ -60,7 +58,7 @@ public class User implements Serializable {
public void setUsername(String username) {
this.username = username;
}
-
+
public String getType() {
return type;
}
diff --git a/src/main/java/de/thm/arsnova/entities/VisitedSession.java b/src/main/java/de/thm/arsnova/entities/VisitedSession.java
index a6e28dd7..06569a43 100644
--- a/src/main/java/de/thm/arsnova/entities/VisitedSession.java
+++ b/src/main/java/de/thm/arsnova/entities/VisitedSession.java
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2012 THM webMedia
- *
+ *
* This file is part of ARSnova.
*
* ARSnova is free software: you can redistribute it and/or modify
diff --git a/src/main/java/de/thm/arsnova/socket/message/Feedback.java b/src/main/java/de/thm/arsnova/socket/message/Feedback.java
index 2b5ac907..8fdff90a 100644
--- a/src/main/java/de/thm/arsnova/socket/message/Feedback.java
+++ b/src/main/java/de/thm/arsnova/socket/message/Feedback.java
@@ -25,5 +25,4 @@ public class Feedback {
public String toString() {
return "Feedback, sessionkey: " + sessionkey + ", value: " + value;
}
-
-}
\ No newline at end of file
+}
diff --git a/src/main/java/de/thm/arsnova/socket/message/package-info.java b/src/main/java/de/thm/arsnova/socket/message/package-info.java
index b4bdfaae..8267a404 100644
--- a/src/main/java/de/thm/arsnova/socket/message/package-info.java
+++ b/src/main/java/de/thm/arsnova/socket/message/package-info.java
@@ -1 +1 @@
-package de.thm.arsnova.socket.message;
\ No newline at end of file
+package de.thm.arsnova.socket.message;
--
GitLab