Skip to content

Polish #46291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Polish #46291

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e251445
Simplify if statement
Jul 4, 2025
2724e29
Revert changes to CharSequenceToObjectConverter
Jul 4, 2025
9368164
Fix formatting issue
Jul 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ...tuator/src/main/java/org/springframework/boot/actuate/management/HeapDumpWebEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,7 @@ private boolean isRunningOnOpenJ9() {
return true;
}
String vmVendor = System.getProperty("java.vm.vendor");
if (StringUtils.hasLength(vmVendor) && vmVendor.toLowerCase(Locale.ROOT).contains("openj9")) {
return true;
}
return false;
return StringUtils.hasLength(vmVendor) && vmVendor.toLowerCase(Locale.ROOT).contains("openj9");
}

/**
Expand Down
7 changes: 2 additions & 5 deletions ...spring-boot-loader/src/main/java/org/springframework/boot/loader/net/util/UrlDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,10 @@ public static String decode(String string) {

private static int fillByteBuffer(ByteBuffer byteBuffer, String string, int index, int length) {
byteBuffer.clear();
while (true) {
do {
byteBuffer.put(unescape(string, index));
index += 3;
if (index >= length || string.charAt(index) != '%') {
break;
}
}
} while (index < length && string.charAt(index) == '%');
byteBuffer.flip();
return index;
}
Expand Down
9 changes: 3 additions & 6 deletions ...ng-boot/src/main/java/org/springframework/boot/convert/CharSequenceToObjectConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,9 @@ private boolean isStringConversionBetter(TypeDescriptor sourceType, TypeDescript
return true;
}
}
if ((targetType.isArray() || targetType.isCollection()) && !targetType.equals(BYTE_ARRAY)) {
// StringToArrayConverter / StringToCollectionConverter are better than
// ObjectToArrayConverter / ObjectToCollectionConverter
return true;
}
return false;
// StringToArrayConverter / StringToCollectionConverter are better than
// ObjectToArrayConverter / ObjectToCollectionConverter
return (targetType.isArray() || targetType.isCollection()) && !targetType.equals(BYTE_ARRAY);
}

@Override
Expand Down
Loading