From 197917a25af15777733e4ad85266348f29bb6d8e Mon Sep 17 00:00:00 2001 From: Gdk666 <763366136@qq.com> Date: Thu, 22 Sep 2022 18:21:05 +0800 Subject: [PATCH 01/10] add ConfigExecutorTest test case (#715) * add BeanUtilTest test case * add BeanUtilTest test case * add BeanUtilTest test case * add ClassUtilTest test case * add ConfigExecutorTest test case * Revert "add ConfigExecutorTest test case" This reverts commit ffc00ff4 * add ConfigExecutorTest test case --- .../config/toolkit/ConfigExecutorTest.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/hippo4j-config/src/test/java/cn/hippo4j/config/toolkit/ConfigExecutorTest.java b/hippo4j-config/src/test/java/cn/hippo4j/config/toolkit/ConfigExecutorTest.java index 4864cd7d..fb8cc27b 100644 --- a/hippo4j-config/src/test/java/cn/hippo4j/config/toolkit/ConfigExecutorTest.java +++ b/hippo4j-config/src/test/java/cn/hippo4j/config/toolkit/ConfigExecutorTest.java @@ -17,8 +17,28 @@ package cn.hippo4j.config.toolkit; +import lombok.extern.slf4j.Slf4j; +import org.junit.Test; +import java.util.concurrent.TimeUnit; + /** * ConfigExecutor Test */ +@Slf4j public class ConfigExecutorTest { + + @Test + public void executeLongPollingTest() { + ConfigExecutor.executeLongPolling(() -> log.info(Thread.currentThread().getName())); + } + + @Test + public void scheduleLongPollingTest() { + ConfigExecutor.scheduleLongPolling(() -> log.info(Thread.currentThread().getName()), 5, TimeUnit.SECONDS); + } + + @Test + public void scheduleLongPollingInitialTest() { + ConfigExecutor.scheduleLongPolling(() -> log.info(Thread.currentThread().getName()), 0, 5, TimeUnit.SECONDS); + } } From e20ae4b32dd8b51c08bf1369f0ce3874f4980c3b Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Thu, 22 Sep 2022 18:27:19 +0800 Subject: [PATCH 02/10] Update the list of contributors via action --- .github/workflows/main.yml | 34 ++++++++++++++++++++++++++++++++++ README.md | 3 ++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..7e72b394 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,34 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# 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. +# + +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +on: + push: + branches: + - develop + +jobs: + contrib-readme-job: + runs-on: ubuntu-latest + name: A job to automate contrib in readme + steps: + - name: Contribute List + uses: akhilmhdh/contributors-readme-action@v2.3.6 + env: + GITHUB_TOKEN: ${{ secrets.ACTION_TOKEN }} diff --git a/README.md b/README.md index 18ecab36..f5e67f1f 100644 --- a/README.md +++ b/README.md @@ -62,4 +62,5 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 感谢所有为项目作出贡献的开发者 [[Contributors](https://github.com/opengoofy/hippo4j/graphs/contributors)]。如果有意贡献，参考 [good first issue](https://github.com/opengoofy/hippo4j/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)。 - + + From 025a4d7479ab40936ce5f1fe2e2f7890b62c957d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5?= Date: Thu, 22 Sep 2022 18:27:45 +0800 Subject: [PATCH 03/10] docs(contributor): contrib-readme-action has updated readme --- README.md | 540 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 540 insertions(+) diff --git a/README.md b/README.md index f5e67f1f..a2f0b851 100644 --- a/README.md +++ b/README.md @@ -63,4 +63,544 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 感谢所有为项目作出贡献的开发者 [[Contributors](https://github.com/opengoofy/hippo4j/graphs/contributors)]。如果有意贡献，参考 [good first issue](https://github.com/opengoofy/hippo4j/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + itmachen +
+ 小马哥 + + 		+ + shining-stars-lk +
+ Lucky 8 + + 		+ + weihubeats +
+ Weihubeats + + 		+ + pirme +
+ 李金来 + + 		+ + iwangjie +
+ 王杰 + + 		+ + shanjianq +
+ Shanjianq + +
+ + BigXin0109 +
+ BigXin0109 + + 		+ + xqxyxchy +
+ Null + + 		+ + Gdk666 +
+ Null + + 		+ + maxisvest +
+ Null + + 		+ + zhuanghaozhe +
+ 庄昊哲 + + 		+ + liulinfei121 +
+ Null + +
+ + road2master +
+ Lijx + + 		+ + pizihao +
+ Pizihao + + 		+ + Atmanuclear +
+ Null + + 		+ + hippo4j +
+ Hippo4j + + 		+ + imyzt +
+ 杨镇涛 + + 		+ + Tliutao +
+ Liutao + +
+ + monsterxxp +
+ Null + + 		+ + voilaf +
+ Null + + 		+ + gywanghai +
+ 二师兄 + + 		+ + skyemin +
+ Null + + 		+ + Redick01 +
+ Redick Liu + + 		+ + xiaochengxuyuan +
+ Sean Wu + +
+ + HKMV +
+ Serenity + + 		+ + gewuwo +
+ 格悟沃 + + 		+ + hushtian +
+ Null + + 		+ + jinlingmei +
+ Null + + 		+ + linlinjie +
+ Null + + 		+ + selectbook +
+ Leping Huang + +
+ + soulmz +
+ Soulzz + + 		+ + tomsun28 +
+ Tomsun28 + + 		+ + backbay2-yzg +
+ 游祖光 + + 		+ + 2EXP +
+ Null + + 		+ + onesimplecoder +
+ Alic + + 		+ + CalebZYC +
+ Null + +
+ + Hibernate5666 +
+ Cheng Xihong + + 		+ + smartdj +
+ DJ + + 		+ + dmego +
+ Dmego + + 		+ + dousp +
+ Douspeng + + 		+ + hl1248 +
+ Lucas + + 		+ + gentlelynn +
+ Lynn + +
+ + sanliangitch +
+ WuLang + + 		+ + alexhaoxuan +
+ Alexli + + 		+ + qizhongju +
+ Bug搬运工 + + 		+ + san4j +
+ San4j + + 		+ + zhenyed +
+ Zhenye + + 		+ + dongming0920 +
+ Null + +
+ + f497196689 +
+ Fengjing + + 		+ + Snailclimb +
+ Guide + + 		+ + hbw1994 +
+ Null + + 		+ + hncboy +
+ Null + + 		+ + stronglong +
+ Itermis + + 		+ + janey668 +
+ Null + +
+ + jialei-jack +
+ Jialei-jack + + 		+ + klsq94 +
+ Hui Cao + + 		+ + kongyanbo-cx +
+ Null + + 		+ + lishiyu +
+ Null + + 		+ + puppet4 +
+ Tudo + + 		+ + Nhxz +
+ Nhxz + +
+ + op-lht +
+ Op-lht + + 		+ + wangjie-github +
+ Wangjie + + 		+ + wangyi123456 +
+ Null + + 		+ + Williamren97 +
+ William Ren + + 		+ + wzw8795 +
+ Null + + 		+ + huaxianchao +
+ Null + +
+ + yangzhiw +
+ Opentanent + + 		+ + yhc777 +
+ Null + + 		+ + zhaiweij +
+ Zhaiweij + + 		+ + zhaojinchao95 +
+ Zhaojinchao + + 		+ + zj1997 +
+ Null + + 		+ + li-xiao-shuang +
+ 李晓双 Li Xiao Shuang + +
+ + oreoft +
+ 没有气的汽水 + + 		+ + wo883721 +
+ Xinhao + + 		+ + Createsequence +
+ 黄成兴 + +
From 446da52fec99ae7ebe661902658508b30056560c Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Thu, 22 Sep 2022 18:30:26 +0800 Subject: [PATCH 04/10] Change contributor avatar size --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7e72b394..47920cb9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,5 +30,7 @@ jobs: steps: - name: Contribute List uses: akhilmhdh/contributors-readme-action@v2.3.6 + with: + image_size: 50 env: GITHUB_TOKEN: ${{ secrets.ACTION_TOKEN }} From 5b385e6c7c8486be2e768bf99666a322489edd4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5?= Date: Thu, 22 Sep 2022 18:30:56 +0800 Subject: [PATCH 05/10] docs(contributor): contrib-readme-action has updated readme --- README.md | 150 +++++++++++++++++++++++++++--------------------------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/README.md b/README.md index a2f0b851..404ff4a9 100644 --- a/README.md +++ b/README.md @@ -67,42 +67,42 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 - itmachen + itmachen
小马哥 - shining-stars-lk + shining-stars-lk
Lucky 8 - weihubeats + weihubeats
Weihubeats - pirme + pirme
李金来 - iwangjie + iwangjie
王杰 - shanjianq + shanjianq
Shanjianq @@ -110,42 +110,42 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 - BigXin0109 + BigXin0109
BigXin0109 - xqxyxchy + xqxyxchy
Null - Gdk666 + Gdk666
Null - maxisvest + maxisvest
Null - zhuanghaozhe + zhuanghaozhe
庄昊哲 - liulinfei121 + liulinfei121
Null @@ -153,42 +153,42 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 - road2master + road2master
Lijx - pizihao + pizihao
Pizihao - Atmanuclear + Atmanuclear
Null - hippo4j + hippo4j
Hippo4j - imyzt + imyzt
杨镇涛 - Tliutao + Tliutao
Liutao @@ -196,42 +196,42 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 - monsterxxp + monsterxxp
Null - voilaf + voilaf
Null - gywanghai + gywanghai
二师兄 - skyemin + skyemin
Null - Redick01 + Redick01
Redick Liu - xiaochengxuyuan + xiaochengxuyuan
Sean Wu @@ -239,42 +239,42 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 - HKMV + HKMV
Serenity - gewuwo + gewuwo
格悟沃 - hushtian + hushtian
Null - jinlingmei + jinlingmei
Null - linlinjie + linlinjie
Null - selectbook + selectbook
Leping Huang @@ -282,42 +282,42 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 - soulmz + soulmz
Soulzz - tomsun28 + tomsun28
Tomsun28 - backbay2-yzg + backbay2-yzg
游祖光 - 2EXP + 2EXP
Null - onesimplecoder + onesimplecoder
Alic - CalebZYC + CalebZYC
Null @@ -325,42 +325,42 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 - Hibernate5666 + Hibernate5666
Cheng Xihong - smartdj + smartdj
DJ - dmego + dmego
Dmego - dousp + dousp
Douspeng - hl1248 + hl1248
Lucas - gentlelynn + gentlelynn
Lynn @@ -368,42 +368,42 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 - sanliangitch + sanliangitch
WuLang - alexhaoxuan + alexhaoxuan
Alexli - qizhongju + qizhongju
Bug搬运工 - san4j + san4j
San4j - zhenyed + zhenyed
Zhenye - dongming0920 + dongming0920
Null @@ -411,42 +411,42 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 - f497196689 + f497196689
Fengjing - Snailclimb + Snailclimb
Guide - hbw1994 + hbw1994
Null - hncboy + hncboy
Null - stronglong + stronglong
Itermis - janey668 + janey668
Null @@ -454,42 +454,42 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 - jialei-jack + jialei-jack
Jialei-jack - klsq94 + klsq94
Hui Cao - kongyanbo-cx + kongyanbo-cx
Null - lishiyu + lishiyu
Null - puppet4 + puppet4
Tudo - Nhxz + Nhxz
Nhxz @@ -497,42 +497,42 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 - op-lht + op-lht
Op-lht - wangjie-github + wangjie-github
Wangjie - wangyi123456 + wangyi123456
Null - Williamren97 + Williamren97
William Ren - wzw8795 + wzw8795
Null - huaxianchao + huaxianchao
Null @@ -540,42 +540,42 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 - yangzhiw + yangzhiw
Opentanent - yhc777 + yhc777
Null - zhaiweij + zhaiweij
Zhaiweij - zhaojinchao95 + zhaojinchao95
Zhaojinchao - zj1997 + zj1997
Null - li-xiao-shuang + li-xiao-shuang
李晓双 Li Xiao Shuang @@ -583,21 +583,21 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 - oreoft + oreoft
没有气的汽水 - wo883721 + wo883721
Xinhao - Createsequence + Createsequence
黄成兴 From 4f79b8c41cd356b2c084d706c178b11415b3f8af Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Thu, 22 Sep 2022 18:33:52 +0800 Subject: [PATCH 06/10] Update contributor action --- .github/workflows/{main.yml => reademe-contributors.yml} | 4 ++++ 1 file changed, 4 insertions(+) rename .github/workflows/{main.yml => reademe-contributors.yml} (88%) diff --git a/.github/workflows/main.yml b/.github/workflows/reademe-contributors.yml similarity index 88% rename from .github/workflows/main.yml rename to .github/workflows/reademe-contributors.yml index 47920cb9..d501db52 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/reademe-contributors.yml @@ -32,5 +32,9 @@ jobs: uses: akhilmhdh/contributors-readme-action@v2.3.6 with: image_size: 50 + columns_per_row: 9 + committer_email: machen@apache.org + committer_username: itmachen + commit_message: 'Update the list of contributors' env: GITHUB_TOKEN: ${{ secrets.ACTION_TOKEN }} From efed83d69c830b7ed43e2427cd071aa308200aeb Mon Sep 17 00:00:00 2001 From: itmachen Date: Thu, 22 Sep 2022 18:34:10 +0800 Subject: [PATCH 07/10] Update the list of contributors --- README.md | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 404ff4a9..9037b6cc 100644 --- a/README.md +++ b/README.md @@ -106,8 +106,7 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
Shanjianq - - + BigXin0109 @@ -128,7 +127,8 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
Null - + + maxisvest @@ -149,8 +149,7 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
Null - - + road2master @@ -235,8 +234,7 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
Sean Wu - - + HKMV @@ -257,7 +255,8 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
Null - + + jinlingmei @@ -278,8 +277,7 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
Leping Huang - - + soulmz @@ -364,8 +362,7 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
Lynn - - + sanliangitch @@ -386,7 +383,8 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
Bug搬运工 - + + san4j @@ -407,8 +405,7 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
Null - - + f497196689 @@ -493,8 +490,7 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
Nhxz - - + op-lht @@ -515,7 +511,8 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
Null - + + Williamren97 @@ -536,8 +533,7 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池
Null - - + yangzhiw From a8e0b1792bfc4f27fe1b49715511299d26eb738e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=87=91=E6=9D=A5?= <41976977+pirme@users.noreply.github.com> Date: Thu, 22 Sep 2022 19:12:26 +0800 Subject: [PATCH 08/10] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6786d573..51fd6e3f 100644 --- a/pom.xml +++ b/pom.xml @@ -338,7 +338,7 @@ chen.ma machen@apache.org - https://github.com/mabaiwan + https://github.com/itmachen OpenGoofy https://github.com/opengoofy From 639e72930091a95167fa125702d52e747fcebab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5?= Date: Thu, 22 Sep 2022 19:17:50 +0800 Subject: [PATCH 09/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9037b6cc..157ac8aa 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 ## 贡献者 -感谢所有为项目作出贡献的开发者 [[Contributors](https://github.com/opengoofy/hippo4j/graphs/contributors)]。如果有意贡献，参考 [good first issue](https://github.com/opengoofy/hippo4j/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)。 +感谢所有为项目作出贡献的开发者。如果有意贡献，参考 [good first issue](https://github.com/opengoofy/hippo4j/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)。 From bbe1e989c2a8be5cea46d3dc0dc2cee1846059ed Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Thu, 22 Sep 2022 22:03:33 +0800 Subject: [PATCH 10/10] Add .mvn wrapper --- .mvn/wrapper/maven-wrapper.jar | 0 .mvn/wrapper/maven-wrapper.properties | 1 + 2 files changed, 1 insertion(+) create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..e69de29b diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..c3150437 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip