Bladeren bron

update lastaflute

Shinsuke Sugaya 8 jaren geleden
bovenliggende
commit
0d124b81d9

+ 3 - 3
pom.xml

@@ -40,9 +40,9 @@
 
 		<!-- Main Framework -->
 		<dbflute.version>1.1.2</dbflute.version>
-		<lastaflute.version>0.9.3</lastaflute.version>
+		<lastaflute.version>0.9.4</lastaflute.version>
 		<lasta.taglib.version>0.7.1</lasta.taglib.version>
-		<lasta.job.version>0.4.4</lasta.job.version>
+		<lasta.job.version>0.4.5</lasta.job.version>
 		<mailflute.version>0.5.2</mailflute.version>
 
 		<!-- Partner Library -->
@@ -54,7 +54,7 @@
 
 		<!-- Testing -->
 		<junit.version>4.12</junit.version>
-		<utflute.version>0.7.1</utflute.version>
+		<utflute.version>0.7.2</utflute.version>
 
 		<!-- Crawler -->
 		<crawler.version>1.2.0-SNAPSHOT</crawler.version>

+ 1 - 5
src/main/java/org/codelibs/fess/app/web/base/FessBaseAction.java

@@ -161,11 +161,7 @@ public abstract class FessBaseAction extends TypicalAction // has several interf
     @SuppressWarnings("unchecked")
     @Override
     public ActionValidator<FessMessages> createValidator() {
-        return systemHelper.createValidator(messageManager // to get validation message
-                , () -> requestManager.getUserLocale() // used with messageManager
-                , () -> createMessages() // for new user messages
-                , () -> handleApiValidationError() // apiFailureHook
-                , myValidationGroups());
+        return systemHelper.createValidator(requestManager, () -> createMessages(), myValidationGroups());
     }
 
     @Override

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

@@ -49,14 +49,11 @@ import org.codelibs.fess.mylasta.action.FessUserBean;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.validation.FessActionValidator;
-import org.lastaflute.core.message.MessageManager;
-import org.lastaflute.core.message.supplier.MessageLocaleProvider;
 import org.lastaflute.core.message.supplier.UserMessagesCreator;
 import org.lastaflute.web.TypicalAction;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.servlet.request.RequestManager;
 import org.lastaflute.web.validation.ActionValidator;
-import org.lastaflute.web.validation.VaErrorHook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -323,10 +320,9 @@ public class SystemHelper {
         return previousClusterState.getAndSet(status) != status;
     }
 
-    public ActionValidator<FessMessages> createValidator(final MessageManager messageManager,
-            final MessageLocaleProvider messageLocaleProvider, final UserMessagesCreator<FessMessages> userMessagesCreator,
-            final VaErrorHook apiFailureHook, final Class<?>... runtimeGroups) {
-        return new FessActionValidator<>(messageManager, messageLocaleProvider, userMessagesCreator, apiFailureHook, runtimeGroups);
+    public ActionValidator<FessMessages> createValidator(final RequestManager requestManager,
+            final UserMessagesCreator<FessMessages> messagesCreator, final Class<?>[] runtimeGroups) {
+        return new FessActionValidator<>(requestManager, messagesCreator, runtimeGroups);
     }
 
 }

+ 4 - 16
src/main/java/org/codelibs/fess/validation/FessActionValidator.java

@@ -15,28 +15,16 @@
  */
 package org.codelibs.fess.validation;
 
-import java.util.Locale;
-
-import org.hibernate.validator.spi.resourceloading.ResourceBundleLocator;
-import org.lastaflute.core.message.MessageManager;
 import org.lastaflute.core.message.UserMessages;
-import org.lastaflute.core.message.supplier.MessageLocaleProvider;
 import org.lastaflute.core.message.supplier.UserMessagesCreator;
+import org.lastaflute.web.servlet.request.RequestManager;
 import org.lastaflute.web.validation.ActionValidator;
-import org.lastaflute.web.validation.VaErrorHook;
 
 public class FessActionValidator<MESSAGES extends UserMessages> extends ActionValidator<MESSAGES> {
 
-    public FessActionValidator(final MessageManager messageManager, final MessageLocaleProvider messageLocaleProvider,
-            final UserMessagesCreator<MESSAGES> userMessagesCreator, final VaErrorHook apiFailureHook, final Class<?>[] runtimeGroups) {
-        super(messageManager, messageLocaleProvider, userMessagesCreator, apiFailureHook, runtimeGroups);
+    public FessActionValidator(final RequestManager requestManager, final UserMessagesCreator<MESSAGES> messagesCreator,
+            final Class<?>[] runtimeGroups) {
+        super(requestManager, messagesCreator, runtimeGroups);
     }
 
-    @Override
-    protected ResourceBundleLocator newResourceBundleLocator() {
-        return locale -> {
-            final Locale userLocale = messageLocaleProvider.provide();
-            return newHookedResourceBundle(userLocale == null ? locale : userLocale);
-        };
-    }
 }