Reformat.

Author: OlgaMaciaszek

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java

@@ -185,14 +185,13 @@ public void setResourceLoader(ResourceLoader resourceLoader) {
 
 	@Override
 	protected void processAnnotationOnClass(MethodMetadata data, Class<?> clz) {
-			RequestMapping classAnnotation = findMergedAnnotation(clz,
-					RequestMapping.class);
-			if (classAnnotation != null) {
-				LOG.error("Cannot process class: " + clz.getName()
-						+ ". @RequestMapping annotation is not allowed on @FeignClient interfaces.");
-				throw new IllegalArgumentException(
-						"@RequestMapping annotation not allowed on @FeignClient interfaces");
-			}
+		RequestMapping classAnnotation = findMergedAnnotation(clz, RequestMapping.class);
+		if (classAnnotation != null) {
+			LOG.error("Cannot process class: " + clz.getName()
+					+ ". @RequestMapping annotation is not allowed on @FeignClient interfaces.");
+			throw new IllegalArgumentException(
+					"@RequestMapping annotation not allowed on @FeignClient interfaces");
+		}
 	}
 
 	@Override

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java

@@ -184,20 +184,19 @@ public void testProcessAnnotations_SimpleGetMapping() throws Exception {
 
 	@Test
 	public void testProcessAnnotations_Class_Annotations_RequestMapping() {
-		assertThatIllegalArgumentException()
-			.isThrownBy(() -> {
-				Method method = TestTemplate_Class_RequestMapping.class
+		assertThatIllegalArgumentException().isThrownBy(() -> {
+			Method method = TestTemplate_Class_RequestMapping.class
 					.getDeclaredMethod("getSpecificTest", String.class, String.class);
-				contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
-			});
+			contract.parseAndValidateMetadata(method.getDeclaringClass(), method);
+		});
 	}
 
 	@Test
 	public void testProcessAnnotations_Class_AnnotationsGetAllTests() throws Exception {
 		Method method = TestTemplate_Class_Annotations.class
-			.getDeclaredMethod("getAllTests", String.class);
+				.getDeclaredMethod("getAllTests", String.class);
 		MethodMetadata data = contract
-			.parseAndValidateMetadata(method.getDeclaringClass(), method);
+				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
 		assertThat(data.template().url()).isEqualTo("/");
 		assertThat(data.template().method()).isEqualTo("GET");
@@ -264,8 +263,7 @@ public void testProcessAnnotationsOnMethod_Advanced() throws Exception {
 		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
-		assertThat(data.template().url())
-			.isEqualTo("/test/{id}?amount=" + "{amount}");
+		assertThat(data.template().url()).isEqualTo("/test/{id}?amount=" + "{amount}");
 		assertThat(data.template().method()).isEqualTo("PUT");
 		assertThat(data.template().headers().get("Accept").iterator().next())
 				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
@@ -300,8 +298,7 @@ public void testProcessAnnotations_Advanced() throws Exception {
 		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
-		assertThat(data.template().url())
-			.isEqualTo("/test/{id}?amount=" + "{amount}");
+		assertThat(data.template().url()).isEqualTo("/test/{id}?amount=" + "{amount}");
 		assertThat(data.template().method()).isEqualTo("PUT");
 		assertThat(data.template().headers().get("Accept").iterator().next())
 				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
@@ -325,8 +322,7 @@ public void testProcessAnnotations_Aliased() throws Exception {
 		MethodMetadata data = contract
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
-		assertThat(data.template().url())
-			.isEqualTo("/test2?amount=" + "{amount}");
+		assertThat(data.template().url()).isEqualTo("/test2?amount=" + "{amount}");
 		assertThat(data.template().method()).isEqualTo("PUT");
 		assertThat(data.template().headers().get("Accept").iterator().next())
 				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
@@ -386,12 +382,12 @@ public void testProcessAnnotations_NumberFormatParam() throws Exception {
 	public void testProcessAnnotations_Advanced2() throws Exception {
 		Method method = TestTemplate_Advanced.class.getDeclaredMethod("getTest");
 		MethodMetadata data = contract
-			.parseAndValidateMetadata(method.getDeclaringClass(), method);
+				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
 		assertThat(data.template().url()).isEqualTo("/");
 		assertThat(data.template().method()).isEqualTo("GET");
 		assertThat(data.template().headers().get("Accept").iterator().next())
-			.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
+				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
 	}
 
 	@Test
@@ -498,7 +494,7 @@ public void testProcessAnnotations_Fallback() throws Exception {
 				.parseAndValidateMetadata(method.getDeclaringClass(), method);
 
 		assertThat(data.template().url())
-			.isEqualTo("/testfallback/{id}?amount=" + "{amount}");
+				.isEqualTo("/testfallback/{id}?amount=" + "{amount}");
 		assertThat(data.template().method()).isEqualTo("PUT");
 		assertThat(data.template().headers().get("Accept").iterator().next())
 				.isEqualTo(MediaType.APPLICATION_JSON_VALUE);
@@ -658,7 +654,7 @@ public interface TestTemplate_Simple {
 		ResponseEntity<TestObject> getMappingTest(@PathVariable("id") String id);
 
 		@RequestMapping(method = RequestMethod.POST,
-			produces = MediaType.APPLICATION_JSON_VALUE)
+				produces = MediaType.APPLICATION_JSON_VALUE)
 		TestObject postTest(@RequestBody TestObject object);
 
 		@PostMapping(produces = MediaType.APPLICATION_JSON_VALUE)
@@ -671,15 +667,15 @@ public interface TestTemplate_Class_RequestMapping {
 
 		@RequestMapping(value = "/test/{testId}", method = RequestMethod.GET)
 		TestObject getSpecificTest(@PathVariable("classId") String classId,
-			@PathVariable("testId") String testId);
+				@PathVariable("testId") String testId);
 
 	}
 
 	public interface TestTemplate_Class_Annotations {
 
 		@RequestMapping(value = "/test/{testId}", method = RequestMethod.GET)
 		TestObject getSpecificTest(@PathVariable("classId") String classId,
-			@PathVariable("testId") String testId);
+				@PathVariable("testId") String testId);
 
 		@RequestMapping(method = RequestMethod.GET)
 		TestObject getAllTests(@PathVariable("classId") String classId);