From 1acb15a52876716b703541b94fc7f9a688901c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ealden=20Esto=20E=2E=20Escan=CC=83an?= Date: Fri, 9 Feb 2024 10:36:58 +0900 Subject: [PATCH] Java 21 --- build.gradle | 6 +++--- .../ealden/race/controller/FrontControllerServlet.java | 8 ++++---- .../escanan/ealden/race/controller/api/model/Roll.java | 2 +- .../race/controller/api/util/RequestParameters.java | 2 +- .../race/controller/FrontControllerServletTest.java | 4 ++-- .../ealden/race/controller/api/model/RollTest.java | 2 +- .../race/controller/api/util/RequestParametersTest.java | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 2410f6e..d40bad7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.+' - id 'io.spring.dependency-management' version '1.0.+' + id 'org.springframework.boot' version '3.+' + id 'io.spring.dependency-management' version '1.+' id 'war' id 'jacoco' id 'org.sonarqube' version '3.+' @@ -40,7 +40,7 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaLanguageVersion.of(17) } test { diff --git a/src/main/java/com/escanan/ealden/race/controller/FrontControllerServlet.java b/src/main/java/com/escanan/ealden/race/controller/FrontControllerServlet.java index d007710..f525ca9 100644 --- a/src/main/java/com/escanan/ealden/race/controller/FrontControllerServlet.java +++ b/src/main/java/com/escanan/ealden/race/controller/FrontControllerServlet.java @@ -9,10 +9,10 @@ import com.escanan.ealden.race.model.Race; import com.google.gson.Gson; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.Map; diff --git a/src/main/java/com/escanan/ealden/race/controller/api/model/Roll.java b/src/main/java/com/escanan/ealden/race/controller/api/model/Roll.java index 1f8421a..0c01613 100644 --- a/src/main/java/com/escanan/ealden/race/controller/api/model/Roll.java +++ b/src/main/java/com/escanan/ealden/race/controller/api/model/Roll.java @@ -4,7 +4,7 @@ import com.escanan.ealden.race.controller.api.util.RequestParameters; import com.escanan.ealden.race.model.SpeedType; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.Map; diff --git a/src/main/java/com/escanan/ealden/race/controller/api/util/RequestParameters.java b/src/main/java/com/escanan/ealden/race/controller/api/util/RequestParameters.java index 9729ed3..63aab4c 100644 --- a/src/main/java/com/escanan/ealden/race/controller/api/util/RequestParameters.java +++ b/src/main/java/com/escanan/ealden/race/controller/api/util/RequestParameters.java @@ -3,7 +3,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.util.Map; diff --git a/src/test/java/com/escanan/ealden/race/controller/FrontControllerServletTest.java b/src/test/java/com/escanan/ealden/race/controller/FrontControllerServletTest.java index a4ad4d3..135e522 100644 --- a/src/test/java/com/escanan/ealden/race/controller/FrontControllerServletTest.java +++ b/src/test/java/com/escanan/ealden/race/controller/FrontControllerServletTest.java @@ -14,8 +14,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/test/java/com/escanan/ealden/race/controller/api/model/RollTest.java b/src/test/java/com/escanan/ealden/race/controller/api/model/RollTest.java index 218bb95..09fc454 100644 --- a/src/test/java/com/escanan/ealden/race/controller/api/model/RollTest.java +++ b/src/test/java/com/escanan/ealden/race/controller/api/model/RollTest.java @@ -7,7 +7,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/com/escanan/ealden/race/controller/api/util/RequestParametersTest.java b/src/test/java/com/escanan/ealden/race/controller/api/util/RequestParametersTest.java index 55cd623..576e73d 100644 --- a/src/test/java/com/escanan/ealden/race/controller/api/util/RequestParametersTest.java +++ b/src/test/java/com/escanan/ealden/race/controller/api/util/RequestParametersTest.java @@ -5,7 +5,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.util.Map;