Refactor providerdata process (#64)

* Update Travis CI Link Address

Update Travis CI Link Address

* Fix issue24 (#41)

* fix temp push

* update version 5.2.1-SNAPSHOT

* fix test case

* fix jetty version,and fix rest api for dataInfoIds

* fix hashcode test

* fix working to init bug

* fix start task log

* fix Watcher can't get providate data,retry and finally return new

* add data server list api

* add server list api

* remove log

* fix isssue 21

* add query by id function

* fix issue 22

* delay client off process and sync data process to working status

* fix data connet meta error

* fix inject NotifyDataSyncHandler

* fix start log

* add send sub log

* fix subscriber to send log

* fix word cache clientid

* add clientoff delay time

* fix clientOffDelayMs

* fix jetty version

* fix version to 5.2.1 release

* fix version

* fix .travis.yml

* fix test case

* fix

* fix test sync case

* fix test case

* fix test case

* fix case

* fix notify online no connect break,and add connect log

* add test case

* add test case

* fix test case

* fix format

* fix resource test case

* fix

* Upgrade version to 5.2.1 for release (#40)

* Fix version 521 (#42)

* fix temp push

* update version 5.2.1-SNAPSHOT

* fix test case

* fix jetty version,and fix rest api for dataInfoIds

* fix hashcode test

* fix working to init bug

* fix start task log

* fix Watcher can't get providate data,retry and finally return new

* add data server list api

* add server list api

* remove log

* fix isssue 21

* add query by id function

* fix issue 22

* delay client off process and sync data process to working status

* fix data connet meta error

* fix inject NotifyDataSyncHandler

* fix start log

* add send sub log

* fix subscriber to send log

* fix word cache clientid

* add clientoff delay time

* fix clientOffDelayMs

* fix jetty version

* fix version to 5.2.1 release

* fix version to 5.2.1 for release

* fix version

* fix .travis.yml

* fix test case

* fix

* fix test sync case

* fix test case

* fix test case

* fix case

* fix notify online no connect break,and add connect log

* add test case

* add test case

* fix test case

* fix format

* fix resource test case

* fix

* remove data numberOfReplicas

* fix jraft version 1.2.5

* fix push confirm error,and fix datum update version,pub threadpool config,add accesslimit service

* add switch renew and expire

* implement renew enable/disable switch

* fix data client exechange log

* fix datum fetch connect error

* bugfix CacheService: set version zero when first sub and get datum error

* fix clean task for fetch

* bugfix DatumCache: Forget to clean up the index in datumCache.putSnapshot

* fix fetch datum word cache

* fix test case time

* fix test cast

* fix test case

* fix tast case

* fix ut case: StopPushDataSwitchTest

* ut case：renew module

* fix ut case：TempPublisherTest

* fix version,and merge new

* bugfix ut case: increase sleep time

* fix ut case：RenewTest

* fix version and fix callback executor,fix log error

* fix ut case：RenewTest format

* fix pom version

* fix ut case：do not run parallelly

* refactor providerdata process

Author: Synex-wh

.travis.yml

@@ -4,14 +4,14 @@ sudo: false
 dist: trusty
 
 jdk:
-  - oraclejdk8
+- oraclejdk8
 
 install:
-  - mvn clean install -DskipTests -B -V
-  - mvn test
+- mvn clean install -DskipTests -B -V
+- mvn test
 
 script:
-  - sh ./tools/check_format.sh
+- sh ./tools/check_format.sh
 
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
+- bash <(curl -s https://codecov.io/bash)

README.md

@@ -1,9 +1,9 @@
 # SOFARegistry
 
-[![Build Status](https://travis-ci.com/alipay/sofa-registry.svg?branch=master)](https://travis-ci.com/alipay/sofa-registry)
+[![Build Status](https://travis-ci.com/alipay/sofa-registry.svg?branch=master)](https://travis-ci.com/sofastack/sofa-registry)
 ![license](https://img.shields.io/badge/license-Apache--2.0-green.svg)
-[![Coverage Status](https://codecov.io/gh/alipay/sofa-registry/branch/master/graph/badge.svg)](https://codecov.io/gh/alipay/sofa-registry)
-![maven](https://img.shields.io/github/release/alipay/sofa-registry.svg)
+[![Coverage Status](https://codecov.io/gh/alipay/sofa-registry/branch/master/graph/badge.svg)](https://codecov.io/gh/sofastack/sofa-registry)
+![maven](https://img.shields.io/github/release/sofastack/sofa-registry.svg)
 
 SOFARegistry 是蚂蚁金服开源的一个生产级、高时效、高可用的服务注册中心。SOFARegistry 最早源自于淘宝的 ConfigServer，十年来，随着蚂蚁金服的业务发展，注册中心架构已经演进至第五代。目前 SOFARegistry 不仅全面服务于蚂蚁金服的自有业务，还随着蚂蚁金融科技服务众多合作伙伴，同时也兼容开源生态。SOFARegistry 采用 AP 架构，支持秒级时效性推送，同时采用分层架构支持无限水平扩展。
 

client/all/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>registry-client-all</artifactId>
-    <version>5.3.0-SNAPSHOT</version>
+    <version>5.3.1-SNAPSHOT</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <url>http://github.com/alipay/sofa-registry</url>

client/api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>5.3.0-SNAPSHOT</version>
+        <version>5.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

client/impl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>5.3.0-SNAPSHOT</version>
+        <version>5.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

client/impl/src/test/java/com/alipay/sofa/registry/client/provider/DefaultRegistryClientTest.java

@@ -16,6 +16,17 @@
  */
 package com.alipay.sofa.registry.client.provider;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import org.junit.After;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.alipay.sofa.registry.client.api.ConfigDataObserver;
 import com.alipay.sofa.registry.client.api.Configurator;
 import com.alipay.sofa.registry.client.api.Publisher;
@@ -31,16 +42,6 @@
 import com.alipay.sofa.registry.core.model.PublisherRegister;
 import com.alipay.sofa.registry.core.model.ScopeEnum;
 import com.alipay.sofa.registry.core.model.SubscriberRegister;
-import org.junit.After;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
 
 /**
  * The type Default registry client test.
@@ -89,7 +90,7 @@ public void registerPublisher() throws InterruptedException {
 
         defaultPublisher.republish("republish test");
 
-        Thread.sleep(500L);
+        Thread.sleep(2000L);
         // register success when republish
         assertTrue(defaultPublisher.isRegistered());
     }
@@ -111,7 +112,7 @@ public void handleData(String dataId, UserData data) {
         assertNotNull(subscriber);
         assertEquals(dataId, subscriber.getDataId());
 
-        Thread.sleep(500L);
+        Thread.sleep(2000L);
 
         RegisterCache registerCache = registryClient.getRegisterCache();
 
@@ -142,7 +143,7 @@ public void handleData(String dataId, ConfigData configData) {
         assertNotNull(configurator);
         assertEquals(dataId, configurator.getDataId());
 
-        Thread.sleep(500L);
+        Thread.sleep(2000L);
 
         RegisterCache registerCache = registryClient.getRegisterCache();
 
@@ -164,7 +165,7 @@ public void unregisterSinglePublisherTest() throws InterruptedException {
         int unregisterCount = registryClient.unregister(dataId, null, RegistryType.PUBLISHER);
         assertEquals(1, unregisterCount);
 
-        Thread.sleep(500L);
+        Thread.sleep(2000L);
 
         Publisher temp = registryClient.getRegisterCache().getPublisherByRegistId(
             publisher.getRegistId());
@@ -185,7 +186,7 @@ public void unregisterSingleSubscriberTest() throws InterruptedException {
         int unregisterCount = registryClient.unregister(dataId, null, RegistryType.SUBSCRIBER);
         assertEquals(1, unregisterCount);
 
-        Thread.sleep(500L);
+        Thread.sleep(2000L);
 
         Subscriber temp = registryClient.getRegisterCache().getSubscriberByRegistId(
             subscriber.getRegistId());
@@ -206,7 +207,7 @@ public void unregisterSingleConfiguratorTest() throws InterruptedException {
         int unregisterCount = registryClient.unregister(dataId, null, RegistryType.CONFIGURATOR);
         assertEquals(1, unregisterCount);
 
-        Thread.sleep(500L);
+        Thread.sleep(2000L);
 
         Subscriber temp = registryClient.getRegisterCache().getSubscriberByRegistId(
             configurator.getRegistId());
@@ -236,13 +237,13 @@ public void unregisterMultiTest() throws InterruptedException {
 
         Subscriber subscriber2 = registryClient.register(subscriberRegistration2);
 
-        Thread.sleep(500L);
+        Thread.sleep(2000L);
 
         // 2. unregister publisher
         int unregisterCount = registryClient.unregister(dataId, null, RegistryType.PUBLISHER);
         assertEquals(2, unregisterCount);
 
-        Thread.sleep(500L);
+        Thread.sleep(2000L);
 
         // 3. check publisher register cache
         RegisterCache registerCache = registryClient.getRegisterCache();
@@ -256,7 +257,7 @@ public void unregisterMultiTest() throws InterruptedException {
         unregisterCount = registryClient.unregister(dataId, null, RegistryType.SUBSCRIBER);
         assertEquals(2, unregisterCount);
 
-        Thread.sleep(500L);
+        Thread.sleep(2000L);
 
         // 5. check subscriber register cache
         Subscriber tempSub = registerCache.getSubscriberByRegistId(subscriber1.getRegistId());

client/impl/src/test/java/com/alipay/sofa/registry/client/provider/RegisterOrderTest.java

@@ -16,6 +16,20 @@
  */
 package com.alipay.sofa.registry.client.provider;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+
+import org.junit.After;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.alipay.sofa.registry.client.api.Publisher;
 import com.alipay.sofa.registry.client.api.Subscriber;
 import com.alipay.sofa.registry.client.api.SubscriberDataObserver;
@@ -26,19 +40,6 @@
 import com.alipay.sofa.registry.core.model.DataBox;
 import com.alipay.sofa.registry.core.model.PublisherRegister;
 import com.alipay.sofa.registry.core.model.SubscriberRegister;
-import org.junit.After;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 /**
  *
@@ -126,7 +127,7 @@ public void publishAndUnregister() throws InterruptedException {
         // step 1
         Publisher publisher = registryClient.register(new PublisherRegistration(dataId), data);
 
-        Thread.sleep(500L);
+        Thread.sleep(2000L);
 
         String registId = publisher.getRegistId();
         PublisherRegister publisherRegister = mockServer.queryPubliser(registId);
@@ -137,7 +138,7 @@ public void publishAndUnregister() throws InterruptedException {
         // step 2
         publisher.unregister();
 
-        Thread.sleep(500L);
+        Thread.sleep(2000L);
 
         assertNull(mockServer.queryPubliser(registId));
 
@@ -151,7 +152,7 @@ public void publishAndRefused() throws InterruptedException {
         // step 1
         Publisher publisher = registryClient.register(new PublisherRegistration(data), data);
 
-        Thread.sleep(500L);
+        Thread.sleep(2000L);
 
         String registId = publisher.getRegistId();
         PublisherRegister publisherRegister = mockServer.queryPubliser(registId);
@@ -182,7 +183,7 @@ public void handleData(String dataId, UserData data) {
         Subscriber subscriber = registryClient.register(new SubscriberRegistration(dataId,
             dataObserver));
 
-        Thread.sleep(500L);
+        Thread.sleep(2000L);
 
         String registId = subscriber.getRegistId();
         SubscriberRegister subscriberRegister = mockServer.querySubscriber(registId);
@@ -191,7 +192,7 @@ public void handleData(String dataId, UserData data) {
         // step 2
         subscriber.unregister();
 
-        Thread.sleep(500L);
+        Thread.sleep(2000L);
 
         assertNull(mockServer.queryPubliser(registId));
 
@@ -211,7 +212,7 @@ public void handleData(String dataId, UserData data) {
         Subscriber subscriber = registryClient.register(new SubscriberRegistration(
             "subscribeAndRefused", dataObserver));
 
-        Thread.sleep(500L);
+        Thread.sleep(2000L);
 
         String registId = subscriber.getRegistId();
         SubscriberRegister subscriberRegister = mockServer.querySubscriber(registId);

client/log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>5.3.0-SNAPSHOT</version>
+        <version>5.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

client/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>5.3.0-SNAPSHOT</version>
+        <version>5.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>5.3.0-SNAPSHOT</version>
+        <version>5.3.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>