Update after review

See gh-28386

Author: rstoyanchev

spring-web/src/main/java/org/springframework/web/service/annotation/GetRequest.java renamed to spring-web/src/main/java/org/springframework/web/service/annotation/GetExchange.java

@@ -26,33 +26,33 @@
 
 
 /**
- * Shortcut for {@link HttpRequest} for HTTP GET requests.
+ * Shortcut for {@link HttpExchange} for HTTP GET requests.
  *
  * @author Rossen Stoyanchev
  * @since 6.0
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@HttpRequest(method = "GET")
-public @interface GetRequest {
+@HttpExchange(method = "GET")
+public @interface GetExchange {
 
 	/**
-	 * Alias for {@link HttpRequest#value}.
+	 * Alias for {@link HttpExchange#value}.
 	 */
-	@AliasFor(annotation = HttpRequest.class)
+	@AliasFor(annotation = HttpExchange.class)
 	String value() default "";
 
 	/**
-	 * Alias for {@link HttpRequest#url()}.
+	 * Alias for {@link HttpExchange#url()}.
 	 */
-	@AliasFor(annotation = HttpRequest.class)
+	@AliasFor(annotation = HttpExchange.class)
 	String url() default "";
 
 	/**
-	 * Alias for {@link HttpRequest#accept()}.
+	 * Alias for {@link HttpExchange#accept()}.
 	 */
-	@AliasFor(annotation = HttpRequest.class)
+	@AliasFor(annotation = HttpExchange.class)
 	String[] accept() default {};
 
 }

spring-web/src/main/java/org/springframework/web/service/annotation/HttpRequest.java renamed to spring-web/src/main/java/org/springframework/web/service/annotation/HttpExchange.java

@@ -42,7 +42,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Mapping
-public @interface HttpRequest {
+public @interface HttpExchange {
 
 	/**
 	 * This is an alias for {@link #url}.
@@ -52,7 +52,7 @@
 
 	/**
 	 * The URL for the request, either a full URL or a path only that is relative
-	 * to a URL declared in a type-level {@code @HttpRequest}, and/or a globally
+	 * to a URL declared in a type-level {@code @HttpExchange}, and/or a globally
 	 * configured base URL.
 	 * <p>By default, this is empty.
 	 */
@@ -67,7 +67,6 @@
 	 */
 	String method() default "";
 
-
 	/**
 	 * The media type for the {@code "Content-Type"} header.
 	 * <p>Supported at the type level as well as at the method level, in which

spring-web/src/main/java/org/springframework/web/service/annotation/PostRequest.java renamed to spring-web/src/main/java/org/springframework/web/service/annotation/PostExchange.java

@@ -24,40 +24,41 @@
 
 import org.springframework.core.annotation.AliasFor;
 
+
 /**
- * Shortcut for {@link HttpRequest} for HTTP POST requests.
+ * Shortcut for {@link HttpExchange} for HTTP POST requests.
  *
  * @author Rossen Stoyanchev
  * @since 6.0
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@HttpRequest(method = "POST")
-public @interface PostRequest {
+@HttpExchange(method = "POST")
+public @interface PostExchange {
 
 	/**
-	 * Alias for {@link HttpRequest#value}.
+	 * Alias for {@link HttpExchange#value}.
 	 */
-	@AliasFor(annotation = HttpRequest.class)
+	@AliasFor(annotation = HttpExchange.class)
 	String value() default "";
 
 	/**
-	 * Alias for {@link HttpRequest#url()}.
+	 * Alias for {@link HttpExchange#url()}.
 	 */
-	@AliasFor(annotation = HttpRequest.class)
+	@AliasFor(annotation = HttpExchange.class)
 	String url() default "";
 
 	/**
-	 * Alias for {@link HttpRequest#contentType()}.
+	 * Alias for {@link HttpExchange#contentType()}.
 	 */
-	@AliasFor(annotation = HttpRequest.class)
+	@AliasFor(annotation = HttpExchange.class)
 	String contentType() default "";
 
 	/**
-	 * Alias for {@link HttpRequest#accept()}.
+	 * Alias for {@link HttpExchange#accept()}.
 	 */
-	@AliasFor(annotation = HttpRequest.class)
+	@AliasFor(annotation = HttpExchange.class)
 	String[] accept() default {};
 
 }

spring-web/src/main/java/org/springframework/web/service/annotation/PutRequest.java renamed to spring-web/src/main/java/org/springframework/web/service/annotation/PutExchange.java

@@ -24,34 +24,35 @@
 
 import org.springframework.core.annotation.AliasFor;
 
+
 /**
- * Shortcut for {@link HttpRequest} for HTTP PUT requests.
+ * Shortcut for {@link HttpExchange} for HTTP PUT requests.
  *
  * @author Rossen Stoyanchev
  * @since 6.0
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@HttpRequest(method = "PUT")
-public @interface PutRequest {
+@HttpExchange(method = "PUT")
+public @interface PutExchange {
 
 	/**
-	 * Alias for {@link HttpRequest#value}.
+	 * Alias for {@link HttpExchange#value}.
 	 */
-	@AliasFor(annotation = HttpRequest.class)
+	@AliasFor(annotation = HttpExchange.class)
 	String[] value() default {};
 
 	/**
-	 * Alias for {@link HttpRequest#url()}.
+	 * Alias for {@link HttpExchange#url()}.
 	 */
-	@AliasFor(annotation = HttpRequest.class)
+	@AliasFor(annotation = HttpExchange.class)
 	String[] url() default {};
 
 	/**
-	 * Alias for {@link HttpRequest#contentType()}.
+	 * Alias for {@link HttpExchange#contentType()}.
 	 */
-	@AliasFor(annotation = HttpRequest.class)
+	@AliasFor(annotation = HttpExchange.class)
 	String contentType() default "";
 
 }

spring-web/src/main/java/org/springframework/web/service/invoker/HttpClientAdapter.java

@@ -25,26 +25,26 @@
 
 
 /**
- * Decouple an {@link HttpServiceProxyFactory#createService(Class) HTTP Service proxy}
- * from the underlying HTTP client.
+ * Contract to abstract the underlying HTTP client and decouple it from the
+ * {@link HttpServiceProxyFactory#createClient(Class) HTTP Service proxy}.
  *
  * @author Rossen Stoyanchev
  * @since 6.0
  */
 public interface HttpClientAdapter {
 
-	Mono<Void> requestToVoid(HttpRequestDefinition requestDefinition);
+	Mono<Void> requestToVoid(HttpRequestSpec spec);
 
-	Mono<HttpHeaders> requestToHeaders(HttpRequestDefinition requestDefinition);
+	Mono<HttpHeaders> requestToHeaders(HttpRequestSpec spec);
 
-	<T> Mono<T> requestToBody(HttpRequestDefinition requestDefinition, ParameterizedTypeReference<T> bodyType);
+	<T> Mono<T> requestToBody(HttpRequestSpec spec, ParameterizedTypeReference<T> bodyType);
 
-	<T> Flux<T> requestToBodyFlux(HttpRequestDefinition requestDefinition, ParameterizedTypeReference<T> bodyType);
+	<T> Flux<T> requestToBodyFlux(HttpRequestSpec spec, ParameterizedTypeReference<T> bodyType);
 
-	Mono<ResponseEntity<Void>> requestToBodilessEntity(HttpRequestDefinition requestDefinition);
+	Mono<ResponseEntity<Void>> requestToBodilessEntity(HttpRequestSpec spec);
 
-	<T> Mono<ResponseEntity<T>> requestToEntity(HttpRequestDefinition requestDefinition, ParameterizedTypeReference<T> bodyType);
+	<T> Mono<ResponseEntity<T>> requestToEntity(HttpRequestSpec spec, ParameterizedTypeReference<T> bodyType);
 
-	<T> Mono<ResponseEntity<Flux<T>>> requestToEntityFlux(HttpRequestDefinition requestDefinition, ParameterizedTypeReference<T> bodyType);
+	<T> Mono<ResponseEntity<Flux<T>>> requestToEntityFlux(HttpRequestSpec spec, ParameterizedTypeReference<T> bodyType);
 
 }

spring-web/src/main/java/org/springframework/web/service/invoker/HttpMethodArgumentResolver.java

@@ -25,20 +25,20 @@
 
 
 /**
- * {@link HttpServiceMethodArgumentResolver} that resolves the target
+ * {@link HttpServiceArgumentResolver} that resolves the target
  * request's HTTP method from an {@link HttpMethod} argument.
  *
  * @author Olga Maciaszek-Sharma
  * @since 6.0
  */
-public class HttpMethodArgumentResolver implements HttpServiceMethodArgumentResolver {
+public class HttpMethodArgumentResolver implements HttpServiceArgumentResolver {
 
 	private static final Log logger = LogFactory.getLog(HttpMethodArgumentResolver.class);
 
 
 	@Override
 	public void resolve(
-			@Nullable Object argument, MethodParameter parameter, HttpRequestDefinition requestDefinition) {
+			@Nullable Object argument, MethodParameter parameter, HttpRequestSpec requestSpec) {
 
 		if (argument == null) {
 			return;
@@ -47,7 +47,7 @@ public void resolve(
 			if (logger.isTraceEnabled()) {
 				logger.trace("Resolved HTTP method to: " + httpMethod.name());
 			}
-			requestDefinition.setHttpMethod(httpMethod);
+			requestSpec.setHttpMethod(httpMethod);
 		}
 	}
 

spring-web/src/main/java/org/springframework/web/service/invoker/HttpRequestDefinition.java renamed to spring-web/src/main/java/org/springframework/web/service/invoker/HttpRequestSpec.java

@@ -30,7 +30,6 @@
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpRequest;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -39,15 +38,15 @@
 
 
 /**
- * Container for HTTP request values accumulated from an
- * {@link HttpRequest @HttpRequest}-annotated method and arguments passed to it.
- * This allows an {@link HttpClientAdapter} adapt these inputs as it sees fit
- * to the API of the underlying client.
+ * Container for HTTP request values extracted from an
+ * {@link org.springframework.web.service.annotation.HttpExchange @HttpExchange}-annotated
+ * method and argument values passed to it. This is then given to
+ * {@link HttpClientAdapter} to adapt to the underlying HTTP client.
  *
  * @author Rossen Stoyanchev
  * @since 6.0
  */
-public class HttpRequestDefinition {
+public class HttpRequestSpec {
 
 	private static final MultiValueMap<String, String> EMPTY_COOKIES_MAP =
 			CollectionUtils.toMultiValueMap(Collections.emptyMap());
@@ -86,6 +85,10 @@ public class HttpRequestDefinition {
 	private boolean complete;
 
 
+	public HttpRequestSpec() {
+	}
+
+
 	public void setUri(URI uri) {
 		checkComplete();
 		this.uri = uri;
@@ -175,6 +178,8 @@ private void checkComplete() {
 
 	void setComplete() {
 
+		this.complete = true;
+
 		this.uriVariables = (this.uriVariables != null ?
 				Collections.unmodifiableMap(this.uriVariables) : Collections.emptyMap());
 

spring-web/src/main/java/org/springframework/web/service/invoker/HttpServiceMethodArgumentResolver.java renamed to spring-web/src/main/java/org/springframework/web/service/invoker/HttpServiceArgumentResolver.java

@@ -18,24 +18,24 @@
 
 import org.springframework.core.MethodParameter;
 import org.springframework.lang.Nullable;
-import org.springframework.web.service.annotation.HttpRequest;
+import org.springframework.web.service.annotation.HttpExchange;
 
 
 /**
- * Resolve an argument from an {@link HttpRequest @HttpRequest} annotated method
+ * Resolve an argument from an {@link HttpExchange @HttpExchange}-annotated method
  * to one or more HTTP request values.
  *
  * @author Rossen Stoyanchev
  * @since 6.0
  */
-public interface HttpServiceMethodArgumentResolver {
+public interface HttpServiceArgumentResolver {
 
 	/**
 	 * Resolve the argument value.
 	 * @param argument the argument value
 	 * @param parameter the method parameter for the argument
-	 * @param requestDefinition container to add HTTP request values to
+	 * @param requestSpec container to add HTTP request values to
 	 */
-	void resolve(@Nullable Object argument, MethodParameter parameter, HttpRequestDefinition requestDefinition);
+	void resolve(@Nullable Object argument, MethodParameter parameter, HttpRequestSpec requestSpec);
 
 }