Merge remote-tracking branch 'upstream/master'

pull/364/head
fangjian0423 6 years ago
commit f136ad1aab

@ -24,7 +24,7 @@ jobs:
- ~/.m2 - ~/.m2
- run: - run:
name: "Running build" name: "Running build"
command: ./mvnw -Pspring -Pdocs clean install cobertura:cobertura -U -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn command: ./mvnw -Pspring -Pdocs clean install -U -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
- run: - run:
name: "Aggregate test results" name: "Aggregate test results"
when: always when: always

@ -81,8 +81,7 @@
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version> <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version> <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
<gmavenplus-plugin.version>1.6</gmavenplus-plugin.version> <gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
<cobertura.version>2.1.1</cobertura.version> <jacoco.version>0.7.9</jacoco.version>
<cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
</properties> </properties>
<modules> <modules>
@ -166,25 +165,10 @@
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
<artifactId>cobertura-runtime</artifactId>
<version>${cobertura.version}</version>
<scope>provided</scope>
<type>pom</type>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -208,30 +192,25 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.jacoco</groupId>
<artifactId>cobertura-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>${cobertura-maven-plugin.version}</version> <version>${jacoco.version}</version>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>5.0.3</version>
</dependency>
</dependencies>
<configuration> <configuration>
<quiet>true</quiet> <destFile>target/coverage-reports/jacoco-unit.exec</destFile>
<formats> <dataFile>target/coverage-reports/jacoco-unit.exec</dataFile>
<format>html</format>
<format>xml</format>
</formats>
<check/>
<check />
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <id>jacoco-initialize</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>jacoco-site</id>
<phase>test</phase>
<goals> <goals>
<goal>cobertura</goal> <goal>report</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>

@ -453,26 +453,4 @@
</pluginRepositories> </pluginRepositories>
</profile> </profile>
</profiles> </profiles>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

@ -49,28 +49,5 @@
</build> </build>
</profile> </profile>
</profiles> </profiles>
<build>
<pluginManagement>
<plugins>
<!-- put here your original plugin configuration for the children -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

@ -23,28 +23,11 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

@ -29,25 +29,4 @@
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

@ -25,25 +25,4 @@
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

@ -27,28 +27,11 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

@ -34,14 +34,6 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -55,15 +47,6 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

@ -48,14 +48,6 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -69,15 +61,6 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

@ -33,14 +33,6 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -54,15 +46,6 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

@ -20,26 +20,4 @@
<module>nacos-discovery-consumer-example</module> <module>nacos-discovery-consumer-example</module>
<module>nacos-discovery-provider-example</module> <module>nacos-discovery-provider-example</module>
</modules> </modules>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

@ -35,14 +35,6 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -56,15 +48,6 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

@ -33,14 +33,6 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -54,15 +46,6 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

@ -20,26 +20,4 @@
<module>nacos-gateway-discovery-example</module> <module>nacos-gateway-discovery-example</module>
<module>nacos-gateway-provider-example</module> <module>nacos-gateway-provider-example</module>
</modules> </modules>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

@ -33,14 +33,6 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -54,15 +46,6 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

@ -40,14 +40,6 @@
</modules> </modules>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -57,16 +49,6 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

@ -40,14 +40,6 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -61,15 +53,6 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

@ -27,28 +27,11 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

@ -51,14 +51,6 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -72,15 +64,6 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

@ -16,14 +16,6 @@
<description>api for sentinel dubbo example</description> <description>api for sentinel dubbo example</description>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -33,15 +25,6 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

@ -40,14 +40,6 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -61,15 +53,6 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

@ -39,14 +39,6 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -60,15 +52,6 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

@ -35,14 +35,6 @@
</dependencies> </dependencies>
<build> <build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -56,15 +48,6 @@
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

@ -82,28 +82,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<instrumentation>
<excludes>
<exclude>org/springframework/cloud/alibaba/nacos/**.*class</exclude>
</excludes>
</instrumentation>
<check/>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

@ -1,230 +1,230 @@
/* ///*
* Copyright (C) 2018 the original author or authors. // * Copyright (C) 2018 the original author or authors.
* // *
* Licensed under the Apache License, Version 2.0 (the "License"); // * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. // * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at // * You may obtain a copy of the License at
* // *
* http://www.apache.org/licenses/LICENSE-2.0 // * http://www.apache.org/licenses/LICENSE-2.0
* // *
* Unless required by applicable law or agreed to in writing, software // * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, // * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and // * See the License for the specific language governing permissions and
* limitations under the License. // * limitations under the License.
*/ // */
//
package org.springframework.cloud.alibaba.sentinel.datasource; //package org.springframework.cloud.alibaba.sentinel.datasource;
//
import static org.junit.Assert.assertEquals; //import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; //import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; //import static org.junit.Assert.assertNull;
//
import org.junit.Test; //import org.junit.Test;
import org.springframework.cloud.alibaba.sentinel.datasource.config.ApolloDataSourceProperties; //import org.springframework.cloud.alibaba.sentinel.datasource.config.ApolloDataSourceProperties;
import org.springframework.cloud.alibaba.sentinel.datasource.config.DataSourcePropertiesConfiguration; //import org.springframework.cloud.alibaba.sentinel.datasource.config.DataSourcePropertiesConfiguration;
import org.springframework.cloud.alibaba.sentinel.datasource.config.FileDataSourceProperties; //import org.springframework.cloud.alibaba.sentinel.datasource.config.FileDataSourceProperties;
import org.springframework.cloud.alibaba.sentinel.datasource.config.NacosDataSourceProperties; //import org.springframework.cloud.alibaba.sentinel.datasource.config.NacosDataSourceProperties;
import org.springframework.cloud.alibaba.sentinel.datasource.config.ZookeeperDataSourceProperties; //import org.springframework.cloud.alibaba.sentinel.datasource.config.ZookeeperDataSourceProperties;
//
/** ///**
* @author <a href="mailto:fangjian0423@gmail.com">Jim</a> // * @author <a href="mailto:fangjian0423@gmail.com">Jim</a>
*/ // */
public class DataSourcePropertiesConfigurationTests { //public class DataSourcePropertiesConfigurationTests {
//
@Test // @Test
public void testFileAttr() { // public void testFileAttr() {
DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration(); // DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration();
assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0, // assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0,
dataSourcePropertiesConfiguration.getValidField().size()); // dataSourcePropertiesConfiguration.getValidField().size());
assertNull("DataSourcePropertiesConfiguration valid properties was not null", // assertNull("DataSourcePropertiesConfiguration valid properties was not null",
dataSourcePropertiesConfiguration.getValidDataSourceProperties()); // dataSourcePropertiesConfiguration.getValidDataSourceProperties());
//
FileDataSourceProperties fileDataSourceProperties = buildFileProperties(); // FileDataSourceProperties fileDataSourceProperties = buildFileProperties();
//
dataSourcePropertiesConfiguration.setFile(fileDataSourceProperties); // dataSourcePropertiesConfiguration.setFile(fileDataSourceProperties);
//
assertEquals( // assertEquals(
"DataSourcePropertiesConfiguration valid field size was wrong after set file attribute", // "DataSourcePropertiesConfiguration valid field size was wrong after set file attribute",
1, dataSourcePropertiesConfiguration.getValidField().size()); // 1, dataSourcePropertiesConfiguration.getValidField().size());
assertNotNull( // assertNotNull(
"DataSourcePropertiesConfiguration file properties was null after set file attribute", // "DataSourcePropertiesConfiguration file properties was null after set file attribute",
dataSourcePropertiesConfiguration.getFile()); // dataSourcePropertiesConfiguration.getFile());
assertNotNull( // assertNotNull(
"DataSourcePropertiesConfiguration valid properties was null after set file attribute", // "DataSourcePropertiesConfiguration valid properties was null after set file attribute",
dataSourcePropertiesConfiguration.getValidDataSourceProperties()); // dataSourcePropertiesConfiguration.getValidDataSourceProperties());
} // }
//
@Test // @Test
public void testNacosAttr() { // public void testNacosAttr() {
DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration(); // DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration();
assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0, // assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0,
dataSourcePropertiesConfiguration.getValidField().size()); // dataSourcePropertiesConfiguration.getValidField().size());
assertNull("DataSourcePropertiesConfiguration valid properties was not null", // assertNull("DataSourcePropertiesConfiguration valid properties was not null",
dataSourcePropertiesConfiguration.getValidDataSourceProperties()); // dataSourcePropertiesConfiguration.getValidDataSourceProperties());
//
NacosDataSourceProperties nacosDataSourceProperties = buildNacosProperties(); // NacosDataSourceProperties nacosDataSourceProperties = buildNacosProperties();
//
dataSourcePropertiesConfiguration.setNacos(nacosDataSourceProperties); // dataSourcePropertiesConfiguration.setNacos(nacosDataSourceProperties);
//
assertEquals( // assertEquals(
"DataSourcePropertiesConfiguration valid field size was wrong after set nacos attribute", // "DataSourcePropertiesConfiguration valid field size was wrong after set nacos attribute",
1, dataSourcePropertiesConfiguration.getValidField().size()); // 1, dataSourcePropertiesConfiguration.getValidField().size());
assertNotNull( // assertNotNull(
"DataSourcePropertiesConfiguration nacos properties was null after set nacos attribute", // "DataSourcePropertiesConfiguration nacos properties was null after set nacos attribute",
dataSourcePropertiesConfiguration.getNacos()); // dataSourcePropertiesConfiguration.getNacos());
assertNotNull( // assertNotNull(
"DataSourcePropertiesConfiguration valid properties was null after set nacos attribute", // "DataSourcePropertiesConfiguration valid properties was null after set nacos attribute",
dataSourcePropertiesConfiguration.getValidDataSourceProperties()); // dataSourcePropertiesConfiguration.getValidDataSourceProperties());
} // }
//
@Test // @Test
public void testZKAttr() { // public void testZKAttr() {
DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration(); // DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration();
assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0, // assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0,
dataSourcePropertiesConfiguration.getValidField().size()); // dataSourcePropertiesConfiguration.getValidField().size());
assertNull("DataSourcePropertiesConfiguration valid properties was not null", // assertNull("DataSourcePropertiesConfiguration valid properties was not null",
dataSourcePropertiesConfiguration.getValidDataSourceProperties()); // dataSourcePropertiesConfiguration.getValidDataSourceProperties());
//
ZookeeperDataSourceProperties zookeeperDataSourceProperties = buildZKProperties(); // ZookeeperDataSourceProperties zookeeperDataSourceProperties = buildZKProperties();
//
dataSourcePropertiesConfiguration.setZk(zookeeperDataSourceProperties); // dataSourcePropertiesConfiguration.setZk(zookeeperDataSourceProperties);
//
assertEquals( // assertEquals(
"DataSourcePropertiesConfiguration valid field size was wrong after set zk attribute", // "DataSourcePropertiesConfiguration valid field size was wrong after set zk attribute",
1, dataSourcePropertiesConfiguration.getValidField().size()); // 1, dataSourcePropertiesConfiguration.getValidField().size());
assertNotNull( // assertNotNull(
"DataSourcePropertiesConfiguration zk properties was null after set zk attribute", // "DataSourcePropertiesConfiguration zk properties was null after set zk attribute",
dataSourcePropertiesConfiguration.getZk()); // dataSourcePropertiesConfiguration.getZk());
assertNotNull( // assertNotNull(
"DataSourcePropertiesConfiguration valid properties was null after set zk attribute", // "DataSourcePropertiesConfiguration valid properties was null after set zk attribute",
dataSourcePropertiesConfiguration.getValidDataSourceProperties()); // dataSourcePropertiesConfiguration.getValidDataSourceProperties());
} // }
//
@Test // @Test
public void testApolloAttr() { // public void testApolloAttr() {
DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration(); // DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration();
assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0, // assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0,
dataSourcePropertiesConfiguration.getValidField().size()); // dataSourcePropertiesConfiguration.getValidField().size());
assertNull("DataSourcePropertiesConfiguration valid properties was not null", // assertNull("DataSourcePropertiesConfiguration valid properties was not null",
dataSourcePropertiesConfiguration.getValidDataSourceProperties()); // dataSourcePropertiesConfiguration.getValidDataSourceProperties());
//
ApolloDataSourceProperties apolloDataSourceProperties = buildApolloProperties(); // ApolloDataSourceProperties apolloDataSourceProperties = buildApolloProperties();
//
dataSourcePropertiesConfiguration.setApollo(apolloDataSourceProperties); // dataSourcePropertiesConfiguration.setApollo(apolloDataSourceProperties);
//
assertEquals( // assertEquals(
"DataSourcePropertiesConfiguration valid field size was wrong after set apollo attribute", // "DataSourcePropertiesConfiguration valid field size was wrong after set apollo attribute",
1, dataSourcePropertiesConfiguration.getValidField().size()); // 1, dataSourcePropertiesConfiguration.getValidField().size());
assertNotNull( // assertNotNull(
"DataSourcePropertiesConfiguration apollo properties was null after set apollo attribute", // "DataSourcePropertiesConfiguration apollo properties was null after set apollo attribute",
dataSourcePropertiesConfiguration.getApollo()); // dataSourcePropertiesConfiguration.getApollo());
assertNotNull( // assertNotNull(
"DataSourcePropertiesConfiguration valid properties was null after set apollo attribute", // "DataSourcePropertiesConfiguration valid properties was null after set apollo attribute",
dataSourcePropertiesConfiguration.getValidDataSourceProperties()); // dataSourcePropertiesConfiguration.getValidDataSourceProperties());
} // }
//
@Test // @Test
public void testMultiAttr() { // public void testMultiAttr() {
DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration(); // DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration();
assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0, // assertEquals("DataSourcePropertiesConfiguration valid field size was wrong", 0,
dataSourcePropertiesConfiguration.getValidField().size()); // dataSourcePropertiesConfiguration.getValidField().size());
assertNull("DataSourcePropertiesConfiguration valid properties was not null", // assertNull("DataSourcePropertiesConfiguration valid properties was not null",
dataSourcePropertiesConfiguration.getValidDataSourceProperties()); // dataSourcePropertiesConfiguration.getValidDataSourceProperties());
//
FileDataSourceProperties fileDataSourceProperties = buildFileProperties(); // FileDataSourceProperties fileDataSourceProperties = buildFileProperties();
NacosDataSourceProperties nacosDataSourceProperties = buildNacosProperties(); // NacosDataSourceProperties nacosDataSourceProperties = buildNacosProperties();
//
dataSourcePropertiesConfiguration.setFile(fileDataSourceProperties); // dataSourcePropertiesConfiguration.setFile(fileDataSourceProperties);
dataSourcePropertiesConfiguration.setNacos(nacosDataSourceProperties); // dataSourcePropertiesConfiguration.setNacos(nacosDataSourceProperties);
//
assertEquals( // assertEquals(
"DataSourcePropertiesConfiguration valid field size was wrong after set file and nacos attribute", // "DataSourcePropertiesConfiguration valid field size was wrong after set file and nacos attribute",
2, dataSourcePropertiesConfiguration.getValidField().size()); // 2, dataSourcePropertiesConfiguration.getValidField().size());
assertNull( // assertNull(
"DataSourcePropertiesConfiguration valid properties was not null after set file and nacos attribute", // "DataSourcePropertiesConfiguration valid properties was not null after set file and nacos attribute",
dataSourcePropertiesConfiguration.getValidDataSourceProperties()); // dataSourcePropertiesConfiguration.getValidDataSourceProperties());
} // }
//
@Test // @Test
public void testFileConstructor() { // public void testFileConstructor() {
DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration( // DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration(
buildFileProperties()); // buildFileProperties());
assertEquals( // assertEquals(
"DataSourcePropertiesConfiguration file constructor valid field size was wrong", // "DataSourcePropertiesConfiguration file constructor valid field size was wrong",
1, dataSourcePropertiesConfiguration.getValidField().size()); // 1, dataSourcePropertiesConfiguration.getValidField().size());
assertNotNull( // assertNotNull(
"DataSourcePropertiesConfiguration file constructor valid properties was null", // "DataSourcePropertiesConfiguration file constructor valid properties was null",
dataSourcePropertiesConfiguration.getValidDataSourceProperties()); // dataSourcePropertiesConfiguration.getValidDataSourceProperties());
} // }
//
@Test // @Test
public void testNacosConstructor() { // public void testNacosConstructor() {
DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration( // DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration(
buildNacosProperties()); // buildNacosProperties());
assertEquals( // assertEquals(
"DataSourcePropertiesConfiguration nacos constructor valid field size was wrong", // "DataSourcePropertiesConfiguration nacos constructor valid field size was wrong",
1, dataSourcePropertiesConfiguration.getValidField().size()); // 1, dataSourcePropertiesConfiguration.getValidField().size());
assertNotNull( // assertNotNull(
"DataSourcePropertiesConfiguration nacos constructor valid properties was null", // "DataSourcePropertiesConfiguration nacos constructor valid properties was null",
dataSourcePropertiesConfiguration.getValidDataSourceProperties()); // dataSourcePropertiesConfiguration.getValidDataSourceProperties());
} // }
//
@Test // @Test
public void testApolloConstructor() { // public void testApolloConstructor() {
DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration( // DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration(
buildApolloProperties()); // buildApolloProperties());
assertEquals( // assertEquals(
"DataSourcePropertiesConfiguration apollo constructor valid field size was wrong", // "DataSourcePropertiesConfiguration apollo constructor valid field size was wrong",
1, dataSourcePropertiesConfiguration.getValidField().size()); // 1, dataSourcePropertiesConfiguration.getValidField().size());
assertNotNull( // assertNotNull(
"DataSourcePropertiesConfiguration apollo constructor valid properties was null", // "DataSourcePropertiesConfiguration apollo constructor valid properties was null",
dataSourcePropertiesConfiguration.getValidDataSourceProperties()); // dataSourcePropertiesConfiguration.getValidDataSourceProperties());
} // }
//
@Test // @Test
public void testZKConstructor() { // public void testZKConstructor() {
DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration( // DataSourcePropertiesConfiguration dataSourcePropertiesConfiguration = new DataSourcePropertiesConfiguration(
buildZKProperties()); // buildZKProperties());
assertEquals( // assertEquals(
"DataSourcePropertiesConfiguration zk constructor valid field size was wrong", // "DataSourcePropertiesConfiguration zk constructor valid field size was wrong",
1, dataSourcePropertiesConfiguration.getValidField().size()); // 1, dataSourcePropertiesConfiguration.getValidField().size());
assertNotNull( // assertNotNull(
"DataSourcePropertiesConfiguration zk constructor valid properties was null", // "DataSourcePropertiesConfiguration zk constructor valid properties was null",
dataSourcePropertiesConfiguration.getValidDataSourceProperties()); // dataSourcePropertiesConfiguration.getValidDataSourceProperties());
} // }
//
private FileDataSourceProperties buildFileProperties() { // private FileDataSourceProperties buildFileProperties() {
FileDataSourceProperties fileDataSourceProperties = new FileDataSourceProperties(); // FileDataSourceProperties fileDataSourceProperties = new FileDataSourceProperties();
//
fileDataSourceProperties.setFile("/tmp/test.json"); // fileDataSourceProperties.setFile("/tmp/test.json");
fileDataSourceProperties.setBufSize(1024); // fileDataSourceProperties.setBufSize(1024);
fileDataSourceProperties.setRecommendRefreshMs(2000); // fileDataSourceProperties.setRecommendRefreshMs(2000);
return fileDataSourceProperties; // return fileDataSourceProperties;
} // }
//
private NacosDataSourceProperties buildNacosProperties() { // private NacosDataSourceProperties buildNacosProperties() {
NacosDataSourceProperties nacosDataSourceProperties = new NacosDataSourceProperties(); // NacosDataSourceProperties nacosDataSourceProperties = new NacosDataSourceProperties();
nacosDataSourceProperties.setServerAddr("127.0.0.1:8848"); // nacosDataSourceProperties.setServerAddr("127.0.0.1:8848");
nacosDataSourceProperties.setDataId("sentinel"); // nacosDataSourceProperties.setDataId("sentinel");
nacosDataSourceProperties.setGroupId("custom-group"); // nacosDataSourceProperties.setGroupId("custom-group");
return nacosDataSourceProperties; // return nacosDataSourceProperties;
} // }
//
private ApolloDataSourceProperties buildApolloProperties() { // private ApolloDataSourceProperties buildApolloProperties() {
ApolloDataSourceProperties apolloDataSourceProperties = new ApolloDataSourceProperties(); // ApolloDataSourceProperties apolloDataSourceProperties = new ApolloDataSourceProperties();
apolloDataSourceProperties.setFlowRulesKey("test-key"); // apolloDataSourceProperties.setFlowRulesKey("test-key");
apolloDataSourceProperties.setDefaultFlowRuleValue("dft-val"); // apolloDataSourceProperties.setDefaultFlowRuleValue("dft-val");
apolloDataSourceProperties.setNamespaceName("namespace"); // apolloDataSourceProperties.setNamespaceName("namespace");
return apolloDataSourceProperties; // return apolloDataSourceProperties;
} // }
//
private ZookeeperDataSourceProperties buildZKProperties() { // private ZookeeperDataSourceProperties buildZKProperties() {
ZookeeperDataSourceProperties zookeeperDataSourceProperties = new ZookeeperDataSourceProperties(); // ZookeeperDataSourceProperties zookeeperDataSourceProperties = new ZookeeperDataSourceProperties();
//
zookeeperDataSourceProperties.setServerAddr("localhost:2181"); // zookeeperDataSourceProperties.setServerAddr("localhost:2181");
zookeeperDataSourceProperties.setPath("/path"); // zookeeperDataSourceProperties.setPath("/path");
return zookeeperDataSourceProperties; // return zookeeperDataSourceProperties;
} // }
//
} //}

@ -20,26 +20,4 @@
<module>spring-cloud-starter-stream-rocketmq</module> <module>spring-cloud-starter-stream-rocketmq</module>
<module>spring-cloud-starter-bus-rocketmq</module> <module>spring-cloud-starter-bus-rocketmq</module>
</modules> </modules>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

@ -17,26 +17,4 @@
<module>spring-cloud-starter-alicloud-schedulerx</module> <module>spring-cloud-starter-alicloud-schedulerx</module>
<module>spring-cloud-starter-alicloud-sms</module> <module>spring-cloud-starter-alicloud-sms</module>
</modules> </modules>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<inherited>false</inherited>
<configuration>
<skip>true</skip>
<check/>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>
Loading…
Cancel
Save