diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java index 93122611f..291bfa034 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java @@ -226,7 +226,7 @@ public class AdminBadwordAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createSuggestBadWord(form).ifPresent(entity -> { + getSuggestBadWord(form).ifPresent(entity -> { suggestBadWordService.store(entity); suggestHelper.addBadWord(entity.getSuggestWord()); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); @@ -240,7 +240,7 @@ public class AdminBadwordAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createSuggestBadWord(form).ifPresent(entity -> { + getSuggestBadWord(form).ifPresent(entity -> { suggestBadWordService.store(entity); suggestHelper.storeAllBadWords(); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); @@ -347,7 +347,7 @@ public class AdminBadwordAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createSuggestBadWord(final CreateForm form) { + protected OptionalEntity getSuggestBadWord(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java index cb9678947..4730ddda2 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java @@ -164,7 +164,7 @@ public class AdminBoostdocAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE); verifyToken(() -> asEditHtml()); validate(form, messages -> {}, () -> asEditHtml()); - createBoostDocumentRule(form).ifPresent(entity -> { + getBoostDocumentRule(form).ifPresent(entity -> { boostDocumentRuleService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -178,7 +178,7 @@ public class AdminBoostdocAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT); verifyToken(() -> asEditHtml()); validate(form, messages -> {}, () -> asEditHtml()); - createBoostDocumentRule(form).ifPresent(entity -> { + getBoostDocumentRule(form).ifPresent(entity -> { boostDocumentRuleService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -228,7 +228,7 @@ public class AdminBoostdocAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createBoostDocumentRule(final CreateForm form) { + protected OptionalEntity getBoostDocumentRule(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java index ca21f9e2b..de199f0a7 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java @@ -222,7 +222,7 @@ public class AdminDataconfigAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createDataConfig(form).ifPresent(entity -> { + getDataConfig(form).ifPresent(entity -> { dataConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -235,7 +235,7 @@ public class AdminDataconfigAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createDataConfig(form).ifPresent(entity -> { + getDataConfig(form).ifPresent(entity -> { dataConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -283,7 +283,7 @@ public class AdminDataconfigAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createDataConfig(final CreateForm form) { + protected OptionalEntity getDataConfig(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java index 0db5ea57d..4762d2233 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java @@ -171,7 +171,7 @@ public class AdminDuplicatehostAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createDuplicateHost(form).ifPresent(entity -> { + getDuplicateHost(form).ifPresent(entity -> { duplicateHostService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -184,7 +184,7 @@ public class AdminDuplicatehostAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createDuplicateHost(form).ifPresent(entity -> { + getDuplicateHost(form).ifPresent(entity -> { duplicateHostService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -232,7 +232,7 @@ public class AdminDuplicatehostAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createDuplicateHost(final CreateForm form) { + protected OptionalEntity getDuplicateHost(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java index d26b6d3d1..3e0d761ca 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java @@ -223,7 +223,7 @@ public class AdminElevatewordAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createSuggestElevateWord(form).ifPresent(entity -> { + getSuggestElevateWord(form).ifPresent(entity -> { suggestElevateWordService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -236,7 +236,7 @@ public class AdminElevatewordAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createSuggestElevateWord(form).ifPresent(entity -> { + getSuggestElevateWord(form).ifPresent(entity -> { suggestElevateWordService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -340,7 +340,7 @@ public class AdminElevatewordAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createSuggestElevateWord(final CreateForm form) { + protected OptionalEntity getSuggestElevateWord(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java index 181e650bb..0b24b8339 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java @@ -192,7 +192,7 @@ public class AdminFileauthAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createFileAuthentication(form).ifPresent(entity -> { + getFileAuthentication(form).ifPresent(entity -> { fileAuthenticationService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -205,7 +205,7 @@ public class AdminFileauthAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createFileAuthentication(form).ifPresent(entity -> { + getFileAuthentication(form).ifPresent(entity -> { fileAuthenticationService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -253,7 +253,7 @@ public class AdminFileauthAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createFileAuthentication(final CreateForm form) { + protected OptionalEntity getFileAuthentication(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java index b205354ac..a9d11adfa 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java @@ -210,7 +210,7 @@ public class AdminFileconfigAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createFileConfig(form).ifPresent(entity -> { + getFileConfig(form).ifPresent(entity -> { fileConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -223,7 +223,7 @@ public class AdminFileconfigAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createFileConfig(form).ifPresent(entity -> { + getFileConfig(form).ifPresent(entity -> { fileConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -271,7 +271,7 @@ public class AdminFileconfigAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createFileConfig(final CreateForm form) { + protected OptionalEntity getFileConfig(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java index 47a6491b1..4f3c53991 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java @@ -173,7 +173,7 @@ public class AdminGroupAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createGroup(form).ifPresent(entity -> { + getGroup(form).ifPresent(entity -> { groupService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -186,7 +186,7 @@ public class AdminGroupAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createGroup(form).ifPresent(entity -> { + getGroup(form).ifPresent(entity -> { groupService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -233,7 +233,7 @@ public class AdminGroupAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createGroup(final CreateForm form) { + protected OptionalEntity getGroup(final CreateForm form) { return getEntity(form).map(entity -> { copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); return entity; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java index 5c99d2b75..115d5b1d2 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java @@ -172,7 +172,7 @@ public class AdminKeymatchAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createKeyMatch(form).ifPresent(entity -> { + getKeyMatch(form).ifPresent(entity -> { keyMatchService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); ComponentUtil.getKeyMatchHelper().update(); @@ -186,7 +186,7 @@ public class AdminKeymatchAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createKeyMatch(form).ifPresent(entity -> { + getKeyMatch(form).ifPresent(entity -> { keyMatchService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); ComponentUtil.getKeyMatchHelper().update(); @@ -237,7 +237,7 @@ public class AdminKeymatchAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createKeyMatch(final CreateForm form) { + protected OptionalEntity getKeyMatch(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java index 36707bdf2..76d8ed4fe 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java @@ -181,7 +181,7 @@ public class AdminLabeltypeAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createLabelType(form).ifPresent(entity -> { + getLabelType(form).ifPresent(entity -> { labelTypeService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -194,7 +194,7 @@ public class AdminLabeltypeAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createLabelType(form).ifPresent(entity -> { + getLabelType(form).ifPresent(entity -> { labelTypeService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -243,7 +243,7 @@ public class AdminLabeltypeAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createLabelType(final CreateForm form) { + protected OptionalEntity getLabelType(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java index 4545e88da..7cddbf2df 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java @@ -172,7 +172,7 @@ public class AdminPathmapAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createPathMapping(form).ifPresent(entity -> { + getPathMapping(form).ifPresent(entity -> { pathMappingService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -185,7 +185,7 @@ public class AdminPathmapAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createPathMapping(form).ifPresent(entity -> { + getPathMapping(form).ifPresent(entity -> { pathMappingService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -233,7 +233,7 @@ public class AdminPathmapAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createPathMapping(final CreateForm form) { + protected OptionalEntity getPathMapping(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java index 14dc41f64..850cd5182 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java @@ -194,7 +194,7 @@ public class AdminReqheaderAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createRequestHeader(form).ifPresent(entity -> { + getRequestHeader(form).ifPresent(entity -> { requestHeaderService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -207,7 +207,7 @@ public class AdminReqheaderAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createRequestHeader(form).ifPresent(entity -> { + getRequestHeader(form).ifPresent(entity -> { requestHeaderService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -255,7 +255,7 @@ public class AdminReqheaderAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createRequestHeader(final CreateForm form) { + protected OptionalEntity getRequestHeader(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java index 77f90f80e..54a78bdef 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java @@ -173,7 +173,7 @@ public class AdminRoleAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createRole(form).ifPresent(entity -> { + getRole(form).ifPresent(entity -> { roleService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -186,7 +186,7 @@ public class AdminRoleAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createRole(form).ifPresent(entity -> { + getRole(form).ifPresent(entity -> { roleService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -233,7 +233,7 @@ public class AdminRoleAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createRole(final CreateForm form) { + protected OptionalEntity getRole(final CreateForm form) { return getEntity(form).map(entity -> { copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); return entity; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java index 59ff0c026..c6811b10c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java @@ -171,7 +171,7 @@ public class AdminRoletypeAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createRoleType(form).ifPresent(entity -> { + getRoleType(form).ifPresent(entity -> { roleTypeService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -184,7 +184,7 @@ public class AdminRoletypeAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createRoleType(form).ifPresent(entity -> { + getRoleType(form).ifPresent(entity -> { roleTypeService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -232,7 +232,7 @@ public class AdminRoletypeAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createRoleType(final CreateForm form) { + protected OptionalEntity getRoleType(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java index 5f401cec9..8e5832f30 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java @@ -177,7 +177,7 @@ public class AdminSchedulerAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createScheduledJob(form).ifPresent(entity -> { + getScheduledJob(form).ifPresent(entity -> { scheduledJobService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -190,7 +190,7 @@ public class AdminSchedulerAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createScheduledJob(form).ifPresent(entity -> { + getScheduledJob(form).ifPresent(entity -> { scheduledJobService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -290,7 +290,7 @@ public class AdminSchedulerAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createScheduledJob(final CreateForm form) { + protected OptionalEntity getScheduledJob(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java index 54f34a660..5375eaa22 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java @@ -205,7 +205,7 @@ public class AdminUserAction extends FessAdminAction { validate(form, messages -> {}, toEditHtml()); verifyPassword(form); storePassword(form); - createUser(form).ifPresent(entity -> { + getUser(form).ifPresent(entity -> { userService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -222,7 +222,7 @@ public class AdminUserAction extends FessAdminAction { if (StringUtil.isNotBlank(form.password)) { storePassword(form); } - createUser(form).ifPresent(entity -> { + getUser(form).ifPresent(entity -> { userService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -269,7 +269,7 @@ public class AdminUserAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createUser(final CreateForm form) { + protected OptionalEntity getUser(final CreateForm form) { return getEntity(form).map(entity -> { copyBeanToBean(form, entity, op -> op.exclude(ArrayUtils.addAll(Constants.COMMON_CONVERSION_RULE, "password"))); sessionManager.getAttribute(TEMPORARY_PASSWORD, String.class).ifPresent(password -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java index 2fcdb297f..e6a7ef6f1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java @@ -193,7 +193,7 @@ public class AdminWebauthAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createWebAuthentication(form).ifPresent(entity -> { + getWebAuthentication(form).ifPresent(entity -> { webAuthenticationService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -206,7 +206,7 @@ public class AdminWebauthAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createWebAuthentication(form).ifPresent(entity -> { + getWebAuthentication(form).ifPresent(entity -> { webAuthenticationService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -254,7 +254,7 @@ public class AdminWebauthAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createWebAuthentication(final CreateForm form) { + protected OptionalEntity getWebAuthentication(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java index ec69f367e..9c7d2839f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java @@ -214,7 +214,7 @@ public class AdminWebconfigAction extends FessAdminAction { public HtmlResponse create(final CreateForm form) { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, toEditHtml()); - createWebConfig(form).ifPresent(entity -> { + getWebConfig(form).ifPresent(entity -> { webConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); }).orElse(() -> { @@ -227,7 +227,7 @@ public class AdminWebconfigAction extends FessAdminAction { public HtmlResponse update(final EditForm form) { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, toEditHtml()); - createWebConfig(form).ifPresent(entity -> { + getWebConfig(form).ifPresent(entity -> { webConfigService.store(entity); saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); }).orElse(() -> { @@ -275,7 +275,7 @@ public class AdminWebconfigAction extends FessAdminAction { return OptionalEntity.empty(); } - protected OptionalEntity createWebConfig(final CreateForm form) { + protected OptionalEntity getWebConfig(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); return getEntity(form, username, currentTime).map(entity -> {