Skip to content

Commit

Permalink
fix checkstyle
Browse files Browse the repository at this point in the history
  • Loading branch information
shedfreez committed Nov 18, 2024
1 parent 97fb657 commit aee15ca
Show file tree
Hide file tree
Showing 19 changed files with 28 additions and 36 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

package com.tencent.cloud.metadata.config;

import com.netflix.zuul.ZuulFilter;
import com.tencent.cloud.common.constant.OrderConstant;
import com.tencent.cloud.metadata.core.DecodeTransferMetadataReactiveFilter;
import com.tencent.cloud.metadata.core.DecodeTransferMetadataServletFilter;
Expand All @@ -27,7 +26,6 @@
import com.tencent.cloud.metadata.core.EncodeTransferMedataScgEnhancedPlugin;
import com.tencent.cloud.metadata.core.EncodeTransferMedataWebClientEnhancedPlugin;
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.ConditionalOnProperty;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import com.tencent.cloud.common.util.JacksonUtils;
import com.tencent.cloud.common.util.UrlUtils;
import com.tencent.cloud.metadata.provider.ReactiveMetadataProvider;
import com.tencent.cloud.polaris.context.config.PolarisContextProperties;
import com.tencent.polaris.api.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import com.tencent.cloud.common.util.JacksonUtils;
import com.tencent.cloud.common.util.UrlUtils;
import com.tencent.cloud.metadata.provider.ServletMetadataProvider;
import com.tencent.cloud.polaris.context.config.PolarisContextProperties;
import com.tencent.polaris.api.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
@SpringBootTest(webEnvironment = RANDOM_PORT,
classes = PolarisCircuitBreakerFeignIntegrationTest.TestConfig.class,
properties = {
"feign.hystrix.enabled=false",
"feign.hystrix.enabled=false",
"spring.cloud.gateway.enabled=false",
"feign.circuitbreaker.enabled=true",
"spring.cloud.polaris.namespace=" + NAMESPACE_TEST,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,51 +19,32 @@


import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.reflect.InvocationTargetException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

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.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.rpc.enhancement.config.RpcEnhancementReporterProperties;
import com.tencent.polaris.api.core.ConsumerAPI;
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.factory.api.DiscoveryAPIFactory;
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 org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
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.cloud.client.circuitbreaker.CircuitBreakerFactory;
import org.springframework.cloud.client.circuitbreaker.Customizer;
import org.springframework.cloud.client.circuitbreaker.NoFallbackAvailableException;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.PolarisFeignCircuitBreakerTargeter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
Expand All @@ -72,7 +53,6 @@
import org.springframework.web.bind.annotation.RequestParam;

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.assertThatThrownBy;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ private void customRegisterPolarisConfigPublishChangeListener(PolarisPropertySou

/**
* Just for junit test.
* @param registered if the polaris config property auto refresh is registered
*/
public void setRegistered(boolean registered) {
this.registered.set(registered);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public TsfConsulConfigRefreshEventListener polarisAdaptorTsfConsulRefreshEventLi
* 1、关闭Spring Cloud Consul Config配置开关(如果开启Consul Config配置开关,那么初始化的是tsf自身的类ConfigController)
* 2、开启北极星配置(本类通过注解@ConditionalOnPolarisConfigEnabled开启)
* 3、tsf.config.instance.released-config.lookup.enabled的开关是打开的(默认不配置就是打开的).
* @return polarisAdaptorTsfConfigController
*/
@Bean
@ConditionalOnMissingBean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public PolarisAdaptorTsfConfigController() {

/**
* 兼容目前TSF控制台的用法,提供北极星查询当前SDK配置接口.
* @return config map
*/
@RequestMapping("/tsf/innerApi/config/findAllConfig")
public Map<String, Object> findAllConfig() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ private EncryptConfig() {

/**
* 是否开启配置,判断 password 是否为空.
* @return true:开启;false:关闭
*/
public static Boolean getEnabled() {
return !StringUtils.isEmpty(password);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ public static NewService.Check createCheck(Integer port, ConsulHeartbeatProperti
}

/**
*
* @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}
*/
public static boolean shouldRegisterManagement(AutoServiceRegistrationProperties autoServiceRegistrationProperties,
Expand All @@ -167,6 +171,9 @@ && getManagementPort(properties, context) != null
}

/**
*
* @param properties consul discovery properties
* @param context application context
* @return the port of the Management Service
*/
public static Integer getManagementPort(ConsulDiscoveryProperties properties, ApplicationContext context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
import org.springframework.beans.factory.SmartInitializingSingleton;
import org.springframework.beans.factory.annotation.Autowired;
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.ConditionalOnProperty;
import org.springframework.cloud.netflix.ribbon.RibbonClients;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@

import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
import org.springframework.cloud.openfeign.ribbon.FeignLoadBalancer;
import org.springframework.util.CollectionUtils;

import static com.tencent.cloud.common.constant.ContextConstant.UTF_8;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import org.springframework.core.env.Environment;
import org.springframework.core.io.Resource;

public class MockApplicationContext implements org.springframework.context.ApplicationContext{
public class MockApplicationContext implements org.springframework.context.ApplicationContext {
@Override
public String getId() {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
import static org.mockito.Mockito.when;

/**
* Test for {@link RouterContextFactory}
* Test for {@link RouterContextFactory}.
*
* @author lepdou 2022-10-09
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ public static String compressBase64Encode(byte[] byteData, String charsetName) t


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];
int num;
while ((num = gzip.read(buf)) != -1) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ public static void innerDestroy() {

/**
* Used for config data.
* @return configSDKContext
*/
public static SDKContext innerGetConfigSDKContext() {
if (configSDKContext == null) {
Expand Down Expand Up @@ -209,6 +210,7 @@ public SDKContext getConfigSDKContext() {

/**
* Used for config data.
* @param context sdk context
*/
public static void setConfigSDKContext(SDKContext context) {
if (configSDKContext == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@
* @author Haotian Zhang
*/
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);

Expand Down Expand Up @@ -96,6 +98,7 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
polarisEnvProperties.put("spring.cloud.tencent.metadata.content.zone", zone);
}

LOGGER.debug("polaris-env-properties:{}", polarisEnvProperties);
MapPropertySource propertySource = new MapPropertySource("polaris-env-properties", polarisEnvProperties);
environment.getPropertySources().addFirst(propertySource);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import java.util.Map;

import com.tencent.polaris.api.utils.StringUtils;
import org.apache.commons.logging.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -37,8 +36,10 @@
* @author Haotian Zhang
*/
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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;

/**
* Autoconfiguration of stat reporter.
Expand Down

0 comments on commit aee15ca

Please sign in to comment.