Skip to content

Commit 810f615

Browse files
committed
Add support for configuration file format to the initializr-actuator module
1 parent d819723 commit 810f615

File tree

8 files changed

+34
-0
lines changed

8 files changed

+34
-0
lines changed

initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocument.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ public class ProjectRequestDocument {
4848

4949
private String language;
5050

51+
private String configurationFileFormat;
52+
5153
private String packaging;
5254

5355
private String packageName;
@@ -116,6 +118,14 @@ public void setLanguage(String language) {
116118
this.language = language;
117119
}
118120

121+
public String getConfigurationFileFormat() {
122+
return this.configurationFileFormat;
123+
}
124+
125+
public void setConfigurationFileFormat(String configurationFileFormat) {
126+
this.configurationFileFormat = configurationFileFormat;
127+
}
128+
119129
public String getPackaging() {
120130
return this.packaging;
121131
}
@@ -177,6 +187,7 @@ public String toString() {
177187
.add("artifactId='" + this.artifactId + "'")
178188
.add("javaVersion='" + this.javaVersion + "'")
179189
.add("language='" + this.language + "'")
190+
.add("configurationFileFormat='" + this.configurationFileFormat + "'")
180191
.add("packaging='" + this.packaging + "'")
181192
.add("packageName='" + this.packageName + "'")
182193
.add("version=" + this.version)
@@ -331,6 +342,8 @@ public static class ErrorStateInformation {
331342

332343
private Boolean language;
333344

345+
private Boolean configurationFileFormat;
346+
334347
private Boolean packaging;
335348

336349
private Boolean type;
@@ -359,6 +372,14 @@ public void setLanguage(Boolean language) {
359372
this.language = language;
360373
}
361374

375+
public Boolean getConfigurationFileFormat() {
376+
return this.configurationFileFormat;
377+
}
378+
379+
public void setConfigurationFileFormat(Boolean configurationFileFormat) {
380+
this.configurationFileFormat = configurationFileFormat;
381+
}
382+
362383
public Boolean getPackaging() {
363384
return this.packaging;
364385
}
@@ -396,6 +417,7 @@ public String toString() {
396417
return new StringJoiner(", ", "{", "}").add("invalid=" + this.invalid)
397418
.add("javaVersion=" + this.javaVersion)
398419
.add("language=" + this.language)
420+
.add("configurationFileFormat=" + this.configurationFileFormat)
399421
.add("packaging=" + this.packaging)
400422
.add("type=" + this.type)
401423
.add("dependencies=" + this.dependencies)

initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ public ProjectRequestDocument createDocument(ProjectRequestEvent event) {
6868
document.triggerError().setLanguage(true);
6969
}
7070

71+
document.setConfigurationFileFormat(request.getConfigurationFileFormat());
72+
if (StringUtils.hasText(request.getConfigurationFileFormat())
73+
&& metadata.getConfigurationFileFormats().get(request.getConfigurationFileFormat()) == null) {
74+
document.triggerError().setConfigurationFileFormat(true);
75+
}
76+
7177
document.setPackaging(request.getPackaging());
7278
if (StringUtils.hasText(request.getPackaging())
7379
&& metadata.getPackagings().get(request.getPackaging()) == null) {

initializr-actuator/src/test/resources/stat/request-invalid-dependencies.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"artifactId": "test",
77
"javaVersion": "1.8",
88
"language": "java",
9+
"configurationFileFormat": "properties",
910
"packaging": "jar",
1011
"packageName": "com.example.acme.test",
1112
"version": {

initializr-actuator/src/test/resources/stat/request-invalid-java-version.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"artifactId": "test",
77
"javaVersion": "1.2",
88
"language": "java",
9+
"configurationFileFormat": "properties",
910
"packaging": "jar",
1011
"packageName": "com.example.acme.test",
1112
"version": {

initializr-actuator/src/test/resources/stat/request-invalid-language.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"artifactId": "test",
77
"javaVersion": "1.8",
88
"language": "c",
9+
"configurationFileFormat": "properties",
910
"packaging": "jar",
1011
"packageName": "com.example.acme.test",
1112
"version": {

initializr-actuator/src/test/resources/stat/request-invalid-type.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"artifactId": "test",
66
"javaVersion": "1.8",
77
"language": "java",
8+
"configurationFileFormat": "properties",
89
"packaging": "jar",
910
"packageName": "com.example.acme.test",
1011
"version": {

initializr-actuator/src/test/resources/stat/request-no-client.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"artifactId": "test",
77
"javaVersion": "1.8",
88
"language": "java",
9+
"configurationFileFormat": "properties",
910
"packaging": "jar",
1011
"packageName": "com.example.acme.test",
1112
"version": {

initializr-actuator/src/test/resources/stat/request-simple.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"artifactId": "project",
77
"javaVersion": "1.8",
88
"language": "java",
9+
"configurationFileFormat": "properties",
910
"packaging": "jar",
1011
"packageName": "com.example.acme.project",
1112
"version": {

0 commit comments

Comments
 (0)