Skip to content

Commit 6caef9b

Browse files
rlaopesdeleuze
authored andcommitted
Refine ServerRequest.queryParamOrNull implementation
Closes gh-31264
1 parent a97ff39 commit 6caef9b

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerRequestExtensions.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,7 @@ fun ServerRequest.attributeOrNull(name: String): Any? = attributes()[name]
173173
*/
174174
fun ServerRequest.queryParamOrNull(name: String): String? {
175175
val queryParamValues = queryParams()[name]
176-
return if (CollectionUtils.isEmpty(queryParamValues)) {
177-
null
178-
} else {
179-
var value: String? = queryParamValues!![0]
180-
if (value == null) {
181-
value = ""
182-
}
183-
value
184-
}
176+
return if (queryParamValues.isNullOrEmpty()) null else queryParamValues[0] ?: ""
185177
}
186178

187179
/**

0 commit comments

Comments
 (0)