Merge b35956d into 1.1.13

reactor · Nov 7, 2023 · a726eda · a726eda
2 parents b933492 + b35956d
commit a726eda
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/reactor-netty-core/src/main/java/reactor/netty/resources/ConnectionProvider.java b/reactor-netty-core/src/main/java/reactor/netty/resources/ConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2022 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2018-2023 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -570,8 +570,8 @@ public final SPEC pendingAcquireTimeout(Duration pendingAcquireTimeout) {
 		 *
 		 * @param maxConnections the maximum number of connections (per connection pool) before start pending
 		 * @return {@literal this}
-		 * @see #allocationStrategy(AllocationStrategy)
 		 * @throws IllegalArgumentException if maxConnections is negative
+		 * @see #allocationStrategy(AllocationStrategy)
 		 */
 		public final SPEC maxConnections(int maxConnections) {
 			if (maxConnections <= 0) {
@@ -783,8 +783,8 @@ public final SPEC pendingAcquireTimer(BiFunction<Runnable, Duration, Disposable>
 		 *
 		 * @param allocationStrategy the {@link AllocationStrategy} to use
 		 * @return {@literal this}
-		 * @see #maxConnections()
 		 * @since 1.0.20
+		 * @see #maxConnections()
 		 */
 		public final SPEC allocationStrategy(AllocationStrategy<?> allocationStrategy) {
 			this.allocationStrategy = Objects.requireNonNull(allocationStrategy, "allocationStrategy");

diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/server/HttpServerConfig.java b/reactor-netty-http/src/main/java/reactor/netty/http/server/HttpServerConfig.java
@@ -192,8 +192,8 @@ public boolean isSecure() {
 	 * The configured maximum number of HTTP/1.1 requests which can be served until the connection is closed by the server.
 	 *
 	 * @return the configured maximum number of HTTP/1.1 requests which can be served until the connection is closed by the server.
-	 * @see HttpServer#maxKeepAliveRequests(int)
 	 * @since 1.0.13
+	 * @see HttpServer#maxKeepAliveRequests(int)
 	 */
 	public int maxKeepAliveRequests() {
 		return maxKeepAliveRequests;

diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/server/logging/AccessLogArgProvider.java b/reactor-netty-http/src/main/java/reactor/netty/http/server/logging/AccessLogArgProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2022 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2020-2023 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,8 +67,8 @@ public interface AccessLogArgProvider {
 	 * <p> Note that the {@link ConnectionInformation#remoteAddress()} will return the forwarded
 	 * remote client address if the server is configured in forwarded mode.
 	 *
-	 * @since 1.0.26
 	 * @return the connection info
+	 * @since 1.0.26
 	 * @see reactor.netty.http.server.HttpServer#forwarded(BiFunction)
 	 */
 	@Nullable