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 ae5807b93..3e6ebd87f 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 @@ -162,10 +162,16 @@ public class AdminBoostdocAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getBoostDocumentRule(form).ifPresent(entity -> { - boostDocumentRuleService.store(entity); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - }).orElse(() -> { + getBoostDocumentRule(form).ifPresent( + entity -> { + try { + boostDocumentRuleService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); return redirect(getClass()); @@ -176,10 +182,16 @@ public class AdminBoostdocAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getBoostDocumentRule(form).ifPresent(entity -> { - boostDocumentRuleService.store(entity); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - }).orElse(() -> { + getBoostDocumentRule(form).ifPresent( + entity -> { + try { + boostDocumentRuleService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), () -> asEditHtml()); }); return redirect(getClass()); @@ -191,12 +203,21 @@ public class AdminBoostdocAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); final String id = form.id; - boostDocumentRuleService.getBoostDocumentRule(id).ifPresent(entity -> { - boostDocumentRuleService.delete(entity); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - }).orElse(() -> { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); - }); + boostDocumentRuleService + .getBoostDocumentRule(id) + .ifPresent( + entity -> { + try { + boostDocumentRuleService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); + }); return redirect(getClass()); } 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 9ed300eae..d5ae2ae95 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 @@ -177,10 +177,16 @@ public class AdminDataconfigAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getDataConfig(form).ifPresent(entity -> { - dataConfigService.store(entity); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - }).orElse(() -> { + getDataConfig(form).ifPresent( + entity -> { + try { + dataConfigService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); return redirect(getClass()); @@ -191,10 +197,16 @@ public class AdminDataconfigAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getDataConfig(form).ifPresent(entity -> { - dataConfigService.store(entity); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - }).orElse(() -> { + getDataConfig(form).ifPresent( + entity -> { + try { + dataConfigService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), () -> asEditHtml()); }); return redirect(getClass()); @@ -206,12 +218,21 @@ public class AdminDataconfigAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); final String id = form.id; - dataConfigService.getDataConfig(id).ifPresent(entity -> { - dataConfigService.delete(entity); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - }).orElse(() -> { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); - }); + dataConfigService + .getDataConfig(id) + .ifPresent( + entity -> { + try { + dataConfigService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); + }); return redirect(getClass()); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java index c18d3e503..ead5a4d04 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java @@ -270,10 +270,16 @@ public class AdminDictKuromojiAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE, form.dictId); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - createKuromojiItem(form).ifPresent(entity -> { - kuromojiService.store(form.dictId, entity); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - }).orElse(() -> { + createKuromojiItem(form).ifPresent( + entity -> { + try { + kuromojiService.store(form.dictId, entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId)); @@ -284,10 +290,16 @@ public class AdminDictKuromojiAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT, form.dictId); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - createKuromojiItem(form).ifPresent(entity -> { - kuromojiService.store(form.dictId, entity); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - }).orElse(() -> { + createKuromojiItem(form).ifPresent( + entity -> { + try { + kuromojiService.store(form.dictId, entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), () -> asEditHtml()); }); return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId)); @@ -300,10 +312,17 @@ public class AdminDictKuromojiAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); kuromojiService .getKuromojiItem(form.dictId, form.id) - .ifPresent(entity -> { - kuromojiService.delete(form.dictId, entity); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - }) + .ifPresent( + entity -> { + try { + kuromojiService.delete(form.dictId, entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }) .orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), () -> asDetailsHtml()); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java index 2402e1768..8cbafdf67 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java @@ -274,10 +274,16 @@ public class AdminDictSynonymAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE, form.dictId); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - createSynonymItem(form, () -> asEditHtml()).ifPresent(entity -> { - synonymService.store(form.dictId, entity); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - }).orElse(() -> { + createSynonymItem(form, () -> asEditHtml()).ifPresent( + entity -> { + try { + synonymService.store(form.dictId, entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId)); @@ -288,10 +294,16 @@ public class AdminDictSynonymAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT, form.dictId); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - createSynonymItem(form, () -> asEditHtml()).ifPresent(entity -> { - synonymService.store(form.dictId, entity); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - }).orElse(() -> { + createSynonymItem(form, () -> asEditHtml()).ifPresent( + entity -> { + try { + synonymService.store(form.dictId, entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), () -> asEditHtml()); }); return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId)); @@ -304,10 +316,17 @@ public class AdminDictSynonymAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); synonymService .getSynonymItem(form.dictId, form.id) - .ifPresent(entity -> { - synonymService.delete(form.dictId, entity); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - }) + .ifPresent( + entity -> { + try { + synonymService.delete(form.dictId, entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }) .orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), () -> asDetailsHtml()); 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 a3747e681..72ff175ad 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 @@ -163,10 +163,16 @@ public class AdminDuplicatehostAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getDuplicateHost(form).ifPresent(entity -> { - duplicateHostService.store(entity); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - }).orElse(() -> { + getDuplicateHost(form).ifPresent( + entity -> { + try { + duplicateHostService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); return redirect(getClass()); @@ -177,10 +183,16 @@ public class AdminDuplicatehostAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getDuplicateHost(form).ifPresent(entity -> { - duplicateHostService.store(entity); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - }).orElse(() -> { + getDuplicateHost(form).ifPresent( + entity -> { + try { + duplicateHostService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), () -> asEditHtml()); }); return redirect(getClass()); @@ -192,12 +204,21 @@ public class AdminDuplicatehostAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); final String id = form.id; - duplicateHostService.getDuplicateHost(id).ifPresent(entity -> { - duplicateHostService.delete(entity); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - }).orElse(() -> { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); - }); + duplicateHostService + .getDuplicateHost(id) + .ifPresent( + entity -> { + try { + duplicateHostService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); + }); return redirect(getClass()); } 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 2ec2f925f..5d07f3872 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 @@ -228,10 +228,15 @@ public class AdminElevatewordAction extends FessAdminAction { verifyToken(() -> asEditHtml()); getElevateWord(form).ifPresent( entity -> { - elevateWordService.store(entity); - suggestHelper.addElevateWord(entity.getSuggestWord(), entity.getReading(), entity.getLabelTypeValues(), - entity.getTargetRole(), entity.getBoost()); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + try { + elevateWordService.store(entity); + suggestHelper.addElevateWord(entity.getSuggestWord(), entity.getReading(), entity.getLabelTypeValues(), + entity.getTargetRole(), entity.getBoost()); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); @@ -243,12 +248,18 @@ public class AdminElevatewordAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getElevateWord(form).ifPresent(entity -> { - elevateWordService.store(entity); - suggestHelper.deleteAllElevateWord(); - suggestHelper.storeAllElevateWords(); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - }).orElse(() -> { + getElevateWord(form).ifPresent( + entity -> { + try { + elevateWordService.store(entity); + suggestHelper.deleteAllElevateWord(); + suggestHelper.storeAllElevateWords(); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), () -> asEditHtml()); }); return redirect(getClass()); @@ -260,13 +271,22 @@ public class AdminElevatewordAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); final String id = form.id; - elevateWordService.getElevateWord(id).ifPresent(entity -> { - elevateWordService.delete(entity); - suggestHelper.deleteElevateWord(entity.getSuggestWord()); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - }).orElse(() -> { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); - }); + elevateWordService + .getElevateWord(id) + .ifPresent( + entity -> { + try { + elevateWordService.delete(entity); + suggestHelper.deleteElevateWord(entity.getSuggestWord()); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); + }); return redirect(getClass()); } 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 a90cf8db7..08e8dc800 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 @@ -180,10 +180,16 @@ public class AdminFileauthAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getFileAuthentication(form).ifPresent(entity -> { - fileAuthenticationService.store(entity); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - }).orElse(() -> { + getFileAuthentication(form).ifPresent( + entity -> { + try { + fileAuthenticationService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); return redirect(getClass()); @@ -194,10 +200,16 @@ public class AdminFileauthAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getFileAuthentication(form).ifPresent(entity -> { - fileAuthenticationService.store(entity); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - }).orElse(() -> { + getFileAuthentication(form).ifPresent( + entity -> { + try { + fileAuthenticationService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), () -> asEditHtml()); }); return redirect(getClass()); @@ -209,12 +221,21 @@ public class AdminFileauthAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); final String id = form.id; - fileAuthenticationService.getFileAuthentication(id).ifPresent(entity -> { - fileAuthenticationService.delete(entity); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - }).orElse(() -> { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); - }); + fileAuthenticationService + .getFileAuthentication(id) + .ifPresent( + entity -> { + try { + fileAuthenticationService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); + }); return redirect(getClass()); } 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 ed64c0d7e..fdfa6fef1 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 @@ -173,10 +173,16 @@ public class AdminFileconfigAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getFileConfig(form).ifPresent(entity -> { - fileConfigService.store(entity); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - }).orElse(() -> { + getFileConfig(form).ifPresent( + entity -> { + try { + fileConfigService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); return redirect(getClass()); @@ -187,10 +193,16 @@ public class AdminFileconfigAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getFileConfig(form).ifPresent(entity -> { - fileConfigService.store(entity); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - }).orElse(() -> { + getFileConfig(form).ifPresent( + entity -> { + try { + fileConfigService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), () -> asEditHtml()); }); return redirect(getClass()); @@ -202,12 +214,21 @@ public class AdminFileconfigAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); final String id = form.id; - fileConfigService.getFileConfig(id).ifPresent(entity -> { - fileConfigService.delete(entity); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - }).orElse(() -> { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); - }); + fileConfigService + .getFileConfig(id) + .ifPresent( + entity -> { + try { + fileConfigService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); + }); return redirect(getClass()); } 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 4f40b9d1f..4d8c11410 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 @@ -164,11 +164,17 @@ public class AdminKeymatchAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getKeyMatch(form).ifPresent(entity -> { - keyMatchService.store(entity); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - ComponentUtil.getKeyMatchHelper().update(); - }).orElse(() -> { + getKeyMatch(form).ifPresent( + entity -> { + try { + keyMatchService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + ComponentUtil.getKeyMatchHelper().update(); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); return redirect(getClass()); @@ -179,11 +185,17 @@ public class AdminKeymatchAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getKeyMatch(form).ifPresent(entity -> { - keyMatchService.store(entity); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - ComponentUtil.getKeyMatchHelper().update(); - }).orElse(() -> { + getKeyMatch(form).ifPresent( + entity -> { + try { + keyMatchService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + ComponentUtil.getKeyMatchHelper().update(); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), () -> asEditHtml()); }); return redirect(getClass()); @@ -195,13 +207,22 @@ public class AdminKeymatchAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); final String id = form.id; - keyMatchService.getKeyMatch(id).ifPresent(entity -> { - keyMatchService.delete(entity); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - ComponentUtil.getKeyMatchHelper().update(); - }).orElse(() -> { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); - }); + keyMatchService + .getKeyMatch(id) + .ifPresent( + entity -> { + try { + keyMatchService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + ComponentUtil.getKeyMatchHelper().update(); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); + }); return redirect(getClass()); } 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 ead9dbb78..0cf0e6a09 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 @@ -171,10 +171,16 @@ public class AdminLabeltypeAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getLabelType(form).ifPresent(entity -> { - labelTypeService.store(entity); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - }).orElse(() -> { + getLabelType(form).ifPresent( + entity -> { + try { + labelTypeService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); return redirect(getClass()); @@ -185,10 +191,16 @@ public class AdminLabeltypeAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getLabelType(form).ifPresent(entity -> { - labelTypeService.store(entity); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - }).orElse(() -> { + getLabelType(form).ifPresent( + entity -> { + try { + labelTypeService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), () -> asEditHtml()); }); return redirect(getClass()); @@ -200,12 +212,21 @@ public class AdminLabeltypeAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); final String id = form.id; - labelTypeService.getLabelType(id).ifPresent(entity -> { - labelTypeService.delete(entity); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - }).orElse(() -> { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); - }); + labelTypeService + .getLabelType(id) + .ifPresent( + entity -> { + try { + labelTypeService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); + }); return redirect(getClass()); } 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 e41e197c3..787af2ca0 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 @@ -164,10 +164,16 @@ public class AdminPathmapAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getPathMapping(form).ifPresent(entity -> { - pathMappingService.store(entity); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - }).orElse(() -> { + getPathMapping(form).ifPresent( + entity -> { + try { + pathMappingService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); return redirect(getClass()); @@ -178,10 +184,16 @@ public class AdminPathmapAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getPathMapping(form).ifPresent(entity -> { - pathMappingService.store(entity); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - }).orElse(() -> { + getPathMapping(form).ifPresent( + entity -> { + try { + pathMappingService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), () -> asEditHtml()); }); return redirect(getClass()); @@ -193,12 +205,21 @@ public class AdminPathmapAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); final String id = form.id; - pathMappingService.getPathMapping(id).ifPresent(entity -> { - pathMappingService.delete(entity); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - }).orElse(() -> { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); - }); + pathMappingService + .getPathMapping(id) + .ifPresent( + entity -> { + try { + pathMappingService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); + }); return redirect(getClass()); } 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 6f209df10..9d78fc3bc 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 @@ -180,10 +180,16 @@ public class AdminReqheaderAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getRequestHeader(form).ifPresent(entity -> { - requestHeaderService.store(entity); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - }).orElse(() -> { + getRequestHeader(form).ifPresent( + entity -> { + try { + requestHeaderService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); return redirect(getClass()); @@ -194,10 +200,16 @@ public class AdminReqheaderAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getRequestHeader(form).ifPresent(entity -> { - requestHeaderService.store(entity); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - }).orElse(() -> { + getRequestHeader(form).ifPresent( + entity -> { + try { + requestHeaderService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), () -> asEditHtml()); }); return redirect(getClass()); @@ -209,12 +221,21 @@ public class AdminReqheaderAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); 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), () -> asDetailsHtml()); - }); + requestHeaderService + .getRequestHeader(id) + .ifPresent( + entity -> { + try { + requestHeaderService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); + }); return redirect(getClass()); } 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 3a4869c7a..043b0502e 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 @@ -166,10 +166,16 @@ public class AdminRoletypeAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getRoleType(form).ifPresent(entity -> { - roleTypeService.store(entity); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - }).orElse(() -> { + getRoleType(form).ifPresent( + entity -> { + try { + roleTypeService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); return redirect(getClass()); @@ -180,10 +186,16 @@ public class AdminRoletypeAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getRoleType(form).ifPresent(entity -> { - roleTypeService.store(entity); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - }).orElse(() -> { + getRoleType(form).ifPresent( + entity -> { + try { + roleTypeService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), () -> asEditHtml()); }); return redirect(getClass()); @@ -195,12 +207,21 @@ public class AdminRoletypeAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); final String id = form.id; - roleTypeService.getRoleType(id).ifPresent(entity -> { - roleTypeService.delete(entity); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - }).orElse(() -> { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); - }); + roleTypeService + .getRoleType(id) + .ifPresent( + entity -> { + try { + roleTypeService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); + }); return redirect(getClass()); } 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 daf7465e5..24af17f95 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 @@ -200,10 +200,16 @@ public class AdminSchedulerAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getScheduledJob(form).ifPresent(entity -> { - scheduledJobService.store(entity); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - }).orElse(() -> { + getScheduledJob(form).ifPresent( + entity -> { + try { + scheduledJobService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); return redirect(getClass()); @@ -214,10 +220,16 @@ public class AdminSchedulerAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getScheduledJob(form).ifPresent(entity -> { - scheduledJobService.store(entity); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - }).orElse(() -> { + getScheduledJob(form).ifPresent( + entity -> { + try { + scheduledJobService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), () -> asEditHtml()); }); return redirect(getClass()); @@ -229,12 +241,21 @@ public class AdminSchedulerAction extends FessAdminAction { final String id = form.id; validate(form, messages -> {}, () -> asDetailsHtml(id)); verifyToken(() -> asDetailsHtml(id)); - scheduledJobService.getScheduledJob(id).ifPresent(entity -> { - scheduledJobService.delete(entity); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - }).orElse(() -> { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml(id)); - }); + scheduledJobService + .getScheduledJob(id) + .ifPresent( + entity -> { + try { + scheduledJobService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml(id)); + }); return redirect(getClass()); } 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 1d8540b4e..e7c6b8f3e 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 @@ -178,10 +178,16 @@ public class AdminWebauthAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getWebAuthentication(form).ifPresent(entity -> { - webAuthenticationService.store(entity); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - }).orElse(() -> { + getWebAuthentication(form).ifPresent( + entity -> { + try { + webAuthenticationService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); return redirect(getClass()); @@ -192,10 +198,16 @@ public class AdminWebauthAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getWebAuthentication(form).ifPresent(entity -> { - webAuthenticationService.store(entity); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - }).orElse(() -> { + getWebAuthentication(form).ifPresent( + entity -> { + try { + webAuthenticationService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), () -> asEditHtml()); }); return redirect(getClass()); @@ -207,12 +219,21 @@ public class AdminWebauthAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); final String id = form.id; - webAuthenticationService.getWebAuthentication(id).ifPresent(entity -> { - webAuthenticationService.delete(entity); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - }).orElse(() -> { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); - }); + webAuthenticationService + .getWebAuthentication(id) + .ifPresent( + entity -> { + try { + webAuthenticationService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); + }); return redirect(getClass()); } 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 2e2d25a5c..5bb12a0c4 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 @@ -173,10 +173,16 @@ public class AdminWebconfigAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.CREATE); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getWebConfig(form).ifPresent(entity -> { - webConfigService.store(entity); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); - }).orElse(() -> { + getWebConfig(form).ifPresent( + entity -> { + try { + webConfigService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudFailedToCreateInstance(GLOBAL), () -> asEditHtml()); }); return redirect(getClass()); @@ -187,10 +193,16 @@ public class AdminWebconfigAction extends FessAdminAction { verifyCrudMode(form.crudMode, CrudMode.EDIT); validate(form, messages -> {}, () -> asEditHtml()); verifyToken(() -> asEditHtml()); - getWebConfig(form).ifPresent(entity -> { - webConfigService.store(entity); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); - }).orElse(() -> { + getWebConfig(form).ifPresent( + entity -> { + try { + webConfigService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError(messages -> messages.addErrorsCrudFailedToUpdateCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), () -> asEditHtml()); }); return redirect(getClass()); @@ -202,12 +214,21 @@ public class AdminWebconfigAction extends FessAdminAction { validate(form, messages -> {}, () -> asDetailsHtml()); verifyToken(() -> asDetailsHtml()); final String id = form.id; - webConfigService.getWebConfig(id).ifPresent(entity -> { - webConfigService.delete(entity); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); - }).orElse(() -> { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); - }); + webConfigService + .getWebConfig(id) + .ifPresent( + entity -> { + try { + webConfigService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + } catch (Exception e) { + throwValidationError( + messages -> messages.addErrorsCrudFailedToDeleteCrudTable(GLOBAL, buildThrowableMessage(e)), + () -> asEditHtml()); + } + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml()); + }); return redirect(getClass()); } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/BadWord.java b/src/main/java/org/codelibs/fess/es/config/exentity/BadWord.java index 16f43edbc..40a71c9bc 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/BadWord.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/BadWord.java @@ -39,4 +39,11 @@ public class BadWord extends BsBadWord { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "BadWord [createdBy=" + createdBy + ", createdTime=" + createdTime + ", suggestWord=" + suggestWord + ", targetLabel=" + + targetLabel + ", targetRole=" + targetRole + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + ", docMeta=" + + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/BoostDocumentRule.java b/src/main/java/org/codelibs/fess/es/config/exentity/BoostDocumentRule.java index f317cb204..91c237ba7 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/BoostDocumentRule.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/BoostDocumentRule.java @@ -39,4 +39,11 @@ public class BoostDocumentRule extends BsBoostDocumentRule { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "BoostDocumentRule [boostExpr=" + boostExpr + ", createdBy=" + createdBy + ", createdTime=" + createdTime + ", sortOrder=" + + sortOrder + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + ", urlExpr=" + urlExpr + ", docMeta=" + docMeta + + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfo.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfo.java index fb4c3a826..088cc00c3 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfo.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfo.java @@ -58,4 +58,10 @@ public class CrawlingInfo extends BsCrawlingInfo { public List getCrawlingInfoParamList() { return crawlingInfoParamList; } + + @Override + public String toString() { + return "CrawlingInfo [crawlingInfoParamList=" + crawlingInfoParamList + ", createdTime=" + createdTime + ", expiredTime=" + + expiredTime + ", name=" + name + ", sessionId=" + sessionId + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java index 4cdb61a23..9af946513 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/CrawlingInfoParam.java @@ -67,4 +67,10 @@ public class CrawlingInfoParam extends BsCrawlingInfoParam { return message; } + @Override + public String toString() { + return "CrawlingInfoParam [crawlingInfo=" + crawlingInfo + ", crawlingInfoId=" + crawlingInfoId + ", createdTime=" + createdTime + + ", key=" + key + ", value=" + value + ", docMeta=" + docMeta + "]"; + } + } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java index b364d44e0..26e509692 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java @@ -16,6 +16,7 @@ package org.codelibs.fess.es.config.exentity; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -416,4 +417,15 @@ public class DataConfig extends BsDataConfig implements CrawlingConfig { } return null; } + + @Override + public String toString() { + return "DataConfig [labelTypeIds=" + Arrays.toString(labelTypeIds) + ", roleTypeIds=" + Arrays.toString(roleTypeIds) + + ", includedDocPathPatterns=" + Arrays.toString(includedDocPathPatterns) + ", excludedDocPathPatterns=" + + Arrays.toString(excludedDocPathPatterns) + ", handlerParameterMap=" + handlerParameterMap + ", handlerScriptMap=" + + handlerScriptMap + ", labelTypeList=" + labelTypeList + ", roleTypeList=" + roleTypeList + ", available=" + available + + ", boost=" + boost + ", createdBy=" + createdBy + ", createdTime=" + createdTime + ", handlerName=" + handlerName + + ", handlerParameter=" + handlerParameter + ", handlerScript=" + handlerScript + ", name=" + name + ", sortOrder=" + + sortOrder + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToLabel.java b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToLabel.java index 0f68e13ee..c4b54ce69 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToLabel.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToLabel.java @@ -39,4 +39,10 @@ public class DataConfigToLabel extends BsDataConfigToLabel { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "DataConfigToLabel [dataConfigId=" + dataConfigId + ", labelTypeId=" + labelTypeId + ", docMeta=" + docMeta + "]"; + } + } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToRole.java b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToRole.java index 1dd193d8a..8b80a6669 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToRole.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/DataConfigToRole.java @@ -39,4 +39,9 @@ public class DataConfigToRole extends BsDataConfigToRole { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "DataConfigToRole [dataConfigId=" + dataConfigId + ", roleTypeId=" + roleTypeId + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/DuplicateHost.java b/src/main/java/org/codelibs/fess/es/config/exentity/DuplicateHost.java index 1afb793d2..c787d9375 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/DuplicateHost.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/DuplicateHost.java @@ -45,4 +45,11 @@ public class DuplicateHost extends BsDuplicateHost { return url.replaceFirst("://" + targetStr + "$", "://" + getRegularName()).replaceFirst("://" + targetStr + "([:/])", "://" + getRegularName() + "$1"); } + + @Override + public String toString() { + return "DuplicateHost [createdBy=" + createdBy + ", createdTime=" + createdTime + ", duplicateHostName=" + duplicateHostName + + ", regularName=" + regularName + ", sortOrder=" + sortOrder + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWord.java b/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWord.java index 479e04f0a..c80b380f0 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWord.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWord.java @@ -16,6 +16,7 @@ package org.codelibs.fess.es.config.exentity; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -103,4 +104,12 @@ public class ElevateWord extends BsElevateWord { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "ElevateWord [labelTypeIds=" + Arrays.toString(labelTypeIds) + ", labelTypeList=" + labelTypeList + ", boost=" + boost + + ", createdBy=" + createdBy + ", createdTime=" + createdTime + ", reading=" + reading + ", suggestWord=" + suggestWord + + ", targetLabel=" + targetLabel + ", targetRole=" + targetRole + ", updatedBy=" + updatedBy + ", updatedTime=" + + updatedTime + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWordToLabel.java b/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWordToLabel.java index 43bf95a5b..d4a9e1c94 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWordToLabel.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/ElevateWordToLabel.java @@ -39,4 +39,9 @@ public class ElevateWordToLabel extends BsElevateWordToLabel { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "ElevateWordToLabel [elevateWordId=" + elevateWordId + ", labelTypeId=" + labelTypeId + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FailureUrl.java b/src/main/java/org/codelibs/fess/es/config/exentity/FailureUrl.java index 66d2cfd0e..fafc762cb 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/FailureUrl.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/FailureUrl.java @@ -39,4 +39,11 @@ public class FailureUrl extends BsFailureUrl { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "FailureUrl [configId=" + configId + ", errorCount=" + errorCount + ", errorLog=" + errorLog + ", errorName=" + errorName + + ", lastAccessTime=" + lastAccessTime + ", threadName=" + threadName + ", url=" + url + ", docMeta=" + docMeta + "]"; + } + } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java b/src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java index 34a86d57b..e3124b931 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/FileAuthentication.java @@ -59,4 +59,12 @@ public class FileAuthentication extends BsFileAuthentication { } return fileConfig; } + + @Override + public String toString() { + return "FileAuthentication [fileConfig=" + fileConfig + ", createdBy=" + createdBy + ", createdTime=" + createdTime + + ", fileConfigId=" + fileConfigId + ", hostname=" + hostname + ", parameters=" + parameters + ", port=" + port + + ", protocolScheme=" + protocolScheme + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + ", username=" + + username + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java index 74ee91850..229b889d2 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java @@ -16,6 +16,7 @@ package org.codelibs.fess.es.config.exentity; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -310,4 +311,17 @@ public class FileConfig extends BsFileConfig implements CrawlingConfig { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "FileConfig [labelTypeIds=" + Arrays.toString(labelTypeIds) + ", roleTypeIds=" + Arrays.toString(roleTypeIds) + + ", includedDocPathPatterns=" + Arrays.toString(includedDocPathPatterns) + ", excludedDocPathPatterns=" + + Arrays.toString(excludedDocPathPatterns) + ", configParameterMap=" + configParameterMap + ", labelTypeList=" + + labelTypeList + ", roleTypeList=" + roleTypeList + ", available=" + available + ", boost=" + boost + ", configParameter=" + + configParameter + ", createdBy=" + createdBy + ", createdTime=" + createdTime + ", depth=" + depth + + ", excludedDocPaths=" + excludedDocPaths + ", excludedPaths=" + excludedPaths + ", includedDocPaths=" + includedDocPaths + + ", includedPaths=" + includedPaths + ", intervalTime=" + intervalTime + ", timeToLive=" + timeToLive + + ", maxAccessCount=" + maxAccessCount + ", name=" + name + ", numOfThread=" + numOfThread + ", paths=" + paths + + ", sortOrder=" + sortOrder + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToLabel.java b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToLabel.java index 45122bdc0..ac5717549 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToLabel.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToLabel.java @@ -39,4 +39,9 @@ public class FileConfigToLabel extends BsFileConfigToLabel { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "FileConfigToLabel [fileConfigId=" + fileConfigId + ", labelTypeId=" + labelTypeId + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToRole.java b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToRole.java index cf9e2f1b6..40bafb6af 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToRole.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/FileConfigToRole.java @@ -39,4 +39,9 @@ public class FileConfigToRole extends BsFileConfigToRole { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "FileConfigToRole [fileConfigId=" + fileConfigId + ", roleTypeId=" + roleTypeId + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java b/src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java index bc8479d2a..42188589b 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/JobLog.java @@ -62,4 +62,11 @@ public class JobLog extends BsJobLog { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "JobLog [scheduledJob=" + scheduledJob + ", endTime=" + endTime + ", jobName=" + jobName + ", jobStatus=" + jobStatus + + ", scriptData=" + scriptData + ", scriptResult=" + scriptResult + ", scriptType=" + scriptType + ", startTime=" + + startTime + ", target=" + target + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/KeyMatch.java b/src/main/java/org/codelibs/fess/es/config/exentity/KeyMatch.java index 37888fe36..091264388 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/KeyMatch.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/KeyMatch.java @@ -39,4 +39,11 @@ public class KeyMatch extends BsKeyMatch { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "KeyMatch [boost=" + boost + ", createdBy=" + createdBy + ", createdTime=" + createdTime + ", maxSize=" + maxSize + + ", query=" + query + ", term=" + term + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + ", docMeta=" + + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/LabelToRole.java b/src/main/java/org/codelibs/fess/es/config/exentity/LabelToRole.java index 90fc9529b..f900862b8 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/LabelToRole.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/LabelToRole.java @@ -39,4 +39,9 @@ public class LabelToRole extends BsLabelToRole { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "LabelToRole [labelTypeId=" + labelTypeId + ", roleTypeId=" + roleTypeId + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/LabelType.java b/src/main/java/org/codelibs/fess/es/config/exentity/LabelType.java index 9935b5317..e25b01b61 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/LabelType.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/LabelType.java @@ -16,6 +16,7 @@ package org.codelibs.fess.es.config.exentity; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -99,4 +100,12 @@ public class LabelType extends BsLabelType { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "LabelType [roleTypeIds=" + Arrays.toString(roleTypeIds) + ", roleTypeList=" + roleTypeList + ", createdBy=" + createdBy + + ", createdTime=" + createdTime + ", excludedPaths=" + excludedPaths + ", includedPaths=" + includedPaths + ", name=" + + name + ", sortOrder=" + sortOrder + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + ", value=" + value + + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java b/src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java index c6b173aad..caaec1449 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/PathMapping.java @@ -51,4 +51,11 @@ public class PathMapping extends BsPathMapping { } return regexPattern.matcher(input); } + + @Override + public String toString() { + return "PathMapping [regexPattern=" + regexPattern + ", createdBy=" + createdBy + ", createdTime=" + createdTime + ", processType=" + + processType + ", regex=" + regex + ", replacement=" + replacement + ", sortOrder=" + sortOrder + ", updatedBy=" + + updatedBy + ", updatedTime=" + updatedTime + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java b/src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java index 1b7edd2e1..0aee1b389 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/RequestHeader.java @@ -63,4 +63,11 @@ public class RequestHeader extends BsRequestHeader { } return webConfig; } + + @Override + public String toString() { + return "RequestHeader [webConfig=" + webConfig + ", createdBy=" + createdBy + ", createdTime=" + createdTime + ", name=" + name + + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + ", value=" + value + ", webConfigId=" + webConfigId + + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/RoleType.java b/src/main/java/org/codelibs/fess/es/config/exentity/RoleType.java index 2054db4ed..379472a46 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/RoleType.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/RoleType.java @@ -39,4 +39,10 @@ public class RoleType extends BsRoleType { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "RoleType [createdBy=" + createdBy + ", createdTime=" + createdTime + ", name=" + name + ", sortOrder=" + sortOrder + + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + ", value=" + value + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/ScheduledJob.java b/src/main/java/org/codelibs/fess/es/config/exentity/ScheduledJob.java index cea444655..739fc3b65 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/ScheduledJob.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/ScheduledJob.java @@ -80,4 +80,12 @@ public class ScheduledJob extends BsScheduledJob { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "ScheduledJob [available=" + available + ", crawler=" + crawler + ", createdBy=" + createdBy + ", createdTime=" + + createdTime + ", cronExpression=" + cronExpression + ", jobLogging=" + jobLogging + ", name=" + name + ", scriptData=" + + scriptData + ", scriptType=" + scriptType + ", sortOrder=" + sortOrder + ", target=" + target + ", updatedBy=" + + updatedBy + ", updatedTime=" + updatedTime + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java b/src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java index 34bdb1b2e..6e3ab13b2 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/WebAuthentication.java @@ -132,4 +132,12 @@ public class WebAuthentication extends BsWebAuthentication { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "WebAuthentication [webConfig=" + webConfig + ", authRealm=" + authRealm + ", createdBy=" + createdBy + ", createdTime=" + + createdTime + ", hostname=" + hostname + ", parameters=" + parameters + ", port=" + port + ", protocolScheme=" + + protocolScheme + ", updatedBy=" + updatedBy + ", updatedTime=" + updatedTime + ", username=" + username + + ", webConfigId=" + webConfigId + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java index 3066eb187..bf4db6538 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfig.java @@ -16,6 +16,7 @@ package org.codelibs.fess.es.config.exentity; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -319,4 +320,17 @@ public class WebConfig extends BsWebConfig implements CrawlingConfig { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "WebConfig [labelTypeIds=" + Arrays.toString(labelTypeIds) + ", roleTypeIds=" + Arrays.toString(roleTypeIds) + + ", includedDocUrlPatterns=" + Arrays.toString(includedDocUrlPatterns) + ", excludedDocUrlPatterns=" + + Arrays.toString(excludedDocUrlPatterns) + ", configParameterMap=" + configParameterMap + ", labelTypeList=" + + labelTypeList + ", roleTypeList=" + roleTypeList + ", available=" + available + ", boost=" + boost + ", configParameter=" + + configParameter + ", createdBy=" + createdBy + ", createdTime=" + createdTime + ", depth=" + depth + ", excludedDocUrls=" + + excludedDocUrls + ", excludedUrls=" + excludedUrls + ", includedDocUrls=" + includedDocUrls + ", includedUrls=" + + includedUrls + ", intervalTime=" + intervalTime + ", timeToLive=" + timeToLive + ", maxAccessCount=" + maxAccessCount + + ", name=" + name + ", numOfThread=" + numOfThread + ", sortOrder=" + sortOrder + ", updatedBy=" + updatedBy + + ", updatedTime=" + updatedTime + ", urls=" + urls + ", userAgent=" + userAgent + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToLabel.java b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToLabel.java index 8f858e97f..746300f40 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToLabel.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToLabel.java @@ -39,4 +39,9 @@ public class WebConfigToLabel extends BsWebConfigToLabel { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "WebConfigToLabel [labelTypeId=" + labelTypeId + ", webConfigId=" + webConfigId + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToRole.java b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToRole.java index 1099aa9e1..9caaa7295 100644 --- a/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToRole.java +++ b/src/main/java/org/codelibs/fess/es/config/exentity/WebConfigToRole.java @@ -39,4 +39,9 @@ public class WebConfigToRole extends BsWebConfigToRole { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "WebConfigToRole [roleTypeId=" + roleTypeId + ", webConfigId=" + webConfigId + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java b/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java index f3f1cecad..d7d6ef8f7 100644 --- a/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java +++ b/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java @@ -40,4 +40,9 @@ public class ClickLog extends BsClickLog { asDocMeta().version(version); } + @Override + public String toString() { + return "ClickLog [queryRequestedAt=" + queryRequestedAt + ", requestedAt=" + requestedAt + ", queryId=" + queryId + ", docId=" + + docId + ", userSessionId=" + userSessionId + ", url=" + url + ", order=" + order + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java b/src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java index cdf28ee1b..085719ecb 100644 --- a/src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java +++ b/src/main/java/org/codelibs/fess/es/log/exentity/FavoriteLog.java @@ -39,4 +39,10 @@ public class FavoriteLog extends BsFavoriteLog { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "FavoriteLog [createdAt=" + createdAt + ", url=" + url + ", docId=" + docId + ", queryId=" + queryId + ", userInfoId=" + + userInfoId + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/SearchFieldLog.java b/src/main/java/org/codelibs/fess/es/log/exentity/SearchFieldLog.java index c6cc948f1..f34c4d3ab 100644 --- a/src/main/java/org/codelibs/fess/es/log/exentity/SearchFieldLog.java +++ b/src/main/java/org/codelibs/fess/es/log/exentity/SearchFieldLog.java @@ -39,4 +39,9 @@ public class SearchFieldLog extends BsSearchFieldLog { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "SearchFieldLog [name=" + name + ", searchLogId=" + searchLogId + ", value=" + value + ", docMeta=" + docMeta + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java b/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java index eb93ab6e7..96b3384e1 100644 --- a/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java +++ b/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java @@ -16,6 +16,7 @@ package org.codelibs.fess.es.log.exentity; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.codelibs.core.lang.StringUtil; @@ -104,4 +105,13 @@ public class SearchLog extends BsSearchLog { super.setUserInfoId(value); } + @Override + public String toString() { + return "SearchLog [searchFieldLogList=" + searchFieldLogList + ", userInfo=" + userInfo + ", accessType=" + accessType + ", user=" + + user + ", roles=" + Arrays.toString(roles) + ", queryId=" + queryId + ", clientIp=" + clientIp + ", hitCount=" + hitCount + + ", queryOffset=" + queryOffset + ", queryPageSize=" + queryPageSize + ", referer=" + referer + ", requestedAt=" + + requestedAt + ", responseTime=" + responseTime + ", queryTime=" + queryTime + ", searchWord=" + searchWord + + ", userAgent=" + userAgent + ", userInfoId=" + userInfoId + ", userSessionId=" + userSessionId + ", docMeta=" + docMeta + + "]"; + } } diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java b/src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java index b2466a184..1a82cf398 100644 --- a/src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java +++ b/src/main/java/org/codelibs/fess/es/log/exentity/UserInfo.java @@ -39,4 +39,9 @@ public class UserInfo extends BsUserInfo { public void setVersionNo(final Long version) { asDocMeta().version(version); } + + @Override + public String toString() { + return "UserInfo [createdAt=" + createdAt + ", updatedAt=" + updatedAt + ", docMeta=" + docMeta + "]"; + } }