Skip to content

Commit 1ca198d

Browse files
sdeleuzednestoro
sdeleuze
authored and
dnestoro
committed
Fix build failure
Code originally contributed by @snicoll.
1 parent e0200c1 commit 1ca198d

File tree

5 files changed

+137
-104
lines changed

5 files changed

+137
-104
lines changed

‎common/utils/src/main/java/org/graalvm/buildtools/model/resources/ResourcesConfigModelSerializer.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
public class ResourcesConfigModelSerializer {
5353
public static void serialize(ResourcesConfigModel model, File outputFile) throws IOException {
5454
JSONObject json = toJson(model);
55-
String pretty = json.toString(4);
55+
String pretty = json.toString(2);
5656
File outputDir = outputFile.getParentFile();
5757
if (outputDir.isDirectory() || outputDir.mkdirs()) {
5858
try (OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(outputFile), StandardCharsets.UTF_8)) {
@@ -73,14 +73,20 @@ private static JSONObject toJson(ResourcesConfigModel model) {
7373
private static JSONObject toJson(ResourcesModel model) {
7474
JSONObject json = new JSONObject();
7575
JSONArray includes = new JSONArray();
76-
model.getIncludes().forEach(includes::put);
76+
model.getIncludes().forEach(patternValue -> includes.put(toJson(patternValue)));
7777
json.put("includes", includes);
7878
JSONArray excludes = new JSONArray();
79-
model.getExcludes().forEach(excludes::put);
79+
model.getExcludes().forEach(patternValue -> excludes.put(toJson(patternValue)));
8080
json.put("excludes", excludes);
8181
return json;
8282
}
8383

84+
private static JSONObject toJson(PatternValue patternValue) {
85+
JSONObject json = new JSONObject();
86+
json.put("pattern", patternValue.getPattern());
87+
return json;
88+
}
89+
8490
private static JSONObject toJson(NamedValue namedValue) {
8591
JSONObject json = new JSONObject();
8692
json.put("name", namedValue.getName());

‎native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/JavaApplicationWithResourcesFunctionalTest.groovy

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,15 @@ class JavaApplicationWithResourcesFunctionalTest extends AbstractFunctionalTest
7878

7979
and:
8080
matches(file("build/native/generated/generateResourcesConfigFile/resource-config.json").text, '''{
81-
"resources" : {
82-
"includes" : [ {
83-
"pattern" : "\\\\Qmessage.txt\\\\E"
84-
} ],
85-
"excludes" : [ ]
81+
"resources": {
82+
"includes": [
83+
{
84+
"pattern": "\\\\Qmessage.txt\\\\E"
85+
}
86+
],
87+
"excludes": []
8688
},
87-
"bundles" : [ ]
89+
"bundles": []
8890
}''')
8991

9092
where:
@@ -152,15 +154,18 @@ graalvmNative {
152154

153155
and:
154156
matches(file("build/native/generated/generateTestResourcesConfigFile/resource-config.json").text, '''{
155-
"resources" : {
156-
"includes" : [ {
157-
"pattern" : "\\\\Qmessage.txt\\\\E"
158-
}, {
159-
"pattern" : "\\\\Qorg/graalvm/demo/expected.txt\\\\E"
160-
} ],
161-
"excludes" : [ ]
157+
"resources": {
158+
"includes": [
159+
{
160+
"pattern": "\\\\Qmessage.txt\\\\E"
161+
},
162+
{
163+
"pattern": "\\\\Qorg/graalvm/demo/expected.txt\\\\E"
164+
}
165+
],
166+
"excludes": []
162167
},
163-
"bundles" : [ ]
168+
"bundles": []
164169
}''')
165170

166171
where:
@@ -205,11 +210,11 @@ graalvmNative {
205210
resourcesFile.parentFile.mkdirs()
206211
resourcesFile << """
207212
{
208-
"resources" : {
209-
"includes" : [ ],
210-
"excludes" : [ ]
213+
"resources": {
214+
"includes": [],
215+
"excludes": []
211216
},
212-
"bundles" : [ ]
217+
"bundles": []
213218
}
214219
"""
215220

@@ -243,13 +248,15 @@ graalvmNative {
243248

244249
and:
245250
matches(file("build/native/generated/generateResourcesConfigFile/resource-config.json").text, '''{
246-
"resources" : {
247-
"includes" : [ {
248-
"pattern" : "\\\\Qmessage.txt\\\\E"
249-
} ],
250-
"excludes" : [ ]
251+
"resources": {
252+
"includes": [
253+
{
254+
"pattern": "\\\\Qmessage.txt\\\\E"
255+
}
256+
],
257+
"excludes": []
251258
},
252-
"bundles" : [ ]
259+
"bundles": []
253260
}''')
254261

255262
when:

‎native-gradle-plugin/src/test/groovy/org/graalvm/buildtools/gradle/tasks/GenerateResourcesConfigFileTest.groovy

Lines changed: 69 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ class GenerateResourcesConfigFileTest extends AbstractPluginTest {
5252
with(project) {
5353
outputFile.exists()
5454
matches(outputFile.text, '''{
55-
"resources" : {
56-
"includes" : [ ],
57-
"excludes" : [ ]
55+
"resources": {
56+
"includes": [],
57+
"excludes": []
5858
},
59-
"bundles" : [ ]
59+
"bundles": []
6060
}''')
6161
}
6262
}
@@ -73,15 +73,18 @@ class GenerateResourcesConfigFileTest extends AbstractPluginTest {
7373
with(project) {
7474
outputFile.exists()
7575
matches(outputFile.text, '''{
76-
"resources" : {
77-
"includes" : [ ],
78-
"excludes" : [ ]
76+
"resources": {
77+
"includes": [],
78+
"excludes": []
7979
},
80-
"bundles" : [ {
81-
"name" : "my.bundle"
82-
}, {
83-
"name" : "other.bundle"
84-
} ]
80+
"bundles": [
81+
{
82+
"name": "my.bundle"
83+
},
84+
{
85+
"name": "other.bundle"
86+
}
87+
]
8588
}''')
8689
}
8790
}
@@ -99,19 +102,25 @@ class GenerateResourcesConfigFileTest extends AbstractPluginTest {
99102
with(project) {
100103
outputFile.exists()
101104
matches(outputFile.text, '''{
102-
"resources" : {
103-
"includes" : [ {
104-
"pattern" : "pattern"
105-
}, {
106-
"pattern" : "[a-z]+"
107-
} ],
108-
"excludes" : [ {
109-
"pattern" : "META-INF/.*"
110-
}, {
111-
"pattern" : ".*[.]class"
112-
} ]
105+
"resources": {
106+
"includes": [
107+
{
108+
"pattern": "pattern"
109+
},
110+
{
111+
"pattern": "[a-z]+"
112+
}
113+
],
114+
"excludes": [
115+
{
116+
"pattern": "META-INF/.*"
117+
},
118+
{
119+
"pattern": ".*[.]class"
120+
}
121+
]
113122
},
114-
"bundles" : [ ]
123+
"bundles": []
115124
}''')
116125
}
117126
}
@@ -128,11 +137,11 @@ class GenerateResourcesConfigFileTest extends AbstractPluginTest {
128137
with(project) {
129138
outputFile.exists()
130139
matches(outputFile.text, '''{
131-
"resources" : {
132-
"includes" : [ ],
133-
"excludes" : [ ]
140+
"resources": {
141+
"includes": [],
142+
"excludes": []
134143
},
135-
"bundles" : [ ]
144+
"bundles": []
136145
}''')
137146
}
138147
}
@@ -150,13 +159,15 @@ class GenerateResourcesConfigFileTest extends AbstractPluginTest {
150159
with(project) {
151160
outputFile.exists()
152161
matches(outputFile.text, '''{
153-
"resources" : {
154-
"includes" : [ {
155-
"pattern" : "\\\\Qorg/foo/some/resource.txt\\\\E"
156-
} ],
157-
"excludes" : [ ]
162+
"resources": {
163+
"includes": [
164+
{
165+
"pattern": "\\\\Qorg/foo/some/resource.txt\\\\E"
166+
}
167+
],
168+
"excludes": []
158169
},
159-
"bundles" : [ ]
170+
"bundles": []
160171
}''')
161172
}
162173
}
@@ -175,13 +186,15 @@ class GenerateResourcesConfigFileTest extends AbstractPluginTest {
175186
with(project) {
176187
outputFile.exists()
177188
matches(outputFile.text, '''{
178-
"resources" : {
179-
"includes" : [ {
180-
"pattern" : "\\\\Qorg/foo/some/resource.txt\\\\E"
181-
} ],
182-
"excludes" : [ ]
189+
"resources": {
190+
"includes": [
191+
{
192+
"pattern": "\\\\Qorg/foo/some/resource.txt\\\\E"
193+
}
194+
],
195+
"excludes": []
183196
},
184-
"bundles" : [ ]
197+
"bundles": []
185198
}''')
186199
}
187200
}
@@ -199,13 +212,15 @@ class GenerateResourcesConfigFileTest extends AbstractPluginTest {
199212
with(project) {
200213
outputFile.exists()
201214
matches(outputFile.text, '''{
202-
"resources" : {
203-
"includes" : [ {
204-
"pattern" : "\\\\Qorg/foo/some/resource.txt\\\\E"
205-
} ],
206-
"excludes" : [ ]
215+
"resources": {
216+
"includes": [
217+
{
218+
"pattern": "\\\\Qorg/foo/some/resource.txt\\\\E"
219+
}
220+
],
221+
"excludes": []
207222
},
208-
"bundles" : [ ]
223+
"bundles": []
209224
}''')
210225
}
211226
}
@@ -225,11 +240,11 @@ class GenerateResourcesConfigFileTest extends AbstractPluginTest {
225240
with(project) {
226241
outputFile.exists()
227242
matches(outputFile.text, '''{
228-
"resources" : {
229-
"includes" : [ ],
230-
"excludes" : [ ]
243+
"resources": {
244+
"includes": [],
245+
"excludes": []
231246
},
232-
"bundles" : [ ]
247+
"bundles": []
233248
}''')
234249
}
235250
}
@@ -247,11 +262,11 @@ class GenerateResourcesConfigFileTest extends AbstractPluginTest {
247262
with(project) {
248263
outputFile.exists()
249264
matches(outputFile.text, '''{
250-
"resources" : {
251-
"includes" : [ ],
252-
"excludes" : [ ]
265+
"resources": {
266+
"includes": [],
267+
"excludes": []
253268
},
254-
"bundles" : [ ]
269+
"bundles": []
255270
}''')
256271
}
257272
}

‎native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/JavaApplicationWithResourcesFunctionalTest.groovy

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ class JavaApplicationWithResourcesFunctionalTest extends AbstractGraalVMMavenFun
3232
resourcesFile.parentFile.mkdirs()
3333
resourcesFile << """
3434
{
35-
"resources" : {
36-
"includes" : [ ],
37-
"excludes" : [ ]
35+
"resources": {
36+
"includes": [],
37+
"excludes": []
3838
},
39-
"bundles" : [ ]
39+
"bundles": []
4040
}
4141
"""
4242

@@ -49,21 +49,23 @@ class JavaApplicationWithResourcesFunctionalTest extends AbstractGraalVMMavenFun
4949
and:
5050
if (ignoreExistingResourcesConfig) {
5151
matches(file("target/native/generated/generateResourceConfig/resource-config.json").text, '''{
52-
"resources" : {
53-
"includes" : [ {
54-
"pattern" : "\\\\Qmessage.txt\\\\E"
55-
} ],
56-
"excludes" : [ ]
52+
"resources": {
53+
"includes": [
54+
{
55+
"pattern" : "\\\\Qmessage.txt\\\\E"
56+
}
57+
],
58+
"excludes": []
5759
},
58-
"bundles" : [ ]
60+
"bundles": []
5961
}''')
6062
} else {
6163
matches(file("target/native/generated/generateResourceConfig/resource-config.json").text, '''{
62-
"resources" : {
63-
"includes" : [ ],
64-
"excludes" : [ ]
64+
"resources": {
65+
"includes": [],
66+
"excludes": []
6567
},
66-
"bundles" : [ ]
68+
"bundles": []
6769
}''')
6870
}
6971

@@ -102,15 +104,18 @@ class JavaApplicationWithResourcesFunctionalTest extends AbstractGraalVMMavenFun
102104

103105
and:
104106
matches(file("target/native/generated/generateTestResourceConfig/resource-config.json").text, '''{
105-
"resources" : {
106-
"includes" : [ {
107-
"pattern" : "\\\\Qmessage.txt\\\\E"
108-
}, {
109-
"pattern" : "\\\\Qorg/graalvm/demo/expected.txt\\\\E"
110-
} ],
111-
"excludes" : [ ]
107+
"resources": {
108+
"includes": [
109+
{
110+
"pattern": "\\\\Qmessage.txt\\\\E"
111+
},
112+
{
113+
"pattern": "\\\\Qorg/graalvm/demo/expected.txt\\\\E"
114+
}
115+
],
116+
"excludes": []
112117
},
113-
"bundles" : [ ]
118+
"bundles": []
114119
}''')
115120

116121
where:

‎native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/sbom/SBOMGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ private void augmentSBOM(Path baseSBOMPath, Set<ArtifactAdapter> artifacts) thro
252252
}
253253

254254
/* Save the augmented SBOM back to the file */
255-
Files.writeString(baseSBOMPath, sbomJson.toString(4));
255+
Files.writeString(baseSBOMPath, sbomJson.toString(2));
256256
}
257257

258258
/**

0 commit comments

Comments
 (0)