From 4d0caec7eea4458757ad22a252c19d16a54cf630 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Tue, 13 Apr 2021 15:17:00 +0200 Subject: [PATCH] Fix checkstyle and formatting. --- .../cloud/openfeign/FeignClientBuilder.java | 9 +++---- .../openfeign/FeignClientFactoryBean.java | 1 - .../FeignBuilderCustomizerTests.java | 5 ++-- .../openfeign/FeignClientBuilderTests.java | 27 ++++++++++++------- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientBuilder.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientBuilder.java index 963c1d9f..5e2ea8f1 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientBuilder.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientBuilder.java @@ -72,11 +72,10 @@ public class FeignClientBuilder { } /** - * Applies a {@link FeignBuilderCustomizer} to the underlying {@link Feign.Builder}. - * May be called multiple times. - * - * @param customizer applied in the same order as supplied here - * after applying customizers found in the context. + * Applies a {@link FeignBuilderCustomizer} to the underlying + * {@link Feign.Builder}. May be called multiple times. + * @param customizer applied in the same order as supplied here after applying + * customizers found in the context. * @return the {@link Builder} with the customizer added */ public Builder customize(final FeignBuilderCustomizer customizer) { diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java index 620a3bad..c7a91fb0 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java @@ -17,7 +17,6 @@ package org.springframework.cloud.openfeign; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignBuilderCustomizerTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignBuilderCustomizerTests.java index f240556b..b2016037 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignBuilderCustomizerTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignBuilderCustomizerTests.java @@ -82,9 +82,10 @@ public class FeignBuilderCustomizerTests { @Test public void testBuildCustomizerOrderedWithAdditional() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( - FeignBuilderCustomizerTests.SampleConfiguration3.class); + FeignBuilderCustomizerTests.SampleConfiguration3.class); - FeignClientFactoryBean clientFactoryBean = context.getBean(FeignClientFactoryBean.class); + FeignClientFactoryBean clientFactoryBean = context + .getBean(FeignClientFactoryBean.class); clientFactoryBean.addCustomizer(builder -> builder.logLevel(Logger.Level.BASIC)); clientFactoryBean.addCustomizer(Feign.Builder::doNotCloseAfterDecode); FeignContext feignContext = context.getBean(FeignContext.class); diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientBuilderTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientBuilderTests.java index ed4c58ba..85171fb0 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientBuilderTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientBuilderTests.java @@ -58,16 +58,18 @@ public class FeignClientBuilderTests { return method.getDefaultValue(); } - private static void assertFactoryBeanField(final FeignClientBuilder.Builder builder, final String fieldName, - final Object expectedValue) { + private static void assertFactoryBeanField(final FeignClientBuilder.Builder builder, + final String fieldName, final Object expectedValue) { final Object value = getFactoryBeanField(builder, fieldName); - assertThat(value).as("Expected value for the field '" + fieldName + "':").isEqualTo(expectedValue); + assertThat(value).as("Expected value for the field '" + fieldName + "':") + .isEqualTo(expectedValue); } @SuppressWarnings("unchecked") - private static T getFactoryBeanField(final FeignClientBuilder.Builder builder, final String fieldName) { - final Field factoryBeanField = ReflectionUtils.findField(FeignClientBuilder.Builder.class, - "feignClientFactoryBean"); + private static T getFactoryBeanField(final FeignClientBuilder.Builder builder, + final String fieldName) { + final Field factoryBeanField = ReflectionUtils + .findField(FeignClientBuilder.Builder.class, "feignClientFactoryBean"); ReflectionUtils.makeAccessible(factoryBeanField); final FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) ReflectionUtils .getField(factoryBeanField, builder); @@ -138,7 +140,7 @@ public class FeignClientBuilderTests { .fallback(TestFeignClientFallback.class) .fallbackFactory(TestFeignClientFallbackFactory.class).decode404(true) .url("Url/").path("/Path").contextId("TestContext") - .customize(Feign.Builder::doNotCloseAfterDecode);; + .customize(Feign.Builder::doNotCloseAfterDecode); // then: assertFactoryBeanField(builder, "applicationContext", this.applicationContext); @@ -154,7 +156,8 @@ public class FeignClientBuilderTests { assertFactoryBeanField(builder, "fallback", TestFeignClientFallback.class); assertFactoryBeanField(builder, "fallbackFactory", TestFeignClientFallbackFactory.class); - List additionalCustomizers = getFactoryBeanField(builder, "additionalCustomizers"); + List additionalCustomizers = getFactoryBeanField(builder, + "additionalCustomizers"); assertThat(additionalCustomizers).hasSize(1); } @@ -162,8 +165,12 @@ public class FeignClientBuilderTests { public void forType_build() { // given: Mockito.when(this.applicationContext.getBean(FeignContext.class)) - .thenThrow(new ClosedFileSystemException()); // throw an unusual exception - // in the + .thenThrow(new ClosedFileSystemException()); // throw + // an + // unusual + // exception + // in + // the // FeignClientFactoryBean final FeignClientBuilder.Builder builder = this.feignClientBuilder .forType(TestClient.class, "TestClient");