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

Remove unneeded conditional logic 

Update `ConversionUtils` to remove conditional logic that isn't
necessary.

Issue: SPR-16968
This commit is contained in:
Phillip Webb 2018-06-13 18:34:59 -07:00 committed by Juergen Hoeller
parent 634f5c2792
commit ad6d183a06
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 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.
@ -62,14 +62,12 @@ abstract class ConversionUtils {
// yes // yes
return true; return true;
} }
else if (sourceElementType.getType().isAssignableFrom(targetElementType.getType())) { if (sourceElementType.getType().isAssignableFrom(targetElementType.getType())) {
// maybe // maybe
return true; return true;
} }
else { // no
// no return false;
return false;
}
} }
public static Class<?> getEnumType(Class<?> targetType) { public static Class<?> getEnumType(Class<?> targetType) {