From 793537361567cbde2cab78be8c50f836fc94bf39 Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Mon, 28 Sep 2015 13:46:19 +0200
Subject: [PATCH] Style fix
---
.../arsnova/controller/LoginController.java | 136 +++++++++---------
.../de/thm/arsnova/entities/Question.java | 32 ++---
.../de/thm/arsnova/dao/StubDatabaseDao.java | 4 +-
3 files changed, 84 insertions(+), 88 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/LoginController.java b/src/main/java/de/thm/arsnova/controller/LoginController.java
index bb678402..3b6d9680 100644
--- a/src/main/java/de/thm/arsnova/controller/LoginController.java
+++ b/src/main/java/de/thm/arsnova/controller/LoginController.java
@@ -146,7 +146,7 @@ public class LoginController extends AbstractController {
@RequestParam(value = "role", required = false) final UserSessionService.Role role,
final HttpServletRequest request,
final HttpServletResponse response
- ) throws IOException {
+ ) throws IOException {
String addr = request.getRemoteAddr();
if (userService.isBannedFromLogin(addr)) {
response.sendError(429, "Too Many Requests");
@@ -178,8 +178,8 @@ public class LoginController extends AbstractController {
if (!"".equals(username) && !"".equals(password)) {
org.springframework.security.core.userdetails.User user =
new org.springframework.security.core.userdetails.User(
- username, password, true, true, true, true, getAuthorities()
- );
+ username, password, true, true, true, true, this.getAuthorities()
+ );
Authentication token = new UsernamePasswordAuthenticationToken(user, password, getAuthorities());
try {
@@ -209,7 +209,7 @@ public class LoginController extends AbstractController {
org.springframework.security.core.userdetails.User user =
new org.springframework.security.core.userdetails.User(
username, "", true, true, true, true, authorities
- );
+ );
Authentication token = new UsernamePasswordAuthenticationToken(user, null, authorities);
SecurityContextHolder.getContext().setAuthentication(token);
@@ -226,7 +226,7 @@ public class LoginController extends AbstractController {
@RequestParam(value = "failureurl", defaultValue = "/") String failureUrl,
final HttpServletRequest request,
final HttpServletResponse response
- ) throws IOException, ServletException {
+ ) throws IOException, ServletException {
View result = null;
/* Use URLs from a request parameters for redirection as long as the
@@ -242,36 +242,36 @@ public class LoginController extends AbstractController {
/* Handle proxy
* TODO: It might be better, to support the proposed standard: http://tools.ietf.org/html/rfc7239 */
int port = "".equals(request.getHeader("X-Forwarded-Port"))
- ? Integer.parseInt(request.getHeader("X-Forwarded-Port")) : request.getServerPort();
- if ("https".equals(request.getScheme())) {
- if (443 != port) {
- serverUrl = serverUrl + ":" + String.valueOf(port);
- }
- } else {
- if (80 != port) {
- serverUrl = serverUrl + ":" + String.valueOf(port);
- }
- }
+ ? Integer.valueOf(request.getHeader("X-Forwarded-Port")) : request.getServerPort();
+ if ("https".equals(request.getScheme())) {
+ if (443 != port) {
+ serverUrl = serverUrl + ":" + String.valueOf(port);
+ }
+ } else {
+ if (80 != port) {
+ serverUrl = serverUrl + ":" + String.valueOf(port);
+ }
+ }
- request.getSession().setAttribute("ars-login-success-url", serverUrl + successUrl);
- request.getSession().setAttribute("ars-login-failure-url", serverUrl + failureUrl);
-
- if ("cas".equals(type)) {
- casEntryPoint.commence(request, response, null);
- } else if ("twitter".equals(type)) {
- final String authUrl = twitterProvider.getAuthorizationUrl(new HttpUserSession(request));
- result = new RedirectView(authUrl);
- } else if ("facebook".equals(type)) {
- facebookProvider.setFields("id,link");
- facebookProvider.setScope("");
- final String authUrl = facebookProvider.getAuthorizationUrl(new HttpUserSession(request));
- result = new RedirectView(authUrl);
- } else if ("google".equals(type)) {
- final String authUrl = googleProvider.getAuthorizationUrl(new HttpUserSession(request));
- result = new RedirectView(authUrl);
- }
+ request.getSession().setAttribute("ars-login-success-url", serverUrl + successUrl);
+ request.getSession().setAttribute("ars-login-failure-url", serverUrl + failureUrl);
+
+ if ("cas".equals(type)) {
+ casEntryPoint.commence(request, response, null);
+ } else if ("twitter".equals(type)) {
+ final String authUrl = twitterProvider.getAuthorizationUrl(new HttpUserSession(request));
+ result = new RedirectView(authUrl);
+ } else if ("facebook".equals(type)) {
+ facebookProvider.setFields("id,link");
+ facebookProvider.setScope("");
+ final String authUrl = facebookProvider.getAuthorizationUrl(new HttpUserSession(request));
+ result = new RedirectView(authUrl);
+ } else if ("google".equals(type)) {
+ final String authUrl = googleProvider.getAuthorizationUrl(new HttpUserSession(request));
+ result = new RedirectView(authUrl);
+ }
- return result;
+ return result;
}
@RequestMapping(value = { "/auth/", "/whoami" }, method = RequestMethod.GET)
@@ -309,10 +309,10 @@ public class LoginController extends AbstractController {
if ("true".equals(guestEnabled)) {
ServiceDescription sdesc = new ServiceDescription(
- "guest",
- "Guest",
- null
- );
+ "guest",
+ "Guest",
+ null
+ );
sdesc.setOrder(guestOrder);
if (!"true".equals(guestLecturerEnabled)) {
sdesc.setAllowLecturer(false);
@@ -322,73 +322,73 @@ public class LoginController extends AbstractController {
if ("true".equals(customLoginEnabled) && !"".equals(customLoginDialog)) {
ServiceDescription sdesc = new ServiceDescription(
- "custom",
- customLoginTitle,
- customizationPath + "/" + customLoginDialog + "?redirect={0}",
- customLoginImage
- );
+ "custom",
+ customLoginTitle,
+ customizationPath + "/" + customLoginDialog + "?redirect={0}",
+ customLoginImage
+ );
sdesc.setOrder(customLoginOrder);
services.add(sdesc);
}
if ("true".equals(dbAuthEnabled) && !"".equals(dbAuthDialog)) {
ServiceDescription sdesc = new ServiceDescription(
- "arsnova",
- dbAuthTitle,
- customizationPath + "/" + dbAuthDialog + "?redirect={0}",
- dbAuthImage
- );
+ "arsnova",
+ dbAuthTitle,
+ customizationPath + "/" + dbAuthDialog + "?redirect={0}",
+ dbAuthImage
+ );
sdesc.setOrder(dbAuthOrder);
services.add(sdesc);
}
if ("true".equals(ldapEnabled) && !"".equals(ldapDialog)) {
ServiceDescription sdesc = new ServiceDescription(
- "ldap",
- ldapTitle,
- customizationPath + "/" + ldapDialog + "?redirect={0}",
- ldapImage
- );
+ "ldap",
+ ldapTitle,
+ customizationPath + "/" + ldapDialog + "?redirect={0}",
+ ldapImage
+ );
sdesc.setOrder(ldapOrder);
services.add(sdesc);
}
if ("true".equals(casEnabled)) {
ServiceDescription sdesc = new ServiceDescription(
- "cas",
- casTitle,
- MessageFormat.format(dialogUrl, "cas")
- );
+ "cas",
+ casTitle,
+ MessageFormat.format(dialogUrl, "cas")
+ );
sdesc.setOrder(casOrder);
services.add(sdesc);
}
if ("true".equals(facebookEnabled)) {
ServiceDescription sdesc = new ServiceDescription(
- "facebook",
- "Facebook",
- MessageFormat.format(dialogUrl, "facebook")
- );
+ "facebook",
+ "Facebook",
+ MessageFormat.format(dialogUrl, "facebook")
+ );
sdesc.setOrder(facebookOrder);
services.add(sdesc);
}
if ("true".equals(googleEnabled)) {
ServiceDescription sdesc = new ServiceDescription(
- "google",
- "Google",
- MessageFormat.format(dialogUrl, "google")
- );
+ "google",
+ "Google",
+ MessageFormat.format(dialogUrl, "google")
+ );
sdesc.setOrder(googleOrder);
services.add(sdesc);
}
if ("true".equals(twitterEnabled)) {
ServiceDescription sdesc = new ServiceDescription(
- "twitter",
- "Twitter",
- MessageFormat.format(dialogUrl, "twitter")
- );
+ "twitter",
+ "Twitter",
+ MessageFormat.format(dialogUrl, "twitter")
+ );
sdesc.setOrder(twitterOrder);
services.add(sdesc);
}
diff --git a/src/main/java/de/thm/arsnova/entities/Question.java b/src/main/java/de/thm/arsnova/entities/Question.java
index 9fa0a75e..36c0c9f2 100644
--- a/src/main/java/de/thm/arsnova/entities/Question.java
+++ b/src/main/java/de/thm/arsnova/entities/Question.java
@@ -505,21 +505,21 @@ public class Question implements Serializable {
@ApiModelProperty(required = true, value = "used to display scale factor")
public String getScaleFactor() {
- return scaleFactor;
+ return this.scaleFactor;
}
public void setGridScaleFactor(String scaleFactor) {
- gridScaleFactor = scaleFactor;
+ this.gridScaleFactor = scaleFactor;
}
@ApiModelProperty(required = true, value = "used to display grid scale factor")
public String getGridScaleFactor() {
- return gridScaleFactor;
+ return this.gridScaleFactor;
}
@ApiModelProperty(required = true, value = "enabled text nswer")
public boolean isTextAnswerEnabled() {
- return textAnswerEnabled;
+ return this.textAnswerEnabled;
}
public void setTextAnswerEnabled(boolean textAnswerEnabled) {
@@ -568,12 +568,8 @@ public class Question implements Serializable {
@Override
public boolean equals(Object obj) {
// auto generated!
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
+ if (this == obj) return true;
+ if (obj == null) return false;
if (getClass() != obj.getClass()) {
return false;
}
@@ -591,9 +587,9 @@ public class Question implements Serializable {
public int calculateValue(Answer answer) {
if (answer.isAbstention()) {
return 0;
- } else if (questionType.equals("mc")) {
+ } else if (this.questionType.equals("mc")) {
return calculateMultipleChoiceValue(answer);
- } else if (questionType.equals("grid")) {
+ } else if (this.questionType.equals("grid")) {
return calculateGridValue(answer);
} else {
return calculateRegularValue(answer);
@@ -647,7 +643,7 @@ public class Question implements Serializable {
private int calculateRegularValue(Answer answer) {
String answerText = answer.getAnswerText();
- for (PossibleAnswer p : possibleAnswers) {
+ for (PossibleAnswer p : this.possibleAnswers) {
if (answerText.equals(p.getText())) {
return p.getValue();
}
@@ -658,9 +654,9 @@ public class Question implements Serializable {
private int calculateGridValue(Answer answer) {
int value = 0;
String[] answers = answer.getAnswerText().split(",");
- for (String answer2 : answers) {
- for (PossibleAnswer p : possibleAnswers) {
- if (answer2.equals(p.getText())) {
+ for (int i = 0; i < answers.length; i++) {
+ for (PossibleAnswer p : this.possibleAnswers) {
+ if (answers[i].equals(p.getText())) {
value += p.getValue();
}
}
@@ -671,9 +667,9 @@ public class Question implements Serializable {
private int calculateMultipleChoiceValue(Answer answer) {
int value = 0;
String[] answers = answer.getAnswerText().split(",");
- for (int i = 0; i < possibleAnswers.size() && i < answers.length; i++) {
+ for (int i = 0; i < this.possibleAnswers.size() && i < answers.length; i++) {
if (answers[i].equals("1")) {
- PossibleAnswer p = possibleAnswers.get(i);
+ PossibleAnswer p = this.possibleAnswers.get(i);
value += p.getValue();
}
}
diff --git a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
index a1f02390..99952d35 100644
--- a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
+++ b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
@@ -247,12 +247,12 @@ public class StubDatabaseDao implements IDatabaseDao {
@Override
public InterposedQuestion getInterposedQuestion(String questionId) {
- return interposedQuestion;
+ return this.interposedQuestion;
}
@Override
public void markInterposedQuestionAsRead(InterposedQuestion question) {
- interposedQuestion.setRead(true);
+ this.interposedQuestion.setRead(true);
}
@Override
--
GitLab