From cffbb6280f251676e85df8592f59bc3957d3d0a5 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <paul-christian.volkmer@mni.thm.de>
Date: Wed, 4 Jun 2014 10:23:00 +0200
Subject: [PATCH] Remove unused parameters and obsolete code fragments
This affects:
* Some null checks before instanceof checks
* CouchDBDao.collectUnansweredQuestionIds()
* DeprecatedApiInterceptorHandler.getDeprecatedApiAnnotation()
* CacheControlInterceptorHandler.getCacheControlAnnotation()
* CacheControlInterceptorHandler.setCacheControlResponseHeader()
* FeedbackService - userService private field
---
.../java/de/thm/arsnova/dao/CouchDBDao.java | 8 +++---
.../thm/arsnova/services/FeedbackService.java | 3 ---
.../web/CacheControlInterceptorHandler.java | 27 ++++++++-----------
.../web/DeprecatedApiInterceptorHandler.java | 16 +++++------
4 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index ae2db78d7..58a9a3637 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -478,7 +478,7 @@ public class CouchDBDao implements IDatabaseDao {
public final List<String> getUnAnsweredQuestionIds(final Session session, final User user) {
final NovaView view = new NovaView("answer/by_user");
view.setKey(user.getUsername(), session.get_id());
- return collectUnansweredQuestionIds(session, user, getQuestionIds(session, user), view);
+ return collectUnansweredQuestionIds(getQuestionIds(session, user), view);
}
@Override
@@ -1211,7 +1211,7 @@ public class CouchDBDao implements IDatabaseDao {
public List<String> getUnAnsweredLectureQuestionIds(final Session session, final User user) {
final NovaView view = new NovaView("answer/variant_by_user");
view.setKey(user.getUsername(), session.get_id(), "lecture");
- return collectUnansweredQuestionIds(session, user, getLectureQuestionIds(session, user), view);
+ return collectUnansweredQuestionIds(getLectureQuestionIds(session, user), view);
}
private List<String> getLectureQuestionIds(final Session session, final User user) {
@@ -1230,7 +1230,7 @@ public class CouchDBDao implements IDatabaseDao {
public List<String> getUnAnsweredPreparationQuestionIds(final Session session, final User user) {
final NovaView view = new NovaView("answer/variant_by_user");
view.setKey(user.getUsername(), session.get_id(), "preparation");
- return collectUnansweredQuestionIds(session, user, getPreparationQuestionIds(session, user), view);
+ return collectUnansweredQuestionIds(getPreparationQuestionIds(session, user), view);
}
private List<String> getPreparationQuestionIds(final Session session, final User user) {
@@ -1246,8 +1246,6 @@ public class CouchDBDao implements IDatabaseDao {
}
private List<String> collectUnansweredQuestionIds(
- final Session session,
- final User user,
final List<String> questions,
final NovaView view
) {
diff --git a/src/main/java/de/thm/arsnova/services/FeedbackService.java b/src/main/java/de/thm/arsnova/services/FeedbackService.java
index a25dc091e..116578bd5 100644
--- a/src/main/java/de/thm/arsnova/services/FeedbackService.java
+++ b/src/main/java/de/thm/arsnova/services/FeedbackService.java
@@ -52,9 +52,6 @@ public class FeedbackService implements IFeedbackService {
@Autowired
private IDatabaseDao databaseDao;
- @Autowired
- private IUserService userService;
-
private FeedbackStorage feedbackStorage;
public final void setDatabaseDao(final IDatabaseDao newDatabaseDao) {
diff --git a/src/main/java/de/thm/arsnova/web/CacheControlInterceptorHandler.java b/src/main/java/de/thm/arsnova/web/CacheControlInterceptorHandler.java
index e72fd61c8..45f60100a 100644
--- a/src/main/java/de/thm/arsnova/web/CacheControlInterceptorHandler.java
+++ b/src/main/java/de/thm/arsnova/web/CacheControlInterceptorHandler.java
@@ -12,29 +12,28 @@ public class CacheControlInterceptorHandler extends HandlerInterceptorAdapter {
@Override
public boolean preHandle(
- HttpServletRequest request,
- HttpServletResponse response,
- Object handler) throws Exception {
+ final HttpServletRequest request,
+ final HttpServletResponse response,
+ final Object handler) throws Exception {
- setCacheControlResponseHeader(request, response, handler);
+ setCacheControlResponseHeader(response, handler);
return super.preHandle(request, response, handler);
}
private void setCacheControlResponseHeader(
- HttpServletRequest request,
- HttpServletResponse response,
- Object handler) {
+ final HttpServletResponse response,
+ final Object handler) {
- CacheControl cacheControl = getCacheControlAnnotation(request, response, handler);
+ final CacheControl cacheControl = getCacheControlAnnotation(handler);
if (cacheControl == null) {
return;
}
- StringBuilder headerValue = new StringBuilder();
+ final StringBuilder headerValue = new StringBuilder();
if(cacheControl.policy().length > 0) {
- for (CacheControl.Policy policy : cacheControl.policy()) {
+ for (final CacheControl.Policy policy : cacheControl.policy()) {
if (headerValue.length() > 0) {
headerValue.append(", ");
}
@@ -60,12 +59,8 @@ public class CacheControlInterceptorHandler extends HandlerInterceptorAdapter {
response.setHeader("cache-control", headerValue.toString());
}
- private CacheControl getCacheControlAnnotation(
- HttpServletRequest request,
- HttpServletResponse response,
- Object handler
- ) {
- if (handler == null || !(handler instanceof HandlerMethod)) {
+ private CacheControl getCacheControlAnnotation(final Object handler) {
+ if (!(handler instanceof HandlerMethod)) {
return null;
}
diff --git a/src/main/java/de/thm/arsnova/web/DeprecatedApiInterceptorHandler.java b/src/main/java/de/thm/arsnova/web/DeprecatedApiInterceptorHandler.java
index bd7b86ac3..5d248608b 100644
--- a/src/main/java/de/thm/arsnova/web/DeprecatedApiInterceptorHandler.java
+++ b/src/main/java/de/thm/arsnova/web/DeprecatedApiInterceptorHandler.java
@@ -12,23 +12,19 @@ public class DeprecatedApiInterceptorHandler extends HandlerInterceptorAdapter {
@Override
public boolean preHandle(
- HttpServletRequest request,
- HttpServletResponse response,
- Object handler) throws Exception {
+ final HttpServletRequest request,
+ final HttpServletResponse response,
+ final Object handler) throws Exception {
- if (getDeprecatedApiAnnotation(request, response, handler) != null) {
+ if (getDeprecatedApiAnnotation(handler) != null) {
response.addHeader("X-Deprecated-Api", "1");
}
return super.preHandle(request, response, handler);
}
- private DeprecatedApi getDeprecatedApiAnnotation(
- HttpServletRequest request,
- HttpServletResponse response,
- Object handler
- ) {
- if (handler == null || !(handler instanceof HandlerMethod)) {
+ private DeprecatedApi getDeprecatedApiAnnotation(final Object handler) {
+ if (!(handler instanceof HandlerMethod)) {
return null;
}
--
GitLab