checkstyle compliance

alftheo · alftheo · commit 8a50c5547aed · 2021-03-03T18:49:49.000+02:00
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/resource/ResourceController.java
@@ -108,8 +108,8 @@ public String retrieve(@PathVariable String name, @PathVariable String profile,
 
 	@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 {
+			ServletWebRequest request, @RequestParam(defaultValue = "true") boolean resolvePlaceholders)
+			throws IOException {
 		return retrieve(request, name, profile, null, path, resolvePlaceholders);
 	}
 
@@ -177,8 +177,7 @@ public byte[] binary(@PathVariable String name, @PathVariable String profile, @P
 	@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 {
+			ServletWebRequest request) throws IOException {
 		return binary(request, name, profile, null, path);
 	}
 
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/resource/ResourceControllerIntegrationTests.java
@@ -20,7 +20,6 @@
 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;
@@ -150,8 +149,7 @@ public void resourceNoLabelHttp() throws Exception {
 
 	@Test
 	public void binaryResourceNoLabel() throws Exception {
-		when(this.repository.findOne("foo", "default", null))
-			.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", "")
