Browse Source

remove HttpServletRequest

Shinsuke Sugaya 7 years ago
parent
commit
b0761d7c82

+ 2 - 3
src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java

@@ -213,13 +213,12 @@ public abstract class FessSearchAction extends FessBaseAction {
     }
 
     protected HtmlResponse redirectToLogin() {
-        return systemHelper.getRedirectResponseToLogin(request, redirect(SsoAction.class));
+        return systemHelper.getRedirectResponseToLogin(redirect(SsoAction.class));
     }
 
     protected HtmlResponse redirectToRoot() {
         final String contextPath = request.getServletContext().getContextPath();
-        return systemHelper.getRedirectResponseToRoot(request,
-                newHtmlResponseAsRedirect(StringUtil.isBlank(contextPath) ? "/" : contextPath));
+        return systemHelper.getRedirectResponseToRoot(newHtmlResponseAsRedirect(StringUtil.isBlank(contextPath) ? "/" : contextPath));
     }
 
     protected HtmlNext virtualHost(final HtmlNext path) {

+ 2 - 3
src/main/java/org/codelibs/fess/helper/SystemHelper.java

@@ -43,7 +43,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.LocaleUtils;
 import org.apache.commons.lang3.RandomStringUtils;
@@ -384,11 +383,11 @@ public class SystemHelper {
         return new FessActionValidator<>(requestManager, messagesCreator, runtimeGroups);
     }
 
-    public HtmlResponse getRedirectResponseToLogin(final HttpServletRequest request, final HtmlResponse response) {
+    public HtmlResponse getRedirectResponseToLogin(final HtmlResponse response) {
         return response;
     }
 
-    public HtmlResponse getRedirectResponseToRoot(final HttpServletRequest request, final HtmlResponse response) {
+    public HtmlResponse getRedirectResponseToRoot(final HtmlResponse response) {
         return response;
     }