Skip to content

Commit c0be1c5

Browse files
rstoyanchevrstoyanchev
committed
Polish
1 parent 6c33af0 commit c0be1c5

File tree

4 files changed

+40
-60
lines changed

4 files changed

+40
-60
lines changed

‎spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ public void compareTo() {
117117
ProducesRequestCondition xml = new ProducesRequestCondition("application/xml");
118118
ProducesRequestCondition none = new ProducesRequestCondition();
119119

120-
MockServerWebExchange exchange = MockServerWebExchange.from(get("/").header("Accept", "application/xml, text/html"));
120+
MockServerWebExchange exchange = MockServerWebExchange.from(get("/")
121+
.header("Accept", "application/xml, text/html"));
121122

122123
assertTrue(html.compareTo(xml, exchange) > 0);
123124
assertTrue(xml.compareTo(html, exchange) < 0);
@@ -135,8 +136,8 @@ public void compareTo() {
135136
exchange = MockServerWebExchange.from(
136137
get("/").header("Accept", "application/pdf"));
137138

138-
assertTrue(html.compareTo(xml, exchange) == 0);
139-
assertTrue(xml.compareTo(html, exchange) == 0);
139+
assertEquals(0, html.compareTo(xml, exchange));
140+
assertEquals(0, xml.compareTo(html, exchange));
140141

141142
// See SPR-7000
142143
exchange = MockServerWebExchange.from(

‎spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ConsumesRequestCondition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ static class ConsumeMediaTypeExpression extends AbstractMediaTypeExpression {
227227

228228
public final boolean match(MediaType contentType) {
229229
boolean match = getMediaType().includes(contentType);
230-
return (!isNegated() ? match : !match);
230+
return !isNegated() == match;
231231
}
232232
}
233233

‎spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ static class ProduceMediaTypeExpression extends AbstractMediaTypeExpression {
317317

318318
public final boolean match(List<MediaType> acceptedMediaTypes) {
319319
boolean match = matchMediaType(acceptedMediaTypes);
320-
return (!isNegated() ? match : !match);
320+
return !isNegated() == match;
321321
}
322322

323323
private boolean matchMediaType(List<MediaType> acceptedMediaTypes) {

‎spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/ProducesRequestConditionTests.java

Lines changed: 34 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616

1717
package org.springframework.web.servlet.mvc.condition;
1818

19+
import java.util.Arrays;
1920
import java.util.Collection;
2021
import java.util.Collections;
22+
import javax.servlet.http.HttpServletRequest;
2123

2224
import org.junit.Test;
2325

@@ -37,29 +39,24 @@ public class ProducesRequestConditionTests {
3739
@Test
3840
public void match() {
3941
ProducesRequestCondition condition = new ProducesRequestCondition("text/plain");
40-
41-
MockHttpServletRequest request = new MockHttpServletRequest();
42-
request.addHeader("Accept", "text/plain");
42+
HttpServletRequest request = createRequest("text/plain");
4343

4444
assertNotNull(condition.getMatchingCondition(request));
4545
}
4646

4747
@Test
4848
public void matchNegated() {
4949
ProducesRequestCondition condition = new ProducesRequestCondition("!text/plain");
50-
51-
MockHttpServletRequest request = new MockHttpServletRequest();
52-
request.addHeader("Accept", "text/plain");
50+
HttpServletRequest request = createRequest("text/plain");
5351

5452
assertNull(condition.getMatchingCondition(request));
5553
}
5654

5755
@Test
5856
public void matchNegatedWithoutAcceptHeader() {
5957
ProducesRequestCondition condition = new ProducesRequestCondition("!text/plain");
60-
MockHttpServletRequest request = new MockHttpServletRequest();
6158

62-
assertNotNull(condition.getMatchingCondition(request));
59+
assertNotNull(condition.getMatchingCondition(new MockHttpServletRequest()));
6360
assertEquals(Collections.emptySet(), condition.getProducibleMediaTypes());
6461
}
6562

@@ -72,68 +69,57 @@ public void getProducibleMediaTypes() {
7269
@Test
7370
public void matchWildcard() {
7471
ProducesRequestCondition condition = new ProducesRequestCondition("text/*");
75-
76-
MockHttpServletRequest request = new MockHttpServletRequest();
77-
request.addHeader("Accept", "text/plain");
72+
HttpServletRequest request = createRequest("text/plain");
7873

7974
assertNotNull(condition.getMatchingCondition(request));
8075
}
8176

8277
@Test
8378
public void matchMultiple() {
8479
ProducesRequestCondition condition = new ProducesRequestCondition("text/plain", "application/xml");
85-
86-
MockHttpServletRequest request = new MockHttpServletRequest();
87-
request.addHeader("Accept", "text/plain");
80+
HttpServletRequest request = createRequest("text/plain");
8881

8982
assertNotNull(condition.getMatchingCondition(request));
9083
}
9184

9285
@Test
9386
public void matchSingle() {
9487
ProducesRequestCondition condition = new ProducesRequestCondition("text/plain");
95-
96-
MockHttpServletRequest request = new MockHttpServletRequest();
97-
request.addHeader("Accept", "application/xml");
88+
HttpServletRequest request = createRequest("application/xml");
9889

9990
assertNull(condition.getMatchingCondition(request));
10091
}
10192

10293
@Test
10394
public void matchParseError() {
10495
ProducesRequestCondition condition = new ProducesRequestCondition("text/plain");
105-
106-
MockHttpServletRequest request = new MockHttpServletRequest();
107-
request.addHeader("Accept", "bogus");
96+
HttpServletRequest request = createRequest("bogus");
10897

10998
assertNull(condition.getMatchingCondition(request));
11099
}
111100

112101
@Test
113102
public void matchParseErrorWithNegation() {
114103
ProducesRequestCondition condition = new ProducesRequestCondition("!text/plain");
115-
116-
MockHttpServletRequest request = new MockHttpServletRequest();
117-
request.addHeader("Accept", "bogus");
104+
HttpServletRequest request = createRequest("bogus");
118105

119106
assertNull(condition.getMatchingCondition(request));
120107
}
121108

122109
@Test
123110
public void matchByRequestParameter() {
124-
ProducesRequestCondition condition = new ProducesRequestCondition(new String[] {"text/plain"}, new String[] {});
125-
126-
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo.txt");
111+
String[] produces = {"text/plain"};
112+
String[] headers = {};
113+
ProducesRequestCondition condition = new ProducesRequestCondition(produces, headers);
114+
HttpServletRequest request = new MockHttpServletRequest("GET", "/foo.txt");
127115

128116
assertNotNull(condition.getMatchingCondition(request));
129117
}
130118

131119
@Test // SPR-17550
132120
public void matchWithNegationAndMediaTypeAllWithQualityParameter() {
133121
ProducesRequestCondition condition = new ProducesRequestCondition("!application/json");
134-
135-
MockHttpServletRequest request = new MockHttpServletRequest();
136-
request.addHeader("Accept",
122+
HttpServletRequest request = createRequest(
137123
"text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8");
138124

139125
assertNotNull(condition.getMatchingCondition(request));
@@ -145,8 +131,7 @@ public void compareTo() {
145131
ProducesRequestCondition xml = new ProducesRequestCondition("application/xml");
146132
ProducesRequestCondition none = new ProducesRequestCondition();
147133

148-
MockHttpServletRequest request = new MockHttpServletRequest();
149-
request.addHeader("Accept", "application/xml, text/html");
134+
HttpServletRequest request = createRequest("application/xml, text/html");
150135

151136
assertTrue(html.compareTo(xml, request) > 0);
152137
assertTrue(xml.compareTo(html, request) < 0);
@@ -155,30 +140,26 @@ public void compareTo() {
155140
assertTrue(html.compareTo(none, request) < 0);
156141
assertTrue(none.compareTo(html, request) > 0);
157142

158-
request = new MockHttpServletRequest();
159-
request.addHeader("Accept", "application/xml, text/*");
143+
request = createRequest("application/xml, text/*");
160144

161145
assertTrue(html.compareTo(xml, request) > 0);
162146
assertTrue(xml.compareTo(html, request) < 0);
163147

164-
request = new MockHttpServletRequest();
165-
request.addHeader("Accept", "application/pdf");
148+
request = createRequest("application/pdf");
166149

167-
assertTrue(html.compareTo(xml, request) == 0);
168-
assertTrue(xml.compareTo(html, request) == 0);
150+
assertEquals(0, html.compareTo(xml, request));
151+
assertEquals(0, xml.compareTo(html, request));
169152

170153
// See SPR-7000
171-
request = new MockHttpServletRequest();
172-
request.addHeader("Accept", "text/html;q=0.9,application/xml");
154+
request = createRequest("text/html;q=0.9,application/xml");
173155

174156
assertTrue(html.compareTo(xml, request) > 0);
175157
assertTrue(xml.compareTo(html, request) < 0);
176158
}
177159

178160
@Test
179161
public void compareToWithSingleExpression() {
180-
MockHttpServletRequest request = new MockHttpServletRequest();
181-
request.addHeader("Accept", "text/plain");
162+
HttpServletRequest request = createRequest("text/plain");
182163

183164
ProducesRequestCondition condition1 = new ProducesRequestCondition("text/plain");
184165
ProducesRequestCondition condition2 = new ProducesRequestCondition("text/*");
@@ -195,8 +176,7 @@ public void compareToMultipleExpressions() {
195176
ProducesRequestCondition condition1 = new ProducesRequestCondition("*/*", "text/plain");
196177
ProducesRequestCondition condition2 = new ProducesRequestCondition("text/*", "text/plain;q=0.7");
197178

198-
MockHttpServletRequest request = new MockHttpServletRequest();
199-
request.addHeader("Accept", "text/plain");
179+
HttpServletRequest request = createRequest("text/plain");
200180

201181
int result = condition1.compareTo(condition2, request);
202182
assertTrue("Invalid comparison result: " + result, result < 0);
@@ -210,19 +190,15 @@ public void compareToMultipleExpressionsAndMultipleAcceptHeaderValues() {
210190
ProducesRequestCondition condition1 = new ProducesRequestCondition("text/*", "text/plain");
211191
ProducesRequestCondition condition2 = new ProducesRequestCondition("application/*", "application/xml");
212192

213-
MockHttpServletRequest request = new MockHttpServletRequest();
214-
request.addHeader("Accept", "text/plain");
215-
request.addHeader("Accept", "application/xml");
193+
HttpServletRequest request = createRequest("text/plain", "application/xml");
216194

217195
int result = condition1.compareTo(condition2, request);
218196
assertTrue("Invalid comparison result: " + result, result < 0);
219197

220198
result = condition2.compareTo(condition1, request);
221199
assertTrue("Invalid comparison result: " + result, result > 0);
222200

223-
request = new MockHttpServletRequest();
224-
request.addHeader("Accept", "application/xml");
225-
request.addHeader("Accept", "text/plain");
201+
request = createRequest("application/xml", "text/plain");
226202

227203
result = condition1.compareTo(condition2, request);
228204
assertTrue("Invalid comparison result: " + result, result > 0);
@@ -270,8 +246,7 @@ public void compareToMediaTypeAll() {
270246

271247
@Test
272248
public void compareToMediaTypeAllWithParameter() {
273-
MockHttpServletRequest request = new MockHttpServletRequest();
274-
request.addHeader("Accept", "*/*;q=0.9");
249+
HttpServletRequest request = createRequest("*/*;q=0.9");
275250

276251
ProducesRequestCondition condition1 = new ProducesRequestCondition();
277252
ProducesRequestCondition condition2 = new ProducesRequestCondition("application/json");
@@ -282,8 +257,7 @@ public void compareToMediaTypeAllWithParameter() {
282257

283258
@Test
284259
public void compareToEqualMatch() {
285-
MockHttpServletRequest request = new MockHttpServletRequest();
286-
request.addHeader("Accept", "text/*");
260+
HttpServletRequest request = createRequest("text/*");
287261

288262
ProducesRequestCondition condition1 = new ProducesRequestCondition("text/plain");
289263
ProducesRequestCondition condition2 = new ProducesRequestCondition("text/xhtml");
@@ -324,8 +298,7 @@ public void instantiateWithProducesAndHeaderConditions() {
324298

325299
@Test
326300
public void getMatchingCondition() {
327-
MockHttpServletRequest request = new MockHttpServletRequest();
328-
request.addHeader("Accept", "text/plain");
301+
HttpServletRequest request = createRequest("text/plain");
329302

330303
ProducesRequestCondition condition = new ProducesRequestCondition("text/plain", "application/xml");
331304

@@ -339,6 +312,12 @@ public void getMatchingCondition() {
339312
}
340313

341314

315+
private MockHttpServletRequest createRequest(String... headerValue) {
316+
MockHttpServletRequest request = new MockHttpServletRequest();
317+
Arrays.stream(headerValue).forEach(value -> request.addHeader("Accept", headerValue));
318+
return request;
319+
}
320+
342321
private void assertConditions(ProducesRequestCondition condition, String... expected) {
343322
Collection<ProduceMediaTypeExpression> expressions = condition.getContent();
344323
assertEquals("Invalid number of conditions", expressions.size(), expected.length);

0 commit comments

Comments
 (0)