Skip to content

Commit 92d27c4

Browse files
committed
Extract check for empty config files
1 parent 1bf7a96 commit 92d27c4

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

tests/tck-build-logic/src/main/java/org/graalvm/internal/tck/ContributionTask.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -464,13 +464,13 @@ private void removeEmptyConfigFiles() throws IOException {
464464

465465
Path resourceConfigPath = metadataDirectory.resolve(CONFIG_FILES.RESOURCE.get());
466466
ResourceConfigModel resourceConfig = objectMapper.readValue(new File(resourceConfigPath.toUri()), new TypeReference<>() {});
467-
if (resourceConfig.bundles().isEmpty() && resourceConfig.resources().toString().equalsIgnoreCase("{}")) {
467+
if (resourceConfig.isEmpty()) {
468468
removeConfigFile(resourceConfigPath, CONFIG_FILES.RESOURCE, remainingFiles);
469469
}
470470

471471
Path serializationConfigPath = metadataDirectory.resolve(CONFIG_FILES.SERIALIZATION.get());
472472
SerializationConfigModel serializationConfig = objectMapper.readValue(new File(serializationConfigPath.toUri()), new TypeReference<>() {});
473-
if (serializationConfig.lambdaCapturingTypes().isEmpty() && serializationConfig.types().isEmpty() && serializationConfig.proxies().isEmpty()) {
473+
if (serializationConfig.isEmpty()) {
474474
removeConfigFile(serializationConfigPath, CONFIG_FILES.SERIALIZATION, remainingFiles);
475475
}
476476

@@ -495,7 +495,7 @@ private void removeEmptyConfigFiles() throws IOException {
495495
Path predefinedClassesConfigPath = metadataDirectory.resolve(CONFIG_FILES.PREDEFINED_CLASSES.get());
496496
List<PredefinedClassesConfigModel> predefinedClassesConfig = objectMapper.readValue(new File(predefinedClassesConfigPath.toUri()), new TypeReference<>() {});
497497
if (predefinedClassesConfig.size() == 1) {
498-
if (predefinedClassesConfig.get(0).type().equalsIgnoreCase("agent-extracted") && predefinedClassesConfig.get(0).classes().isEmpty()) {
498+
if (predefinedClassesConfig.get(0).isEmpty()) {
499499
removeConfigFile(predefinedClassesConfigPath, CONFIG_FILES.PREDEFINED_CLASSES, remainingFiles);
500500
}
501501
}

tests/tck-build-logic/src/main/java/org/graalvm/internal/tck/model/contributing/PredefinedClassesConfigModel.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@ public record PredefinedClassesConfigModel(
66
String type,
77
List<Object> classes
88
) {
9+
public boolean isEmpty() {
10+
return this.type().equalsIgnoreCase("agent-extracted") && this.classes().isEmpty();
11+
}
912
}

tests/tck-build-logic/src/main/java/org/graalvm/internal/tck/model/contributing/ResourceConfigModel.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@ public record ResourceConfigModel(
55
Object resources,
66
List<Object> bundles
77
) {
8+
public boolean isEmpty() {
9+
return this.bundles().isEmpty() && this.resources().toString().equalsIgnoreCase("{}");
10+
}
811
}

tests/tck-build-logic/src/main/java/org/graalvm/internal/tck/model/contributing/SerializationConfigModel.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@ public record SerializationConfigModel(
88
List<Object> proxies,
99
List<Object> lambdaCapturingTypes
1010
) {
11+
public boolean isEmpty() {
12+
return this.lambdaCapturingTypes().isEmpty() && this.types().isEmpty() && this.proxies().isEmpty();
13+
}
1114
}

0 commit comments

Comments
 (0)