SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Formatting changes

Browse Source
This commit is contained in:
Ryan Baxter
2020-10-19 10:55:12 -04:00
parent 96b3cc9a39
commit 22aa32b187
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/ConfigMapsFromFilePathsTests.java
View File

@@ -46,7 +46,7 @@ import static org.springframework.cloud.kubernetes.config.ConfigMapTestUtil.crea
"spring.cloud.kubernetes.config.paths="
+ ConfigMapsFromFilePathsTests.FIRST_FILE_NAME_FULL_PATH + ","
+ ConfigMapsFromFilePathsTests.SECOND_FILE_NAME_FULL_PATH + ","
+ ConfigMapsFromFilePathsTests.FIRST_FILE_NAME_DUPLICATED_FULL_PATH})
+ ConfigMapsFromFilePathsTests.FIRST_FILE_NAME_DUPLICATED_FULL_PATH })
public class ConfigMapsFromFilePathsTests {
protected static final String FILES_ROOT_PATH = "/tmp/scktests";
@@ -68,9 +68,8 @@ public class ConfigMapsFromFilePathsTests {
protected static final String UNUSED_FILE_NAME_FULL_PATH = FILES_ROOT_PATH + "/"
+ UNUSED_FILE_NAME;
protected static final String FIRST_FILE_NAME_DUPLICATED_FULL_PATH = FILES_ROOT_PATH + "/"
+ FILES_SUB_PATH + "/"
+ FIRST_FILE_NAME;
protected static final String FIRST_FILE_NAME_DUPLICATED_FULL_PATH = FILES_ROOT_PATH
+ "/" + FILES_SUB_PATH + "/" + FIRST_FILE_NAME;
@ClassRule
public static KubernetesServer server = new KubernetesServer();
@@ -100,7 +99,8 @@ public class ConfigMapsFromFilePathsTests {
createFileWithContent(SECOND_FILE_NAME_FULL_PATH, "bean.farewell=Bye from path!");
createFileWithContent(UNUSED_FILE_NAME_FULL_PATH,
"bean.morning=Morning from path!");
createFileWithContent(FIRST_FILE_NAME_DUPLICATED_FULL_PATH, "bean.bonjour=Bonjour from path!");
createFileWithContent(FIRST_FILE_NAME_DUPLICATED_FULL_PATH,
"bean.bonjour=Bonjour from path!");
}
@AfterClass
@@ -136,7 +136,7 @@ public class ConfigMapsFromFilePathsTests {
@Test
public void bonjourInputShouldReturnPropertyFromDuplicatedFile() {
this.webClient.get().uri("/api/bonjour").exchange().expectStatus().isOk()
.expectBody().jsonPath("content").isEqualTo("Bonjour from path!");
.expectBody().jsonPath("content").isEqualTo("Bonjour from path!");
}
}

2
spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/example/GreetingController.java
View File

@@ -54,7 +54,7 @@ public class GreetingController {
@RequestMapping("/api/bonjour")
public ResponseMessage bonjour(
@RequestParam(value = "name", defaultValue = "World") String name) {
@RequestParam(value = "name", defaultValue = "World") String name) {
return new ResponseMessage(String.format(this.properties.getBonjour(), name));
}