From 61bca4fca9741db68c69de73f97e2d7c4465a285 Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Wed, 30 Sep 2020 18:17:03 +0200 Subject: [PATCH] do the same to platform version init Signed-off-by: MiniDigger --- .../controller/ApplicationController.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/io/papermc/hangar/controller/ApplicationController.java b/src/main/java/io/papermc/hangar/controller/ApplicationController.java index c13cbd4c7..fb61d049f 100644 --- a/src/main/java/io/papermc/hangar/controller/ApplicationController.java +++ b/src/main/java/io/papermc/hangar/controller/ApplicationController.java @@ -33,6 +33,9 @@ import io.papermc.hangar.service.VersionService; import io.papermc.hangar.service.project.FlagService; import io.papermc.hangar.service.project.ProjectService; import io.papermc.hangar.util.AlertUtil; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import org.springframework.format.annotation.DateTimeFormat; @@ -54,6 +57,7 @@ import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.View; +import javax.annotation.PostConstruct; import javax.servlet.http.HttpServletRequest; import java.time.LocalDate; import java.time.temporal.ChronoUnit; @@ -65,6 +69,8 @@ import java.util.stream.Collectors; @Controller public class ApplicationController extends HangarController { + private static final Logger log = LoggerFactory.getLogger(ApplicationController.class); + private final HangarDao platformVersionsDao; private final UserService userService; private final ProjectService projectService; @@ -102,17 +108,20 @@ public class ApplicationController extends HangarController { this.hangarConfig = hangarConfig; this.request = request; this.statsService = statsService; - - initPlatformVersions(); } // TODO remove + @PostConstruct private void initPlatformVersions() { - Map> platformVersions = platformVersionsDao.get().getVersions(); - if (platformVersions.isEmpty()) { - platformVersionsDao.get().insert(paperVersions.stream().map(v -> new PlatformVersionsTable(Platform.PAPER, v)).collect(Collectors.toList())); - platformVersionsDao.get().insert(velocityVersions.stream().map(v -> new PlatformVersionsTable(Platform.VELOCITY, v)).collect(Collectors.toList())); - platformVersionsDao.get().insert(waterfallVersions.stream().map(v -> new PlatformVersionsTable(Platform.WATERFALL, v)).collect(Collectors.toList())); + try { + Map> platformVersions = platformVersionsDao.get().getVersions(); + if (platformVersions.isEmpty()) { + platformVersionsDao.get().insert(paperVersions.stream().map(v -> new PlatformVersionsTable(Platform.PAPER, v)).collect(Collectors.toList())); + platformVersionsDao.get().insert(velocityVersions.stream().map(v -> new PlatformVersionsTable(Platform.VELOCITY, v)).collect(Collectors.toList())); + platformVersionsDao.get().insert(waterfallVersions.stream().map(v -> new PlatformVersionsTable(Platform.WATERFALL, v)).collect(Collectors.toList())); + } + } catch (Exception ex) { + log.warn("Error while initializing platform versions", ex); } }