diff --git a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java
index 4ea8ce523bbc62c4fe38b36ad4135db2ecb5df1c..29318f8e485cf8d1df4824df3cbdaa959bd6818f 100644
--- a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java
@@ -29,6 +29,7 @@ import org.codelibs.fess.es.cbean.RequestHeaderCB;
import org.codelibs.fess.es.exbhv.RequestHeaderBhv;
import org.codelibs.fess.es.exentity.RequestHeader;
import org.dbflute.cbean.result.PagingResultBean;
+import org.dbflute.optional.OptionalEntity;
public class RequestHeaderService implements Serializable {
@@ -57,17 +58,8 @@ public class RequestHeaderService implements Serializable {
return requestHeaderList;
}
- public RequestHeader getRequestHeader(final Map<String, String> keys) {
- final RequestHeader requestHeader = requestHeaderBhv.selectEntity(cb -> {
- cb.query().docMeta().setId_Equal(keys.get("id"));
- setupEntityCondition(cb, keys);
- }).orElse(null);//TODO
- if (requestHeader == null) {
- // TODO exception?
- return null;
- }
-
- return requestHeader;
+ public OptionalEntity<RequestHeader> getRequestHeader(final String id) {
+ return requestHeaderBhv.selectByPK(id);
}
public void store(final RequestHeader requestHeader) {
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java
index 67c43996155b69ffcfa105cd14816b9d38a3d803..b20cb2f8026335b44fdc3ef00d27b18414e3efdc 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java
@@ -30,11 +30,15 @@ import org.codelibs.fess.app.pager.RequestHeaderPager;
import org.codelibs.fess.app.service.RequestHeaderService;
import org.codelibs.fess.app.service.WebConfigService;
import org.codelibs.fess.app.web.CrudMode;
+import org.codelibs.fess.app.web.admin.requestheader.CreateForm;
+import org.codelibs.fess.app.web.admin.requestheader.EditForm;
+import org.codelibs.fess.app.web.admin.requestheader.SearchForm;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.exentity.RequestHeader;
import org.codelibs.fess.es.exentity.WebConfig;
import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.util.ComponentUtil;
+import org.dbflute.optional.OptionalEntity;
import org.lastaflute.web.Execute;
import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
@@ -45,6 +49,7 @@ import org.lastaflute.web.validation.VaErrorHook;
/**
* @author shinsuke
* @author Shunji Makino
+ * @author Keiichi Watanabe
*/
public class AdminRequestheaderAction extends FessAdminAction {
@@ -56,9 +61,9 @@ public class AdminRequestheaderAction extends FessAdminAction {
@Resource
private RequestHeaderPager requestHeaderPager;
@Resource
- private SystemHelper systemHelper;
- @Resource
protected WebConfigService webConfigService;
+ @Resource
+ private SystemHelper systemHelper;
// ===================================================================================
// Hook
@@ -73,14 +78,14 @@ public class AdminRequestheaderAction extends FessAdminAction {
// Search Execute
// ==============
@Execute
- public HtmlResponse index(final RequestHeaderSearchForm form) {
+ public HtmlResponse index(final SearchForm form) {
return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
searchPaging(data, form);
});
}
@Execute
- public HtmlResponse list(final Integer pageNumber, final RequestHeaderSearchForm form) {
+ public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
requestHeaderPager.setCurrentPageNumber(pageNumber);
return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
searchPaging(data, form);
@@ -88,15 +93,15 @@ public class AdminRequestheaderAction extends FessAdminAction {
}
@Execute
- public HtmlResponse search(final RequestHeaderSearchForm form) {
- copyBeanToBean(form.searchParams, requestHeaderPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
+ public HtmlResponse search(final SearchForm form) {
+ copyBeanToBean(form, requestHeaderPager, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
searchPaging(data, form);
});
}
@Execute
- public HtmlResponse reset(final RequestHeaderSearchForm form) {
+ public HtmlResponse reset(final SearchForm form) {
requestHeaderPager.clear();
return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
searchPaging(data, form);
@@ -104,18 +109,18 @@ public class AdminRequestheaderAction extends FessAdminAction {
}
@Execute
- public HtmlResponse back(final RequestHeaderSearchForm form) {
+ public HtmlResponse back(final SearchForm form) {
return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
searchPaging(data, form);
});
}
- protected void searchPaging(final RenderData data, final RequestHeaderSearchForm form) {
+ protected void searchPaging(final RenderData data, final SearchForm form) {
data.register("requestHeaderItems", requestHeaderService.getRequestHeaderList(requestHeaderPager)); // page navi
data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty());
// restore from pager
- copyBeanToBean(requestHeaderPager, form.searchParams, op -> op.exclude(Constants.PAGER_CONVERSION_RULE));
+ copyBeanToBean(requestHeaderPager, form, op -> op.include("id"));
}
// ===================================================================================
@@ -126,10 +131,13 @@ public class AdminRequestheaderAction extends FessAdminAction {
// ----------
@Token(save = true, validate = false)
@Execute
- public HtmlResponse createpage(final RequestHeaderEditForm form) {
- form.initialize();
- form.crudMode = CrudMode.CREATE;
- return asHtml(path_AdminRequestheader_EditJsp).renderWith(data -> {
+ public HtmlResponse createpage() {
+ return asHtml(path_AdminRequestheader_EditJsp).useForm(CreateForm.class, op -> {
+ op.setup(form -> {
+ form.initialize();
+ form.crudMode = CrudMode.CREATE;
+ });
+ }).renderWith(data -> {
registerProtocolSchemeItems(data);
registerWebConfigItems(data);
});
@@ -137,11 +145,30 @@ public class AdminRequestheaderAction extends FessAdminAction {
@Token(save = true, validate = false)
@Execute
- public HtmlResponse editpage(final int crudMode, final String id, final RequestHeaderEditForm form) {
- form.crudMode = crudMode;
- form.id = id;
- verifyCrudMode(form, CrudMode.EDIT);
- loadRequestHeader(form);
+ public HtmlResponse editpage(final int crudMode, final String id) {
+ verifyCrudMode(crudMode, CrudMode.EDIT);
+ return asHtml(path_AdminRequestheader_EditJsp).useForm(EditForm.class, op -> {
+ op.setup(form -> {
+ requestHeaderService.getRequestHeader(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
+ });
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
+ });
+ form.crudMode = crudMode;
+ });
+ }).renderWith(data -> {
+ registerProtocolSchemeItems(data);
+ registerWebConfigItems(data);
+ });
+ }
+
+ @Token(save = true, validate = false)
+ @Execute
+ public HtmlResponse createagain(final CreateForm form) {
+ verifyCrudMode(form.crudMode, CrudMode.CREATE);
+ validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminRequestheader_EditJsp).renderWith(data -> {
registerProtocolSchemeItems(data);
registerWebConfigItems(data);
@@ -150,7 +177,9 @@ public class AdminRequestheaderAction extends FessAdminAction {
@Token(save = true, validate = false)
@Execute
- public HtmlResponse editagain(final RequestHeaderEditForm form) {
+ public HtmlResponse editagain(final EditForm form) {
+ verifyCrudMode(form.crudMode, CrudMode.EDIT);
+ validate(form, messages -> {}, toEditHtml());
return asHtml(path_AdminRequestheader_EditJsp).renderWith(data -> {
registerProtocolSchemeItems(data);
registerWebConfigItems(data);
@@ -159,9 +188,15 @@ public class AdminRequestheaderAction extends FessAdminAction {
@Token(save = true, validate = false)
@Execute
- public HtmlResponse editfromconfirm(final RequestHeaderEditForm form) {
+ public HtmlResponse editfromconfirm(final EditForm form) {
+ validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
- loadRequestHeader(form);
+ final String id = form.id;
+ requestHeaderService.getRequestHeader(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, op -> {});
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
+ });
return asHtml(path_AdminRequestheader_EditJsp).renderWith(data -> {
registerProtocolSchemeItems(data);
registerWebConfigItems(data);
@@ -170,12 +205,20 @@ public class AdminRequestheaderAction extends FessAdminAction {
@Token(save = true, validate = false)
@Execute
- public HtmlResponse deletepage(final int crudMode, final String id, final RequestHeaderEditForm form) {
- form.crudMode = crudMode;
- form.id = id;
- verifyCrudMode(form, CrudMode.DELETE);
- loadRequestHeader(form);
- return asHtml(path_AdminRequestheader_ConfirmJsp).renderWith(data -> {
+ public HtmlResponse deletepage(final int crudMode, final String id) {
+ verifyCrudMode(crudMode, CrudMode.DELETE);
+ return asHtml(path_AdminRequestheader_ConfirmJsp).useForm(EditForm.class, op -> {
+ op.setup(form -> {
+ requestHeaderService.getRequestHeader(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
+ });
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
+ });
+ form.crudMode = crudMode;
+ });
+ }).renderWith(data -> {
registerProtocolSchemeItems(data);
registerWebConfigItems(data);
});
@@ -183,9 +226,15 @@ public class AdminRequestheaderAction extends FessAdminAction {
@Token(save = true, validate = false)
@Execute
- public HtmlResponse deletefromconfirm(final RequestHeaderEditForm form) {
+ public HtmlResponse deletefromconfirm(final EditForm form) {
+ validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.DELETE;
- loadRequestHeader(form);
+ final String id = form.id;
+ requestHeaderService.getRequestHeader(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, op -> {});
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
+ });
return asHtml(path_AdminRequestheader_ConfirmJsp).renderWith(data -> {
registerProtocolSchemeItems(data);
registerWebConfigItems(data);
@@ -196,26 +245,45 @@ public class AdminRequestheaderAction extends FessAdminAction {
// Confirm
// -------
@Execute
- public HtmlResponse confirmpage(final int crudMode, final String id, final RequestHeaderEditForm form) {
- form.crudMode = crudMode;
- form.id = id;
- verifyCrudMode(form, CrudMode.CONFIRM);
- loadRequestHeader(form);
- return asHtml(path_AdminRequestheader_ConfirmJsp);
+ public HtmlResponse confirmpage(final int crudMode, final String id) {
+ verifyCrudMode(crudMode, CrudMode.CONFIRM);
+ return asHtml(path_AdminRequestheader_ConfirmJsp).useForm(EditForm.class, op -> {
+ op.setup(form -> {
+ requestHeaderService.getRequestHeader(id).ifPresent(entity -> {
+ copyBeanToBean(entity, form, copyOp -> {
+ copyOp.excludeNull();
+ });
+ form.crudMode = crudMode;
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
+ });
+ });
+ }).renderWith(data -> {
+ registerProtocolSchemeItems(data);
+ registerWebConfigItems(data);
+ });
}
@Token(save = false, validate = true, keep = true)
@Execute
- public HtmlResponse confirmfromcreate(final RequestHeaderEditForm form) {
+ public HtmlResponse confirmfromcreate(final CreateForm form) {
validate(form, messages -> {}, toEditHtml());
- return asHtml(path_AdminRequestheader_ConfirmJsp);
+ form.crudMode = CrudMode.CREATE;
+ return asHtml(path_AdminRequestheader_ConfirmJsp).renderWith(data -> {
+ registerProtocolSchemeItems(data);
+ registerWebConfigItems(data);
+ });
}
@Token(save = false, validate = true, keep = true)
@Execute
- public HtmlResponse confirmfromupdate(final RequestHeaderEditForm form) {
+ public HtmlResponse confirmfromupdate(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
- return asHtml(path_AdminRequestheader_ConfirmJsp);
+ form.crudMode = CrudMode.EDIT;
+ return asHtml(path_AdminRequestheader_ConfirmJsp).renderWith(data -> {
+ registerProtocolSchemeItems(data);
+ registerWebConfigItems(data);
+ });
}
// -----------------------------------------------------
@@ -223,66 +291,78 @@ public class AdminRequestheaderAction extends FessAdminAction {
// -------------
@Token(save = false, validate = true)
@Execute
- public HtmlResponse create(final RequestHeaderEditForm form) {
+ public HtmlResponse create(final CreateForm form) {
+ verifyCrudMode(form.crudMode, CrudMode.CREATE);
validate(form, messages -> {}, toEditHtml());
- requestHeaderService.store(createRequestHeader(form));
- saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ createRequestHeader(form).ifPresent(entity -> {
+ copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE));
+ requestHeaderService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL), toEditHtml());
+ });
return redirect(getClass());
}
@Token(save = false, validate = true)
@Execute
- public HtmlResponse update(final RequestHeaderEditForm form) {
+ public HtmlResponse update(final EditForm form) {
+ verifyCrudMode(form.crudMode, CrudMode.EDIT);
validate(form, messages -> {}, toEditHtml());
- requestHeaderService.store(createRequestHeader(form));
- saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ createRequestHeader(form).ifPresent(entity -> {
+ copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE));
+ requestHeaderService.store(entity);
+ saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml());
+ });
return redirect(getClass());
}
@Execute
- public HtmlResponse delete(final RequestHeaderEditForm form) {
- verifyCrudMode(form, CrudMode.DELETE);
- requestHeaderService.delete(getRequestHeader(form));
- saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ public HtmlResponse delete(final EditForm form) {
+ verifyCrudMode(form.crudMode, CrudMode.DELETE);
+ validate(form, messages -> {}, toEditHtml());
+ final String id = form.id;
+ requestHeaderService.getRequestHeader(id).ifPresent(entity -> {
+ requestHeaderService.delete(entity);
+ saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
+ }).orElse(() -> {
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
+ });
return redirect(getClass());
}
// ===================================================================================
// Assist Logic
// ============
- protected void loadRequestHeader(final RequestHeaderEditForm form) {
- copyBeanToBean(getRequestHeader(form), form, op -> op.exclude("crudMode"));
- }
-
- protected RequestHeader getRequestHeader(final RequestHeaderEditForm form) {
- final RequestHeader requestHeader = requestHeaderService.getRequestHeader(createKeyMap(form));
- if (requestHeader == null) {
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml());
- }
- return requestHeader;
- }
-
- protected RequestHeader createRequestHeader(final RequestHeaderEditForm form) {
- RequestHeader requestHeader;
+ protected OptionalEntity<RequestHeader> createRequestHeader(final CreateForm form) {
final String username = systemHelper.getUsername();
final long currentTime = systemHelper.getCurrentTimeAsLong();
- if (form.crudMode == CrudMode.EDIT) {
- requestHeader = getRequestHeader(form);
- } else {
- requestHeader = new RequestHeader();
- requestHeader.setCreatedBy(username);
- requestHeader.setCreatedTime(currentTime);
+ switch (form.crudMode) {
+ case CrudMode.CREATE:
+ if (form instanceof CreateForm) {
+ final RequestHeader entity = new RequestHeader();
+ entity.setCreatedBy(username);
+ entity.setCreatedTime(currentTime);
+ entity.setUpdatedBy(username);
+ entity.setUpdatedTime(currentTime);
+ return OptionalEntity.of(entity);
+ }
+ break;
+ case CrudMode.EDIT:
+ if (form instanceof EditForm) {
+ return requestHeaderService.getRequestHeader(((EditForm) form).id).map(entity -> {
+ entity.setUpdatedBy(username);
+ entity.setUpdatedTime(currentTime);
+ return entity;
+ });
+ }
+ break;
+ default:
+ break;
}
- requestHeader.setUpdatedBy(username);
- requestHeader.setUpdatedTime(currentTime);
- copyBeanToBean(form, requestHeader, op -> op.exclude(Constants.COMMON_CONVERSION_RULE));
- return requestHeader;
- }
-
- protected Map<String, String> createKeyMap(final RequestHeaderEditForm form) {
- final Map<String, String> keys = new HashMap<String, String>();
- keys.put("id", form.id);
- return keys;
+ return OptionalEntity.empty();
}
protected void registerProtocolSchemeItems(final RenderData data) {
@@ -316,10 +396,10 @@ public class AdminRequestheaderAction extends FessAdminAction {
// ===================================================================================
// Small Helper
// ============
- protected void verifyCrudMode(final RequestHeaderEditForm form, final int expectedMode) {
- if (form.crudMode != expectedMode) {
+ protected void verifyCrudMode(final int crudMode, final int expectedMode) {
+ if (crudMode != expectedMode) {
throwValidationError(messages -> {
- messages.addErrorsCrudInvalidMode(GLOBAL, String.valueOf(expectedMode), String.valueOf(form.crudMode));
+ messages.addErrorsCrudInvalidMode(GLOBAL, String.valueOf(expectedMode), String.valueOf(crudMode));
}, toEditHtml());
}
}
@@ -327,6 +407,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
protected VaErrorHook toEditHtml() {
return () -> {
return asHtml(path_AdminRequestheader_EditJsp).renderWith(data -> {
+ registerProtocolSchemeItems(data);
registerWebConfigItems(data);
});
};
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/CreateForm.java
new file mode 100644
index 0000000000000000000000000000000000000000..ee2f7e6774d4727f78de317b7b0a9b6f2290d962
--- /dev/null
+++ b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/CreateForm.java
@@ -0,0 +1,62 @@
+/*
+ * 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.requestheader;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.Size;
+
+import org.codelibs.fess.app.web.CrudMode;
+import org.codelibs.fess.util.ComponentUtil;
+import org.lastaflute.web.validation.Required;
+
+/**
+ * @author codelibs
+ * @author Shunji Makino
+ * @author Keiichi Watanabe
+ */
+public class CreateForm implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public Integer crudMode;
+
+ @Required
+ @Size(max = 100)
+ public String name;
+
+ @Required
+ @Size(max = 1000)
+ public String value;
+
+ @Required
+ @Size(max = 1000)
+ public String webConfigId;
+
+ @Required
+ @Size(max = 1000)
+ public String createdBy;
+
+ @Required
+ public Long createdTime;
+
+ public void initialize() {
+ crudMode = CrudMode.CREATE;
+ createdBy = ComponentUtil.getSystemHelper().getUsername();
+ createdTime = ComponentUtil.getSystemHelper().getCurrentTimeAsLong();
+ }
+}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/EditForm.java
new file mode 100644
index 0000000000000000000000000000000000000000..fcf00eb761cd73f7a8157cef978cb0b6e58468ef
--- /dev/null
+++ b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/EditForm.java
@@ -0,0 +1,42 @@
+/*
+ * 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.requestheader;
+
+import javax.validation.constraints.Size;
+
+import org.lastaflute.web.validation.Required;
+
+/**
+ * @author Keiichi Watanabe
+ */
+public class EditForm extends CreateForm {
+
+ private static final long serialVersionUID = 1L;
+
+ @Required
+ @Size(max = 1000)
+ public String id;
+
+ @Size(max = 1000)
+ public String updatedBy;
+
+ public Long updatedTime;
+
+ @Required
+ public Integer versionNo;
+
+}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/RequestHeaderEditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/RequestHeaderEditForm.java
deleted file mode 100644
index ed47bba594725ae83abc10361b49022fb467099e..0000000000000000000000000000000000000000
--- a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/RequestHeaderEditForm.java
+++ /dev/null
@@ -1,79 +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.requestheader;
-
-import java.io.Serializable;
-
-import org.codelibs.fess.util.ComponentUtil;
-
-/**
- * @author codelibs
- * @author Shunji Makino
- */
-public class RequestHeaderEditForm implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- //@IntegerType
- public int crudMode;
-
- //@Required(target = "confirmfromupdate,update,delete")
- //@Maxbytelength(maxbytelength = 1000)
- public String id;
-
- //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
- //@Maxbytelength(maxbytelength = 100)
- public String name;
-
- //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
- //@Maxbytelength(maxbytelength = 1000)
- public String value;
-
- //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
- //@Maxbytelength(maxbytelength = 1000)
- public String webConfigId;
-
- //@Required(target = "confirmfromupdate,update,delete")
- //@Maxbytelength(maxbytelength = 255)
- public String createdBy;
-
- //@Required(target = "confirmfromupdate,update,delete")
- //@LongType
- public String createdTime;
-
- //@Maxbytelength(maxbytelength = 255)
- public String updatedBy;
-
- //@LongType
- public String updatedTime;
-
- //@Required(target = "confirmfromupdate,update,delete")
- //@IntegerType
- public String versionNo;
-
- public void initialize() {
- id = null;
- name = null;
- value = null;
- webConfigId = null;
- createdBy = "system";
- createdTime = Long.toString(ComponentUtil.getSystemHelper().getCurrentTimeAsLong());
- updatedBy = null;
- updatedTime = null;
- versionNo = null;
- }
-}
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/RequestHeaderSearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/SearchForm.java
similarity index 81%
rename from src/main/java/org/codelibs/fess/app/web/admin/requestheader/RequestHeaderSearchForm.java
rename to src/main/java/org/codelibs/fess/app/web/admin/requestheader/SearchForm.java
index ea8418652aecca260bd7499489b444bc98fd93e6..2ba2a6cf67dfdbb03491f75f88b0e5ab2eee2330 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/RequestHeaderSearchForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/SearchForm.java
@@ -17,16 +17,15 @@
package org.codelibs.fess.app.web.admin.requestheader;
import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
/**
* @author codelibs
* @author Shunji Makino
+ * @author Keiichi Watanabe
*/
-public class RequestHeaderSearchForm implements Serializable {
+public class SearchForm implements Serializable {
private static final long serialVersionUID = 1L;
- public Map<String, String> searchParams = new HashMap<String, String>();
+ public String id;
}
diff --git a/src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp
index bfed83b19ce84d2fb54e0c59b72bdf41c8818ce0..1f8688c819ec48db1d93c4be449eb642476a20b5 100644
--- a/src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp
@@ -111,7 +111,7 @@
<%-- Box Footer --%>
<div class="box-footer">
<c:if test="${crudMode == 1}">
- <input type="submit" class="btn" name="editagain" value="<la:message key="labels.request_header_button_back"/>" />
+ <input type="submit" class="btn" name="createagain" value="<la:message key="labels.request_header_button_back"/>" />
<input type="submit" class="btn btn-primary" name="create"
value="<la:message key="labels.request_header_button_create"/>"
/>