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

Fix and document CompositeUriComponentsContributor#hasContributors()

Browse Source 
Prior to this commit, the hasContributors() method incorrectly returned
false if contributors had been configured.

This commit fixes the logic in hasContributors() and documents it.

Closes #27271
This commit is contained in:
Sam Brannen
2021-08-18 17:33:50 +02:00
parent 6177f00a63
commit 6770e4b3cc
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-web/src/test/java/org/springframework/web/method/support/CompositeUriComponentsContributorTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2021 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.
@@ -32,30 +32,33 @@ import org.springframework.web.method.annotation.RequestParamMethodArgumentResol
import static org.assertj.core.api.Assertions.assertThat;
/**
* Unit tests for
* {@link org.springframework.web.method.support.CompositeUriComponentsContributor}.
* Unit tests for {@link CompositeUriComponentsContributor}.
*
* @author Rossen Stoyanchev
* @author Sam Brannen
*/
public class CompositeUriComponentsContributorTests {
class CompositeUriComponentsContributorTests {
@Test
public void supportsParameter() {
void supportsParameter() {
List<HandlerMethodArgumentResolver> resolvers = new ArrayList<>();
resolvers.add(new RequestParamMethodArgumentResolver(false));
resolvers.add(new RequestHeaderMethodArgumentResolver(null));
resolvers.add(new RequestParamMethodArgumentResolver(true));
Method method = ClassUtils.getMethod(this.getClass(), "handleRequest", String.class, String.class, String.class);
CompositeUriComponentsContributor contributor = new CompositeUriComponentsContributor(resolvers);
Method method = ClassUtils.getMethod(this.getClass(), "handleRequest", String.class, String.class, String.class);
assertThat(contributor.supportsParameter(new MethodParameter(method, 0))).isTrue();
assertThat(contributor.supportsParameter(new MethodParameter(method, 1))).isTrue();
assertThat(contributor.supportsParameter(new MethodParameter(method, 2))).isFalse();
}
@Test
void hasContributors() {
assertThat(new CompositeUriComponentsContributor().hasContributors()).isFalse();
assertThat(new CompositeUriComponentsContributor(new RequestParamMethodArgumentResolver(true)).hasContributors()).isTrue();
}
public void handleRequest(@RequestParam String p1, String p2, @RequestHeader String h) {
}