root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Order methods that take a type as a lambda consistently 

Closes gh-32062
This commit is contained in:
Stéphane Nicoll 2024-01-19 11:53:35 +01:00
parent 18ea43c905
commit 4f8eca1350
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spring-test/src/main/java/org/springframework/test/web/reactive/server/JsonPathAssertions.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -148,8 +148,19 @@ public class JsonPathAssertions {
/** /**
* Delegates to {@link JsonPathExpectationsHelper#assertValue(String, Matcher, Class)}. * Delegates to {@link JsonPathExpectationsHelper#assertValue(String, Matcher, Class)}.
* @since 5.1 * @since 6.2
*/ */
public <T> WebTestClient.BodyContentSpec value(Class<T> targetType, Matcher<? super T> matcher) {
this.pathHelper.assertValue(this.content, matcher, targetType);
return this.bodySpec;
}
/**
* Delegates to {@link JsonPathExpectationsHelper#assertValue(String, Matcher, Class)}.
* @since 5.1
* @deprecated in favor of {@link #value(Class, Matcher)}
*/
@Deprecated(since = "6.2", forRemoval = true)
public <T> WebTestClient.BodyContentSpec value(Matcher<? super T> matcher, Class<T> targetType) { public <T> WebTestClient.BodyContentSpec value(Matcher<? super T> matcher, Class<T> targetType) {
this.pathHelper.assertValue(this.content, matcher, targetType); this.pathHelper.assertValue(this.content, matcher, targetType);
return this.bodySpec; return this.bodySpec;
@ -168,15 +179,24 @@ public class JsonPathAssertions {
/** /**
* Consume the result of the JSONPath evaluation and provide a target class. * Consume the result of the JSONPath evaluation and provide a target class.
* @since 5.1 * @since 6.2
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> WebTestClient.BodyContentSpec value(Consumer<T> consumer, Class<T> targetType) { public <T> WebTestClient.BodyContentSpec value(Class<T> targetType, Consumer<T> consumer) {
Object value = this.pathHelper.evaluateJsonPath(this.content, targetType); Object value = this.pathHelper.evaluateJsonPath(this.content, targetType);
consumer.accept((T) value); consumer.accept((T) value);
return this.bodySpec; return this.bodySpec;
} }
/**
* Consume the result of the JSONPath evaluation and provide a target class.
* @since 5.1
* @deprecated in favor of {@link #value(Class, Consumer)}
*/
@Deprecated(since = "6.2", forRemoval = true)
public <T> WebTestClient.BodyContentSpec value(Consumer<T> consumer, Class<T> targetType) {
return value(targetType, consumer);
}
@Override @Override
public boolean equals(@Nullable Object obj) { public boolean equals(@Nullable Object obj) {

4
spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/ResponseBodyTests.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -48,7 +48,7 @@ class ResponseBodyTests {
.jsonPath("$.name").isEqualTo("Lee") .jsonPath("$.name").isEqualTo("Lee")
.jsonPath("$.age").isEqualTo(42) .jsonPath("$.age").isEqualTo(42)
.jsonPath("$.age").value(equalTo(42)) .jsonPath("$.age").value(equalTo(42))
.jsonPath("$.age").value(equalTo(42.0f), Float.class); .jsonPath("$.age").value(Float.class, equalTo(42.0f));
} }