admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Configure JsonPath in RestTestClient with MappingProvider

Browse Source 
Closes gh-35793
This commit is contained in:
rstoyanchev
2025-11-18 15:45:21 +00:00
parent adffd3dcf6
commit f80b79bc45
2 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClient.java
+39 -1
View File
@@ -28,9 +28,13 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Consumer;
import java.util.function.Function;
import com.jayway.jsonpath.Configuration;
import com.jayway.jsonpath.TypeRef;
import com.jayway.jsonpath.spi.mapper.MappingProvider;
import org.jspecify.annotations.Nullable;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.core.ResolvableType;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpRequest;
@@ -486,7 +490,8 @@ class DefaultRestTestClient implements RestTestClient {
@Override
public JsonPathAssertions jsonPath(String expression) {
return new JsonPathAssertions(this, getBodyAsString(), expression, null);
Configuration config = JsonPathConfigurationProvider.getConfiguration(this.result);
return new JsonPathAssertions(this, getBodyAsString(), expression, config);
}
@Override
@@ -540,4 +545,37 @@ class DefaultRestTestClient implements RestTestClient {
}
}
private static class JsonPathConfigurationProvider {
static Configuration getConfiguration(EntityExchangeResult<?> result) {
Configuration config = Configuration.defaultConfiguration();
JsonConverterDelegate delegate = result.getJsonConverterDelegate();
return (delegate != null ? config.mappingProvider(new MessageConverterMappingProvider(delegate)) : config);
}
}
private record MessageConverterMappingProvider(JsonConverterDelegate delegate) implements MappingProvider {
@Override
public <T> T map(Object value, Class<T> targetType, Configuration configuration) {
return mapToTargetType(value, ResolvableType.forClass(targetType));
}
@Override
public <T> T map(Object value, TypeRef<T> targetType, Configuration configuration) {
return mapToTargetType(value, ResolvableType.forType(targetType.getType()));
}
private <T> T mapToTargetType(Object value, ResolvableType targetType) {
try {
return delegate().map(value, targetType);
}
catch (IOException ex) {
throw new IllegalStateException("Failed to map " + value + " to " + targetType, ex);
}
}
}
}