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

restore useDefaultLabel parameter in ResourceController (#1822)

Browse Source 
Co-authored-by: Alf Potgieter <AlfP@discovery.co.za>
This commit is contained in:
Alftheo Potgieter
2021-03-11 01:22:22 +02:00
committed by GitHub
parent 587cc97b4c
commit dcf35c6745
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceController.java
View File

@@ -106,6 +106,13 @@ public class ResourceController {
return retrieve(request, name, profile, label, path, resolvePlaceholders);
}
@RequestMapping(value = "/{name}/{profile}/{path:.*}", params = "useDefaultLabel")
public String retrieveDefault(@PathVariable String name, @PathVariable String profile, @PathVariable String path,
ServletWebRequest request, @RequestParam(defaultValue = "true") boolean resolvePlaceholders)
throws IOException {
return retrieve(request, name, profile, null, path, resolvePlaceholders);
}
private String getFilePath(ServletWebRequest request, String name, String profile, String label) {
String stem;
if (label != null) {
@@ -167,6 +174,13 @@ public class ResourceController {
return binary(request, name, profile, label, path);
}
@RequestMapping(value = "/{name}/{profile}/{path:.*}", params = "useDefaultLabel",
produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
public byte[] binaryDefault(@PathVariable String name, @PathVariable String profile, @PathVariable String path,
ServletWebRequest request) throws IOException {
return binary(request, name, profile, null, path);
}
/*
* Used only for unit tests.
*/

11
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerIntegrationTests.java
View File

@@ -20,7 +20,6 @@ import java.util.HashMap;
import java.util.Map;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
@@ -122,7 +121,6 @@ public class ResourceControllerIntegrationTests {
verify(this.resources).findOne("foo", "default", "master", "foo.txt");
}
@Ignore
@Test
public void resourceNoLabel() throws Exception {
when(this.repository.findOne("foo", "default", null, false))
@@ -135,7 +133,6 @@ public class ResourceControllerIntegrationTests {
verify(this.resources).findOne("foo", "default", null, "foo.txt");
}
@Ignore
@Test
public void resourceNoLabelHttp() throws Exception {
when(this.repository.findOne("foo", "default", null, false))
@@ -144,23 +141,21 @@ public class ResourceControllerIntegrationTests {
.thenReturn(new ClassPathResource("resource-controller/foo.txt"));
ResponseEntity<String> response = new TestRestTemplate()
.getForEntity("http://localhost:" + port + "/foo/default/master/foo.txt", String.class);
.getForEntity("http://localhost:" + port + "/foo/default/foo.txt?useDefaultLabel", String.class);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
verify(this.repository).findOne("foo", "default", null, false);
verify(this.resources).findOne("foo", "default", null, "foo.txt");
}
@Ignore
@Test
public void binaryResourceNoLabel() throws Exception {
when(this.repository.findOne("foo", "default", null, false))
.thenReturn(new Environment("foo", "default", "master"));
when(this.repository.findOne("foo", "default", null)).thenReturn(new Environment("foo", "default", "master"));
when(this.resources.findOne("foo", "default", null, "foo.txt"))
.thenReturn(new ClassPathResource("resource-controller/foo.txt"));
this.mvc.perform(MockMvcRequestBuilders.get("/foo/default/foo.txt").param("useDefaultLabel", "")
.header(HttpHeaders.ACCEPT, MimeTypeUtils.APPLICATION_OCTET_STREAM_VALUE))
.andExpect(MockMvcResultMatchers.status().isOk());
verify(this.repository).findOne("foo", "default", null, false);
verify(this.repository).findOne("foo", "default", null);
verify(this.resources).findOne("foo", "default", null, "foo.txt");
}