Removed blank lines .

pull/391/head
misselvexu 3 years ago
parent c861cdc05e
commit f95ed5afce

@ -21,7 +21,7 @@ import com.tencent.cloud.polaris.circuitbreaker.feign.PolarisFeignBeanPostProces
import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisResponseErrorHandler; import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisResponseErrorHandler;
import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisRestTemplateModifier; import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisRestTemplateModifier;
import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisRestTemplateResponseErrorHandler; import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisRestTemplateResponseErrorHandler;
import com.tencent.cloud.polaris.context.PolarisContextAutoConfiguration; import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
import com.tencent.polaris.api.core.ConsumerAPI; import com.tencent.polaris.api.core.ConsumerAPI;
import com.tencent.polaris.client.api.SDKContext; import com.tencent.polaris.client.api.SDKContext;
import com.tencent.polaris.factory.api.DiscoveryAPIFactory; import com.tencent.polaris.factory.api.DiscoveryAPIFactory;
@ -72,7 +72,6 @@ public class PolarisCircuitBreakerAutoConfiguration {
public PolarisFeignBeanPostProcessor polarisFeignBeanPostProcessor(ConsumerAPI consumerAPI) { public PolarisFeignBeanPostProcessor polarisFeignBeanPostProcessor(ConsumerAPI consumerAPI) {
return new PolarisFeignBeanPostProcessor(consumerAPI); return new PolarisFeignBeanPostProcessor(consumerAPI);
} }
} }
/** /**
@ -99,7 +98,5 @@ public class PolarisCircuitBreakerAutoConfiguration {
PolarisRestTemplateResponseErrorHandler restTemplateResponseErrorHandler) { PolarisRestTemplateResponseErrorHandler restTemplateResponseErrorHandler) {
return new PolarisRestTemplateModifier(restTemplateResponseErrorHandler); return new PolarisRestTemplateModifier(restTemplateResponseErrorHandler);
} }
} }
} }

@ -18,7 +18,7 @@
package com.tencent.cloud.polaris.circuitbreaker; package com.tencent.cloud.polaris.circuitbreaker;
import com.tencent.cloud.polaris.circuitbreaker.config.PolarisRestTemplateAutoConfiguration; import com.tencent.cloud.polaris.circuitbreaker.config.PolarisCircuitBreakerAutoConfiguration;
import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisRestTemplateModifier; import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisRestTemplateModifier;
import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisRestTemplateResponseErrorHandler; import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisRestTemplateResponseErrorHandler;
import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration; import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
@ -35,7 +35,7 @@ import org.springframework.web.client.RestTemplate;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Test For {@link PolarisRestTemplateAutoConfiguration} . * Test For {@link PolarisCircuitBreakerAutoConfiguration} .
* *
* @author <a href="mailto:iskp.me@gmail.com">Palmer Xu</a> 2022-06-28 * @author <a href="mailto:iskp.me@gmail.com">Palmer Xu</a> 2022-06-28
*/ */
@ -45,7 +45,7 @@ public class PolarisRestTemplateAutoConfigurationTest {
.withConfiguration(AutoConfigurations.of( .withConfiguration(AutoConfigurations.of(
PolarisRestTemplateAutoConfigurationTester.class, PolarisRestTemplateAutoConfigurationTester.class,
PolarisContextAutoConfiguration.class, PolarisContextAutoConfiguration.class,
PolarisRestTemplateAutoConfiguration.class)) PolarisCircuitBreakerAutoConfiguration.class))
.withPropertyValues("spring.cloud.polaris.circuitbreaker.enabled=true"); .withPropertyValues("spring.cloud.polaris.circuitbreaker.enabled=true");
@Test @Test
@ -59,7 +59,7 @@ public class PolarisRestTemplateAutoConfigurationTest {
@Configuration @Configuration
@EnableAutoConfiguration @EnableAutoConfiguration
@AutoConfigureBefore(PolarisRestTemplateAutoConfiguration.class) @AutoConfigureBefore(PolarisCircuitBreakerAutoConfiguration.class)
static class PolarisRestTemplateAutoConfigurationTester { static class PolarisRestTemplateAutoConfigurationTester {
@Bean @Bean

@ -39,5 +39,4 @@ public class PolarisRateLimitPropertiesAutoConfiguration {
public RateLimitConfigModifier rateLimitConfigModifier(PolarisRateLimitProperties polarisRateLimitProperties) { public RateLimitConfigModifier rateLimitConfigModifier(PolarisRateLimitProperties polarisRateLimitProperties) {
return new RateLimitConfigModifier(polarisRateLimitProperties); return new RateLimitConfigModifier(polarisRateLimitProperties);
} }
} }

@ -65,5 +65,4 @@ public class LoadBalancerClientFilterBeanPostProcessor implements BeanPostProces
} }
return bean; return bean;
} }
} }

@ -66,5 +66,4 @@ public class LoadBalancerInterceptorBeanPostProcessor implements BeanPostProcess
} }
return bean; return bean;
} }
} }

@ -40,5 +40,4 @@ public class FeignLoadBalancerConfiguration {
ServerIntrospector serverIntrospector) { ServerIntrospector serverIntrospector) {
return new PolarisFeignLoadBalancer(lb, clientConfig, serverIntrospector); return new PolarisFeignLoadBalancer(lb, clientConfig, serverIntrospector);
} }
} }

@ -47,5 +47,4 @@ public class RibbonConfiguration {
polarisNearByRouterProperties, polarisMetadataRouterProperties, polarisNearByRouterProperties, polarisMetadataRouterProperties,
polarisRuleBasedRouterProperties, iClientConfig); polarisRuleBasedRouterProperties, iClientConfig);
} }
} }

@ -63,5 +63,4 @@ public class RouterAutoConfiguration {
public RouterRuleLabelResolver routerRuleLabelResolver(ServiceRuleManager serviceRuleManager) { public RouterRuleLabelResolver routerRuleLabelResolver(ServiceRuleManager serviceRuleManager) {
return new RouterRuleLabelResolver(serviceRuleManager); return new RouterRuleLabelResolver(serviceRuleManager);
} }
} }

@ -44,5 +44,4 @@ public class PolarisMetadataRouterProperties {
"enabled=" + enabled + "enabled=" + enabled +
'}'; '}';
} }
} }

@ -44,5 +44,4 @@ public class PolarisNearByRouterProperties {
"enabled=" + enabled + "enabled=" + enabled +
'}'; '}';
} }
} }

@ -83,5 +83,4 @@ public final class FeignExpressionLabelUtils {
public static String getQueryValue(RequestTemplate request, String key) { public static String getQueryValue(RequestTemplate request, String key) {
return ExpressionLabelUtils.getFirstValue(request.queries(), key); return ExpressionLabelUtils.getFirstValue(request.queries(), key);
} }
} }

@ -69,5 +69,4 @@ public class PolarisCachingSpringLoadBalanceFactory extends CachingSpringLoadBal
return loadBalancer; return loadBalancer;
} }
} }

@ -90,5 +90,4 @@ public class PolarisFeignLoadBalancer extends FeignLoadBalancer {
return routerContext; return routerContext;
} }
} }

@ -53,5 +53,4 @@ public class PolarisLoadBalancerAutoConfiguration {
public RouterAPI routerAPI(SDKContext polarisContext) throws PolarisException { public RouterAPI routerAPI(SDKContext polarisContext) throws PolarisException {
return RouterAPIFactory.createRouterAPIByContext(polarisContext); return RouterAPIFactory.createRouterAPIByContext(polarisContext);
} }
} }

Loading…
Cancel
Save