Skip to content

Commit d512aaf

Browse files
committed
Avoid javadoc references to deprecated types/methods
(cherry picked from commit 68997d8)
1 parent faa000f commit d512aaf

File tree

5 files changed

+15
-30
lines changed

5 files changed

+15
-30
lines changed

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractAsyncReturnValueHandler.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,9 +22,7 @@
2222

2323
/**
2424
* Convenient base class for {@link AsyncHandlerMethodReturnValueHandler}
25-
* implementations that support only asynchronous (Future-like) return values
26-
* and merely serve as adapters of such types to Spring's
27-
* {@link org.springframework.util.concurrent.ListenableFuture ListenableFuture}.
25+
* implementations that support only asynchronous (Future-like) return values.
2826
*
2927
* @author Sebastien Deleuze
3028
* @since 4.2

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AsyncHandlerMethodReturnValueHandler.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@
2424
/**
2525
* An extension of {@link HandlerMethodReturnValueHandler} for handling async,
2626
* Future-like return value types that support success and error callbacks.
27-
* Essentially anything that can be adapted to a
28-
* {@link org.springframework.util.concurrent.ListenableFuture ListenableFuture}.
2927
*
3028
* <p>Implementations should consider extending the convenient base class
3129
* {@link AbstractAsyncReturnValueHandler}.
@@ -71,6 +69,7 @@ public interface AsyncHandlerMethodReturnValueHandler extends HandlerMethodRetur
7169
@Nullable
7270
default org.springframework.util.concurrent.ListenableFuture<?> toListenableFuture(
7371
Object returnValue, MethodParameter returnType) {
72+
7473
CompletableFuture<?> result = toCompletableFuture(returnValue, returnType);
7574
return (result != null ?
7675
new org.springframework.util.concurrent.CompletableToListenableFutureAdapter<>(result) :

spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -62,16 +62,9 @@ public void setProxy(Proxy proxy) {
6262
/**
6363
* Indicate whether this request factory should buffer the
6464
* {@linkplain ClientHttpRequest#getBody() request body} internally.
65-
* <p>Default is {@code true}. When sending large amounts of data via POST or PUT,
66-
* it is recommended to change this property to {@code false}, so as not to run
67-
* out of memory. This will result in a {@link ClientHttpRequest} that either
68-
* streams directly to the underlying {@link HttpURLConnection} (if the
69-
* {@link org.springframework.http.HttpHeaders#getContentLength() Content-Length}
70-
* is known in advance), or that will use "Chunked transfer encoding"
71-
* (if the {@code Content-Length} is not known in advance).
7265
* @see #setChunkSize(int)
73-
* @see HttpURLConnection#setFixedLengthStreamingMode(int)
74-
* @deprecated since 6.1 requests are never buffered, as if this property is {@code false}
66+
* @deprecated since 6.1 requests are never buffered,
67+
* as if this property is {@code false}
7568
*/
7669
@Deprecated(since = "6.1", forRemoval = true)
7770
public void setBufferRequestBody(boolean bufferRequestBody) {
@@ -80,11 +73,6 @@ public void setBufferRequestBody(boolean bufferRequestBody) {
8073
/**
8174
* Set the number of bytes to write in each chunk when not buffering request
8275
* bodies locally.
83-
* <p>Note that this parameter is only used when
84-
* {@link #setBufferRequestBody(boolean) bufferRequestBody} is set to {@code false},
85-
* and the {@link org.springframework.http.HttpHeaders#getContentLength() Content-Length}
86-
* is not known in advance.
87-
* @see #setBufferRequestBody(boolean)
8876
*/
8977
public void setChunkSize(int chunkSize) {
9078
this.chunkSize = chunkSize;

spring-web/src/main/java/org/springframework/http/client/support/HttpAccessor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@ public abstract class HttpAccessor {
6767
* @see #createRequest(URI, HttpMethod)
6868
* @see SimpleClientHttpRequestFactory
6969
* @see org.springframework.http.client.HttpComponentsClientHttpRequestFactory
70-
* @see org.springframework.http.client.OkHttp3ClientHttpRequestFactory
70+
* @see org.springframework.http.client.JdkClientHttpRequestFactory
7171
*/
7272
public void setRequestFactory(ClientHttpRequestFactory requestFactory) {
7373
Assert.notNull(requestFactory, "ClientHttpRequestFactory must not be null");

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/SockJsClient.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -116,13 +116,13 @@ private static InfoReceiver initInfoReceiver(List<Transport> transports) {
116116

117117

118118
/**
119-
* The names of HTTP headers that should be copied from the handshake headers
120-
* of each call to {@link SockJsClient#doHandshake(WebSocketHandler, WebSocketHttpHeaders, URI)}
121-
* and also used with other HTTP requests issued as part of that SockJS
122-
* connection, e.g. the initial info request, XHR send or receive requests.
119+
* The names of HTTP headers that should be copied from the handshake headers of each
120+
* call to {@link SockJsClient#execute(WebSocketHandler, WebSocketHttpHeaders, URI)}
121+
* and also used with other HTTP requests issued as part of that SockJS connection,
122+
* for example, the initial info request, XHR send or receive requests.
123123
* <p>By default if this property is not set, all handshake headers are also
124124
* used for other HTTP requests. Set it if you want only a subset of handshake
125-
* headers (e.g. auth headers) to be used for other HTTP requests.
125+
* headers (for example, auth headers) to be used for other HTTP requests.
126126
* @param httpHeaderNames the HTTP header names
127127
*/
128128
public void setHttpHeaderNames(@Nullable String... httpHeaderNames) {

0 commit comments

Comments
 (0)