Skip to content

Commit bbe5124

Browse files
jhoellerjhoeller
committed
Polishing
1 parent 5935b7a commit bbe5124

File tree

7 files changed

+42
-54
lines changed

7 files changed

+42
-54
lines changed

‎spring-web/src/main/java/org/springframework/http/codec/support/ClientDefaultCodecsImpl.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.http.codec.support;
1718

1819
import java.util.ArrayList;
20+
import java.util.Collections;
1921
import java.util.List;
2022
import java.util.function.Supplier;
2123

@@ -79,18 +81,24 @@ protected void extendObjectReaders(List<HttpMessageReader<?>> objectReaders) {
7981

8082
@Nullable
8183
private Decoder<?> getSseDecoder() {
82-
return this.sseDecoder != null ? this.sseDecoder : jackson2Present ? getJackson2JsonDecoder() : null;
84+
return (this.sseDecoder != null ? this.sseDecoder : jackson2Present ? getJackson2JsonDecoder() : null);
8385
}
8486

8587
@Override
8688
protected void extendTypedWriters(List<HttpMessageWriter<?>> typedWriters) {
8789
typedWriters.add(new MultipartHttpMessageWriter(getPartWriters(), new FormHttpMessageWriter()));
8890
}
8991

90-
@SuppressWarnings("ConstantConditions")
9192
private List<HttpMessageWriter<?>> getPartWriters() {
92-
return this.multipartCodecs != null ?
93-
this.multipartCodecs.getWriters() : this.partWritersSupplier.get();
93+
if (this.multipartCodecs != null) {
94+
return this.multipartCodecs.getWriters();
95+
}
96+
else if (this.partWritersSupplier != null) {
97+
return this.partWritersSupplier.get();
98+
}
99+
else {
100+
return Collections.emptyList();
101+
}
94102
}
95103

96104

@@ -101,7 +109,6 @@ private static class DefaultMultipartCodecs implements ClientCodecConfigurer.Mul
101109

102110
private final List<HttpMessageWriter<?>> writers = new ArrayList<>();
103111

104-
105112
@Override
106113
public ClientCodecConfigurer.MultipartCodecs encoder(Encoder<?> encoder) {
107114
writer(new EncoderHttpMessageWriter<>(encoder));

‎spring-web/src/main/java/org/springframework/http/codec/support/DefaultClientCodecConfigurer.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@
2626
*/
2727
public class DefaultClientCodecConfigurer extends BaseCodecConfigurer implements ClientCodecConfigurer {
2828

29-
3029
public DefaultClientCodecConfigurer() {
3130
super(new ClientDefaultCodecsImpl());
3231
((ClientDefaultCodecsImpl) defaultCodecs()).setPartWritersSupplier(() -> getWritersInternal(true));
3332
}
3433

35-
3634
@Override
3735
public ClientDefaultCodecs defaultCodecs() {
3836
return (ClientDefaultCodecs) super.defaultCodecs();

‎spring-web/src/main/java/org/springframework/http/codec/support/DefaultServerCodecConfigurer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
*/
2727
public class DefaultServerCodecConfigurer extends BaseCodecConfigurer implements ServerCodecConfigurer {
2828

29-
3029
public DefaultServerCodecConfigurer() {
3130
super(new ServerDefaultCodecsImpl());
3231
}

‎spring-webflux/src/main/java/org/springframework/web/reactive/resource/DefaultResourceResolverChain.java

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,48 +44,43 @@ class DefaultResourceResolverChain implements ResourceResolverChain {
4444

4545

4646
public DefaultResourceResolverChain(@Nullable List<? extends ResourceResolver> resolvers) {
47-
resolvers = resolvers != null ? resolvers : Collections.emptyList();
47+
resolvers = (resolvers != null ? resolvers : Collections.emptyList());
4848
DefaultResourceResolverChain chain = initChain(new ArrayList<>(resolvers));
4949
this.resolver = chain.resolver;
5050
this.nextChain = chain.nextChain;
5151
}
5252

5353
private static DefaultResourceResolverChain initChain(ArrayList<? extends ResourceResolver> resolvers) {
5454
DefaultResourceResolverChain chain = new DefaultResourceResolverChain(null, null);
55-
ListIterator<? extends ResourceResolver> itr = resolvers.listIterator(resolvers.size());
56-
while (itr.hasPrevious()) {
57-
chain = new DefaultResourceResolverChain(itr.previous(), chain);
55+
ListIterator<? extends ResourceResolver> it = resolvers.listIterator(resolvers.size());
56+
while (it.hasPrevious()) {
57+
chain = new DefaultResourceResolverChain(it.previous(), chain);
5858
}
5959
return chain;
6060
}
6161

62-
private DefaultResourceResolverChain(@Nullable ResourceResolver resolver,
63-
@Nullable ResourceResolverChain chain) {
64-
62+
private DefaultResourceResolverChain(@Nullable ResourceResolver resolver, @Nullable ResourceResolverChain chain) {
6563
Assert.isTrue((resolver == null && chain == null) || (resolver != null && chain != null),
6664
"Both resolver and resolver chain must be null, or neither is");
67-
6865
this.resolver = resolver;
6966
this.nextChain = chain;
7067
}
7168

7269

7370
@Override
74-
@SuppressWarnings("ConstantConditions")
7571
public Mono<Resource> resolveResource(@Nullable ServerWebExchange exchange, String requestPath,
7672
List<? extends Resource> locations) {
7773

78-
return this.resolver != null ?
74+
return (this.resolver != null && this.nextChain != null ?
7975
this.resolver.resolveResource(exchange, requestPath, locations, this.nextChain) :
80-
Mono.empty();
76+
Mono.empty());
8177
}
8278

8379
@Override
84-
@SuppressWarnings("ConstantConditions")
8580
public Mono<String> resolveUrlPath(String resourcePath, List<? extends Resource> locations) {
86-
return this.resolver != null ?
81+
return (this.resolver != null && this.nextChain != null ?
8782
this.resolver.resolveUrlPath(resourcePath, locations, this.nextChain) :
88-
Mono.empty();
83+
Mono.empty());
8984
}
9085

9186
}

‎spring-webflux/src/main/java/org/springframework/web/reactive/resource/DefaultResourceTransformerChain.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,12 @@ class DefaultResourceTransformerChain implements ResourceTransformerChain {
4545
private final ResourceTransformerChain nextChain;
4646

4747

48-
public DefaultResourceTransformerChain(ResourceResolverChain resolverChain,
49-
@Nullable List<ResourceTransformer> transformers) {
48+
public DefaultResourceTransformerChain(
49+
ResourceResolverChain resolverChain, @Nullable List<ResourceTransformer> transformers) {
5050

5151
Assert.notNull(resolverChain, "ResourceResolverChain is required");
5252
this.resolverChain = resolverChain;
53-
54-
transformers = transformers != null ? transformers : Collections.emptyList();
53+
transformers = (transformers != null ? transformers : Collections.emptyList());
5554
DefaultResourceTransformerChain chain = initTransformerChain(resolverChain, new ArrayList<>(transformers));
5655
this.transformer = chain.transformer;
5756
this.nextChain = chain.nextChain;
@@ -61,9 +60,9 @@ private DefaultResourceTransformerChain initTransformerChain(ResourceResolverCha
6160
ArrayList<ResourceTransformer> transformers) {
6261

6362
DefaultResourceTransformerChain chain = new DefaultResourceTransformerChain(resolverChain, null, null);
64-
ListIterator<? extends ResourceTransformer> itr = transformers.listIterator(transformers.size());
65-
while (itr.hasPrevious()) {
66-
chain = new DefaultResourceTransformerChain(resolverChain, itr.previous(), chain);
63+
ListIterator<? extends ResourceTransformer> it = transformers.listIterator(transformers.size());
64+
while (it.hasPrevious()) {
65+
chain = new DefaultResourceTransformerChain(resolverChain, it.previous(), chain);
6766
}
6867
return chain;
6968
}
@@ -73,23 +72,22 @@ public DefaultResourceTransformerChain(ResourceResolverChain resolverChain,
7372

7473
Assert.isTrue((transformer == null && chain == null) || (transformer != null && chain != null),
7574
"Both transformer and transformer chain must be null, or neither is");
76-
7775
this.resolverChain = resolverChain;
7876
this.transformer = transformer;
7977
this.nextChain = chain;
8078
}
8179

80+
81+
@Override
8282
public ResourceResolverChain getResolverChain() {
8383
return this.resolverChain;
8484
}
8585

86-
8786
@Override
88-
@SuppressWarnings("ConstantConditions")
8987
public Mono<Resource> transform(ServerWebExchange exchange, Resource resource) {
90-
return this.transformer != null ?
88+
return (this.transformer != null && this.nextChain != null ?
9189
this.transformer.transform(exchange, resource, this.nextChain) :
92-
Mono.just(resource);
90+
Mono.just(resource));
9391
}
9492

9593
}

‎spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,13 @@
5656
import org.springframework.web.reactive.accept.RequestedContentTypeResolver;
5757
import org.springframework.web.reactive.accept.RequestedContentTypeResolverBuilder;
5858

59-
import static org.junit.Assert.assertEquals;
60-
import static org.junit.Assert.assertFalse;
61-
import static org.junit.Assert.assertTrue;
62-
import static org.springframework.core.ResolvableType.forClassWithGenerics;
63-
import static org.springframework.http.MediaType.APPLICATION_JSON;
64-
import static org.springframework.http.ResponseEntity.notFound;
65-
import static org.springframework.http.ResponseEntity.ok;
66-
import static org.springframework.mock.http.server.reactive.test.MockServerHttpRequest.get;
67-
import static org.springframework.web.method.ResolvableMethod.on;
68-
import static org.springframework.web.reactive.HandlerMapping.PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE;
59+
import static org.junit.Assert.*;
60+
import static org.springframework.core.ResolvableType.*;
61+
import static org.springframework.http.MediaType.*;
62+
import static org.springframework.http.ResponseEntity.*;
63+
import static org.springframework.mock.http.server.reactive.test.MockServerHttpRequest.*;
64+
import static org.springframework.web.method.ResolvableMethod.*;
65+
import static org.springframework.web.reactive.HandlerMapping.*;
6966

7067
/**
7168
* Unit tests for {@link ResponseEntityResultHandler}. When adding a test also
@@ -106,9 +103,7 @@ private ResponseEntityResultHandler createHandler(HttpMessageWriter<?>... writer
106103

107104

108105
@Test
109-
@SuppressWarnings("ConstantConditions")
110-
public void supports() throws NoSuchMethodException {
111-
106+
public void supports() throws Exception {
112107
Object value = null;
113108

114109
MethodParameter returnType = on(TestController.class).resolveReturnType(entity(String.class));
@@ -133,9 +128,7 @@ public void supports() throws NoSuchMethodException {
133128
}
134129

135130
@Test
136-
@SuppressWarnings("ConstantConditions")
137-
public void doesNotSupport() throws NoSuchMethodException {
138-
131+
public void doesNotSupport() throws Exception {
139132
Object value = null;
140133

141134
MethodParameter returnType = on(TestController.class).resolveReturnType(String.class);
@@ -417,7 +410,6 @@ private static class TestController {
417410
Flux<?> fluxWildcard() { return null; }
418411

419412
Object object() { return null; }
420-
421413
}
422414

423415
}

‎spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ public void setup() throws Exception {
9393
}
9494

9595

96-
@SuppressWarnings("ConstantConditions")
9796
@Test
9897
public void nullHandler() {
9998
Object handler = null;
@@ -103,7 +102,7 @@ public void nullHandler() {
103102
}
104103

105104
@Test
106-
public void setCustomArgumentResolvers() throws Exception {
105+
public void setCustomArgumentResolvers() {
107106
HandlerMethodArgumentResolver resolver = new ServletRequestMethodArgumentResolver();
108107
this.resolver.setCustomArgumentResolvers(Collections.singletonList(resolver));
109108
this.resolver.afterPropertiesSet();
@@ -113,7 +112,7 @@ public void setCustomArgumentResolvers() throws Exception {
113112
}
114113

115114
@Test
116-
public void setArgumentResolvers() throws Exception {
115+
public void setArgumentResolvers() {
117116
HandlerMethodArgumentResolver resolver = new ServletRequestMethodArgumentResolver();
118117
this.resolver.setArgumentResolvers(Collections.singletonList(resolver));
119118
this.resolver.afterPropertiesSet();

0 commit comments

Comments
 (0)