diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingAutoConfiguration.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingAutoConfiguration.java deleted file mode 100644 index b2e14d033..000000000 --- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingAutoConfiguration.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.tencent.cloud.polaris.context.logging; - -import com.tencent.cloud.polaris.context.ConditionalOnPolarisEnabled; - -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; - -/** - * Autoconfiguration for polaris logging. - * - * @author wenxuan70 - */ -@ConditionalOnPolarisEnabled -@EnableConfigurationProperties({PolarisLoggingProperties.class}) -public class PolarisLoggingAutoConfiguration { - - @Bean - public PolarisLoggingProperties polarisLoggingProperties() { - return new PolarisLoggingProperties(); - } -} diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingBootstrapAutoConfiguration.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingBootstrapAutoConfiguration.java deleted file mode 100644 index 41a61762d..000000000 --- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingBootstrapAutoConfiguration.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.tencent.cloud.polaris.context.logging; - -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Import; - -/** - * Bootstrap autoconfiguration for polaris logging. - * - * @author wenxuan70 - */ -@ConditionalOnProperty("spring.cloud.polaris.enabled") -@Import(PolarisLoggingAutoConfiguration.class) -public class PolarisLoggingBootstrapAutoConfiguration { -} diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingProperties.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingProperties.java deleted file mode 100644 index 37940a7d3..000000000 --- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingProperties.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.tencent.cloud.polaris.context.logging; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * The properties for polaris logging. - * - * @author wenxuan70 - */ -@ConfigurationProperties(prefix = "spring.cloud.polaris.logging") -public class PolarisLoggingProperties { - - /** - * logging path. - */ - @Value("${spring.cloud.polaris.logging.path:#{systemProperties['user.dir'] + T(java.io.File).separator + 'polaris' + T(java.io.File).separator + 'logs'}}") - private String path; - - public String getPath() { - return path; - } - - public void setPath(String path) { - System.out.println("设置spring.cloud.polaris.logging.path: " + path); - this.path = path; - } - - @Override - public String toString() { - return "PolarisLoggingProperties{" + - "path='" + path + '\'' + - '}'; - } -} diff --git a/spring-cloud-tencent-polaris-context/src/main/resources/META-INF/spring.factories b/spring-cloud-tencent-polaris-context/src/main/resources/META-INF/spring.factories index 4a8ef0da2..a121e3c26 100644 --- a/spring-cloud-tencent-polaris-context/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-tencent-polaris-context/src/main/resources/META-INF/spring.factories @@ -1,9 +1,7 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration,\ - com.tencent.cloud.polaris.context.config.PolarisContextPostConfiguration,\ - com.tencent.cloud.polaris.context.logging.PolarisLoggingAutoConfiguration + com.tencent.cloud.polaris.context.config.PolarisContextPostConfiguration org.springframework.cloud.bootstrap.BootstrapConfiguration=\ - com.tencent.cloud.polaris.context.config.PolarisContextBootstrapAutoConfiguration,\ - com.tencent.cloud.polaris.context.logging.PolarisLoggingBootstrapAutoConfiguration + com.tencent.cloud.polaris.context.config.PolarisContextBootstrapAutoConfiguration org.springframework.context.ApplicationListener=\ com.tencent.cloud.polaris.context.logging.PolarisLoggingApplicationListener diff --git a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PolarisLoggingSystemPropertyTest.java b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PolarisLoggingSystemPropertyTest.java index 9b96a1a14..71168551d 100644 --- a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PolarisLoggingSystemPropertyTest.java +++ b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PolarisLoggingSystemPropertyTest.java @@ -18,14 +18,10 @@ package com.tencent.cloud.polaris.context; import com.tencent.cloud.polaris.context.logging.PolarisLoggingApplicationListener; -import com.tencent.cloud.polaris.context.logging.PolarisLoggingAutoConfiguration; -import com.tencent.cloud.polaris.context.logging.PolarisLoggingProperties; import com.tencent.polaris.logging.LoggingConsts; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -39,15 +35,10 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @SpringBootTest(classes = PolarisLoggingApplication.class, properties = {"spring.config.location=classpath:bootstrap.yml"}) -@ImportAutoConfiguration(PolarisLoggingAutoConfiguration.class) public class PolarisLoggingSystemPropertyTest { - @Autowired - private PolarisLoggingProperties polarisLoggingProperties; - @Test public void testSystemProperty() { - assertThat(polarisLoggingProperties.getPath()).isEqualTo("/tmp/polaris/logs"); assertThat(System.getProperty(LoggingConsts.LOGGING_PATH_PROPERTY)).isEqualTo("/tmp/polaris/logs"); } } diff --git a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingAutoConfigurationTest.java b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingAutoConfigurationTest.java deleted file mode 100644 index a181103ab..000000000 --- a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingAutoConfigurationTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Tencent is pleased to support the open source community by making Spring Cloud Tencent available. - * - * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. - * - * Licensed under the BSD 3-Clause License (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://opensource.org/licenses/BSD-3-Clause - * - * Unless required by applicable law or agreed to in writing, software distributed - * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR - * CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package com.tencent.cloud.polaris.context.logging; - -import org.junit.jupiter.api.Test; - -import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.test.context.runner.ApplicationContextRunner; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Test for {@link PolarisLoggingAutoConfigurationTest}. - * - * @author wenxuan70 - */ -public class PolarisLoggingAutoConfigurationTest { - - private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() - .withConfiguration(AutoConfigurations.of(PolarisLoggingAutoConfiguration.class)) - .withPropertyValues( - "spring.cloud.polaris.enabled=true", - "spring.cloud.polaris.logging.path=/tmp/polaris/logs" - ); - - @Test - public void testProperties() { - contextRunner.run(context -> { - String loggingPath = context.getEnvironment().getProperty("spring.cloud.polaris.logging.path"); - assertThat(loggingPath).isEqualTo("/tmp/polaris/logs"); - }); - } -}