From c30b2ec9632d8c2e1b6b426954e04b07798d35dc Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Tue, 28 Mar 2017 13:00:56 +0200
Subject: [PATCH] Make all loggers private static final

---
 src/main/java/de/thm/arsnova/CASLogoutSuccessHandler.java       | 2 +-
 src/main/java/de/thm/arsnova/ImageUtils.java                    | 2 +-
 src/main/java/de/thm/arsnova/config/SecurityConfig.java         | 2 +-
 .../java/de/thm/arsnova/controller/ConfigurationController.java | 2 +-
 src/main/java/de/thm/arsnova/controller/CourseController.java   | 2 +-
 src/main/java/de/thm/arsnova/controller/FeedbackController.java | 2 +-
 .../de/thm/arsnova/controller/LecturerQuestionController.java   | 2 +-
 src/main/java/de/thm/arsnova/controller/LoginController.java    | 2 +-
 src/main/java/de/thm/arsnova/controller/SessionController.java  | 2 +-
 src/main/java/de/thm/arsnova/controller/UserController.java     | 2 +-
 src/main/java/de/thm/arsnova/dao/CouchDBDao.java                | 2 +-
 .../de/thm/arsnova/security/CustomLdapUserDetailsMapper.java    | 2 +-
 src/main/java/de/thm/arsnova/security/DbUserDetailsService.java | 2 +-
 src/main/java/de/thm/arsnova/services/QuestionService.java      | 2 +-
 src/main/java/de/thm/arsnova/services/SessionService.java       | 2 +-
 src/main/java/de/thm/arsnova/services/UserService.java          | 2 +-
 src/main/java/de/thm/arsnova/web/CorsFilter.java                | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/de/thm/arsnova/CASLogoutSuccessHandler.java b/src/main/java/de/thm/arsnova/CASLogoutSuccessHandler.java
index a7ce378f4..13eb93434 100644
--- a/src/main/java/de/thm/arsnova/CASLogoutSuccessHandler.java
+++ b/src/main/java/de/thm/arsnova/CASLogoutSuccessHandler.java
@@ -34,7 +34,7 @@ import java.io.IOException;
  */
 public class CASLogoutSuccessHandler implements LogoutSuccessHandler {
 
-	public static final Logger logger = LoggerFactory.getLogger(CASLogoutSuccessHandler.class);
+	private static final Logger logger = LoggerFactory.getLogger(CASLogoutSuccessHandler.class);
 
 	private String casUrl;
 	private String defaultTarget;
diff --git a/src/main/java/de/thm/arsnova/ImageUtils.java b/src/main/java/de/thm/arsnova/ImageUtils.java
index 5d4fc27aa..6349cc844 100644
--- a/src/main/java/de/thm/arsnova/ImageUtils.java
+++ b/src/main/java/de/thm/arsnova/ImageUtils.java
@@ -56,7 +56,7 @@ public class ImageUtils {
 	/* default value is 200 pixel in height, set the value in the configuration file */
 	static final int THUMB_HEIGHT_DEFAULT = 200;
 
-	public static final Logger logger = LoggerFactory.getLogger(ImageUtils.class);
+	private static final Logger logger = LoggerFactory.getLogger(ImageUtils.class);
 
 	@Value("${imageupload.thumbnail.width}")
 	private int thumbWidth = THUMB_WIDTH_DEFAULT;
diff --git a/src/main/java/de/thm/arsnova/config/SecurityConfig.java b/src/main/java/de/thm/arsnova/config/SecurityConfig.java
index 21af46063..73b719285 100644
--- a/src/main/java/de/thm/arsnova/config/SecurityConfig.java
+++ b/src/main/java/de/thm/arsnova/config/SecurityConfig.java
@@ -87,7 +87,7 @@ import java.util.List;
 @EnableWebSecurity
 @Profile("!test")
 public class SecurityConfig extends WebSecurityConfigurerAdapter implements ServletContextAware {
-	private final Logger logger = LoggerFactory.getLogger(SecurityConfig.class);
+	private static final Logger logger = LoggerFactory.getLogger(SecurityConfig.class);
 
 	private ServletContext servletContext;
 
diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 8956c1ea0..2a00e65b7 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -37,7 +37,7 @@ import java.util.Map;
 @Controller
 @RequestMapping({"/configuration", "/arsnova-config"})
 public class ConfigurationController extends AbstractController {
-	public static final Logger logger = LoggerFactory
+	private static final Logger logger = LoggerFactory
 			.getLogger(ConfigurationController.class);
 
 	@Value("${api.path:}")
diff --git a/src/main/java/de/thm/arsnova/controller/CourseController.java b/src/main/java/de/thm/arsnova/controller/CourseController.java
index f213fcd95..48e4ece77 100644
--- a/src/main/java/de/thm/arsnova/controller/CourseController.java
+++ b/src/main/java/de/thm/arsnova/controller/CourseController.java
@@ -45,7 +45,7 @@ import java.util.List;
 @RestController
 public class CourseController extends AbstractController {
 
-	public static final Logger logger = LoggerFactory.getLogger(CourseController.class);
+	private static final Logger logger = LoggerFactory.getLogger(CourseController.class);
 
 	@Autowired(required = false)
 	private ConnectorClient connectorClient;
diff --git a/src/main/java/de/thm/arsnova/controller/FeedbackController.java b/src/main/java/de/thm/arsnova/controller/FeedbackController.java
index a0fc5a6f7..d0e77fdda 100644
--- a/src/main/java/de/thm/arsnova/controller/FeedbackController.java
+++ b/src/main/java/de/thm/arsnova/controller/FeedbackController.java
@@ -43,7 +43,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class FeedbackController extends AbstractController {
 
-	public static final Logger logger = LoggerFactory.getLogger(FeedbackController.class);
+	private static final Logger logger = LoggerFactory.getLogger(FeedbackController.class);
 
 	@Autowired
 	private IFeedbackService feedbackService;
diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
index 23acef6d4..40674a0e8 100644
--- a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
@@ -56,7 +56,7 @@ import java.util.List;
 @Api(value = "/lecturerquestion", description = "Operations for Lecture Questions")
 public class LecturerQuestionController extends PaginationController {
 
-	public static final Logger logger = LoggerFactory.getLogger(LecturerQuestionController.class);
+	private static final Logger logger = LoggerFactory.getLogger(LecturerQuestionController.class);
 
 	@Autowired
 	private IQuestionService questionService;
diff --git a/src/main/java/de/thm/arsnova/controller/LoginController.java b/src/main/java/de/thm/arsnova/controller/LoginController.java
index 766972fd2..0420a7240 100644
--- a/src/main/java/de/thm/arsnova/controller/LoginController.java
+++ b/src/main/java/de/thm/arsnova/controller/LoginController.java
@@ -141,7 +141,7 @@ public class LoginController extends AbstractController {
 	@Autowired
 	private UserSessionService userSessionService;
 
-	public static final Logger logger = LoggerFactory.getLogger(LoginController.class);
+	private static final Logger logger = LoggerFactory.getLogger(LoginController.class);
 
 	@RequestMapping(value = { "/auth/login", "/doLogin" }, method = { RequestMethod.POST, RequestMethod.GET })
 	public void doLogin(
diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java
index 570db51eb..fb5ad95f6 100644
--- a/src/main/java/de/thm/arsnova/controller/SessionController.java
+++ b/src/main/java/de/thm/arsnova/controller/SessionController.java
@@ -63,7 +63,7 @@ import java.util.List;
 @Api(value = "/session", description = "the Session Controller API")
 public class SessionController extends PaginationController {
 
-	public static final Logger logger = LoggerFactory.getLogger(SessionController.class);
+	private static final Logger logger = LoggerFactory.getLogger(SessionController.class);
 
 	@Autowired
 	private ISessionService sessionService;
diff --git a/src/main/java/de/thm/arsnova/controller/UserController.java b/src/main/java/de/thm/arsnova/controller/UserController.java
index 3aa76475c..6f955b5a8 100644
--- a/src/main/java/de/thm/arsnova/controller/UserController.java
+++ b/src/main/java/de/thm/arsnova/controller/UserController.java
@@ -48,7 +48,7 @@ public class UserController extends AbstractController {
 	@Autowired
 	private UserSessionService userSessionService;
 
-	public static final Logger logger = LoggerFactory
+	private static final Logger logger = LoggerFactory
 			.getLogger(UserController.class);
 
 	@RequestMapping(value = "/register", method = RequestMethod.POST)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 31aa76c2c..3a4f89847 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -96,7 +96,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
 
 	private final Queue<AbstractMap.SimpleEntry<Document, AnswerQueueElement>> answerQueue = new ConcurrentLinkedQueue<>();
 
-	public static final Logger logger = LoggerFactory.getLogger(CouchDBDao.class);
+	private static final Logger logger = LoggerFactory.getLogger(CouchDBDao.class);
 
 	@Value("${couchdb.host}")
 	public void setDatabaseHost(final String newDatabaseHost) {
diff --git a/src/main/java/de/thm/arsnova/security/CustomLdapUserDetailsMapper.java b/src/main/java/de/thm/arsnova/security/CustomLdapUserDetailsMapper.java
index 9697c07a9..34e4af944 100644
--- a/src/main/java/de/thm/arsnova/security/CustomLdapUserDetailsMapper.java
+++ b/src/main/java/de/thm/arsnova/security/CustomLdapUserDetailsMapper.java
@@ -31,7 +31,7 @@ import java.util.Collection;
  * to get a consistent ID despite case insensitivity.
  */
 public class CustomLdapUserDetailsMapper extends LdapUserDetailsMapper {
-	public static final Logger logger = LoggerFactory.getLogger(CustomLdapUserDetailsMapper.class);
+	private static final Logger logger = LoggerFactory.getLogger(CustomLdapUserDetailsMapper.class);
 
 	private String userIdAttr;
 
diff --git a/src/main/java/de/thm/arsnova/security/DbUserDetailsService.java b/src/main/java/de/thm/arsnova/security/DbUserDetailsService.java
index 6023bd1fa..cb1000e97 100644
--- a/src/main/java/de/thm/arsnova/security/DbUserDetailsService.java
+++ b/src/main/java/de/thm/arsnova/security/DbUserDetailsService.java
@@ -41,7 +41,7 @@ public class DbUserDetailsService implements UserDetailsService {
 	@Autowired
 	private IDatabaseDao dao;
 
-	public static final Logger logger = LoggerFactory
+	private static final Logger logger = LoggerFactory
 			.getLogger(DbUserDetailsService.class);
 
 	@Override
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index 2c257e882..275adfedb 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -67,7 +67,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
 
 	private ApplicationEventPublisher publisher;
 
-	public static final Logger logger = LoggerFactory.getLogger(QuestionService.class);
+	private static final Logger logger = LoggerFactory.getLogger(QuestionService.class);
 
 	private HashMap<String, Timer> timerList = new HashMap<>();
 
diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index 242351d67..7ea54a72e 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -126,7 +126,7 @@ public class SessionService implements ISessionService, ApplicationEventPublishe
 
 	private ApplicationEventPublisher publisher;
 
-	public static final Logger logger = LoggerFactory.getLogger(SessionService.class);
+	private static final Logger logger = LoggerFactory.getLogger(SessionService.class);
 
 	@Scheduled(fixedDelay = SESSION_INACTIVITY_CHECK_INTERVAL_MS)
 	public void deleteInactiveSessions() {
diff --git a/src/main/java/de/thm/arsnova/services/UserService.java b/src/main/java/de/thm/arsnova/services/UserService.java
index bd5b14266..9df1adffd 100644
--- a/src/main/java/de/thm/arsnova/services/UserService.java
+++ b/src/main/java/de/thm/arsnova/services/UserService.java
@@ -88,7 +88,7 @@ public class UserService implements IUserService {
 	private static final long ACTIVATION_KEY_CHECK_INTERVAL_MS = 30 * 60 * 1000L;
 	private static final long ACTIVATION_KEY_DURABILITY_MS = 6 * 60 * 60 * 1000L;
 
-	public static final Logger logger = LoggerFactory.getLogger(UserService.class);
+	private static final Logger logger = LoggerFactory.getLogger(UserService.class);
 
 	private static final ConcurrentHashMap<UUID, User> socketid2user = new ConcurrentHashMap<>();
 
diff --git a/src/main/java/de/thm/arsnova/web/CorsFilter.java b/src/main/java/de/thm/arsnova/web/CorsFilter.java
index 267145098..9742993d1 100644
--- a/src/main/java/de/thm/arsnova/web/CorsFilter.java
+++ b/src/main/java/de/thm/arsnova/web/CorsFilter.java
@@ -25,7 +25,7 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import java.util.List;
 
 public class CorsFilter extends org.springframework.web.filter.CorsFilter {
-	protected final Logger logger = LoggerFactory.getLogger(CorsFilter.class);
+	private final Logger logger = LoggerFactory.getLogger(CorsFilter.class);
 
 	public CorsFilter(List<String> origins) {
 		super(configurationSource(origins));
-- 
GitLab