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

Polish

Browse Source
This commit is contained in:
Phillip Webb
2015-12-10 17:28:50 +00:00
parent f3bcf94fb0
commit 0489a3b4de
28 changed files with 135 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RestartCompatibleRedisSerializerConfigurer.java
View File

@@ -35,7 +35,6 @@ import org.springframework.util.ObjectUtils;
*
* @author Andy Wilkinson
* @author Rob Winch
*
* @see RedisTemplate#setHashKeySerializer(RedisSerializer)
* @see RedisTemplate#setHashValueSerializer(RedisSerializer)
* @see RedisTemplate#setKeySerializer(RedisSerializer)
@@ -69,6 +68,8 @@ class RestartCompatibleRedisSerializerConfigurer implements BeanClassLoaderAware
static class RestartCompatibleRedisSerializer implements RedisSerializer<Object> {
private static final byte[] NO_BYTES = new byte[0];
private final Converter<Object, byte[]> serializer = new SerializingConverter();
private final Converter<byte[], Object> deserializer;
@@ -80,12 +81,9 @@ class RestartCompatibleRedisSerializerConfigurer implements BeanClassLoaderAware
@Override
public Object deserialize(byte[] bytes) {
if (ObjectUtils.isEmpty(bytes)) {
return null;
}
try {
return this.deserializer.convert(bytes);
return (ObjectUtils.isEmpty(bytes) ? null
: this.deserializer.convert(bytes));
}
catch (Exception ex) {
throw new SerializationException("Cannot deserialize", ex);
@@ -94,11 +92,8 @@ class RestartCompatibleRedisSerializerConfigurer implements BeanClassLoaderAware
@Override
public byte[] serialize(Object object) {
if (object == null) {
return new byte[0];
}
try {
return this.serializer.convert(object);
return (object == null ? NO_BYTES : this.serializer.convert(object));
}
catch (Exception ex) {
throw new SerializationException("Cannot serialize", ex);

7
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilter.java
View File

@@ -41,10 +41,9 @@ public class DefaultSourceFolderUrlFilter implements SourceFolderUrlFilter {
private static final Pattern VERSION_PATTERN = Pattern
.compile("^-\\d+(?:\\.\\d+)*(?:[.-].+)?$");
private static final Set<String> SKIPPED_PROJECTS = new HashSet<String>(
Arrays.asList("spring-boot", "spring-boot-devtools",
"spring-boot-autoconfigure", "spring-boot-actuator",
"spring-boot-starter"));
private static final Set<String> SKIPPED_PROJECTS = new HashSet<String>(Arrays.asList(
"spring-boot", "spring-boot-devtools", "spring-boot-autoconfigure",
"spring-boot-actuator", "spring-boot-starter"));
@Override
public boolean isMatch(String sourceFolder, URL url) {