diff --git a/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java b/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java index 686b638cb3..363a9e5e19 100644 --- a/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java +++ b/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java @@ -142,8 +142,8 @@ public class BootstrapContextListener implements ServletContextListener { Throwable startupError = SCMContext.getContext().getStartupError(); if (startupError != null) { contextListener = SingleView.error(startupError); - } else if (Versions.isToOld()) { - contextListener = SingleView.view("/templates/to-old.mustache", HttpServletResponse.SC_CONFLICT); + } else if (Versions.isTooOld()) { + contextListener = SingleView.view("/templates/too-old.mustache", HttpServletResponse.SC_CONFLICT); } else { createMigrationOrNormalContextListener(); Versions.writeNew(); diff --git a/scm-webapp/src/main/java/sonia/scm/boot/Versions.java b/scm-webapp/src/main/java/sonia/scm/boot/Versions.java index e3c2848ace..6da19fedca 100644 --- a/scm-webapp/src/main/java/sonia/scm/boot/Versions.java +++ b/scm-webapp/src/main/java/sonia/scm/boot/Versions.java @@ -29,7 +29,7 @@ class Versions { } @VisibleForTesting - boolean isPreviousVersionToOld() { + boolean isPreviousVersionTooOld() { return readVersion().map(v -> v.isOlder(MIN_VERSION)).orElse(false); } @@ -66,8 +66,8 @@ class Versions { } } - static boolean isToOld() { - return new Versions(SCMContext.getContext()).isPreviousVersionToOld(); + static boolean isTooOld() { + return new Versions(SCMContext.getContext()).isPreviousVersionTooOld(); } static void writeNew() { diff --git a/scm-webapp/src/main/resources/templates/to-old.mustache b/scm-webapp/src/main/resources/templates/too-old.mustache similarity index 100% rename from scm-webapp/src/main/resources/templates/to-old.mustache rename to scm-webapp/src/main/resources/templates/too-old.mustache diff --git a/scm-webapp/src/test/java/sonia/scm/boot/VersionsTest.java b/scm-webapp/src/test/java/sonia/scm/boot/VersionsTest.java index 0506bd5594..e5aa8fe3d1 100644 --- a/scm-webapp/src/test/java/sonia/scm/boot/VersionsTest.java +++ b/scm-webapp/src/test/java/sonia/scm/boot/VersionsTest.java @@ -29,37 +29,37 @@ class VersionsTest { @Test void shouldReturnTrueForVersionsPreviousTo160(@TempDirectory.TempDir Path directory) throws IOException { setVersion(directory, "1.59"); - assertThat(versions.isPreviousVersionToOld()).isTrue(); + assertThat(versions.isPreviousVersionTooOld()).isTrue(); setVersion(directory, "1.12"); - assertThat(versions.isPreviousVersionToOld()).isTrue(); + assertThat(versions.isPreviousVersionTooOld()).isTrue(); } @Test void shouldReturnFalseForVersion160(@TempDirectory.TempDir Path directory) throws IOException { setVersion(directory, "1.60"); - assertThat(versions.isPreviousVersionToOld()).isFalse(); + assertThat(versions.isPreviousVersionTooOld()).isFalse(); } @Test void shouldNotFailIfVersionContainsLineBreak(@TempDirectory.TempDir Path directory) throws IOException { setVersion(directory, "1.59\n"); - assertThat(versions.isPreviousVersionToOld()).isTrue(); + assertThat(versions.isPreviousVersionTooOld()).isTrue(); } @Test void shouldReturnFalseForVersionsNewerAs160(@TempDirectory.TempDir Path directory) throws IOException { setVersion(directory, "1.61"); - assertThat(versions.isPreviousVersionToOld()).isFalse(); + assertThat(versions.isPreviousVersionTooOld()).isFalse(); setVersion(directory, "1.82"); - assertThat(versions.isPreviousVersionToOld()).isFalse(); + assertThat(versions.isPreviousVersionTooOld()).isFalse(); } @Test void shouldReturnFalseForNonExistingVersionFile(@TempDirectory.TempDir Path directory) { setVersionFile(directory.resolve("version.txt")); - assertThat(versions.isPreviousVersionToOld()).isFalse(); + assertThat(versions.isPreviousVersionTooOld()).isFalse(); } @Test