0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update lastaflute, use RequestManager and minor fixes

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-12-29 20:38:47 +09:00
parent 36bcfa4046
commit 7393fc6bd3
13 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pom.xml
View file

@ -41,7 +41,7 @@
<!-- Main Framework -->
<dbflute.version>1.1.0-sp9</dbflute.version>
<lastaflute.version>0.7.3-RC2</lastaflute.version>
<lastaflute.version>0.7.3</lastaflute.version>
<lasta.taglib.version>0.6.6</lasta.taglib.version>
<servlet.version>3.1.0</servlet.version>
<jsp.version>2.3.1</jsp.version>
@ -56,7 +56,7 @@
<!-- Testing -->
<junit.version>4.12</junit.version>
<utflute.version>0.6.0B-RC3</utflute.version>
<utflute.version>0.6.0B</utflute.version>
<!-- Crawler -->
<crawler.version>1.0.2-SNAPSHOT</crawler.version>

8
src/main/java/org/codelibs/fess/api/es/EsApiManager.java
View file

@ -37,11 +37,12 @@ import org.codelibs.elasticsearch.runner.net.Curl.Method;
import org.codelibs.elasticsearch.runner.net.CurlRequest;
import org.codelibs.fess.Constants;
import org.codelibs.fess.api.BaseApiManager;
import org.codelibs.fess.app.web.base.login.FessLoginAssist;
import org.codelibs.fess.exception.FessSystemException;
import org.codelibs.fess.exception.WebApiException;
import org.codelibs.fess.mylasta.action.FessUserBean;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.ResourceUtil;
import org.lastaflute.web.servlet.request.RequestManager;
import org.lastaflute.web.servlet.session.SessionManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -64,8 +65,9 @@ public class EsApiManager extends BaseApiManager {
public boolean matches(final HttpServletRequest request) {
final String servletPath = request.getServletPath();
if (servletPath.startsWith(pathPrefix)) {
final FessLoginAssist loginAssist = ComponentUtil.getComponent(FessLoginAssist.class);
return loginAssist.getSessionUserBean().map(user -> user.hasRoles(acceptedRoles)).orElseGet(() -> Boolean.FALSE).booleanValue();
final RequestManager requestManager = ComponentUtil.getRequestManager();
return requestManager.findUserBean(FessUserBean.class).map(user -> user.hasRoles(acceptedRoles)).orElseGet(() -> Boolean.FALSE)
.booleanValue();
}
return false;
}

4
src/main/java/org/codelibs/fess/app/service/SearchService.java
View file

@ -33,7 +33,6 @@ import org.apache.commons.lang3.StringUtils;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.web.base.login.FessLoginAssist;
import org.codelibs.fess.entity.QueryContext;
import org.codelibs.fess.entity.SearchRenderData;
import org.codelibs.fess.entity.SearchRequestParams;
@ -46,6 +45,7 @@ import org.codelibs.fess.helper.RoleQueryHelper;
import org.codelibs.fess.helper.SearchLogHelper;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.helper.UserInfoHelper;
import org.codelibs.fess.mylasta.action.FessUserBean;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.QueryResponseList;
@ -217,7 +217,7 @@ public class SearchService {
searchLog.setRequestedAt(requestedTime);
searchLog.setQueryOffset(pageStart);
searchLog.setQueryPageSize(pageSize);
ComponentUtil.getComponent(FessLoginAssist.class).getSessionUserBean().ifPresent(user -> {
ComponentUtil.getRequestManager().findUserBean(FessUserBean.class).ifPresent(user -> {
searchLog.setUser(user.getUserId());
});

1
src/main/java/org/codelibs/fess/app/web/RootAction.java
View file

@ -16,6 +16,7 @@
package org.codelibs.fess.app.web;
import org.codelibs.fess.app.web.base.FessSearchAction;
import org.codelibs.fess.app.web.base.SearchForm;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;

2
src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java
View file

@ -94,7 +94,7 @@ public class AdminGeneralAction extends FessAdminAction {
dataMap.put("hostname", "UNKNOWN");
}
final FessConfig fessConfig = ComponentUtil.getComponent(FessConfig.class);
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final Postbox postbox = ComponentUtil.getComponent(Postbox.class);
try {
TestmailPostcard.droppedInto(postbox, postcard -> {

2
src/main/java/org/codelibs/fess/app/web/SearchForm.java → src/main/java/org/codelibs/fess/app/web/base/SearchForm.java
View file

@ -13,7 +13,7 @@
* either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
package org.codelibs.fess.app.web;
package org.codelibs.fess.app.web.base;
import java.io.Serializable;
import java.util.HashMap;

4
src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java
View file

@ -31,7 +31,7 @@ import org.dbflute.optional.OptionalThing;
import org.lastaflute.core.magic.async.AsyncManager;
import org.lastaflute.core.time.TimeManager;
import org.lastaflute.web.login.LoginHandlingResource;
import org.lastaflute.web.login.LoginManager;
import org.lastaflute.web.login.PrimaryLoginManager;
import org.lastaflute.web.login.TypicalLoginAssist;
import org.lastaflute.web.login.exception.LoginRequiredException;
import org.lastaflute.web.login.option.LoginSpecifiedOption;
@ -41,7 +41,7 @@ import org.lastaflute.web.login.option.LoginSpecifiedOption;
* @author shinsuke
*/
public class FessLoginAssist extends TypicalLoginAssist<String, FessUserBean, FessUser> // #change_it also UserBean
implements LoginManager {
implements PrimaryLoginManager {
// ===================================================================================
// Attribute

2
src/main/java/org/codelibs/fess/app/web/help/HelpAction.java
View file

@ -15,8 +15,8 @@
*/
package org.codelibs.fess.app.web.help;
import org.codelibs.fess.app.web.SearchForm;
import org.codelibs.fess.app.web.base.FessSearchAction;
import org.codelibs.fess.app.web.base.SearchForm;
import org.codelibs.fess.util.RenderDataUtil;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;

2
src/main/java/org/codelibs/fess/app/web/search/SearchAction.java
View file

@ -27,8 +27,8 @@ import javax.servlet.http.HttpSession;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.service.SearchService;
import org.codelibs.fess.app.web.SearchForm;
import org.codelibs.fess.app.web.base.FessSearchAction;
import org.codelibs.fess.app.web.base.SearchForm;
import org.codelibs.fess.entity.SearchRenderData;
import org.codelibs.fess.exception.InvalidQueryException;
import org.codelibs.fess.exception.ResultOffsetExceededException;

2
src/main/java/org/codelibs/fess/exec/Crawler.java
View file

@ -290,7 +290,7 @@ public class Crawler implements Serializable {
// ignore
}
final FessConfig fessConfig = ComponentUtil.getComponent(FessConfig.class);
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final Postbox postbox = ComponentUtil.getComponent(Postbox.class);
CrawlerPostcard.droppedInto(postbox, postcard -> {
postcard.setFrom(fessConfig.getMailFromAddress(), fessConfig.getMailFromName());

6
src/main/java/org/codelibs/fess/helper/SystemHelper.java
View file

@ -41,11 +41,12 @@ import org.apache.commons.lang3.StringUtils;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.service.RoleTypeService;
import org.codelibs.fess.app.web.base.login.FessLoginAssist;
import org.codelibs.fess.crawler.util.CharUtil;
import org.codelibs.fess.es.config.exentity.RoleType;
import org.codelibs.fess.mylasta.action.FessUserBean;
import org.codelibs.fess.util.ComponentUtil;
import org.lastaflute.di.core.SingletonLaContainer;
import org.lastaflute.web.servlet.request.RequestManager;
import org.lastaflute.web.util.LaRequestUtil;
import com.google.common.cache.CacheBuilder;
@ -114,7 +115,8 @@ public class SystemHelper implements Serializable {
}
public String getUsername() {
return ComponentUtil.getComponent(FessLoginAssist.class).getSessionUserBean().map(user -> {
final RequestManager requestManager = ComponentUtil.getRequestManager();
return requestManager.findUserBean(FessUserBean.class).map(user -> {
return user.getUserId();
}).orElse(Constants.GUEST_USER);
}

8
src/main/java/org/codelibs/fess/helper/impl/RoleQueryHelperImpl.java
View file

@ -30,10 +30,11 @@ import javax.servlet.http.HttpServletRequest;
import org.codelibs.core.crypto.CachedCipher;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.app.web.base.login.FessLoginAssist;
import org.codelibs.fess.helper.RoleQueryHelper;
import org.codelibs.fess.mylasta.action.FessUserBean;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.StreamUtil;
import org.lastaflute.web.servlet.request.RequestManager;
import org.lastaflute.web.util.LaRequestUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -110,8 +111,9 @@ public class RoleQueryHelperImpl implements RoleQueryHelper, Serializable {
roleList.addAll(buildByCookieNameMapping(request));
}
final FessLoginAssist fessLoginAssist = ComponentUtil.getComponent(FessLoginAssist.class);
fessLoginAssist.getSessionUserBean().ifPresent(fessUserBean -> StreamUtil.of(fessUserBean.getRoles()).forEach(roleList::add));
final RequestManager requestManager = ComponentUtil.getRequestManager();
requestManager.findUserBean(FessUserBean.class).ifPresent(
fessUserBean -> StreamUtil.of(fessUserBean.getRoles()).forEach(roleList::add));
if (defaultRoleList != null) {
roleList.addAll(defaultRoleList);

14
src/main/java/org/codelibs/fess/util/ComponentUtil.java
View file

@ -52,6 +52,7 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
import org.lastaflute.core.message.MessageManager;
import org.lastaflute.di.core.SingletonLaContainer;
import org.lastaflute.di.core.factory.SingletonLaContainerFactory;
import org.lastaflute.web.servlet.request.RequestManager;
public final class ComponentUtil {
private static final String LDAP_MANAGER = "ldapManager";
@ -269,10 +270,6 @@ public final class ComponentUtil {
return SingletonLaContainer.getComponent(FessConfig.class);
}
public static <T> T getComponent(final Class<T> clazz) {
return SingletonLaContainer.getComponent(clazz);
}
public static SuggestHelper getSuggestHelper() {
return SingletonLaContainer.getComponent(SUGGEST_HELPER);
}
@ -285,7 +282,16 @@ public final class ComponentUtil {
return SingletonLaContainer.getComponent(LDAP_MANAGER);
}
public static RequestManager getRequestManager() {
return SingletonLaContainer.getComponent(RequestManager.class);
}
public static <T> T getComponent(final Class<T> clazz) {
return SingletonLaContainer.getComponent(clazz);
}
public static boolean hasQueryHelper() {
return SingletonLaContainerFactory.getContainer().hasComponentDef(QUERY_HELPER);
}
}