Skip to content

Use Charset instead of String for Mustache template encoding #48346

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 2 commits into from
Closed

Use Charset instead of String for Mustache template encoding #48346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8030e5
Use Charset instead of String for Mustache template encoding
ddongjunn Nov 29, 2025
4e3cdc3
Simplify Property handling using map().getOrNull()
ddongjunn Nov 29, 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
2 changes: 1 addition & 1 deletion ...ugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchiveSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ CopyAction createCopyAction(Jar jar, ResolvedDependencies resolvedDependencies,
}

private @Nullable Integer asUnixNumeric(Property<ConfigurableFilePermissions> permissions) {
return permissions.isPresent() ? permissions.get().toUnixNumeric() : null;
return permissions.map(ConfigurableFilePermissions::toUnixNumeric).getOrNull();
}

private @Nullable Integer getDirMode(CopySpec copySpec) {
Expand Down
6 changes: 4 additions & 2 deletions .../java/org/springframework/boot/mustache/autoconfigure/MustacheResourceTemplateLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;

import com.samskivert.mustache.Mustache;
import com.samskivert.mustache.Mustache.Compiler;
Expand Down Expand Up @@ -45,7 +47,7 @@ public class MustacheResourceTemplateLoader implements TemplateLoader, ResourceL

private String suffix = "";

private String charSet = "UTF-8";
private Charset charSet = StandardCharsets.UTF_8;

private ResourceLoader resourceLoader = new DefaultResourceLoader(null);

Expand All @@ -61,7 +63,7 @@ public MustacheResourceTemplateLoader(String prefix, String suffix) {
* Set the charset.
* @param charSet the charset
*/
public void setCharset(String charSet) {
public void setCharset(Charset charSet) {
this.charSet = charSet;
}

Expand Down