diff --git a/.github/workflows/webmvc-method-arg-resolver.yml b/.github/workflows/webmvc-method-arg-resolver.yml new file mode 100644 index 0000000..2a4dab4 --- /dev/null +++ b/.github/workflows/webmvc-method-arg-resolver.yml @@ -0,0 +1,32 @@ +name: webmvc-method-arg-resolver +on: + push: + paths: + - "webmvc-method-arg-resolver/**" + branches: [master] + pull_request: + paths: + - "webmvc-method-arg-resolver/**" + branches: [master] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + with: + # Disabling shallow clone is recommended for improving relevancy of reporting + fetch-depth: 0 + - name: Set up JDK + uses: actions/setup-java@v2 + with: + java-version: "21" + distribution: "zulu" + cache: "gradle" + - name: Build with Gradle + run: | + cd webmvc-method-arg-resolver + chmod a+x ./gradlew + ./gradlew clean build + diff --git a/webmvc-method-arg-resolver/.gitignore b/webmvc-method-arg-resolver/.gitignore new file mode 100644 index 0000000..5a979af --- /dev/null +++ b/webmvc-method-arg-resolver/.gitignore @@ -0,0 +1,40 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Kotlin ### +.kotlin diff --git a/webmvc-method-arg-resolver/build.gradle.kts b/webmvc-method-arg-resolver/build.gradle.kts new file mode 100644 index 0000000..fed08ec --- /dev/null +++ b/webmvc-method-arg-resolver/build.gradle.kts @@ -0,0 +1,48 @@ +plugins { + kotlin("jvm") version "1.9.25" + kotlin("plugin.spring") version "1.9.25" + id("org.springframework.boot") version "3.4.0-M3" + id("io.spring.dependency-management") version "1.1.6" +} + +group = "com.example" +version = "0.0.1-SNAPSHOT" + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() + maven { url = uri("https://repo.spring.io/milestone") } +} + +dependencies { + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("org.jetbrains.kotlin:kotlin-reflect") + + testImplementation("org.springframework.boot:spring-boot-starter-webflux") + testImplementation("org.springframework.boot:spring-boot-starter-test"){ + // use mockk as mocking framework + exclude(module = "mockito-core") + exclude(module = "android-json") + } + testImplementation("io.mockk:mockk-jvm:1.13.12") + testImplementation("com.ninja-squad:springmockk:4.0.2") + testImplementation("io.kotest:kotest-assertions-core-jvm:5.9.1") + testImplementation("org.jetbrains.kotlin:kotlin-test-junit5") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") +} + +kotlin { + compilerOptions { + freeCompilerArgs.addAll("-Xjsr305=strict") + } +} + +tasks.withType { + useJUnitPlatform() +} diff --git a/webmvc-method-arg-resolver/gradle/wrapper/gradle-wrapper.jar b/webmvc-method-arg-resolver/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/webmvc-method-arg-resolver/gradle/wrapper/gradle-wrapper.jar differ diff --git a/webmvc-method-arg-resolver/gradle/wrapper/gradle-wrapper.properties b/webmvc-method-arg-resolver/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..0aaefbc --- /dev/null +++ b/webmvc-method-arg-resolver/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/webmvc-method-arg-resolver/gradlew b/webmvc-method-arg-resolver/gradlew new file mode 100644 index 0000000..f5feea6 --- /dev/null +++ b/webmvc-method-arg-resolver/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# 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/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# 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 + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + 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. +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=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# 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" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/webmvc-method-arg-resolver/gradlew.bat b/webmvc-method-arg-resolver/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/webmvc-method-arg-resolver/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@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 ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +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 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +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 + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/webmvc-method-arg-resolver/settings.gradle.kts b/webmvc-method-arg-resolver/settings.gradle.kts new file mode 100644 index 0000000..66431f0 --- /dev/null +++ b/webmvc-method-arg-resolver/settings.gradle.kts @@ -0,0 +1,7 @@ +pluginManagement { + repositories { + maven { url = uri("https://repo.spring.io/milestone") } + gradlePluginPortal() + } +} +rootProject.name = "demo" diff --git a/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/DemoApplication.kt b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/DemoApplication.kt new file mode 100644 index 0000000..76194b5 --- /dev/null +++ b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/DemoApplication.kt @@ -0,0 +1,12 @@ +package com.example.demo + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication + +@SpringBootApplication +class DemoApplication + +fun main(args: Array) { + runApplication(*args) +} + diff --git a/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/DemoApplication.kt~ b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/DemoApplication.kt~ new file mode 100644 index 0000000..7fd8c28 --- /dev/null +++ b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/DemoApplication.kt~ @@ -0,0 +1,11 @@ +package com.example.demo + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication + +@SpringBootApplication +class DemoApplication + +fun main(args: Array) { + runApplication(*args) +} diff --git a/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/Message.kt b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/Message.kt new file mode 100644 index 0000000..60cf659 --- /dev/null +++ b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/Message.kt @@ -0,0 +1,5 @@ +package com.example.demo + +import java.time.LocalDateTime + +data class Message(val id: Long, val body:String ,val createdAt: LocalDateTime = LocalDateTime.now()) diff --git a/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/MessageController.kt b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/MessageController.kt new file mode 100644 index 0000000..fb28bfe --- /dev/null +++ b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/MessageController.kt @@ -0,0 +1,22 @@ +package com.example.demo + +import org.slf4j.LoggerFactory +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("/messages") +class MessageController(private val messages: MessageRepository) { + + + @GetMapping("") + fun getAll(sort: Map): List { + log.debug("sort by: $sort") + return messages.getAll(sort) + } + + companion object{ + private val log = LoggerFactory.getLogger(MessageController::class.java) + } +} \ No newline at end of file diff --git a/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/MessageController.kt~ b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/MessageController.kt~ new file mode 100644 index 0000000..c250603 --- /dev/null +++ b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/MessageController.kt~ @@ -0,0 +1,18 @@ +package com.example.demo + +import org.slf4j.LoggerFactory +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("/messages") +class MessageController(private val messages: MessageRepository) { + fun getAll(sort: Map): List { + log.debug("sort by: $sort") + return messages.getAll(sort) + } + + companion object{ + private val log = LoggerFactory.getLogger(MessageController::class.java) + } +} \ No newline at end of file diff --git a/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/MessageRepository.kt b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/MessageRepository.kt new file mode 100644 index 0000000..8ca83a5 --- /dev/null +++ b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/MessageRepository.kt @@ -0,0 +1,6 @@ +package com.example.demo + + +interface MessageRepository { + fun getAll(sort: Map): List +} diff --git a/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/MessageRepository.kt~ b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/MessageRepository.kt~ new file mode 100644 index 0000000..dd05f03 --- /dev/null +++ b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/MessageRepository.kt~ @@ -0,0 +1,7 @@ +package com.example.demo + + +interface MessageRepository { + fun getAll(sort: Map): List + +} diff --git a/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/WebConfig.kt b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/WebConfig.kt new file mode 100644 index 0000000..e3660bc --- /dev/null +++ b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/WebConfig.kt @@ -0,0 +1,53 @@ +package com.example.demo + +import org.slf4j.LoggerFactory +import org.springframework.context.annotation.Configuration +import org.springframework.core.MethodParameter +import org.springframework.web.bind.support.WebDataBinderFactory +import org.springframework.web.context.request.NativeWebRequest +import org.springframework.web.context.request.ServletWebRequest +import org.springframework.web.method.support.HandlerMethodArgumentResolver +import org.springframework.web.method.support.ModelAndViewContainer +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer + +@Configuration +class WebConfig : WebMvcConfigurer { + + override fun addArgumentResolvers(resolvers: MutableList) { + resolvers.add(SimpleSortMapHandlerMethodArgumentResolver()) + } + +// @Bean +// @Order(0) +// fun simpleSortMapHandlerMethodArgumentResolver() = SimpleSortMapHandlerMethodArgumentResolver() +} + +class SimpleSortMapHandlerMethodArgumentResolver : HandlerMethodArgumentResolver { + + override fun supportsParameter(parameter: MethodParameter): Boolean { + log.debug("test method param: {}", parameter) + return Map::class.java.isAssignableFrom(parameter.parameterType) + } + + @Throws(Exception::class) + override fun resolveArgument( + parameter: MethodParameter, + mavContainer: ModelAndViewContainer?, + webRequest: NativeWebRequest, + binderFactor: WebDataBinderFactory? + ): Any { + val params = (webRequest as ServletWebRequest).parameterMap[parameter.parameterName] + log.debug("resolved args: $params") + if (params.isNullOrEmpty()) return emptyMap() + + val paramValues = params[0].split(",").map { it.trim() } + .groupBy({ it -> if (it.startsWith("-")) it.substring(1) else it }, { it -> !it.startsWith("-") }) + .mapValues { it.value.first() } + log.debug("converted sort result: $paramValues") + return paramValues + } + + companion object { + private val log = LoggerFactory.getLogger(SimpleSortMapHandlerMethodArgumentResolver::class.java) + } +} \ No newline at end of file diff --git a/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/internal/SimpleMessageRepository.kt b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/internal/SimpleMessageRepository.kt new file mode 100644 index 0000000..4c37293 --- /dev/null +++ b/webmvc-method-arg-resolver/src/main/kotlin/com/example/demo/internal/SimpleMessageRepository.kt @@ -0,0 +1,27 @@ +package com.example.demo.internal + +import com.example.demo.Message +import com.example.demo.MessageRepository +import org.springframework.stereotype.Repository + +@Repository +class SimpleMessageRepository : MessageRepository { + val data = listOf( + Message(1, "Hello"), + Message(2, "World"), + Message(3, "Spring Boot"), + Message(4, "Kotlin") + ) + + override fun getAll(sort: Map): List { + if (sort.isNotEmpty() && sort.keys.contains("id")) { + if (sort["id"] == true) + return data.sortedBy { it.id } + + if (sort["id"] == false) + return data.sortedByDescending { it.id } + } + + return data.sortedBy { it.createdAt }.reversed() + } +} \ No newline at end of file diff --git a/webmvc-method-arg-resolver/src/main/resources/application.properties b/webmvc-method-arg-resolver/src/main/resources/application.properties new file mode 100644 index 0000000..4d17e7c --- /dev/null +++ b/webmvc-method-arg-resolver/src/main/resources/application.properties @@ -0,0 +1,4 @@ +spring.application.name=demo +logging.level.com.example.demo=debug +logging.level.web=debug + diff --git a/webmvc-method-arg-resolver/src/test/kotlin/com/example/demo/MessageControllerTest.kt b/webmvc-method-arg-resolver/src/test/kotlin/com/example/demo/MessageControllerTest.kt new file mode 100644 index 0000000..e6c5c94 --- /dev/null +++ b/webmvc-method-arg-resolver/src/test/kotlin/com/example/demo/MessageControllerTest.kt @@ -0,0 +1,47 @@ +package com.example.demo + +import com.ninjasquad.springmockk.MockkBean +import io.kotest.matchers.shouldBe +import io.mockk.every +import io.mockk.slot +import io.mockk.verify +import org.junit.jupiter.api.Test +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest +import org.springframework.boot.test.context.TestConfiguration +import org.springframework.context.annotation.Import +import org.springframework.test.web.reactive.server.WebTestClient + +@WebFluxTest +class MessageControllerTest { + + @TestConfiguration + @Import(WebConfig::class) + inner class TestConfig + + @Autowired + lateinit var client: WebTestClient + + @MockkBean + lateinit var messageRepository: MessageRepository + + @Test + fun `get all messages`() { + val slot = slot>() + every { messageRepository.getAll(capture(slot)) } returns + listOf( + Message(1, "Hello"), + Message(2, "World") + ) + + client.get() + .uri("/messages?sort=id") + .exchange() + .expectStatus().isOk + .expectBodyList(Message::class.java).hasSize(2) + + slot.captured shouldBe mapOf("id" to true) + verify(exactly = 1) { messageRepository.getAll(any()) } + } + +} \ No newline at end of file