From 667fc7e4a9d9daf15110339af3659404ace6adba Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 4 Sep 2015 14:38:47 +0200 Subject: [PATCH] Polishing --- .../beans/factory/config/YamlProcessor.java | 11 ++++------- .../spel/support/ReflectiveMethodExecutor.java | 13 +++++++------ .../messaging/simp/stomp/StompDecoder.java | 7 +++---- .../mock/web/MockHttpServletResponse.java | 4 ++-- .../samples/standalone/ResponseBodyTests.java | 9 ++++----- .../org/springframework/http/ResponseEntity.java | 4 ++-- .../ContentNegotiationManagerFactoryBean.java | 4 ++-- .../web/client/HttpMessageConverterExtractor.java | 2 +- .../MessageBodyClientHttpResponseWrapper.java | 2 +- .../org/springframework/web/util/UrlPathHelper.java | 4 ++-- .../AbstractMessageConverterMethodProcessor.java | 6 +++--- .../RequestResponseBodyMethodProcessor.java | 3 +-- 12 files changed, 32 insertions(+), 37 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java index 2d34e5a5ee0..4680bb56932 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java @@ -393,17 +393,14 @@ public abstract class YamlProcessor { */ protected static class StrictMapAppenderConstructor extends Constructor { - public StrictMapAppenderConstructor() { - super(); - } - @Override protected Map constructMapping(MappingNode node) { try { return super.constructMapping(node); - } catch (IllegalStateException e) { + } + catch (IllegalStateException ex) { throw new ParserException("while parsing MappingNode", - node.getStartMark(), e.getMessage(), node.getEndMark()); + node.getStartMark(), ex.getMessage(), node.getEndMark()); } } @@ -414,7 +411,7 @@ public abstract class YamlProcessor { @Override public Object put(Object key, Object value) { if (delegate.containsKey(key)) { - throw new IllegalStateException("duplicate key: " + key); + throw new IllegalStateException("Duplicate key: " + key); } return delegate.put(key, value); } diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java index da1fda3d027..b2798c3ddab 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 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. @@ -80,13 +80,14 @@ public class ReflectiveMethodExecutor implements MethodExecutor { try { clazz.getDeclaredMethod(method.getName(), method.getParameterTypes()); return clazz; - } catch (NoSuchMethodException nsme) { - + } + catch (NoSuchMethodException ex) { + // Continue below... } } - Class[] intfaces = clazz.getInterfaces(); - for (Class intface: intfaces) { - discoverPublicClass(method, intface); + Class[] ifcs = clazz.getInterfaces(); + for (Class ifc: ifcs) { + discoverPublicClass(method, ifc); } if (clazz.getSuperclass() != null) { return discoverPublicClass(method, clazz.getSuperclass()); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java index ab8201a48b9..f74ab172f32 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java @@ -58,9 +58,8 @@ public class StompDecoder { /** - * Configure a - * {@link org.springframework.messaging.support.MessageHeaderInitializer MessageHeaderInitializer} - * to apply to the headers of {@link Message}s from decoded STOMP frames. + * Configure a {@link MessageHeaderInitializer} to apply to the headers of + * {@link Message}s from decoded STOMP frames. */ public void setHeaderInitializer(MessageHeaderInitializer headerInitializer) { this.headerInitializer = headerInitializer; @@ -216,7 +215,7 @@ public class StompDecoder { String header = new String(headerStream.toByteArray(), UTF8_CHARSET); int colonIndex = header.indexOf(':'); if (colonIndex <= 0) { - if(buffer.remaining() > 0) { + if (buffer.remaining() > 0) { throw new StompConversionException("Illegal header: '" + header + "'. A header must be of the form :[]."); } diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java index 9d93851c2c5..79f1f7bd2e1 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java @@ -33,7 +33,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.TimeZone; - import javax.servlet.ServletOutputStream; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; @@ -499,7 +498,8 @@ public class MockHttpServletResponse implements HttpServletResponse { dateFormat.setTimeZone(GMT); try { return dateFormat.parse(getHeader(name)).getTime(); - } catch (ParseException exception) { + } + catch (ParseException ex) { throw new IllegalArgumentException( "Value for header '" + name + "' is not a valid Date: " + getHeader(name)); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java index 60f82cd1c33..6f2e6467bd8 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2015 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. @@ -38,22 +38,21 @@ public class ResponseBodyTests { @Test public void json() throws Exception { - standaloneSetup(new PersonController()).build() - .perform(get("/person/Lee").accept(MediaType.APPLICATION_JSON)) + .perform(get("/person/Lee").accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(content().contentType("application/json;charset=UTF-8")) .andExpect(jsonPath("$.name").value("Lee")); } + @Controller private class PersonController { @RequestMapping(value="/person/{name}") @ResponseBody public Person get(@PathVariable String name) { - Person person = new Person(name); - return person; + return new Person(name); } } diff --git a/spring-web/src/main/java/org/springframework/http/ResponseEntity.java b/spring-web/src/main/java/org/springframework/http/ResponseEntity.java index b3e766d4e3c..9eba72c0755 100644 --- a/spring-web/src/main/java/org/springframework/http/ResponseEntity.java +++ b/spring-web/src/main/java/org/springframework/http/ResponseEntity.java @@ -422,10 +422,10 @@ public class ResponseEntity extends HttpEntity { @Override public BodyBuilder eTag(String eTag) { if (eTag != null) { - if(!eTag.startsWith("\"") && !eTag.startsWith("W/\"")) { + if (!eTag.startsWith("\"") && !eTag.startsWith("W/\"")) { eTag = "\"" + eTag; } - if(!eTag.endsWith("\"")) { + if (!eTag.endsWith("\"")) { eTag = eTag + "\""; } } diff --git a/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java b/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java index 3449fd26888..0c6e6ed1df9 100644 --- a/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java +++ b/spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 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. @@ -234,7 +234,7 @@ public class ContentNegotiationManagerFactoryBean strategies.add(new HeaderContentNegotiationStrategy()); } - if(this.defaultNegotiationStrategy != null) { + if (this.defaultNegotiationStrategy != null) { strategies.add(defaultNegotiationStrategy); } diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java index d73807eecbd..0da4efed64d 100644 --- a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java +++ b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java @@ -80,7 +80,7 @@ public class HttpMessageConverterExtractor implements ResponseExtractor { public T extractData(ClientHttpResponse response) throws IOException { MessageBodyClientHttpResponseWrapper responseWrapper = new MessageBodyClientHttpResponseWrapper(response); - if(!responseWrapper.hasMessageBody() || responseWrapper.hasEmptyMessageBody()) { + if (!responseWrapper.hasMessageBody() || responseWrapper.hasEmptyMessageBody()) { return null; } MediaType contentType = getContentType(responseWrapper); diff --git a/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java b/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java index b36e37d885e..8b732d8b64a 100644 --- a/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java +++ b/spring-web/src/main/java/org/springframework/web/client/MessageBodyClientHttpResponseWrapper.java @@ -61,7 +61,7 @@ class MessageBodyClientHttpResponseWrapper implements ClientHttpResponse { responseStatus == HttpStatus.NOT_MODIFIED) { return false; } - else if(this.getHeaders().getContentLength() == 0) { + else if (this.getHeaders().getContentLength() == 0) { return false; } return true; diff --git a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java index 245c9981f13..64de2672cf5 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java +++ b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 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. @@ -180,7 +180,7 @@ public class UrlPathHelper { String path; // if the app container sanitized the servletPath, check against the sanitized version - if(servletPath.indexOf(sanitizedPathWithinApp) != -1) { + if (servletPath.indexOf(sanitizedPathWithinApp) != -1) { path = getRemainingPath(sanitizedPathWithinApp, servletPath, false); } else { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java index 5d7d53fa75f..93a45c94837 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java @@ -35,7 +35,6 @@ import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.HttpMessageNotWritableException; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.http.server.ServletServerHttpResponse; -import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.web.HttpMediaTypeNotAcceptableException; import org.springframework.web.accept.ContentNegotiationManager; @@ -121,8 +120,9 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe List requestedMediaTypes = getAcceptableMediaTypes(servletRequest); List producibleMediaTypes = getProducibleMediaTypes(servletRequest, returnValueClass, returnValueType); - Assert.isTrue(returnValue == null || !producibleMediaTypes.isEmpty(), - "No converter found for return value of type: " + returnValueClass); + if (returnValue != null && producibleMediaTypes.isEmpty()) { + throw new IllegalArgumentException("No converter found for return value of type: " + returnValueClass); + } Set compatibleMediaTypes = new LinkedHashSet(); for (MediaType requestedType : requestedMediaTypes) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java index 99ab71e42d9..bc187962c57 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java @@ -144,8 +144,7 @@ public class RequestResponseBodyMethodProcessor extends AbstractMessageConverter HttpServletRequest servletRequest = webRequest.getNativeRequest(HttpServletRequest.class); ServletServerHttpRequest inputMessage = new ServletServerHttpRequest(servletRequest); - Object arg = null; - arg = readWithMessageConverters(inputMessage, methodParam, paramType); + Object arg = readWithMessageConverters(inputMessage, methodParam, paramType); if (arg == null) { if (methodParam.getParameterAnnotation(RequestBody.class).required()) { throw new HttpMessageNotReadableException("Required request body is missing: " +