Skip to content

Write native configuration files as UTF-8 #36972

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
junhyeong9812 wants to merge 1 commit into from
Closed

Write native configuration files as UTF-8 #36972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion spring-core/src/main/java/org/springframework/aot/nativex/FileNativeConfigurationWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.function.Consumer;

Expand Down Expand Up @@ -59,7 +60,7 @@ public FileNativeConfigurationWriter(Path basePath, @Nullable String groupId, @N
protected void writeTo(String fileName, Consumer<BasicJsonWriter> writer) {
try {
File file = createIfNecessary(fileName);
try (FileWriter out = new FileWriter(file)) {
try (FileWriter out = new FileWriter(file, StandardCharsets.UTF_8)) {
writer.accept(createJsonWriter(out));
}
}
Expand Down
12 changes: 12 additions & 0 deletions ...ore/src/test/java/org/springframework/aot/nativex/FileNativeConfigurationWriterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.function.Consumer;
Expand Down Expand Up @@ -176,6 +177,17 @@ void resourceConfig() throws IOException, JSONException {
}""");
}

@Test
void resourceConfigWithNonAsciiPatternIsWrittenAsUtf8() throws IOException {
FileNativeConfigurationWriter generator = new FileNativeConfigurationWriter(tempDir);
RuntimeHints hints = new RuntimeHints();
hints.resources().registerPattern("com/example/café/**");
generator.write(hints);
Path jsonFile = tempDir.resolve("META-INF").resolve("native-image").resolve("reachability-metadata.json");
byte[] content = Files.readAllBytes(jsonFile);
assertThat(content).containsSequence("café".getBytes(StandardCharsets.UTF_8));
}

@Test
void namespace() {
String groupId = "foo.bar";
Expand Down