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

modify jobLog action

Browse source
This commit is contained in:
Shunji Makino 2015-09-16 15:48:59 +09:00
parent 70a456f6ed
commit dde5969a6c
6 changed files with 231 additions and 348 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -91,7 +91,6 @@
<encoding>UTF-8</encoding>
<!-- TODO remove -->
<excludes>
<exclude>org/codelibs/fess/app/web/admin/JobLogAction.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/WizardAction.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/SearchListForm.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/dict/UserDictForm.java</exclude>
@ -99,7 +98,6 @@
<exclude>org/codelibs/fess/app/web/admin/dict/UserDictAction.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/dict/SynonymAction.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/DocumentAction.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/JobLogForm.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/SystemAction.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/DictForm.java</exclude>
<exclude>org/codelibs/fess/app/web/admin/SystemForm.java</exclude>

331
src/main/java/org/codelibs/fess/app/web/admin/JobLogAction.java
View file

@ -1,331 +0,0 @@
/*
* Copyright 2009-2015 the CodeLibs Project and the Others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
package org.codelibs.fess.app.web.admin;
import java.beans.Beans;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.core.beans.util.BeanUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.crud.CommonConstants;
import org.codelibs.fess.crud.CrudMessageException;
import org.codelibs.fess.crud.util.SAStrutsUtil;
import org.codelibs.fess.es.exentity.JobLog;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.app.pager.JobLogPager;
import org.codelibs.fess.app.service.JobLogService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class JobLogAction extends FessAdminAction {
private static final Logger logger = LoggerFactory.getLogger(JobLogAction.class);
// for list
public List<JobLog> jobLogItems;
// for edit/confirm/delete
//@ActionForm
@Resource
protected JobLogForm jobLogForm;
@Resource
protected JobLogService jobLogService;
@Resource
protected JobLogPager jobLogPager;
@Resource
protected SystemHelper systemHelper;
public String getHelpLink() {
return systemHelper.getHelpLink("jobLog");
}
protected String displayList(final boolean redirect) {
// page navi
jobLogItems = jobLogService.getJobLogList(jobLogPager);
// restore from pager
BeanUtil.copyBeanToBean(jobLogPager, jobLogForm.searchParams, option -> option.exclude(CommonConstants.PAGER_CONVERSION_RULE));
if (redirect) {
return "index?redirect=true";
} else {
return "index.jsp";
}
}
//@Execute(validator = false, input = "error.jsp")
public String index() {
return displayList(false);
}
//@Execute(validator = false, input = "error.jsp", urlPattern = "list/{pageNumber}")
public String list() {
// page navi
if (StringUtil.isNotBlank(jobLogForm.pageNumber)) {
try {
jobLogPager.setCurrentPageNumber(Integer.parseInt(jobLogForm.pageNumber));
} catch (final NumberFormatException e) {
if (logger.isDebugEnabled()) {
logger.debug("Invalid value: " + jobLogForm.pageNumber, e);
}
}
}
return displayList(false);
}
//@Execute(validator = false, input = "error.jsp")
public String search() {
BeanUtil.copyBeanToBean(jobLogForm.searchParams, jobLogPager, option -> option.exclude(CommonConstants.PAGER_CONVERSION_RULE));
return displayList(false);
}
//@Execute(validator = false, input = "error.jsp")
public String reset() {
jobLogPager.clear();
return displayList(false);
}
//@Execute(validator = false, input = "error.jsp")
public String back() {
return displayList(false);
}
@Token(save = true, validate = false)
//@Execute(validator = false, input = "error.jsp")
public String editagain() {
return "edit.jsp";
}
//@Execute(validator = false, input = "error.jsp", urlPattern = "confirmpage/{crudMode}/{id}")
public String confirmpage() {
if (jobLogForm.crudMode != CommonConstants.CONFIRM_MODE) {
throw new ActionMessagesException("errors.crud_invalid_mode",
new Object[] { CommonConstants.CONFIRM_MODE, jobLogForm.crudMode });
}
loadJobLog();
return "confirm.jsp";
}
@Token(save = true, validate = false)
//@Execute(validator = false, input = "error.jsp")
public String createpage() {
// page navi
jobLogForm.initialize();
jobLogForm.crudMode = CommonConstants.CREATE_MODE;
return "edit.jsp";
}
@Token(save = true, validate = false)
//@Execute(validator = false, input = "error.jsp", urlPattern = "editpage/{crudMode}/{id}")
public String editpage() {
if (jobLogForm.crudMode != CommonConstants.EDIT_MODE) {
throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.EDIT_MODE, jobLogForm.crudMode });
}
loadJobLog();
return "edit.jsp";
}
@Token(save = true, validate = false)
//@Execute(validator = false, input = "error.jsp")
public String editfromconfirm() {
jobLogForm.crudMode = CommonConstants.EDIT_MODE;
loadJobLog();
return "edit.jsp";
}
@Token(save = false, validate = true, keep = true)
//@Execute(validator = true, input = "edit.jsp")
public String confirmfromcreate() {
return "confirm.jsp";
}
@Token(save = false, validate = true, keep = true)
//@Execute(validator = true, input = "edit.jsp")
public String confirmfromupdate() {
return "confirm.jsp";
}
@Token(save = true, validate = false)
//@Execute(validator = false, input = "error.jsp", urlPattern = "deletepage/{crudMode}/{id}")
public String deletepage() {
if (jobLogForm.crudMode != CommonConstants.DELETE_MODE) {
throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.DELETE_MODE, jobLogForm.crudMode });
}
loadJobLog();
return "confirm.jsp";
}
@Token(save = true, validate = false)
//@Execute(validator = false, input = "error.jsp")
public String deletefromconfirm() {
jobLogForm.crudMode = CommonConstants.DELETE_MODE;
loadJobLog();
return "confirm.jsp";
}
@Token(save = false, validate = true)
//@Execute(validator = true, input = "edit.jsp")
public String create() {
try {
final JobLog jobLog = createJobLog();
jobLogService.store(jobLog);
SAStrutsUtil.addSessionMessage("success.crud_create_crud_table");
return displayList(true);
} catch (final ActionMessagesException e) {
logger.error(e.getMessage(), e);
throw e;
} catch (final CrudMessageException e) {
logger.error(e.getMessage(), e);
throw new ActionMessagesException(e.getMessageId(), e.getArgs());
} catch (final Exception e) {
logger.error(e.getMessage(), e);
throw new ActionMessagesException("errors.crud_failed_to_create_crud_table");
}
}
@Token(save = false, validate = true)
//@Execute(validator = true, input = "edit.jsp")
public String update() {
try {
final JobLog jobLog = createJobLog();
jobLogService.store(jobLog);
SAStrutsUtil.addSessionMessage("success.crud_update_crud_table");
return displayList(true);
} catch (final ActionMessagesException e) {
logger.error(e.getMessage(), e);
throw e;
} catch (final CrudMessageException e) {
logger.error(e.getMessage(), e);
throw new ActionMessagesException(e.getMessageId(), e.getArgs());
} catch (final Exception e) {
logger.error(e.getMessage(), e);
throw new ActionMessagesException("errors.crud_failed_to_update_crud_table");
}
}
@Token(save = false, validate = true)
//@Execute(validator = false, input = "error.jsp")
public String delete() {
if (jobLogForm.crudMode != CommonConstants.DELETE_MODE) {
throw new ActionMessagesException("errors.crud_invalid_mode", new Object[] { CommonConstants.DELETE_MODE, jobLogForm.crudMode });
}
try {
final JobLog jobLog = jobLogService.getJobLog(createKeyMap());
if (jobLog == null) {
// throw an exception
throw new ActionMessagesException("errors.crud_could_not_find_crud_table",
new Object[] { jobLogForm.id });
}
jobLogService.delete(jobLog);
SAStrutsUtil.addSessionMessage("success.crud_delete_crud_table");
return displayList(true);
} catch (final ActionMessagesException e) {
logger.error(e.getMessage(), e);
throw e;
} catch (final CrudMessageException e) {
logger.error(e.getMessage(), e);
throw new ActionMessagesException(e.getMessageId(), e.getArgs());
} catch (final Exception e) {
logger.error(e.getMessage(), e);
throw new ActionMessagesException("errors.crud_failed_to_delete_crud_table");
}
}
protected void loadJobLog() {
final JobLog jobLog = jobLogService.getJobLog(createKeyMap());
if (jobLog == null) {
// throw an exception
throw new ActionMessagesException("errors.crud_could_not_find_crud_table",
new Object[] { jobLogForm.id });
}
BeanUtil.copyBeanToBean(jobLog, jobLogForm, option -> option.exclude("searchParams", "mode"));
}
protected JobLog createJobLog() {
JobLog jobLog;
if (jobLogForm.crudMode == CommonConstants.EDIT_MODE) {
jobLog = jobLogService.getJobLog(createKeyMap());
if (jobLog == null) {
// throw an exception
throw new ActionMessagesException("errors.crud_could_not_find_crud_table",
new Object[] { jobLogForm.id });
}
} else {
jobLog = new JobLog();
}
BeanUtil.copyBeanToBean(jobLogForm, jobLog, option -> option.exclude("searchParams", "mode"));
return jobLog;
}
protected Map<String, String> createKeyMap() {
final Map<String, String> keys = new HashMap<String, String>();
keys.put("id", jobLogForm.id);
return keys;
}
//@Execute(validator = false, input = "error.jsp")
public String deleteall() {
final List<String> jobStatusList = new ArrayList<String>();
jobStatusList.add(Constants.OK);
jobStatusList.add(Constants.FAIL);
jobLogService.deleteByJobStatus(jobStatusList);
SAStrutsUtil.addSessionMessage("success.joblog_delete_all");
return displayList(true);
}
}

191
src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java Normal file
View file

@ -0,0 +1,191 @@
/*
* Copyright 2009-2015 the CodeLibs Project and the Others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
package org.codelibs.fess.app.web.admin.joblog;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Resource;
import org.codelibs.fess.annotation.Token;
import org.codelibs.fess.app.pager.JobLogPager;
import org.codelibs.fess.app.service.JobLogService;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.crud.CommonConstants;
import org.codelibs.fess.es.exentity.JobLog;
import org.codelibs.fess.helper.SystemHelper;
import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.validation.VaErrorHook;
/**
* @author shinsuke
* @author Shunji Makino
*/
public class AdminJoblogAction extends FessAdminAction {
// ===================================================================================
// Attribute
// =========
@Resource
private JobLogService jobLogService;
@Resource
private JobLogPager jobLogPager;
@Resource
private SystemHelper systemHelper;
// ===================================================================================
// Hook
// ======
@Override
protected void setupHtmlData(final ActionRuntime runtime) {
super.setupHtmlData(runtime);
runtime.registerData("helpLink", systemHelper.getHelpLink("jobLog"));
}
// ===================================================================================
// Search Execute
// ==============
@Execute
public HtmlResponse index(final JobLogSearchForm form) {
return asHtml(path_AdminJoblog_IndexJsp).renderWith(data -> {
searchPaging(data, form);
});
}
@Execute
public HtmlResponse list(final Integer pageNumber, final JobLogSearchForm form) {
jobLogPager.setCurrentPageNumber(pageNumber);
return asHtml(path_AdminJoblog_IndexJsp).renderWith(data -> {
searchPaging(data, form);
});
}
@Execute
public HtmlResponse search(final JobLogSearchForm form) {
copyBeanToBean(form.searchParams, jobLogPager, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE));
return asHtml(path_AdminJoblog_IndexJsp).renderWith(data -> {
searchPaging(data, form);
});
}
@Execute
public HtmlResponse reset(final JobLogSearchForm form) {
jobLogPager.clear();
return asHtml(path_AdminJoblog_IndexJsp).renderWith(data -> {
searchPaging(data, form);
});
}
@Execute
public HtmlResponse back(final JobLogSearchForm form) {
return asHtml(path_AdminJoblog_IndexJsp).renderWith(data -> {
searchPaging(data, form);
});
}
protected void searchPaging(final RenderData data, final JobLogSearchForm form) {
data.register("jobLogItems", jobLogService.getJobLogList(jobLogPager)); // page navi
// restore from pager
copyBeanToBean(jobLogPager, form.searchParams, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE));
}
// ===================================================================================
// Edit Execute
// ============
// -----------------------------------------------------
// Entry Page
// ----------
@Token(save = true, validate = false)
@Execute
public HtmlResponse deletepage(final int crudMode, final String id, final JobLogEditForm form) {
form.crudMode = crudMode;
form.id = id;
verifyCrudMode(form, CommonConstants.DELETE_MODE);
loadJobLog(form);
return asHtml(path_AdminJoblog_ConfirmJsp);
}
@Token(save = true, validate = false)
@Execute
public HtmlResponse deletefromconfirm(final JobLogEditForm form) {
form.crudMode = CommonConstants.DELETE_MODE;
loadJobLog(form);
return asHtml(path_AdminJoblog_ConfirmJsp);
}
// -----------------------------------------------------
// Confirm
// -------
@Execute
public HtmlResponse confirmpage(final int crudMode, final String id, final JobLogEditForm form) {
form.crudMode = crudMode;
form.id = id;
verifyCrudMode(form, CommonConstants.CONFIRM_MODE);
loadJobLog(form);
return asHtml(path_AdminJoblog_ConfirmJsp);
}
// -----------------------------------------------------
// Actually Crud
// -------------
@Execute
public HtmlResponse delete(final JobLogEditForm form) {
verifyCrudMode(form, CommonConstants.DELETE_MODE);
jobLogService.delete(getJobLog(form));
saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
return redirect(getClass());
}
// ===================================================================================
// Assist Logic
// ============
protected void loadJobLog(final JobLogEditForm form) {
copyBeanToBean(getJobLog(form), form, op -> op.exclude("crudMode"));
}
protected JobLog getJobLog(final JobLogEditForm form) {
final JobLog jobLog = jobLogService.getJobLog(createKeyMap(form));
return jobLog;
}
protected Map<String, String> createKeyMap(final JobLogEditForm form) {
final Map<String, String> keys = new HashMap<String, String>();
keys.put("id", form.id);
return keys;
}
// ===================================================================================
// Small Helper
// ============
protected void verifyCrudMode(final JobLogEditForm form, final int expectedMode) {
if (form.crudMode != expectedMode) {
throwValidationError(messages -> {
messages.addErrorsCrudInvalidMode(GLOBAL, String.valueOf(expectedMode), String.valueOf(form.crudMode));
}, toIndexHtml());
}
}
protected VaErrorHook toIndexHtml() {
return () -> {
return asHtml(path_AdminJoblog_IndexJsp);
};
}
}

19
src/main/java/org/codelibs/fess/app/web/admin/JobLogForm.java → src/main/java/org/codelibs/fess/app/web/admin/joblog/JobLogEditForm.java
View file

@ -14,28 +14,21 @@
* governing permissions and limitations under the License.
*/
package org.codelibs.fess.app.web.admin;
package org.codelibs.fess.app.web.admin.joblog;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
public class JobLogForm implements Serializable {
/**
* @author codelibs
* @author Shunji Makino
*/
public class JobLogEditForm implements Serializable {
private static final long serialVersionUID = 1L;
//@IntegerType
public String pageNumber;
public Map<String, String> searchParams = new HashMap<String, String>();
//@IntegerType
public int crudMode;
public String getCurrentPageNumber() {
return pageNumber;
}
//@Required(target = "confirmfromupdate,update,delete")
//@LongType
public String id;

32
src/main/java/org/codelibs/fess/app/web/admin/joblog/JobLogSearchForm.java Normal file
View file

@ -0,0 +1,32 @@
/*
* Copyright 2009-2015 the CodeLibs Project and the Others.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
package org.codelibs.fess.app.web.admin.joblog;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
/**
* @author codelibs
* @author Shunji Makino
*/
public class JobLogSearchForm implements Serializable {
private static final long serialVersionUID = 1L;
public Map<String, String> searchParams = new HashMap<String, String>();
}

4
src/main/webapp/WEB-INF/view/common/admin2/sidebar.jsp
View file

@ -199,10 +199,10 @@
<span><la:message key="labels.menu.system_info" /></span>
</la:link></li>
<li <c:if test="${param.menuType=='jobLog'}">class="active"</c:if>><todo:link href="/admin/jobLog/index">
<li <c:if test="${param.menuType=='jobLog'}">class="active"</c:if>><la:link href="/admin/joblog/index">
<i class='fa fa-angle-right'></i>
<span><la:message key="labels.menu.jobLog" /></span>
</todo:link></li>
</la:link></li>
<li <c:if test="${param.menuType=='crawlingSession'}">class="active"</c:if>><todo:link
href="/admin/crawlingSession/index"