Skip to content

Commit 7d5b34a

Browse files
rstoyanchevrstoyanchev
committed
Fix warnings
1 parent f669a40 commit 7d5b34a

File tree

2 files changed

+46
-47
lines changed

2 files changed

+46
-47
lines changed

‎spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsContributorTests.java renamed to ‎spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java

Lines changed: 42 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
import static org.hamcrest.Matchers.*;
4242
import static org.junit.Assert.assertThat;
43-
import static org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder.on;
43+
import static org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder.*;
4444

4545
/**
4646
* Unit tests for {@link org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder}.
@@ -49,12 +49,10 @@
4949
* @author Dietrich Schulten
5050
* @author Rossen Stoyanchev
5151
*/
52-
public class MvcUriComponentsContributorTests {
52+
public class MvcUriComponentsBuilderTests {
5353

5454
private MockHttpServletRequest request;
5555

56-
private MvcUriComponentsBuilder builder;
57-
5856

5957
@Before
6058
public void setUp() {
@@ -69,66 +67,65 @@ public void tearDown() {
6967

7068

7169
@Test
72-
public void fromController() {
73-
UriComponents uriComponents = this.builder.fromController(PersonControllerImpl.class).build();
70+
public void testFromController() {
71+
UriComponents uriComponents = fromController(PersonControllerImpl.class).build();
7472
assertThat(uriComponents.toUriString(), Matchers.endsWith("/people"));
7573
}
7674

7775
@Test
78-
public void fromControllerUriTemplate() {
79-
UriComponents uriComponents = this.builder.fromController(PersonsAddressesController.class).buildAndExpand(15);
76+
public void testFromControllerUriTemplate() {
77+
UriComponents uriComponents = fromController(PersonsAddressesController.class).buildAndExpand(15);
8078
assertThat(uriComponents.toUriString(), endsWith("/people/15/addresses"));
8179
}
8280

8381
@Test
84-
public void fromControllerSubResource() {
85-
UriComponents uriComponents =
86-
this.builder.fromController(PersonControllerImpl.class).pathSegment("something").build();
82+
public void testFromControllerSubResource() {
83+
UriComponents uriComponents = fromController(PersonControllerImpl.class).pathSegment("something").build();
8784

8885
assertThat(uriComponents.toUriString(), endsWith("/people/something"));
8986
}
9087

9188
@Test
92-
public void fromControllerTwoTypeLevelMappings() {
93-
UriComponents uriComponents = this.builder.fromController(InvalidController.class).build();
89+
public void testFromControllerTwoTypeLevelMappings() {
90+
UriComponents uriComponents = fromController(InvalidController.class).build();
9491
assertThat(uriComponents.toUriString(), is("http://localhost/persons"));
9592
}
9693

9794
@Test
98-
public void fromControllerNotMapped() {
99-
UriComponents uriComponents = this.builder.fromController(UnmappedController.class).build();
95+
public void testFromControllerNotMapped() {
96+
UriComponents uriComponents = fromController(UnmappedController.class).build();
10097
assertThat(uriComponents.toUriString(), is("http://localhost/"));
10198
}
10299

103100
@Test
104-
public void fromMethodPathVariable() throws Exception {
105-
UriComponents uriComponents = this.builder.fromMethodName(
101+
public void testFromMethodPathVariable() throws Exception {
102+
UriComponents uriComponents = fromMethodName(
106103
ControllerWithMethods.class, "methodWithPathVariable", new Object[]{"1"}).build();
107104

108105
assertThat(uriComponents.toUriString(), is("http://localhost/something/1/foo"));
109106
}
110107

111108
@Test
112-
public void fromMethodTypeLevelPathVariable() throws Exception {
109+
public void testFromMethodTypeLevelPathVariable() throws Exception {
113110
this.request.setContextPath("/myapp");
114-
UriComponents uriComponents = this.builder.fromMethodName(
111+
UriComponents uriComponents = fromMethodName(
115112
PersonsAddressesController.class, "getAddressesForCountry", "DE").buildAndExpand("1");
116113

117114
assertThat(uriComponents.toUriString(), is("http://localhost/myapp/people/1/addresses/DE"));
118115
}
119116

120117
@Test
121-
public void fromMethodTwoPathVariables() throws Exception {
118+
public void testFromMethodTwoPathVariables() throws Exception {
122119
DateTime now = DateTime.now();
123-
UriComponents uriComponents = this.builder.fromMethodName(
120+
UriComponents uriComponents = fromMethodName(
124121
ControllerWithMethods.class, "methodWithTwoPathVariables", 1, now).build();
125122

126123
assertThat(uriComponents.getPath(), is("/something/1/foo/" + ISODateTimeFormat.date().print(now)));
127124
}
128125

129126
@Test
130-
public void fromMethodWithPathVarAndRequestParam() throws Exception {
131-
UriComponents uriComponents = this.builder.fromMethodName(
127+
public void testFromMethodWithPathVarAndRequestParam() throws Exception {
128+
UriComponents uriComponents = fromMethodName(
132129
ControllerWithMethods.class, "methodForNextPage", "1", 10, 5).build();
133130

134131
assertThat(uriComponents.getPath(), is("/something/1/foo"));
@@ -138,43 +135,42 @@ public void fromMethodWithPathVarAndRequestParam() throws Exception {
138135
}
139136

140137
@Test
141-
public void fromMethodNotMapped() throws Exception {
142-
UriComponents uriComponents = this.builder.fromMethodName(UnmappedController.class, "unmappedMethod").build();
138+
public void testFromMethodNotMapped() throws Exception {
139+
UriComponents uriComponents = fromMethodName(UnmappedController.class, "unmappedMethod").build();
143140

144141
assertThat(uriComponents.toUriString(), is("http://localhost/"));
145142
}
146143

147144
@Test
148-
public void fromMethodCall() {
149-
UriComponents uriComponents = this.builder.fromMethodCall(
150-
on(ControllerWithMethods.class).myMethod(null)).build();
145+
public void testFromMethodCall() {
146+
UriComponents uriComponents = fromMethodCall(on(ControllerWithMethods.class).myMethod(null)).build();
151147

152148
assertThat(uriComponents.toUriString(), startsWith("http://localhost"));
153149
assertThat(uriComponents.toUriString(), endsWith("/something/else"));
154150
}
155151

156152
@Test
157-
public void fromMethodCallWithTypeLevelUriVars() {
158-
UriComponents uriComponents = this.builder.fromMethodCall(
159-
on(PersonsAddressesController.class).getAddressesForCountry("DE")).buildAndExpand(15);
153+
public void testFromMethodCallWithTypeLevelUriVars() {
154+
UriComponents uriComponents = fromMethodCall(on(
155+
PersonsAddressesController.class).getAddressesForCountry("DE")).buildAndExpand(15);
160156

161157
assertThat(uriComponents.toUriString(), endsWith("/people/15/addresses/DE"));
162158
}
163159

164160

165161
@Test
166-
public void fromMethodCallWithPathVar() {
167-
UriComponents uriComponents = this.builder.fromMethodCall(
168-
on(ControllerWithMethods.class).methodWithPathVariable("1")).build();
162+
public void testFromMethodCallWithPathVar() {
163+
UriComponents uriComponents = fromMethodCall(on(
164+
ControllerWithMethods.class).methodWithPathVariable("1")).build();
169165

170166
assertThat(uriComponents.toUriString(), startsWith("http://localhost"));
171167
assertThat(uriComponents.toUriString(), endsWith("/something/1/foo"));
172168
}
173169

174170
@Test
175-
public void fromMethodCallWithPathVarAndRequestParams() {
176-
UriComponents uriComponents = this.builder.fromMethodCall(
177-
on(ControllerWithMethods.class).methodForNextPage("1", 10, 5)).build();
171+
public void testFromMethodCallWithPathVarAndRequestParams() {
172+
UriComponents uriComponents = fromMethodCall(on(
173+
ControllerWithMethods.class).methodForNextPage("1", 10, 5)).build();
178174

179175
assertThat(uriComponents.getPath(), is("/something/1/foo"));
180176

@@ -184,10 +180,9 @@ public void fromMethodCallWithPathVarAndRequestParams() {
184180
}
185181

186182
@Test
187-
public void fromMethodCallWithPathVarAndMultiValueRequestParams() {
188-
UriComponents uriComponents = this.builder.fromMethodCall(
189-
on(ControllerWithMethods.class).methodWithMultiValueRequestParams(
190-
"1", Arrays.asList(3, 7), 5)).build();
183+
public void testFromMethodCallWithPathVarAndMultiValueRequestParams() {
184+
UriComponents uriComponents = fromMethodCall(on(
185+
ControllerWithMethods.class).methodWithMultiValueRequestParams("1", Arrays.asList(3, 7), 5)).build();
191186

192187
assertThat(uriComponents.getPath(), is("/something/1/foo"));
193188

@@ -199,23 +194,23 @@ public void fromMethodCallWithPathVarAndMultiValueRequestParams() {
199194
@Test
200195
public void usesForwardedHostAsHostIfHeaderIsSet() {
201196
this.request.addHeader("X-Forwarded-Host", "somethingDifferent");
202-
UriComponents uriComponents = this.builder.fromController(PersonControllerImpl.class).build();
197+
UriComponents uriComponents = fromController(PersonControllerImpl.class).build();
203198

204199
assertThat(uriComponents.toUriString(), startsWith("http://somethingDifferent"));
205200
}
206201

207202
@Test
208203
public void usesForwardedHostAndPortFromHeader() {
209204
request.addHeader("X-Forwarded-Host", "foobar:8088");
210-
UriComponents uriComponents = this.builder.fromController(PersonControllerImpl.class).build();
205+
UriComponents uriComponents = fromController(PersonControllerImpl.class).build();
211206

212207
assertThat(uriComponents.toUriString(), startsWith("http://foobar:8088"));
213208
}
214209

215210
@Test
216211
public void usesFirstHostOfXForwardedHost() {
217212
request.addHeader("X-Forwarded-Host", "barfoo:8888, localhost:8088");
218-
UriComponents uriComponents = this.builder.fromController(PersonControllerImpl.class).build();
213+
UriComponents uriComponents = fromController(PersonControllerImpl.class).build();
219214

220215
assertThat(uriComponents.toUriString(), startsWith("http://barfoo:8888"));
221216
}
@@ -239,6 +234,7 @@ class PersonControllerImpl implements PersonController {
239234

240235
}
241236

237+
@SuppressWarnings("unused")
242238
@RequestMapping("/people/{id}/addresses")
243239
static class PersonsAddressesController {
244240

@@ -253,13 +249,15 @@ class InvalidController {
253249

254250
}
255251

252+
@SuppressWarnings("unused")
256253
class UnmappedController {
257254

258255
@RequestMapping
259256
public void unmappedMethod() {
260257
}
261258
}
262259

260+
@SuppressWarnings("unused")
263261
@RequestMapping("/something")
264262
static class ControllerWithMethods {
265263

@@ -292,5 +290,4 @@ HttpEntity<Void> methodWithMultiValueRequestParams(@PathVariable String id,
292290
}
293291
}
294292

295-
296293
}

‎spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public void renderOnlyIncludedAttributes() throws Exception {
247247
public void filterSingleKeyModel() throws Exception {
248248
view.setExtractValueFromSingleKeyModel(true);
249249

250-
Map<String, Object> model = new HashMap<String, Object>();
250+
Map<String, Object> model = new HashMap<>();
251251
TestBeanSimple bean = new TestBeanSimple();
252252
model.put("foo", bean);
253253

@@ -261,7 +261,7 @@ public void filterSingleKeyModel() throws Exception {
261261
public void filterTwoKeyModel() throws Exception {
262262
view.setExtractValueFromSingleKeyModel(true);
263263

264-
Map<String, Object> model = new HashMap<String, Object>();
264+
Map<String, Object> model = new HashMap<>();
265265
TestBeanSimple bean1 = new TestBeanSimple();
266266
TestBeanSimple bean2 = new TestBeanSimple();
267267
model.put("foo1", bean1);
@@ -282,6 +282,7 @@ private void validateResult() throws Exception {
282282
}
283283

284284

285+
@SuppressWarnings("unused")
285286
public static class TestBeanSimple {
286287

287288
private String value = "foo";
@@ -358,6 +359,7 @@ public void serialize(Object value, JsonGenerator jgen, SerializerProvider provi
358359
}
359360

360361

362+
@SuppressWarnings("serial")
361363
public static class DelegatingSerializerFactory extends BeanSerializerFactory {
362364

363365
protected DelegatingSerializerFactory(SerializerFactoryConfig config) {

0 commit comments

Comments
 (0)