root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2015-05-13 15:04:26 +02:00
parent ef7cf2c650
commit 0711d6d0df
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/main/java/org/springframework/core/convert/support/StreamConverter.java
View File

@ -44,10 +44,12 @@ public class StreamConverter implements ConditionalGenericConverter {
private final ConversionService conversionService; private final ConversionService conversionService;
public StreamConverter(ConversionService conversionService) { public StreamConverter(ConversionService conversionService) {
this.conversionService = conversionService; this.conversionService = conversionService;
} }
@Override @Override
public Set<ConvertiblePair> getConvertibleTypes() { public Set<ConvertiblePair> getConvertibleTypes() {
return CONVERTIBLE_TYPES; return CONVERTIBLE_TYPES;

5
spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -22,10 +22,11 @@ import org.springframework.core.convert.converter.Converter;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
/** /**
* Converts a String to a Locale. * Converts from a String to a {@link java.util.Locale}.
* *
* @author Keith Donald * @author Keith Donald
* @since 3.0 * @since 3.0
* @see StringUtils#parseLocaleString
*/ */
final class StringToLocaleConverter implements Converter<String, Locale> { final class StringToLocaleConverter implements Converter<String, Locale> {

10
spring-core/src/main/java/org/springframework/core/convert/support/StringToUUIDConverter.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -22,19 +22,17 @@ import org.springframework.core.convert.converter.Converter;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
/** /**
* Converts from a String to a java.util.UUID by calling {@link UUID#fromString(String)}. * Converts from a String to a {@link java.util.UUID}.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 3.2 * @since 3.2
* @see UUID#fromString
*/ */
final class StringToUUIDConverter implements Converter<String, UUID> { final class StringToUUIDConverter implements Converter<String, UUID> {
@Override @Override
public UUID convert(String source) { public UUID convert(String source) {
if (StringUtils.hasLength(source)) { return (StringUtils.hasLength(source) ? UUID.fromString(source.trim()) : null);
return UUID.fromString(source.trim());
}
return null;
} }
} }

9
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -59,8 +59,7 @@ public class ResourceUrlEncodingFilter extends OncePerRequestFilter {
/* Cache the index of the path within the DispatcherServlet mapping. */ /* Cache the index of the path within the DispatcherServlet mapping. */
private Integer indexLookupPath; private Integer indexLookupPath;
public ResourceUrlEncodingResponseWrapper(HttpServletRequest request, HttpServletResponse wrapped) {
private ResourceUrlEncodingResponseWrapper(HttpServletRequest request, HttpServletResponse wrapped) {
super(wrapped); super(wrapped);
this.request = request; this.request = request;
} }
@ -69,11 +68,11 @@ public class ResourceUrlEncodingFilter extends OncePerRequestFilter {
public String encodeURL(String url) { public String encodeURL(String url) {
ResourceUrlProvider resourceUrlProvider = getResourceUrlProvider(); ResourceUrlProvider resourceUrlProvider = getResourceUrlProvider();
if (resourceUrlProvider == null) { if (resourceUrlProvider == null) {
logger.debug("Request attribute exposing ResourceUrlProvider not found."); logger.debug("Request attribute exposing ResourceUrlProvider not found");
return super.encodeURL(url); return super.encodeURL(url);
} }
initIndexLookupPath(resourceUrlProvider); initIndexLookupPath(resourceUrlProvider);
if(url.length() >= this.indexLookupPath) { if (url.length() >= this.indexLookupPath) {
String prefix = url.substring(0, this.indexLookupPath); String prefix = url.substring(0, this.indexLookupPath);
String lookupPath = url.substring(this.indexLookupPath); String lookupPath = url.substring(this.indexLookupPath);
lookupPath = resourceUrlProvider.getForLookupPath(lookupPath); lookupPath = resourceUrlProvider.getForLookupPath(lookupPath);