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

Polish contribution

Browse Source 
See gh-31320
This commit is contained in:
Stéphane Nicoll
2023-09-27 08:58:11 +02:00
parent d6a105c151
commit 7a05d23597
4 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ParamsRequestCondition.java
View File

@@ -86,10 +86,7 @@ public final class ParamsRequestCondition extends AbstractRequestCondition<Param
*/
@Override
public ParamsRequestCondition combine(ParamsRequestCondition other) {
if (isEmpty() && other.isEmpty()) {
return this;
}
else if (other.isEmpty()) {
if (other.isEmpty()) {
return this;
}
else if (isEmpty()) {

34
spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java
View File

@@ -28,7 +28,9 @@ import static org.springframework.web.testfixture.http.server.reactive.MockServe
/**
* Unit tests for {@link ParamsRequestCondition}.
*
* @author Rossen Stoyanchev
* @author Stephane Nicoll
*/
public class ParamsRequestConditionTests {
@@ -42,43 +44,43 @@ public class ParamsRequestConditionTests {
}
@Test
public void paramPresent() throws Exception {
public void paramPresent() {
ParamsRequestCondition condition = new ParamsRequestCondition("foo");
assertThat(condition.getMatchingCondition(MockServerWebExchange.from(get("/path?foo=")))).isNotNull();
}
@Test // SPR-15831
public void paramPresentNullValue() throws Exception {
public void paramPresentNullValue() {
ParamsRequestCondition condition = new ParamsRequestCondition("foo");
assertThat(condition.getMatchingCondition(MockServerWebExchange.from(get("/path?foo")))).isNotNull();
}
@Test
public void paramPresentNoMatch() throws Exception {
public void paramPresentNoMatch() {
ParamsRequestCondition condition = new ParamsRequestCondition("foo");
assertThat(condition.getMatchingCondition(MockServerWebExchange.from(get("/path?bar=")))).isNull();
}
@Test
public void paramNotPresent() throws Exception {
public void paramNotPresent() {
MockServerWebExchange exchange = MockServerWebExchange.from(get("/"));
assertThat(new ParamsRequestCondition("!foo").getMatchingCondition(exchange)).isNotNull();
}
@Test
public void paramValueMatch() throws Exception {
public void paramValueMatch() {
ParamsRequestCondition condition = new ParamsRequestCondition("foo=bar");
assertThat(condition.getMatchingCondition(MockServerWebExchange.from(get("/path?foo=bar")))).isNotNull();
}
@Test
public void paramValueNoMatch() throws Exception {
public void paramValueNoMatch() {
ParamsRequestCondition condition = new ParamsRequestCondition("foo=bar");
assertThat(condition.getMatchingCondition(MockServerWebExchange.from(get("/path?foo=bazz")))).isNull();
}
@Test
public void compareTo() throws Exception {
public void compareTo() {
ServerWebExchange exchange = MockServerWebExchange.from(get("/"));
ParamsRequestCondition condition1 = new ParamsRequestCondition("foo", "bar", "baz");
@@ -112,6 +114,24 @@ public class ParamsRequestConditionTests {
assertThat(condition1.compareTo(condition2, exchange)).as("Negated match should not count as more specific").isEqualTo(0);
}
@Test
public void combineWitOtherEmpty() {
ParamsRequestCondition condition1 = new ParamsRequestCondition("foo=bar");
ParamsRequestCondition condition2 = new ParamsRequestCondition();
ParamsRequestCondition result = condition1.combine(condition2);
assertThat(result).isEqualTo(condition1);
}
@Test
public void combineWitThisEmpty() {
ParamsRequestCondition condition1 = new ParamsRequestCondition();
ParamsRequestCondition condition2 = new ParamsRequestCondition("foo=bar");
ParamsRequestCondition result = condition1.combine(condition2);
assertThat(result).isEqualTo(condition2);
}
@Test
public void combine() {
ParamsRequestCondition condition1 = new ParamsRequestCondition("foo=bar");