Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source 
(cherry picked from commit 0711d6d)
This commit is contained in:
Juergen Hoeller
2015-05-13 17:27:41 +02:00
parent 391f72d2e4
commit ae35e84c1e
6 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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");
* 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;
/**
* Converts a String to a Locale.
* Converts from a String to a {@link java.util.Locale}.
*
* @author Keith Donald
* @since 3.0
* @see StringUtils#parseLocaleString
*/
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");
* 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;
/**
* 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
* @since 3.2
* @see UUID#fromString
*/
final class StringToUUIDConverter implements Converter<String, UUID> {
@Override
public UUID convert(String source) {
if (StringUtils.hasLength(source)) {
return UUID.fromString(source.trim());
}
return null;
return (StringUtils.hasLength(source) ? UUID.fromString(source.trim()) : null);
}
}