Make URI template variables nullable
Closes gh-34221
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2023 the original author or authors.
|
||||
* Copyright 2002-2025 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -120,7 +120,7 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
|
||||
* @param uriVars zero or more URI variables
|
||||
* @return the created builder
|
||||
*/
|
||||
public static BaseBuilder<?> get(String urlTemplate, Object... uriVars) {
|
||||
public static BaseBuilder<?> get(String urlTemplate, @Nullable Object... uriVars) {
|
||||
return method(HttpMethod.GET, urlTemplate, uriVars);
|
||||
}
|
||||
|
||||
@@ -130,7 +130,7 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
|
||||
* @param uriVars zero or more URI variables
|
||||
* @return the created builder
|
||||
*/
|
||||
public static BaseBuilder<?> head(String urlTemplate, Object... uriVars) {
|
||||
public static BaseBuilder<?> head(String urlTemplate, @Nullable Object... uriVars) {
|
||||
return method(HttpMethod.HEAD, urlTemplate, uriVars);
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
|
||||
* @param uriVars zero or more URI variables
|
||||
* @return the created builder
|
||||
*/
|
||||
public static BodyBuilder post(String urlTemplate, Object... uriVars) {
|
||||
public static BodyBuilder post(String urlTemplate, @Nullable Object... uriVars) {
|
||||
return method(HttpMethod.POST, urlTemplate, uriVars);
|
||||
}
|
||||
|
||||
@@ -151,7 +151,7 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
|
||||
* @param uriVars zero or more URI variables
|
||||
* @return the created builder
|
||||
*/
|
||||
public static BodyBuilder put(String urlTemplate, Object... uriVars) {
|
||||
public static BodyBuilder put(String urlTemplate, @Nullable Object... uriVars) {
|
||||
return method(HttpMethod.PUT, urlTemplate, uriVars);
|
||||
}
|
||||
|
||||
@@ -161,7 +161,7 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
|
||||
* @param uriVars zero or more URI variables
|
||||
* @return the created builder
|
||||
*/
|
||||
public static BodyBuilder patch(String urlTemplate, Object... uriVars) {
|
||||
public static BodyBuilder patch(String urlTemplate, @Nullable Object... uriVars) {
|
||||
return method(HttpMethod.PATCH, urlTemplate, uriVars);
|
||||
}
|
||||
|
||||
@@ -171,7 +171,7 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
|
||||
* @param uriVars zero or more URI variables
|
||||
* @return the created builder
|
||||
*/
|
||||
public static BaseBuilder<?> delete(String urlTemplate, Object... uriVars) {
|
||||
public static BaseBuilder<?> delete(String urlTemplate, @Nullable Object... uriVars) {
|
||||
return method(HttpMethod.DELETE, urlTemplate, uriVars);
|
||||
}
|
||||
|
||||
@@ -181,7 +181,7 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
|
||||
* @param uriVars zero or more URI variables
|
||||
* @return the created builder
|
||||
*/
|
||||
public static BaseBuilder<?> options(String urlTemplate, Object... uriVars) {
|
||||
public static BaseBuilder<?> options(String urlTemplate, @Nullable Object... uriVars) {
|
||||
return method(HttpMethod.OPTIONS, urlTemplate, uriVars);
|
||||
}
|
||||
|
||||
@@ -206,7 +206,7 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
|
||||
* @param vars variables to expand into the template
|
||||
* @return the created builder
|
||||
*/
|
||||
public static BodyBuilder method(HttpMethod method, String uri, Object... vars) {
|
||||
public static BodyBuilder method(HttpMethod method, String uri, @Nullable Object... vars) {
|
||||
return method(method, toUri(uri, vars));
|
||||
}
|
||||
|
||||
@@ -221,12 +221,12 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
|
||||
* @deprecated in favor of {@link #method(HttpMethod, String, Object...)}
|
||||
*/
|
||||
@Deprecated
|
||||
public static BodyBuilder method(String httpMethod, String uri, Object... vars) {
|
||||
public static BodyBuilder method(String httpMethod, String uri, @Nullable Object... vars) {
|
||||
Assert.isTrue(StringUtils.hasText(httpMethod), "HTTP method is required.");
|
||||
return new DefaultBodyBuilder(HttpMethod.valueOf(httpMethod), toUri(uri, vars));
|
||||
}
|
||||
|
||||
private static URI toUri(String uri, Object[] vars) {
|
||||
private static URI toUri(String uri, @Nullable Object[] vars) {
|
||||
return UriComponentsBuilder.fromUriString(uri).buildAndExpand(vars).encode().toUri();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user