study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

#734 -> update pkg name

Browse Source
This commit is contained in:
fangjian0423
2019-07-08 22:42:08 +08:00
parent aa03ddbbe2
commit 52ac888164
477 changed files with 1584 additions and 1259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ConditionalOnNacosDiscoveryEnabled.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ConditionalOnNacosDiscoveryEnabled.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos;
package com.alibaba.cloud.nacos;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

9
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java
View File

@@ -14,15 +14,16 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos;
package com.alibaba.cloud.nacos;
import com.alibaba.cloud.nacos.registry.NacosAutoServiceRegistration;
import com.alibaba.cloud.nacos.registry.NacosRegistration;
import com.alibaba.cloud.nacos.registry.NacosServiceRegistry;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.alibaba.nacos.registry.NacosAutoServiceRegistration;
import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration;
import org.springframework.cloud.alibaba.nacos.registry.NacosServiceRegistry;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;

2
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos;
package com.alibaba.cloud.nacos;
import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.naming.NamingMaintainFactory;

2
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosServiceInstance.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/NacosServiceInstance.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos;
package com.alibaba.cloud.nacos;
import org.springframework.cloud.client.DefaultServiceInstance;
import org.springframework.cloud.client.ServiceInstance;

6
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosDiscoveryClient.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClient.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.discovery;
package com.alibaba.cloud.nacos.discovery;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.NacosServiceInstance;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.api.naming.pojo.ListView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.alibaba.nacos.NacosServiceInstance;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;

8
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.discovery;
package com.alibaba.cloud.nacos.discovery;
import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.alibaba.nacos.ConditionalOnNacosDiscoveryEnabled;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.client.CommonsClientAutoConfiguration;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;

7
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosWatch.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/NacosWatch.java
View File

@@ -14,23 +14,20 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.discovery;
package com.alibaba.cloud.nacos.discovery;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.naming.listener.EventListener;
import com.alibaba.nacos.api.naming.pojo.ListView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.client.discovery.event.HeartbeatEvent;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;

5
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java
View File

@@ -14,18 +14,19 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.discovery.configclient;
package com.alibaba.cloud.nacos.discovery.configclient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.config.server.config.ConfigServerProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.StringUtils;
import javax.annotation.PostConstruct;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
/**
* Extra configuration for config server if it happens to be registered with Nacos.
*

7
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java
View File

@@ -14,18 +14,19 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.discovery.configclient;
package com.alibaba.cloud.nacos.discovery.configclient;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
import org.springframework.context.annotation.Configuration;
import javax.annotation.PostConstruct;
import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
/**
* Helper for config client that wants to lookup the config server via discovery.
*

4
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpoint.java
View File

@@ -14,13 +14,14 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.endpoint;
package com.alibaba.cloud.nacos.endpoint;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.ServiceInfo;
@@ -28,7 +29,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
/**
* Endpoint for nacos discovery, get nacos properties and subscribed services

7
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java
View File

@@ -14,14 +14,15 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.endpoint;
package com.alibaba.cloud.nacos.endpoint;
import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.cloud.alibaba.nacos.ConditionalOnNacosDiscoveryEnabled;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

2
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistration.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistration.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.registry;
package com.alibaba.cloud.nacos.registry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/registry/NacosRegistration.java
View File

@@ -14,9 +14,8 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.registry;
package com.alibaba.cloud.nacos.registry;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.client.DefaultServiceInstance;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.ManagementServerPortUtils;
@@ -30,6 +29,7 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.naming.NamingService;
/**

4
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosServiceRegistry.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java
View File

@@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.registry;
package com.alibaba.cloud.nacos.registry;
import java.util.List;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.client.serviceregistry.Registration;
import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
import org.springframework.util.StringUtils;

2
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/ConditionalOnRibbonNacos.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/ConditionalOnRibbonNacos.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.ribbon;
package com.alibaba.cloud.nacos.ribbon;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

2
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/ExtendBalancer.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/ExtendBalancer.java
View File

@@ -1,4 +1,4 @@
package org.springframework.cloud.alibaba.nacos.ribbon;
package com.alibaba.cloud.nacos.ribbon;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.client.naming.core.Balancer;

5
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfiguration.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfiguration.java
View File

@@ -14,12 +14,13 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.ribbon;
package com.alibaba.cloud.nacos.ribbon;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.ServerList;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

4
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRule.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosRule.java
View File

@@ -1,4 +1,4 @@
package org.springframework.cloud.alibaba.nacos.ribbon;
package com.alibaba.cloud.nacos.ribbon;
import java.util.List;
import java.util.Objects;
@@ -8,9 +8,9 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.util.CollectionUtils;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;

2
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServer.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServer.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.ribbon;
package com.alibaba.cloud.nacos.ribbon;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.netflix.loadbalancer.Server;

2
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerIntrospector.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServerIntrospector.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.ribbon;
package com.alibaba.cloud.nacos.ribbon;
import java.util.Map;

4
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/NacosServerList.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.ribbon;
package com.alibaba.cloud.nacos.ribbon;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.AbstractServerList;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import java.util.ArrayList;
import java.util.List;

5
alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/RibbonNacosAutoConfiguration.java → alibaba-nacos-discovery-spring-cloud/src/main/java/com/alibaba/cloud/nacos/ribbon/RibbonNacosAutoConfiguration.java
View File

@@ -14,12 +14,13 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.ribbon;
package com.alibaba.cloud.nacos.ribbon;
import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.alibaba.nacos.ConditionalOnNacosDiscoveryEnabled;
import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
import org.springframework.cloud.netflix.ribbon.RibbonClients;
import org.springframework.cloud.netflix.ribbon.SpringClientFactory;

12
alibaba-nacos-discovery-spring-cloud/src/main/resources/META-INF/spring.factories
View File

@@ -1,8 +1,8 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration,\
org.springframework.cloud.alibaba.nacos.ribbon.RibbonNacosAutoConfiguration,\
org.springframework.cloud.alibaba.nacos.endpoint.NacosDiscoveryEndpointAutoConfiguration,\
org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration,\
org.springframework.cloud.alibaba.nacos.discovery.configclient.NacosConfigServerAutoConfiguration
com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration,\
com.alibaba.cloud.nacos.ribbon.RibbonNacosAutoConfiguration,\
com.alibaba.cloud.nacos.endpoint.NacosDiscoveryEndpointAutoConfiguration,\
com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration,\
com.alibaba.cloud.nacos.discovery.configclient.NacosConfigServerAutoConfiguration
org.springframework.cloud.bootstrap.BootstrapConfiguration=\
org.springframework.cloud.alibaba.nacos.discovery.configclient.NacosDiscoveryClientConfigServiceBootstrapConfiguration
com.alibaba.cloud.nacos.discovery.configclient.NacosDiscoveryClientConfigServiceBootstrapConfiguration

6
alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClientTests.java → alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryClientTests.java
View File

@@ -14,26 +14,26 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos;
package com.alibaba.cloud.nacos;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClient;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.api.naming.pojo.ListView;
import org.junit.Test;
import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClient;
import org.springframework.cloud.client.ServiceInstance;
import static com.alibaba.cloud.nacos.test.NacosMockTest.serviceInstance;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.springframework.cloud.alibaba.nacos.test.NacosMockTest.serviceInstance;
/**
* @author xiaojing

9
alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java → alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java
View File

@@ -14,13 +14,17 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.registry;
package com.alibaba.cloud.nacos.registry;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.Enumeration;
import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@@ -31,9 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.cloud.commons.util.InetUtils;
import org.springframework.context.annotation.Configuration;

9
alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationIpTests.java → alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpTests.java
View File

@@ -14,7 +14,11 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.registry;
package com.alibaba.cloud.nacos.registry;
import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -22,9 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;

13
alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java → alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java
View File

@@ -14,13 +14,17 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.registry;
package com.alibaba.cloud.nacos.registry;
import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import static com.alibaba.cloud.nacos.registry.NacosRegistration.MANAGEMENT_CONTEXT_PATH;
import static com.alibaba.cloud.nacos.registry.NacosRegistration.MANAGEMENT_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
import static org.springframework.cloud.alibaba.nacos.registry.NacosRegistration.MANAGEMENT_PORT;
import static org.springframework.cloud.alibaba.nacos.registry.NacosRegistration.MANAGEMENT_CONTEXT_PATH;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -28,9 +32,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;

9
alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationPortTests.java → alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationPortTests.java
View File

@@ -14,7 +14,11 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.registry;
package com.alibaba.cloud.nacos.registry;
import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -27,9 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;

11
alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationTests.java → alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java
View File

@@ -14,10 +14,15 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.registry;
package com.alibaba.cloud.nacos.registry;
import java.util.Map;
import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import com.alibaba.cloud.nacos.endpoint.NacosDiscoveryEndpoint;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,10 +30,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.alibaba.nacos.endpoint.NacosDiscoveryEndpoint;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.cloud.commons.util.InetUtils;
import org.springframework.context.annotation.Configuration;

5
alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfigurationTests.java → alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfigurationTests.java
View File

@@ -1,4 +1,6 @@
package org.springframework.cloud.alibaba.nacos.ribbon;
package com.alibaba.cloud.nacos.ribbon;
import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import com.netflix.client.config.DefaultClientConfigImpl;
import com.netflix.client.config.IClientConfig;
@@ -6,7 +8,6 @@ import org.junit.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.context.annotation.Bean;

6
alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerListTests.java → alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosServerListTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.ribbon;
package com.alibaba.cloud.nacos.ribbon;
import java.util.ArrayList;
import java.util.Collections;
@@ -22,19 +22,19 @@ import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.netflix.client.config.IClientConfig;
import org.junit.Test;
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import static com.alibaba.cloud.nacos.test.NacosMockTest.serviceInstance;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.springframework.cloud.alibaba.nacos.test.NacosMockTest.serviceInstance;
/**
* @author xiaojing

2
alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/test/CommonTestConfig.java → alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/test/CommonTestConfig.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.test;
package com.alibaba.cloud.nacos.test;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.context.annotation.Bean;

2
alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/test/NacosMockTest.java → alibaba-nacos-discovery-spring-cloud/src/test/java/com/alibaba/cloud/nacos/test/NacosMockTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.cloud.alibaba.nacos.test;
package com.alibaba.cloud.nacos.test;
import java.util.Map;
import java.util.UUID;