Update Kotlin Test Usage

Issue gh-13539
spring-projects · Jul 15, 2023 · cf79af2 · cf79af2
1 parent a08036a
commit cf79af2
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 20 deletions.
diff --git a/...otlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDslTests.kt b/...otlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDslTests.kt
@@ -124,11 +124,13 @@ class AuthorizeHttpRequestsDslTests {
         @RestController
         internal class PathController {
             @RequestMapping("/path")
-            fun path() {
+            fun path(): String {
+                return "ok"
             }
 
             @RequestMapping("/onlyPostPermitted")
-            fun onlyPostPermitted() {
+            fun onlyPostPermitted():String {
+                return "ok"
             }
         }
     }
@@ -274,7 +276,8 @@ class AuthorizeHttpRequestsDslTests {
         @RestController
         internal class PathController {
             @GetMapping("/")
-            fun index() {
+            fun index(): String {
+                return "ok"
             }
         }
 
@@ -340,7 +343,8 @@ class AuthorizeHttpRequestsDslTests {
         @RestController
         internal class PathController {
             @GetMapping("/")
-            fun index() {
+            fun index(): String {
+                return "ok"
             }
         }
 
@@ -405,7 +409,8 @@ class AuthorizeHttpRequestsDslTests {
         @RestController
         internal class PathController {
             @GetMapping("/")
-            fun index() {
+            fun index(): String {
+                return "ok"
             }
         }
 
@@ -471,7 +476,8 @@ class AuthorizeHttpRequestsDslTests {
         @RestController
         internal class PathController {
             @GetMapping("/")
-            fun index() {
+            fun index(): String {
+                return  "ok"
             }
         }
 

diff --git a/...st/kotlin/org/springframework/security/config/annotation/web/AuthorizeRequestsDslTests.kt b/...st/kotlin/org/springframework/security/config/annotation/web/AuthorizeRequestsDslTests.kt
@@ -114,11 +114,13 @@ class AuthorizeRequestsDslTests {
         @RestController
         internal class PathController {
             @RequestMapping("/path")
-            fun path() {
+            fun path(): String {
+                return "ok"
             }
 
             @RequestMapping("/onlyPostPermitted")
-            fun onlyPostPermitted() {
+            fun onlyPostPermitted(): String {
+                return "ok"
             }
         }
     }
@@ -171,7 +173,8 @@ class AuthorizeRequestsDslTests {
         @RestController
         internal class PathController {
             @RequestMapping("/path")
-            fun path() {
+            fun path(): String {
+                return "ok"
             }
         }
     }
@@ -327,7 +330,8 @@ class AuthorizeRequestsDslTests {
         @RestController
         internal class PathController {
             @GetMapping("/")
-            fun index() {
+            fun index():String {
+                return "ok"
             }
         }
 
@@ -398,7 +402,8 @@ class AuthorizeRequestsDslTests {
         @RestController
         internal class PathController {
             @GetMapping("/")
-            fun index() {
+            fun index():String {
+                return "ok"
             }
         }
 
@@ -461,7 +466,8 @@ class AuthorizeRequestsDslTests {
         @RestController
         internal class PathController {
             @RequestMapping("/path")
-            fun path() {
+            fun path():String {
+                return "ok"
             }
         }
     }
@@ -484,7 +490,8 @@ class AuthorizeRequestsDslTests {
         @RestController
         internal class PathController {
             @RequestMapping("/path")
-            fun path() {
+            fun path(): String {
+                return "ok"
             }
         }
     }
@@ -522,7 +529,8 @@ class AuthorizeRequestsDslTests {
         @RestController
         internal class PathController {
             @RequestMapping("/path")
-            fun path() {
+            fun path(): String {
+                return "ok"
             }
         }
     }

diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/CsrfDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/CsrfDslTests.kt
@@ -290,11 +290,13 @@ class CsrfDslTests {
     @RestController
     internal class BasicController {
         @PostMapping("/test1")
-        fun test1() {
+        fun test1():String {
+            return "ok"
         }
 
         @PostMapping("/test2")
-        fun test2() {
+        fun test2():String {
+            return "ok"
         }
     }
 

diff --git a/...g/src/test/kotlin/org/springframework/security/config/annotation/web/HttpBasicDslTests.kt b/...g/src/test/kotlin/org/springframework/security/config/annotation/web/HttpBasicDslTests.kt
@@ -217,7 +217,8 @@ class HttpBasicDslTests {
     @RestController
     class MainController {
         @GetMapping("/")
-        fun main() {
+        fun main():String {
+            return "ok"
         }
     }
 }
diff --git a/...src/test/kotlin/org/springframework/security/config/annotation/web/OAuth2LoginDslTests.kt b/...src/test/kotlin/org/springframework/security/config/annotation/web/OAuth2LoginDslTests.kt
@@ -128,7 +128,9 @@ class OAuth2LoginDslTests {
         @RestController
         class LoginController {
             @GetMapping("/custom-login")
-            fun loginPage() { }
+            fun loginPage():String {
+                return "ok"
+            }
         }
     }
 

diff --git a/...a/org/springframework/security/access/prepost/PrePostAdviceReactiveMethodInterceptor.java b/...a/org/springframework/security/access/prepost/PrePostAdviceReactiveMethodInterceptor.java
@@ -201,8 +201,8 @@ private static Object asFlow(Publisher<?> publisher) {
 			return ReactiveFlowKt.asFlow(publisher);
 		}
 
-		private static Object awaitSingleOrNull(Publisher<?> publisher, Object continuation) {
-			return MonoKt.awaitSingleOrNull(publisher, (Continuation<?>) continuation);
+		private static Object awaitSingleOrNull(Mono<?> publisher, Object continuation) {
+			return MonoKt.awaitSingleOrNull(publisher, (Continuation<Object>) continuation);
 		}
 
 	}