Skip to content

Commit 6ecb29a

Browse files
committed
Adjust formatting and make params consistent
See spring-attic#5239
1 parent c33aa71 commit 6ecb29a

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

spring-cloud-dataflow-core/src/main/java/org/springframework/cloud/dataflow/core/AppBootSchemaVersion.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,18 @@
2929
public enum AppBootSchemaVersion {
3030

3131
BOOT2("2"),
32-
BOOT3( "3");
32+
BOOT3("3");
3333

3434
private String bootVersion;
3535

3636
AppBootSchemaVersion(String bootVersion) {
3737
this.bootVersion = bootVersion;
3838
}
39+
3940
public static AppBootSchemaVersion defaultVersion() {
4041
return BOOT2;
4142
}
43+
4244
public static AppBootSchemaVersion fromBootVersion(String bootVersion) {
4345
return Arrays.stream(AppBootSchemaVersion.values())
4446
.filter((bv) -> bv.bootVersion.equals(bootVersion))

spring-cloud-dataflow-registry/src/main/java/org/springframework/cloud/dataflow/registry/service/DefaultAppRegistryService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ public List<AppRegistration> importAll(boolean overwrite, Resource... resources)
399399
String[] typeName = lineSplit[0].split("\\.");
400400
if (typeName.length < 2 || typeName.length > 3) {
401401
throw new IllegalArgumentException("Invalid format for app key '" + lineSplit[0]
402-
+ "'in file. Must be <type>.<name> or <type>.<name>.metadata or <type>.<name>.bootVersion");
402+
+ "'in file. Must be <type>.<name> or <type>.<name>.metadata");
403403
}
404404
String type = typeName[0].trim();
405405
String name = typeName[1].trim();

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/AppRegistryController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public void register(
259259
public void register(
260260
@PathVariable("type") ApplicationType type,
261261
@PathVariable("name") String name,
262-
@RequestParam(name = "boot-version", required = false) AppBootSchemaVersion bootVersion,
262+
@RequestParam(name = "bootVersion", required = false) AppBootSchemaVersion bootVersion,
263263
@RequestParam("uri") String uri,
264264
@RequestParam(name = "metadata-uri", required = false) String metadataUri,
265265
@RequestParam(value = "force", defaultValue = "false") boolean force) {

0 commit comments

Comments
 (0)