diff --git a/build.gradle b/build.gradle index 8ef88bb..bd12fee 100644 --- a/build.gradle +++ b/build.gradle @@ -30,8 +30,9 @@ dependencies { implementation group: 'org.springframework.boot', name: 'spring-boot-starter-jetty' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-test' - implementation group: 'org.slf4j', name: 'slf4j-api', version: versionSLF4J - implementation group: 'nz.net.ultraq.thymeleaf', name: 'thymeleaf-layout-dialect', version: '3.0.0' + implementation group: 'org.slf4j', name: 'slf4j-api' + implementation group: 'nz.net.ultraq.thymeleaf', name: 'thymeleaf-layout-dialect' + implementation group: 'org.thymeleaf.extras', name: 'thymeleaf-extras-springsecurity6' implementation group: 'org.javassist', name: 'javassist', version: '3.25.0-GA' implementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: versionJetty diff --git a/src/main/java/ru/ulstu/HttpUtils.java b/src/main/java/ru/ulstu/HttpUtils.java index faac963..75b8cbf 100644 --- a/src/main/java/ru/ulstu/HttpUtils.java +++ b/src/main/java/ru/ulstu/HttpUtils.java @@ -1,6 +1,6 @@ package ru.ulstu; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class HttpUtils { public static String getUserIp(HttpServletRequest request) { diff --git a/src/main/java/ru/ulstu/configuration/TemplateConfiguration.java b/src/main/java/ru/ulstu/configuration/TemplateConfiguration.java index a403254..533146c 100644 --- a/src/main/java/ru/ulstu/configuration/TemplateConfiguration.java +++ b/src/main/java/ru/ulstu/configuration/TemplateConfiguration.java @@ -6,7 +6,7 @@ import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.support.ReloadableResourceBundleMessageSource; -import org.thymeleaf.spring5.SpringTemplateEngine; +import org.thymeleaf.spring6.SpringTemplateEngine; import org.thymeleaf.templateresolver.ITemplateResolver; @Configuration diff --git a/src/main/java/ru/ulstu/controller/TimeSeriesController.java b/src/main/java/ru/ulstu/controller/TimeSeriesController.java index b97a2cb..44cc20d 100644 --- a/src/main/java/ru/ulstu/controller/TimeSeriesController.java +++ b/src/main/java/ru/ulstu/controller/TimeSeriesController.java @@ -1,6 +1,8 @@ package ru.ulstu.controller; import io.swagger.v3.oas.annotations.Operation; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; @@ -20,8 +22,6 @@ import ru.ulstu.datamodel.ts.TimeSeries; import ru.ulstu.method.Method; import ru.ulstu.service.TimeSeriesService; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; import java.lang.reflect.InvocationTargetException; import java.util.List; import java.util.concurrent.ExecutionException; diff --git a/src/main/java/ru/ulstu/datamodel/ForecastParams.java b/src/main/java/ru/ulstu/datamodel/ForecastParams.java index 265dfe6..38cb513 100644 --- a/src/main/java/ru/ulstu/datamodel/ForecastParams.java +++ b/src/main/java/ru/ulstu/datamodel/ForecastParams.java @@ -1,9 +1,8 @@ package ru.ulstu.datamodel; +import jakarta.validation.constraints.NotNull; import ru.ulstu.datamodel.ts.TimeSeries; -import javax.validation.constraints.NotNull; - public class ForecastParams { @NotNull private TimeSeries originalTimeSeries; diff --git a/src/main/java/ru/ulstu/datamodel/SmoothingParams.java b/src/main/java/ru/ulstu/datamodel/SmoothingParams.java index 444b84d..2c04d37 100644 --- a/src/main/java/ru/ulstu/datamodel/SmoothingParams.java +++ b/src/main/java/ru/ulstu/datamodel/SmoothingParams.java @@ -1,9 +1,8 @@ package ru.ulstu.datamodel; +import jakarta.validation.constraints.NotNull; import ru.ulstu.datamodel.ts.TimeSeries; -import javax.validation.constraints.NotNull; - public class SmoothingParams { @NotNull private TimeSeries originalTimeSeries; diff --git a/src/main/java/ru/ulstu/service/UtilService.java b/src/main/java/ru/ulstu/service/UtilService.java index 498dad4..5f8113a 100644 --- a/src/main/java/ru/ulstu/service/UtilService.java +++ b/src/main/java/ru/ulstu/service/UtilService.java @@ -1,7 +1,5 @@ package ru.ulstu.service; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import ru.ulstu.TimeSeriesUtils; import ru.ulstu.datamodel.ts.TimeSeries; @@ -16,7 +14,6 @@ import java.util.stream.Collectors; @Service public class UtilService { - private static final Logger LOGGER = LoggerFactory.getLogger(UtilService.class); private static final String DELIMITER = ";"; public TimeSeries getRandomTimeSeries(int length) {