Skip to content

Commit

Permalink
fix #2838 upgrade task for 14.16
Browse files Browse the repository at this point in the history
  • Loading branch information
@marevol
marevol committed Aug 10, 2024
1 parent abe6356 commit e40edd2
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 1 deletion.
51 changes: 51 additions & 0 deletions src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ public class AdminUpgradeAction extends FessAdminAction {

private static final String VERSION_14_14 = "14.14";

private static final String VERSION_14_15 = "14.15";

// ===================================================================================
// Attribute
//
Expand Down Expand Up @@ -221,6 +223,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -264,6 +267,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -306,6 +310,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -347,6 +352,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -387,6 +393,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -426,6 +433,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -464,6 +472,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -501,6 +510,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -537,6 +547,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -572,6 +583,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -606,6 +618,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -638,6 +651,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -669,6 +683,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -699,6 +714,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -728,6 +744,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -757,6 +774,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -785,6 +803,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -812,6 +831,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -838,6 +858,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -863,6 +884,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -887,6 +909,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -910,6 +933,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -932,6 +956,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -953,6 +978,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -973,6 +999,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -992,6 +1019,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1010,6 +1038,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1027,6 +1056,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1043,6 +1073,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1058,6 +1089,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1072,6 +1104,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1085,6 +1118,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
try {
upgradeFrom14_13();
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1097,6 +1131,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
} else if (VERSION_14_14.equals(form.targetVersion)) {
try {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1106,6 +1141,18 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
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();
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 {
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
}
Expand Down Expand Up @@ -1337,6 +1384,10 @@ private void upgradeFrom14_14() {
// nothing
}

private void upgradeFrom14_15() {
// nothing
}

private String[] getDictionaryPaths() {
try (CurlResponse response = ComponentUtil.getCurlHelper().get("/_configsync/file").param("size", "1000").execute()) {
if (response.getHttpStatusCode() == 200) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/codelibs/fess/helper/SystemHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public void init() {
logger.debug("Initialize {}", this.getClass().getSimpleName());
}
final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
cal.set(2026, 1 - 1, 1); // EOL Date
cal.set(2026, 2 - 1, 1); // EOL Date
eolTime = cal.getTimeInMillis();
if (isEoled()) {
logger.error("Your system is out of support. See https://fess.codelibs.org/eol.html");
Expand Down
1 change: 1 addition & 0 deletions src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
<la:option value="14.12">14.12</la:option>
<la:option value="14.13">14.13</la:option>
<la:option value="14.14">14.14</la:option>
<la:option value="14.15">14.15</la:option>
</la:select>
</div>
</div>
Expand Down

0 comments on commit e40edd2

Please sign in to comment.