Skip to content

Commit e251445

Browse files
author
Piyal Ahmed
committed
Simplify if statement
Signed-off-by: Piyal Ahmed <[email protected]>
1 parent 5e52468 commit e251445

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/HeapDumpWebEndpoint.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,7 @@ private boolean isRunningOnOpenJ9() {
126126
return true;
127127
}
128128
String vmVendor = System.getProperty("java.vm.vendor");
129-
if (StringUtils.hasLength(vmVendor) && vmVendor.toLowerCase(Locale.ROOT).contains("openj9")) {
130-
return true;
131-
}
132-
return false;
129+
return StringUtils.hasLength(vmVendor) && vmVendor.toLowerCase(Locale.ROOT).contains("openj9");
133130
}
134131

135132
/**

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/util/UrlDecoder.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,10 @@ public static String decode(String string) {
7373

7474
private static int fillByteBuffer(ByteBuffer byteBuffer, String string, int index, int length) {
7575
byteBuffer.clear();
76-
while (true) {
76+
do {
7777
byteBuffer.put(unescape(string, index));
7878
index += 3;
79-
if (index >= length || string.charAt(index) != '%') {
80-
break;
81-
}
82-
}
79+
} while (index < length && string.charAt(index) == '%');
8380
byteBuffer.flip();
8481
return index;
8582
}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/CharSequenceToObjectConverter.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,9 @@ private boolean isStringConversionBetter(TypeDescriptor sourceType, TypeDescript
8787
return true;
8888
}
8989
}
90-
if ((targetType.isArray() || targetType.isCollection()) && !targetType.equals(BYTE_ARRAY)) {
91-
// StringToArrayConverter / StringToCollectionConverter are better than
92-
// ObjectToArrayConverter / ObjectToCollectionConverter
93-
return true;
94-
}
95-
return false;
90+
// StringToArrayConverter / StringToCollectionConverter are better than
91+
// ObjectToArrayConverter / ObjectToCollectionConverter
92+
return (targetType.isArray() || targetType.isCollection()) && !targetType.equals(BYTE_ARRAY);
9693
}
9794

9895
@Override

0 commit comments

Comments
 (0)