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

Upgrade to spring-javaformat 0.0.28 and downgrade to Checkstyle 8.41

Browse Source 
In order to be able to use text blocks and other new Java language
features, we are upgrading to a recent version of Checkstyle.

The latest version of spring-javaformat-checkstyle (0.0.28) is built
against Checkstyle 8.32 which does not include support for language
features such as text blocks. Support for text blocks was added in
Checkstyle 8.36.

In addition, there is a binary compatibility issue between
spring-javaformat-checkstyle 0.0.28 and Checkstyle 8.42. Thus we cannot
use Checkstyle 8.42 or higher.

In this commit, we therefore upgrade to spring-javaformat-checkstyle
0.0.28 and downgrade to Checkstyle 8.41.

This change is being applied to `5.3.x` as well as `main` in order to
benefit from the enhanced checking provided in more recent versions of
Checkstyle.

Closes gh-27481
This commit is contained in:
Sam Brannen
2021-09-28 10:28:19 +02:00
parent 119c78b1c9
commit 2567b20949
173 changed files with 221 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-test/src/main/java/org/springframework/mock/http/client/reactive/MockClientHttpRequest.java
View File

@@ -79,7 +79,6 @@ public class MockClientHttpRequest extends AbstractClientHttpRequest {
* <p>The default write handler consumes and caches the request body so it
* may be accessed subsequently, e.g. in test assertions. Use this property
* when the request body is an infinite stream.
*
* @param writeHandler the write handler to use returning {@code Mono<Void>}
* when the body has been "written" (i.e. consumed).
*/

1
spring-test/src/main/java/org/springframework/test/context/support/PropertyProvider.java
View File

@@ -32,7 +32,6 @@ public interface PropertyProvider {
/**
* Get the value of the named property.
*
* @param name the name of the property to retrieve
* @return the value of the property or {@code null} if not found
*/

7
spring-test/src/main/java/org/springframework/test/context/support/TestConstructorUtils.java
View File

@@ -44,10 +44,8 @@ public abstract class TestConstructorUtils {
/**
* Determine if the supplied executable for the given test class is an
* autowirable constructor.
*
* <p>This method delegates to {@link #isAutowirableConstructor(Executable, Class, PropertyProvider)}
* will a value of {@code null} for the fallback {@link PropertyProvider}.
*
* @param executable an executable for the test class
* @param testClass the test class
* @return {@code true} if the executable is an autowirable constructor
@@ -60,10 +58,8 @@ public abstract class TestConstructorUtils {
/**
* Determine if the supplied constructor for the given test class is
* autowirable.
*
* <p>This method delegates to {@link #isAutowirableConstructor(Constructor, Class, PropertyProvider)}
* will a value of {@code null} for the fallback {@link PropertyProvider}.
*
* @param constructor a constructor for the test class
* @param testClass the test class
* @return {@code true} if the constructor is autowirable
@@ -76,10 +72,8 @@ public abstract class TestConstructorUtils {
/**
* Determine if the supplied executable for the given test class is an
* autowirable constructor.
*
* <p>This method delegates to {@link #isAutowirableConstructor(Constructor, Class, PropertyProvider)}
* if the supplied executable is a constructor and otherwise returns {@code false}.
*
* @param executable an executable for the test class
* @param testClass the test class
* @param fallbackPropertyProvider fallback property provider used to look up
@@ -114,7 +108,6 @@ public abstract class TestConstructorUtils {
* {@link PropertyProvider} (see
* {@link TestConstructor#TEST_CONSTRUCTOR_AUTOWIRE_MODE_PROPERTY_NAME}).</li>
* </ol>
*
* @param constructor a constructor for the test class
* @param testClass the test class
* @param fallbackPropertyProvider fallback property provider used to look up

1
spring-test/src/main/java/org/springframework/test/context/testng/AbstractTestNGSpringContextTests.java
View File

@@ -203,7 +203,6 @@ public abstract class AbstractTestNGSpringContextTests implements IHookable, App
* Delegates to the configured {@link TestContextManager} to
* {@linkplain TestContextManager#afterTestMethod(Object, Method, Throwable)
* post-process} the test method after the actual test has executed.
*
* @param testMethod the test method which has just been executed on the
* test instance
* @throws Exception allows all exceptions to propagate

1
spring-test/src/main/java/org/springframework/test/context/util/TestContextResourceUtils.java
View File

@@ -52,7 +52,6 @@ public abstract class TestContextResourceUtils {
/**
* Convert the supplied paths to classpath resource paths.
*
* <p>Delegates to {@link #convertToClasspathResourcePaths(Class, boolean, String...)}
* with {@code false} supplied for the {@code preservePlaceholders} flag.
* @param clazz the class with which the paths are associated

1
spring-test/src/main/java/org/springframework/test/web/client/RequestExpectationManager.java
View File

@@ -42,7 +42,6 @@ public interface RequestExpectationManager {
* used to add more expectations and define a response.
* <p>This is a delegate for
* {@link MockRestServiceServer#expect(ExpectedCount, RequestMatcher)}.
*
* @param requestMatcher a request expectation
* @return for setting up further expectations and define a response
* @see MockRestServiceServer#expect(RequestMatcher)

1
spring-test/src/main/java/org/springframework/test/web/reactive/server/MockServerClientHttpResponse.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.test.web.reactive.server;
import org.springframework.http.client.reactive.ClientHttpResponse;

1
spring-test/src/main/java/org/springframework/test/web/reactive/server/WebTestClient.java
View File

@@ -862,7 +862,6 @@ public interface WebTestClient {
/**
* Exit the chained flow in order to consume the response body
* externally, e.g. via {@link reactor.test.StepVerifier}.
*
* <p>Note that when {@code Void.class} is passed in, the response body
* is consumed and released. If no content is expected, then consider
* using {@code .expectBody().isEmpty()} instead which asserts that

3
spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
View File

@@ -47,7 +47,6 @@ public interface ResultActions {
* .andExpect(content().contentType(MediaType.APPLICATION_JSON))
* .andExpect(jsonPath("$.person.name").value("Jason"));
* </pre>
*
* @see #andExpectAll(ResultMatcher...)
*/
ResultActions andExpect(ResultMatcher matcher) throws Exception;
@@ -78,7 +77,6 @@ public interface ResultActions {
* jsonPath("$.person.name").value("Jason")
* );
* </pre>
*
* @since 5.3.10
* @see #andExpect(ResultMatcher)
*/
@@ -105,7 +103,6 @@ public interface ResultActions {
/**
* Return the result of the executed request for direct access to the results.
*
* @return the result of the request
*/
MvcResult andReturn();

1
spring-test/src/main/java/org/springframework/test/web/servlet/ResultHandler.java
View File

@@ -49,7 +49,6 @@ public interface ResultHandler {
/**
* Perform an action on the given result.
*
* @param result the result of the executed request
* @throws Exception if a failure occurs
*/

1
spring-test/src/main/java/org/springframework/test/web/servlet/SmartRequestBuilder.java
View File

@@ -31,7 +31,6 @@ public interface SmartRequestBuilder extends RequestBuilder {
/**
* Apply request post processing. Typically that means invoking one or more
* {@link org.springframework.test.web.servlet.request.RequestPostProcessor org.springframework.test.web.servlet.request.RequestPostProcessors}.
*
* @param request the request to initialize
* @return the request to use, either the one passed in or a wrapped one
*/

1
spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.test.web.servlet.client;
import javax.servlet.Filter;

1
spring-test/src/main/java/org/springframework/test/web/servlet/client/ApplicationContextMockMvcSpec.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.test.web.servlet.client;
import org.springframework.test.web.servlet.setup.ConfigurableMockMvcBuilder;

1
spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcHttpConnector.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.test.web.servlet.client;
import java.io.StringWriter;

3
spring-test/src/main/java/org/springframework/test/web/servlet/client/MockMvcWebTestClient.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.test.web.servlet.client;
import java.util.function.Supplier;
@@ -112,7 +113,6 @@ public interface MockMvcWebTestClient {
/**
* This method can be used to apply further assertions on a given
* {@link ExchangeResult} based the state of the server response.
*
* <p>Normally {@link WebTestClient} is used to assert the client response
* including HTTP status, headers, and body. That is all that is available
* when making a live request over HTTP. However when the server is
@@ -134,7 +134,6 @@ public interface MockMvcWebTestClient {
* .andExpect(flash().attributeCount(1))
* .andExpect(flash().attribute("message", "success!"));
* </pre>
*
* <p>Note: this method works only if the {@link WebTestClient} used to
* perform the request was initialized through one of bind method in this
* class, and therefore requests are handled by {@link MockMvc}.

1
spring-test/src/main/java/org/springframework/test/web/servlet/client/StandaloneMockMvcSpec.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.test.web.servlet.client;
import java.util.function.Supplier;