Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

Browse Source
This commit is contained in:
Stéphane Nicoll
2024-03-09 16:03:04 +01:00
parent f4c1ad7ae6 accf7ff645
commit e53ed3e3c6
21 changed files with 54 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-web/src/jmh/java/org/springframework/web/bind/ServletRequestUtilsBenchmark.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2024 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.
@@ -16,6 +16,7 @@
package org.springframework.web.bind;
import jakarta.servlet.ServletRequest;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Mode;
@@ -26,7 +27,8 @@ import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
/**
* Benchmarks for extracting parameters from {@libnk ServletRequest}.
* Benchmarks for extracting parameters from {@link ServletRequest}.
*
* @author Brian Clozel
*/
@BenchmarkMode(Mode.Throughput)

5
spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 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.
@@ -69,8 +69,7 @@ public abstract class AbstractListenerWriteProcessor<T> implements Processor<T,
/**
* Indicates we're waiting for one last isReady-onWritePossible cycle
* after "onComplete" because some Servlet containers expect this to take
* place prior to calling AsyncContext.complete().
* See https://github.com/eclipse-ee4j/servlet-api/issues/273
* place prior to calling AsyncContext.complete(). See also gh-273.
*/
private volatile boolean readyToCompleteAfterLastWrite;

4
spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
* HTML 4.0 standard.
*
* <p>A complete description of the HTML 4.0 character set can be found
* at https://www.w3.org/TR/html4/charset.html.
* at <a href="https://www.w3.org/TR/html4/charset.html">https://www.w3.org/TR/html4/charset.html</a>.
*
* @author Juergen Hoeller
* @author Martin Kersten

4
spring-web/src/test/java/org/springframework/http/WebBeanUtilsRuntimeHintsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -29,7 +29,7 @@ import org.springframework.util.ClassUtils;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Web-related tests for {@link BeanUtilsRuntimeHints}.
* Web-related tests for {@link org.springframework.beans.BeanUtilsRuntimeHints}.
*
* @author Sebastien Deleuze
* @since 6.0.10