From d0ca4f44f8d9c482b3c31d1b4746e0b013561677 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Wed, 4 Jun 2014 08:54:51 +0200
Subject: [PATCH] Fixed some code issues
SessionController: Append integer to a string will result in a string
ApplicationPermissionEvaluator: Code formatting
UserService: Create new user object instead of assining parameter reference
ARSnovaSocketIOServer: No exceptions are thrown
---
.../arsnova/controller/SessionController.java | 2 +-
.../ApplicationPermissionEvaluator.java | 45 +++++++++++++++----
.../de/thm/arsnova/services/UserService.java | 5 ++-
.../arsnova/socket/ARSnovaSocketIOServer.java | 4 +-
4 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java
index fe08325b..6552d397 100644
--- a/src/main/java/de/thm/arsnova/controller/SessionController.java
+++ b/src/main/java/de/thm/arsnova/controller/SessionController.java
@@ -93,7 +93,7 @@ public class SessionController extends AbstractController {
courses.add(course);
final int sessionCount = sessionService.countSessions(courses);
if (sessionCount > 0) {
- final String appendix = " (" + String.valueOf(sessionCount + 1) + ")";
+ final String appendix = " (" + (sessionCount + 1) + ")";
session.setName(session.getName() + appendix);
session.setShortName(session.getShortName() + appendix);
}
diff --git a/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java b/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java
index 77cf14b0..4e3d4965 100644
--- a/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java
+++ b/src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java
@@ -26,12 +26,16 @@ public class ApplicationPermissionEvaluator implements PermissionEvaluator {
private IDatabaseDao dao;
@Override
- public boolean hasPermission(final Authentication authentication, final Object targetDomainObject, final Object permission) {
+ public boolean hasPermission(
+ final Authentication authentication,
+ final Object targetDomainObject,
+ final Object permission
+ ) {
final String username = getUsername(authentication);
if (
targetDomainObject instanceof Session
- && ! checkSessionPermission(username, ((Session)targetDomainObject).getKeyword(), permission)
+ && !checkSessionPermission(username, ((Session) targetDomainObject).getKeyword(), permission)
) {
throw new ForbiddenException();
}
@@ -39,20 +43,35 @@ public class ApplicationPermissionEvaluator implements PermissionEvaluator {
}
@Override
- public boolean hasPermission(final Authentication authentication, final Serializable targetId, final String targetType, final Object permission) {
+ public boolean hasPermission(
+ final Authentication authentication,
+ final Serializable targetId,
+ final String targetType,
+ final Object permission
+ ) {
final String username = getUsername(authentication);
- if ("session".equals(targetType) && ! checkSessionPermission(username, targetId, permission)) {
+ if ("session".equals(targetType) && !checkSessionPermission(username, targetId, permission)) {
throw new ForbiddenException();
- } else if ("question".equals(targetType) && ! checkQuestionPermission(username, targetId, permission)) {
+ } else if (
+ "question".equals(targetType)
+ && !checkQuestionPermission(username, targetId, permission)
+ ) {
throw new ForbiddenException();
- } else if ("interposedquestion".equals(targetType) && ! checkInterposedQuestionPermission(username, targetId, permission)) {
+ } else if (
+ "interposedquestion".equals(targetType)
+ && !checkInterposedQuestionPermission(username, targetId, permission)
+ ) {
throw new ForbiddenException();
}
return true;
}
- private boolean checkSessionPermission(final String username, final Serializable targetId, final Object permission) {
+ private boolean checkSessionPermission(
+ final String username,
+ final Serializable targetId,
+ final Object permission
+ ) {
if (permission instanceof String && (permission.equals("owner") || permission.equals("write"))) {
return dao.getSession(targetId.toString()).getCreator().equals(username);
} else if (permission instanceof String && permission.equals("read")) {
@@ -61,7 +80,11 @@ public class ApplicationPermissionEvaluator implements PermissionEvaluator {
return false;
}
- private boolean checkQuestionPermission(final String username, final Serializable targetId, final Object permission) {
+ private boolean checkQuestionPermission(
+ final String username,
+ final Serializable targetId,
+ final Object permission
+ ) {
if (permission instanceof String && permission.equals("owner")) {
final Question question = dao.getQuestion(targetId.toString());
if (question != null) {
@@ -75,7 +98,11 @@ public class ApplicationPermissionEvaluator implements PermissionEvaluator {
return false;
}
- private boolean checkInterposedQuestionPermission(final String username, final Serializable targetId, final Object permission) {
+ private boolean checkInterposedQuestionPermission(
+ final String username,
+ final Serializable targetId,
+ final Object permission
+ ) {
if (permission instanceof String && permission.equals("owner")) {
final InterposedQuestion question = dao.getInterposedQuestion(targetId.toString());
if (question != null) {
diff --git a/src/main/java/de/thm/arsnova/services/UserService.java b/src/main/java/de/thm/arsnova/services/UserService.java
index 9d776a08..f45ed6d9 100644
--- a/src/main/java/de/thm/arsnova/services/UserService.java
+++ b/src/main/java/de/thm/arsnova/services/UserService.java
@@ -86,7 +86,7 @@ public class UserService implements IUserService {
User user = null;
if (authentication instanceof OAuthAuthenticationToken) {
- user = getOAuthUser(authentication, user);
+ user = getOAuthUser(authentication);
} else if (authentication instanceof CasAuthenticationToken) {
final CasAuthenticationToken token = (CasAuthenticationToken) authentication;
user = new User(token.getAssertion().getPrincipal());
@@ -105,7 +105,8 @@ public class UserService implements IUserService {
return user;
}
- private User getOAuthUser(final Authentication authentication, User user) {
+ private User getOAuthUser(final Authentication authentication) {
+ User user = null;
final OAuthAuthenticationToken token = (OAuthAuthenticationToken) authentication;
if (token.getUserProfile() instanceof Google2Profile) {
final Google2Profile profile = (Google2Profile) token.getUserProfile();
diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index e1c85a03..9090447a 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -77,7 +77,7 @@ public class ARSnovaSocketIOServer {
server.stop();
}
- public void startServer() throws Exception {
+ public void startServer() {
/**
* hack: listen to ipv4 adresses
*/
@@ -151,7 +151,7 @@ public class ARSnovaSocketIOServer {
server.start();
}
- public void stopServer() throws Exception {
+ public void stopServer() {
LOGGER.trace("In stopServer method of class: {}", getClass().getName());
try {
for (final SocketIOClient client : server.getAllClients()) {
--
GitLab