diff --git a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java index cd631e8c5..14a438b8f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java @@ -56,75 +56,7 @@ public class AdminUpgradeAction extends FessAdminAction { // private static final Logger logger = LogManager.getLogger(AdminUpgradeAction.class); - private static final String VERSION_13_0 = "13.0"; - - private static final String VERSION_13_1 = "13.1"; - - private static final String VERSION_13_2 = "13.2"; - - private static final String VERSION_13_3 = "13.3"; - - private static final String VERSION_13_4 = "13.4"; - - private static final String VERSION_13_5 = "13.5"; - - private static final String VERSION_13_6 = "13.6"; - - private static final String VERSION_13_7 = "13.7"; - - private static final String VERSION_13_8 = "13.8"; - - private static final String VERSION_13_9 = "13.9"; - - private static final String VERSION_13_10 = "13.10"; - - private static final String VERSION_13_11 = "13.11"; - - private static final String VERSION_13_12 = "13.12"; - - private static final String VERSION_13_13 = "13.13"; - - private static final String VERSION_13_14 = "13.14"; - - private static final String VERSION_13_15 = "13.15"; - - private static final String VERSION_13_16 = "13.16"; - - private static final String VERSION_13_17 = "13.17"; - - private static final String VERSION_14_0 = "14.0"; - - private static final String VERSION_14_1 = "14.1"; - - private static final String VERSION_14_2 = "14.2"; - - private static final String VERSION_14_3 = "14.3"; - - private static final String VERSION_14_4 = "14.4"; - - private static final String VERSION_14_5 = "14.5"; - - private static final String VERSION_14_6 = "14.6"; - - private static final String VERSION_14_7 = "14.7"; - - private static final String VERSION_14_8 = "14.8"; - - private static final String VERSION_14_9 = "14.9"; - - private static final String VERSION_14_10 = "14.10"; - - private static final String VERSION_14_11 = "14.11"; - - private static final String VERSION_14_12 = "14.12"; - - private static final String VERSION_14_13 = "14.13"; - - private static final String VERSION_14_14 = "14.14"; - - private static final String VERSION_14_15 = "14.15"; - - private static final String VERSION_14_16 = "14.16"; + private static final String VERSION_14_18 = "14.18"; // =================================================================================== // Attribute @@ -191,42 +123,9 @@ public class AdminUpgradeAction extends FessAdminAction { validate(form, messages -> {}, this::asIndexHtml); verifyToken(this::asIndexHtml); - if (VERSION_13_0.equals(form.targetVersion)) { + if (VERSION_14_18.equals(form.targetVersion)) { try { - upgradeFrom13_0(); - upgradeFrom13_1(); - upgradeFrom13_2(); - upgradeFrom13_3(); - upgradeFrom13_4(); - upgradeFrom13_5(); - upgradeFrom13_6(); - upgradeFrom13_7(); - upgradeFrom13_8(); - upgradeFrom13_10(); - upgradeFrom13_11(); - upgradeFrom13_12(); - upgradeFrom13_13(); - upgradeFrom13_14(); - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); + upgradeFrom14_18(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -234,972 +133,7 @@ public class AdminUpgradeAction extends FessAdminAction { systemHelper.reloadConfiguration(); } catch (final Exception e) { logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_0, e.getLocalizedMessage())); - } - } else if (VERSION_13_1.equals(form.targetVersion)) { - try { - upgradeFrom13_1(); - upgradeFrom13_2(); - upgradeFrom13_3(); - upgradeFrom13_4(); - upgradeFrom13_5(); - upgradeFrom13_6(); - upgradeFrom13_7(); - upgradeFrom13_8(); - upgradeFrom13_9(); - upgradeFrom13_10(); - upgradeFrom13_11(); - upgradeFrom13_12(); - upgradeFrom13_13(); - upgradeFrom13_14(); - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_1, e.getLocalizedMessage())); - } - } else if (VERSION_13_2.equals(form.targetVersion)) { - try { - upgradeFrom13_2(); - upgradeFrom13_3(); - upgradeFrom13_4(); - upgradeFrom13_5(); - upgradeFrom13_6(); - upgradeFrom13_7(); - upgradeFrom13_8(); - upgradeFrom13_9(); - upgradeFrom13_10(); - upgradeFrom13_11(); - upgradeFrom13_12(); - upgradeFrom13_13(); - upgradeFrom13_14(); - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_2, e.getLocalizedMessage())); - } - } else if (VERSION_13_3.equals(form.targetVersion)) { - try { - upgradeFrom13_3(); - upgradeFrom13_4(); - upgradeFrom13_5(); - upgradeFrom13_6(); - upgradeFrom13_7(); - upgradeFrom13_8(); - upgradeFrom13_9(); - upgradeFrom13_10(); - upgradeFrom13_11(); - upgradeFrom13_12(); - upgradeFrom13_13(); - upgradeFrom13_14(); - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_3, e.getLocalizedMessage())); - } - } else if (VERSION_13_4.equals(form.targetVersion)) { - try { - upgradeFrom13_4(); - upgradeFrom13_5(); - upgradeFrom13_6(); - upgradeFrom13_7(); - upgradeFrom13_8(); - upgradeFrom13_9(); - upgradeFrom13_10(); - upgradeFrom13_11(); - upgradeFrom13_12(); - upgradeFrom13_13(); - upgradeFrom13_14(); - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_4, e.getLocalizedMessage())); - } - } else if (VERSION_13_5.equals(form.targetVersion)) { - try { - upgradeFrom13_5(); - upgradeFrom13_6(); - upgradeFrom13_7(); - upgradeFrom13_8(); - upgradeFrom13_9(); - upgradeFrom13_10(); - upgradeFrom13_11(); - upgradeFrom13_12(); - upgradeFrom13_13(); - upgradeFrom13_14(); - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_5, e.getLocalizedMessage())); - } - } else if (VERSION_13_6.equals(form.targetVersion)) { - try { - upgradeFrom13_6(); - upgradeFrom13_7(); - upgradeFrom13_8(); - upgradeFrom13_9(); - upgradeFrom13_10(); - upgradeFrom13_11(); - upgradeFrom13_12(); - upgradeFrom13_13(); - upgradeFrom13_14(); - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_6, e.getLocalizedMessage())); - } - } else if (VERSION_13_7.equals(form.targetVersion)) { - try { - upgradeFrom13_7(); - upgradeFrom13_8(); - upgradeFrom13_9(); - upgradeFrom13_10(); - upgradeFrom13_11(); - upgradeFrom13_12(); - upgradeFrom13_13(); - upgradeFrom13_14(); - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_7, e.getLocalizedMessage())); - } - } else if (VERSION_13_8.equals(form.targetVersion)) { - try { - upgradeFrom13_8(); - upgradeFrom13_9(); - upgradeFrom13_10(); - upgradeFrom13_11(); - upgradeFrom13_12(); - upgradeFrom13_13(); - upgradeFrom13_14(); - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_8, e.getLocalizedMessage())); - } - } else if (VERSION_13_9.equals(form.targetVersion)) { - try { - upgradeFrom13_9(); - upgradeFrom13_10(); - upgradeFrom13_11(); - upgradeFrom13_12(); - upgradeFrom13_13(); - upgradeFrom13_14(); - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_9, e.getLocalizedMessage())); - } - } else if (VERSION_13_10.equals(form.targetVersion)) { - try { - upgradeFrom13_10(); - upgradeFrom13_11(); - upgradeFrom13_12(); - upgradeFrom13_13(); - upgradeFrom13_14(); - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_10, e.getLocalizedMessage())); - } - } else if (VERSION_13_11.equals(form.targetVersion)) { - try { - upgradeFrom13_11(); - upgradeFrom13_12(); - upgradeFrom13_13(); - upgradeFrom13_14(); - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_11, e.getLocalizedMessage())); - } - } else if (VERSION_13_12.equals(form.targetVersion)) { - try { - upgradeFrom13_12(); - upgradeFrom13_13(); - upgradeFrom13_14(); - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_12, e.getLocalizedMessage())); - } - } else if (VERSION_13_13.equals(form.targetVersion)) { - try { - upgradeFrom13_13(); - upgradeFrom13_14(); - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_13, e.getLocalizedMessage())); - } - } else if (VERSION_13_14.equals(form.targetVersion)) { - try { - upgradeFrom13_14(); - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_14, e.getLocalizedMessage())); - } - } else if (VERSION_13_15.equals(form.targetVersion)) { - try { - upgradeFrom13_15(); - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_15, e.getLocalizedMessage())); - } - } else if (VERSION_13_16.equals(form.targetVersion)) { - try { - upgradeFrom13_16(); - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_16, e.getLocalizedMessage())); - } - } else if (VERSION_13_17.equals(form.targetVersion)) { - try { - upgradeFrom13_17(); - upgradeFrom14_0(); - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_17, e.getLocalizedMessage())); - } - } else if (VERSION_14_0.equals(form.targetVersion)) { - try { - upgradeFrom14_0(); - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_0, e.getLocalizedMessage())); - } - } else if (VERSION_14_1.equals(form.targetVersion)) { - try { - upgradeFrom14_1(); - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_1, e.getLocalizedMessage())); - } - } else if (VERSION_14_2.equals(form.targetVersion)) { - try { - upgradeFrom14_2(); - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_2, e.getLocalizedMessage())); - } - } else if (VERSION_14_3.equals(form.targetVersion)) { - try { - upgradeFrom14_3(); - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_3, e.getLocalizedMessage())); - } - } else if (VERSION_14_4.equals(form.targetVersion)) { - try { - upgradeFrom14_4(); - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_4, e.getLocalizedMessage())); - } - } else if (VERSION_14_5.equals(form.targetVersion)) { - try { - upgradeFrom14_5(); - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_5, e.getLocalizedMessage())); - } - } else if (VERSION_14_6.equals(form.targetVersion)) { - try { - upgradeFrom14_6(); - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_6, e.getLocalizedMessage())); - } - } else if (VERSION_14_7.equals(form.targetVersion)) { - try { - upgradeFrom14_7(); - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_7, e.getLocalizedMessage())); - } - } else if (VERSION_14_8.equals(form.targetVersion)) { - try { - upgradeFrom14_8(); - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_8, e.getLocalizedMessage())); - } - } else if (VERSION_14_9.equals(form.targetVersion)) { - try { - upgradeFrom14_9(); - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_9, e.getLocalizedMessage())); - } - } else if (VERSION_14_10.equals(form.targetVersion)) { - try { - upgradeFrom14_10(); - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_10, e.getLocalizedMessage())); - } - } else if (VERSION_14_11.equals(form.targetVersion)) { - try { - upgradeFrom14_11(); - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_11, e.getLocalizedMessage())); - } - } else if (VERSION_14_12.equals(form.targetVersion)) { - try { - upgradeFrom14_12(); - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_12, e.getLocalizedMessage())); - } - } else if (VERSION_14_13.equals(form.targetVersion)) { - try { - upgradeFrom14_13(); - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_13, e.getLocalizedMessage())); - } - } else if (VERSION_14_14.equals(form.targetVersion)) { - try { - upgradeFrom14_14(); - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_14, e.getLocalizedMessage())); - } - } else if (VERSION_14_15.equals(form.targetVersion)) { - try { - upgradeFrom14_15(); - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_15, e.getLocalizedMessage())); - } - } else if (VERSION_14_16.equals(form.targetVersion)) { - try { - upgradeFrom14_16(); - upgradeFromAll(); - - saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); - - systemHelper.reloadConfiguration(); - } catch (final Exception e) { - logger.warn("Failed to upgrade data.", e); - saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_16, e.getLocalizedMessage())); + saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_18, e.getLocalizedMessage())); } } else { saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL)); @@ -1207,236 +141,7 @@ public class AdminUpgradeAction extends FessAdminAction { return redirect(getClass()); } - private void upgradeFrom13_0() { - UpgradeUtil.addData(searchEngineClient, ".fess_config.scheduled_job", "label_updater", - "{\"name\":\"Label Updater\",\"target\":\"all\",\"cronExpression\":\"\",\"scriptType\":\"groovy\",\"scriptData\":\"return container.getComponent(\\\"updateLabelJob\\\").execute();\",\"jobLogging\":false,\"crawler\":false,\"available\":true,\"sortOrder\":11,\"createdBy\":\"system\",\"createdTime\":0,\"updatedBy\":\"system\",\"updatedTime\":0}"); - } - - private void upgradeFrom13_1() { - // nothing - } - - private void upgradeFrom13_2() { - // nothing - } - - private void upgradeFrom13_3() { - // nothing - } - - private void upgradeFrom13_4() { - // nothing - } - - private void upgradeFrom13_5() { - // nothing - } - - private void upgradeFrom13_6() { - // nothing - } - - private void upgradeFrom13_7() { - // nothing - } - - private void upgradeFrom13_8() { - // nothing - } - - private void upgradeFrom13_9() { - // nothing - } - - private void upgradeFrom13_10() { - // nothing - } - - private void upgradeFrom13_11() { - // nothing - } - - private void upgradeFrom13_12() { - // nothing - } - - private void upgradeFrom13_13() { - // nothing - } - - private void upgradeFrom13_14() { - // nothing - } - - private void upgradeFrom13_15() { - // nothing - } - - private void upgradeFrom13_16() { - // nothing - } - - private void upgradeFrom13_17() { - final String[] configIndices = { // - "fess_config.access_token", // - "fess_config.bad_word", // - "fess_config.boost_document_rule", // - "fess_config.crawling_info", // - "fess_config.crawling_info_param", // - "fess_config.data_config", // - "fess_config.duplicate_host", // - "fess_config.elevate_word", // - "fess_config.elevate_word_to_label", // - "fess_config.failure_url", // - "fess_config.file_authentication", // - "fess_config.file_config", // - "fess_config.job_log", // - "fess_config.key_match", // - "fess_config.label_type", // - "fess_config.path_mapping", // - "fess_config.related_content", // - "fess_config.related_query", // - "fess_config.request_header", // - "fess_config.role_type", // - "fess_config.scheduled_job", // - "fess_config.thumbnail_queue", // - "fess_config.web_authentication", // - "fess_config.web_config", // - "fess_user.group", // - "fess_user.role", // - "fess_user.user", // - "configsync", // - }; - final String[] crawlerIndices = { ".crawler.data", // - ".crawler.filter", // - ".crawler.queue", // - }; - final SearchEngineClient client = ComponentUtil.getSearchEngineClient(); - for (final String index : configIndices) { - final String oldIndex = "." + index; - if (client.existsIndex(oldIndex) && client.existsIndex(index)) { - logger.info("Copying from {} to {}", oldIndex, index); - if (!client.reindex(oldIndex, index, false)) { - logger.warn("Failed to copy from {} to {}", oldIndex, index); - } - } else if (logger.isDebugEnabled()) { - if (!client.existsIndex(oldIndex)) { - logger.debug("{} does not exist.", oldIndex); - } - if (!client.existsIndex(index)) { - logger.debug("{} does not exist.", index); - } - } - } - for (final String index : crawlerIndices) { - if (client.existsIndex(index)) { - if (client.deleteIndex(index)) { - logger.warn("Deleted {}.", index); - } else { - logger.warn("Failed to delete {}.", index); - } - } else if (logger.isDebugEnabled()) { - logger.debug("{} does not exist.", index); - } - } - } - - private void upgradeFrom14_0() { - // nothing - } - - private void upgradeFrom14_1() { - // nothing - } - - private void upgradeFrom14_2() { - // nothing - } - - private void upgradeFrom14_3() { - // nothing - } - - private void upgradeFrom14_4() { - // nothing - } - - private void upgradeFrom14_5() { - // nothing - } - - private void upgradeFrom14_6() { - // nothing - } - - private void upgradeFrom14_7() { - // nothing - } - - private void upgradeFrom14_8() { - // nothing - } - - private void upgradeFrom14_9() { - // update mapping text files - final FessConfig fessConfig = ComponentUtil.getFessConfig(); - - final String fesenType = fessConfig.getFesenType(); - switch (fesenType) { - case Constants.FESEN_TYPE_CLOUD: - case Constants.FESEN_TYPE_AWS: - // nothing - break; - default: - for (final String path : getDictionaryPaths()) { - if (path.endsWith("mapping.txt")) { - logger.debug("Updating {}", path); - final String content = getDictionaryContent(path); - if (content != null) { - sendDictionaryContent(path, StreamUtil.split(content, "\n") - .get(stream -> stream.map(s -> s.replaceFirst("#.*", StringUtil.EMPTY)).collect(Collectors.joining("\n")))); - } - } - } - try (CurlResponse response = ComponentUtil.getCurlHelper().post("/_configsync/flush").execute()) { - if (response.getHttpStatusCode() == 200) { - logger.info("Flushed config files."); - } else { - logger.warn("Failed to flush config files."); - } - } catch (final Exception e) { - logger.warn("Failed to flush config files.", e); - } - break; - } - - } - - private void upgradeFrom14_10() { - // nothing - } - - private void upgradeFrom14_11() { - // nothing - } - - private void upgradeFrom14_12() { - // nothing - } - - private void upgradeFrom14_13() { - // nothing - } - - private void upgradeFrom14_14() { - // nothing - } - - private void upgradeFrom14_15() { - // nothing - } - - private void upgradeFrom14_16() { + private void upgradeFrom14_18() { // nothing } diff --git a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp index 9fa53f41d..8c8ec4f2d 100644 --- a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp +++ b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp @@ -50,41 +50,7 @@
- 13.0 - 13.1 - 13.2 - 13.3 - 13.4 - 13.5 - 13.6 - 13.7 - 13.8 - 13.9 - 13.10 - 13.11 - 13.12 - 13.13 - 13.14 - 13.15 - 13.16 - 13.17 - 14.0 - 14.1 - 14.2 - 14.3 - 14.4 - 14.5 - 14.6 - 14.7 - 14.8 - 14.9 - 14.10 - 14.11 - 14.12 - 14.13 - 14.14 - 14.15 - 14.16 + 14.18