diff --git a/.gitignore b/.gitignore index 5934dd76..56d541f0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ .gradle build/ out/ + +.kotlin diff --git a/build.gradle.kts b/build.gradle.kts index 33703721..6a4ee3c1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,30 +1,30 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - - description = "Kotlin version of the Spring Petclinic application" group = "org.springframework.samples" // Align with Spring Version -version = "3.3.0" - -java.sourceCompatibility = JavaVersion.VERSION_17 +version = "3.4.0" plugins { val kotlinVersion = "2.1.0" - id("org.springframework.boot") version "3.3.5" + id("org.springframework.boot") version "3.4.0" id("io.spring.dependency-management") version "1.1.6" id("com.google.cloud.tools.jib") version "3.4.4" kotlin("jvm") version kotlinVersion kotlin("plugin.spring") version kotlinVersion } -// WebJars versions are also referenced in src/main/resources/templates/fragments/layout.html for resource URLs val boostrapVersion = "5.3.3" val fontAwesomeVersion = "4.7.0" +val webjarsLocatorLiteVersion = "1.0.1" + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} -tasks.withType { - kotlinOptions { - jvmTarget = "17" - freeCompilerArgs = listOf("-Xjsr305=strict") +kotlin { + compilerOptions { + freeCompilerArgs.addAll("-Xjsr305=strict") } } @@ -59,9 +59,9 @@ dependencies { runtimeOnly("com.h2database:h2") runtimeOnly("com.mysql:mysql-connector-j") + runtimeOnly("org.webjars:webjars-locator-lite:${webjarsLocatorLiteVersion}") developmentOnly("org.springframework.boot:spring-boot-devtools") - implementation(kotlin("stdlib-jdk8")) } jib { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbf..a4b76b95 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdc9a83b..94113f20 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d..f5feea6d 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,10 +85,9 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +134,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -144,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 6689b85b..9b42019c 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/src/main/resources/templates/fragments/layout.html b/src/main/resources/templates/fragments/layout.html index a6e133ff..5677180a 100755 --- a/src/main/resources/templates/fragments/layout.html +++ b/src/main/resources/templates/fragments/layout.html @@ -17,7 +17,7 @@ - + @@ -87,7 +87,7 @@ - + diff --git a/src/test/jmeter/petclinic_test_plan.jmx b/src/test/jmeter/petclinic_test_plan.jmx index e39fe173..0dfec1d1 100644 --- a/src/test/jmeter/petclinic_test_plan.jmx +++ b/src/test/jmeter/petclinic_test_plan.jmx @@ -135,7 +135,7 @@ - ${CONTEXT_WEB}/webjars/bootstrap/5.1.3/dist/js/bootstrap.bundle.min.js + ${CONTEXT_WEB}/webjars/bootstrap/dist/js/bootstrap.bundle.min.js GET true false diff --git a/src/test/kotlin/org/springframework/samples/petclinic/owner/OwnerControllerTest.kt b/src/test/kotlin/org/springframework/samples/petclinic/owner/OwnerControllerTest.kt index 3bf40275..d64e7c5e 100644 --- a/src/test/kotlin/org/springframework/samples/petclinic/owner/OwnerControllerTest.kt +++ b/src/test/kotlin/org/springframework/samples/petclinic/owner/OwnerControllerTest.kt @@ -7,11 +7,10 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.mockito.BDDMockito.given -import org.mockito.BDDMockito.verify import org.mockito.Mockito import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.context.junit.jupiter.SpringExtension import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get @@ -35,10 +34,10 @@ class OwnerControllerTest { @Autowired lateinit private var mockMvc: MockMvc - @MockBean + @MockitoBean private lateinit var owners: OwnerRepository - @MockBean + @MockitoBean private lateinit var visits: VisitRepository private lateinit var george: Owner diff --git a/src/test/kotlin/org/springframework/samples/petclinic/owner/PetControllerTest.kt b/src/test/kotlin/org/springframework/samples/petclinic/owner/PetControllerTest.kt index 8bf52659..ebd694ce 100644 --- a/src/test/kotlin/org/springframework/samples/petclinic/owner/PetControllerTest.kt +++ b/src/test/kotlin/org/springframework/samples/petclinic/owner/PetControllerTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.extension.ExtendWith import org.mockito.BDDMockito.given import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.context.annotation.ComponentScan import org.springframework.context.annotation.FilterType import org.springframework.test.context.junit.jupiter.SpringExtension @@ -32,10 +32,10 @@ class PetControllerTest { @Autowired lateinit private var mockMvc: MockMvc - @MockBean + @MockitoBean private lateinit var pets: PetRepository - @MockBean + @MockitoBean private lateinit var owners: OwnerRepository @BeforeEach diff --git a/src/test/kotlin/org/springframework/samples/petclinic/owner/VisitControllerTest.kt b/src/test/kotlin/org/springframework/samples/petclinic/owner/VisitControllerTest.kt index c505530c..a3051596 100644 --- a/src/test/kotlin/org/springframework/samples/petclinic/owner/VisitControllerTest.kt +++ b/src/test/kotlin/org/springframework/samples/petclinic/owner/VisitControllerTest.kt @@ -6,7 +6,7 @@ import org.junit.jupiter.api.extension.ExtendWith import org.mockito.BDDMockito.given import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.samples.petclinic.visit.VisitRepository import org.springframework.test.context.junit.jupiter.SpringExtension import org.springframework.test.web.servlet.MockMvc @@ -26,10 +26,10 @@ class VisitControllerTest { @Autowired lateinit private var mockMvc: MockMvc - @MockBean + @MockitoBean private lateinit var visits: VisitRepository - @MockBean + @MockitoBean private lateinit var pets: PetRepository @BeforeEach diff --git a/src/test/kotlin/org/springframework/samples/petclinic/vet/VetControllerTest.kt b/src/test/kotlin/org/springframework/samples/petclinic/vet/VetControllerTest.kt index a81535e1..275b9570 100644 --- a/src/test/kotlin/org/springframework/samples/petclinic/vet/VetControllerTest.kt +++ b/src/test/kotlin/org/springframework/samples/petclinic/vet/VetControllerTest.kt @@ -7,7 +7,7 @@ import org.junit.jupiter.api.extension.ExtendWith import org.mockito.BDDMockito.given import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.http.MediaType import org.springframework.test.context.junit.jupiter.SpringExtension import org.springframework.test.web.servlet.MockMvc @@ -24,7 +24,7 @@ class VetControllerTest { @Autowired lateinit private var mockMvc: MockMvc - @MockBean + @MockitoBean private lateinit var vets: VetRepository @BeforeEach