fix checkstyle

pull/1458/head
shedfreewu 10 months ago
parent 97fb657dfa
commit aee15cab99

@ -18,7 +18,6 @@
package com.tencent.cloud.metadata.config; package com.tencent.cloud.metadata.config;
import com.netflix.zuul.ZuulFilter;
import com.tencent.cloud.common.constant.OrderConstant; import com.tencent.cloud.common.constant.OrderConstant;
import com.tencent.cloud.metadata.core.DecodeTransferMetadataReactiveFilter; import com.tencent.cloud.metadata.core.DecodeTransferMetadataReactiveFilter;
import com.tencent.cloud.metadata.core.DecodeTransferMetadataServletFilter; import com.tencent.cloud.metadata.core.DecodeTransferMetadataServletFilter;
@ -27,7 +26,6 @@ import com.tencent.cloud.metadata.core.EncodeTransferMedataRestTemplateEnhancedP
import com.tencent.cloud.metadata.core.EncodeTransferMedataScgEnhancedPlugin; import com.tencent.cloud.metadata.core.EncodeTransferMedataScgEnhancedPlugin;
import com.tencent.cloud.metadata.core.EncodeTransferMedataWebClientEnhancedPlugin; import com.tencent.cloud.metadata.core.EncodeTransferMedataWebClientEnhancedPlugin;
import com.tencent.cloud.metadata.core.EncodeTransferMetadataZuulEnhancedPlugin; import com.tencent.cloud.metadata.core.EncodeTransferMetadataZuulEnhancedPlugin;
import com.tencent.cloud.polaris.context.config.PolarisContextProperties;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

@ -27,7 +27,6 @@ import com.tencent.cloud.common.metadata.MetadataContextHolder;
import com.tencent.cloud.common.util.JacksonUtils; import com.tencent.cloud.common.util.JacksonUtils;
import com.tencent.cloud.common.util.UrlUtils; import com.tencent.cloud.common.util.UrlUtils;
import com.tencent.cloud.metadata.provider.ReactiveMetadataProvider; import com.tencent.cloud.metadata.provider.ReactiveMetadataProvider;
import com.tencent.cloud.polaris.context.config.PolarisContextProperties;
import com.tencent.polaris.api.utils.StringUtils; import com.tencent.polaris.api.utils.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

@ -32,7 +32,6 @@ import com.tencent.cloud.common.metadata.MetadataContextHolder;
import com.tencent.cloud.common.util.JacksonUtils; import com.tencent.cloud.common.util.JacksonUtils;
import com.tencent.cloud.common.util.UrlUtils; import com.tencent.cloud.common.util.UrlUtils;
import com.tencent.cloud.metadata.provider.ServletMetadataProvider; import com.tencent.cloud.metadata.provider.ServletMetadataProvider;
import com.tencent.cloud.polaris.context.config.PolarisContextProperties;
import com.tencent.polaris.api.utils.StringUtils; import com.tencent.polaris.api.utils.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

@ -19,51 +19,32 @@ package com.tencent.cloud.polaris.circuitbreaker.feign;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.google.protobuf.util.JsonFormat; import com.google.protobuf.util.JsonFormat;
import com.tencent.cloud.polaris.circuitbreaker.PolarisCircuitBreakerFactory;
import com.tencent.cloud.polaris.circuitbreaker.config.PolarisCircuitBreakerFeignClientAutoConfiguration; import com.tencent.cloud.polaris.circuitbreaker.config.PolarisCircuitBreakerFeignClientAutoConfiguration;
import com.tencent.cloud.polaris.circuitbreaker.config.PolarisCircuitBreakerProperties;
import com.tencent.cloud.polaris.circuitbreaker.reporter.ExceptionCircuitBreakerReporter;
import com.tencent.cloud.polaris.circuitbreaker.reporter.SuccessCircuitBreakerReporter;
import com.tencent.cloud.polaris.context.PolarisSDKContextManager; import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementReporterProperties;
import com.tencent.polaris.api.core.ConsumerAPI;
import com.tencent.polaris.api.pojo.ServiceKey; import com.tencent.polaris.api.pojo.ServiceKey;
import com.tencent.polaris.circuitbreak.api.CircuitBreakAPI;
import com.tencent.polaris.circuitbreak.factory.CircuitBreakAPIFactory;
import com.tencent.polaris.client.util.Utils; import com.tencent.polaris.client.util.Utils;
import com.tencent.polaris.factory.api.DiscoveryAPIFactory;
import com.tencent.polaris.specification.api.v1.fault.tolerance.CircuitBreakerProto; import com.tencent.polaris.specification.api.v1.fault.tolerance.CircuitBreakerProto;
import com.tencent.polaris.test.common.TestUtils;
import com.tencent.polaris.test.mock.discovery.NamingServer; import com.tencent.polaris.test.mock.discovery.NamingServer;
import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
import org.springframework.cloud.client.circuitbreaker.Customizer;
import org.springframework.cloud.client.circuitbreaker.NoFallbackAvailableException; import org.springframework.cloud.client.circuitbreaker.NoFallbackAvailableException;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.PolarisFeignCircuitBreakerTargeter;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
@ -72,7 +53,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import static com.tencent.polaris.test.common.Consts.NAMESPACE_TEST; import static com.tencent.polaris.test.common.Consts.NAMESPACE_TEST;
import static com.tencent.polaris.test.common.TestUtils.SERVER_ADDRESS_ENV;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;

@ -158,6 +158,7 @@ public abstract class PolarisConfigPropertyAutoRefresher implements ApplicationL
/** /**
* Just for junit test. * Just for junit test.
* @param registered if the polaris config property auto refresh is registered
*/ */
public void setRegistered(boolean registered) { public void setRegistered(boolean registered) {
this.registered.set(registered); this.registered.set(registered);

@ -48,6 +48,7 @@ public class PolarisAdaptorTsfConfigAutoConfiguration {
* 1Spring Cloud Consul ConfigConsul ConfigtsfConfigController * 1Spring Cloud Consul ConfigConsul ConfigtsfConfigController
* 2@ConditionalOnPolarisConfigEnabled * 2@ConditionalOnPolarisConfigEnabled
* 3tsf.config.instance.released-config.lookup.enabled. * 3tsf.config.instance.released-config.lookup.enabled.
* @return polarisAdaptorTsfConfigController
*/ */
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean

@ -53,6 +53,7 @@ public class PolarisAdaptorTsfConfigController {
/** /**
* TSFSDK. * TSFSDK.
* @return config map
*/ */
@RequestMapping("/tsf/innerApi/config/findAllConfig") @RequestMapping("/tsf/innerApi/config/findAllConfig")
public Map<String, Object> findAllConfig() { public Map<String, Object> findAllConfig() {

@ -56,6 +56,7 @@ public final class EncryptConfig {
/** /**
* password . * password .
* @return truefalse
*/ */
public static Boolean getEnabled() { public static Boolean getEnabled() {
return !StringUtils.isEmpty(password); return !StringUtils.isEmpty(password);

@ -157,6 +157,10 @@ public final class ConsulDiscoveryUtil {
} }
/** /**
*
* @param autoServiceRegistrationProperties auto service registration properties
* @param properties consul discovery properties
* @param context application context
* @return if the management service should be registered with the {@link ServiceRegistry} * @return if the management service should be registered with the {@link ServiceRegistry}
*/ */
public static boolean shouldRegisterManagement(AutoServiceRegistrationProperties autoServiceRegistrationProperties, public static boolean shouldRegisterManagement(AutoServiceRegistrationProperties autoServiceRegistrationProperties,
@ -167,6 +171,9 @@ public final class ConsulDiscoveryUtil {
} }
/** /**
*
* @param properties consul discovery properties
* @param context application context
* @return the port of the Management Service * @return the port of the Management Service
*/ */
public static Integer getManagementPort(ConsulDiscoveryProperties properties, ApplicationContext context) { public static Integer getManagementPort(ConsulDiscoveryProperties properties, ApplicationContext context) {

@ -49,7 +49,6 @@ import com.tencent.cloud.rpc.enhancement.resttemplate.EnhancedRestTemplateInterc
import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.beans.factory.SmartInitializingSingleton;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.netflix.ribbon.RibbonClients; import org.springframework.cloud.netflix.ribbon.RibbonClients;

@ -37,7 +37,6 @@ import com.tencent.cloud.polaris.router.PolarisRouterContext;
import org.springframework.cloud.netflix.ribbon.ServerIntrospector; import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer; import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer;
import org.springframework.util.CollectionUtils;
import static com.tencent.cloud.common.constant.ContextConstant.UTF_8; import static com.tencent.cloud.common.constant.ContextConstant.UTF_8;

@ -39,7 +39,7 @@ import org.springframework.core.ResolvableType;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
public class MockApplicationContext implements org.springframework.context.ApplicationContext{ public class MockApplicationContext implements org.springframework.context.ApplicationContext {
@Override @Override
public String getId() { public String getId() {
return null; return null;

@ -51,7 +51,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
/** /**
* Test for {@link RouterContextFactory} * Test for {@link RouterContextFactory}.
* *
* @author lepdou 2022-10-09 * @author lepdou 2022-10-09
*/ */

@ -61,7 +61,9 @@ public final class GzipUtil {
public static byte[] decompress(byte[] zipData) throws IOException { public static byte[] decompress(byte[] zipData) throws IOException {
try (ByteArrayInputStream bis = new ByteArrayInputStream(zipData); GZIPInputStream gzip = new GZIPInputStream(bis); ByteArrayOutputStream bos = new ByteArrayOutputStream()) { try (ByteArrayInputStream bis = new ByteArrayInputStream(zipData);
GZIPInputStream gzip = new GZIPInputStream(bis);
ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
byte[] buf = new byte[256]; byte[] buf = new byte[256];
int num; int num;
while ((num = gzip.read(buf)) != -1) { while ((num = gzip.read(buf)) != -1) {

@ -137,6 +137,7 @@ public class PolarisSDKContextManager {
/** /**
* Used for config data. * Used for config data.
* @return configSDKContext
*/ */
public static SDKContext innerGetConfigSDKContext() { public static SDKContext innerGetConfigSDKContext() {
if (configSDKContext == null) { if (configSDKContext == null) {
@ -209,6 +210,7 @@ public class PolarisSDKContextManager {
/** /**
* Used for config data. * Used for config data.
* @param context sdk context
*/ */
public static void setConfigSDKContext(SDKContext context) { public static void setConfigSDKContext(SDKContext context) {
if (configSDKContext == null) { if (configSDKContext == null) {

@ -36,8 +36,10 @@ import org.springframework.core.env.MapPropertySource;
* @author Haotian Zhang * @author Haotian Zhang
*/ */
public final class PolarisContextEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered { public final class PolarisContextEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered {
/**
public static final int ORDER = Ordered.HIGHEST_PRECEDENCE + 10 - 2; * order before TsfCoreEnvironmentPostProcessor.
*/
public static final int ORDER = Ordered.HIGHEST_PRECEDENCE + 8;
private final Logger LOGGER = LoggerFactory.getLogger(PolarisContextEnvironmentPostProcessor.class); private final Logger LOGGER = LoggerFactory.getLogger(PolarisContextEnvironmentPostProcessor.class);
@ -96,6 +98,7 @@ public final class PolarisContextEnvironmentPostProcessor implements Environment
polarisEnvProperties.put("spring.cloud.tencent.metadata.content.zone", zone); polarisEnvProperties.put("spring.cloud.tencent.metadata.content.zone", zone);
} }
LOGGER.debug("polaris-env-properties:{}", polarisEnvProperties);
MapPropertySource propertySource = new MapPropertySource("polaris-env-properties", polarisEnvProperties); MapPropertySource propertySource = new MapPropertySource("polaris-env-properties", polarisEnvProperties);
environment.getPropertySources().addFirst(propertySource); environment.getPropertySources().addFirst(propertySource);
} }

@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.tencent.polaris.api.utils.StringUtils; import com.tencent.polaris.api.utils.StringUtils;
import org.apache.commons.logging.Log;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -37,8 +36,10 @@ import org.springframework.core.env.MapPropertySource;
* @author Haotian Zhang * @author Haotian Zhang
*/ */
public final class TsfCoreEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered { public final class TsfCoreEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered {
/**
public static final int ORDER = Ordered.HIGHEST_PRECEDENCE + 10 - 1; * order after PolarisContextEnvironmentPostProcessor.
*/
public static final int ORDER = Ordered.HIGHEST_PRECEDENCE + 9;
private final Logger LOGGER = LoggerFactory.getLogger(TsfCoreEnvironmentPostProcessor.class); private final Logger LOGGER = LoggerFactory.getLogger(TsfCoreEnvironmentPostProcessor.class);

@ -23,7 +23,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
/** /**
* Autoconfiguration of stat reporter. * Autoconfiguration of stat reporter.

Loading…
Cancel
Save