From fa0e4063d7e7b1b6c1c19bba68d7f39f29728a40 Mon Sep 17 00:00:00 2001 From: akib6075 <128719273+akib6075@users.noreply.github.com> Date: Wed, 31 May 2023 23:23:49 +0600 Subject: [PATCH 1/6] Create main.yml --- .github/workflows/main.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) 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..c63ac35b --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,27 @@ +name: Test:ConnectHandlerTest.handlerTest +run-name: Known Flaky test +on: [push] +jobs: + Test_Without_Nondex_Shuffling: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 8 + uses: actions/setup-java@v3 + with: + java-version: '8' + distribution: 'temurin' + - name: Test + run: mvn -pl hippo4j-common test -Dtest=cn.hippo4j.common.toolkit.ContentUtilTest#assertGetPoolContent + + Test_With_Nondex_Shuffling: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 8 + uses: actions/setup-java@v3 + with: + java-version: '8' + distribution: 'temurin' + - name: Test + run: mvn -pl hippo4j-common edu.illinois:nondex-maven-plugin:2.1.1:nondex -Dtest=cn.hippo4j.common.toolkit.ContentUtilTest#assertGetPoolContent From 037b3889211074ba111ec4c97cbcc8aa6423ba60 Mon Sep 17 00:00:00 2001 From: Kazi Akib Javed Date: Wed, 31 May 2023 23:25:36 +0600 Subject: [PATCH 2/6] chnaged --- .../src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java index f86f0df2..4adb6245 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java @@ -45,6 +45,7 @@ public class JacksonHandler implements JsonFacade { MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL); MAPPER.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + MAPPER.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true); } @Override From c1e11419d81174d6b11dd4508143dd306da946a7 Mon Sep 17 00:00:00 2001 From: Kazi Akib Javed Date: Wed, 31 May 2023 23:54:45 +0600 Subject: [PATCH 3/6] changed getPoolContent --- .../hippo4j/common/toolkit/ContentUtil.java | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java index ae5b6dfe..a4f5fcb4 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java @@ -19,7 +19,6 @@ package cn.hippo4j.common.toolkit; import cn.hippo4j.common.constant.Constants; import cn.hippo4j.common.model.ThreadPoolParameter; -import cn.hippo4j.common.model.ThreadPoolParameterInfo; /** * Content util. @@ -33,22 +32,13 @@ public class ContentUtil { * @return dynamic thread-pool content str */ public static String getPoolContent(ThreadPoolParameter parameter) { - ThreadPoolParameterInfo threadPoolParameterInfo = new ThreadPoolParameterInfo(); - threadPoolParameterInfo.setTenantId(parameter.getTenantId()) - .setItemId(parameter.getItemId()) - .setTpId(parameter.getTpId()) - .setCoreSize(parameter.getCoreSize()) - .setMaxSize(parameter.getMaxSize()) - .setQueueType(parameter.getQueueType()) - .setCapacity(parameter.getCapacity()) - .setKeepAliveTime(parameter.getKeepAliveTime()) - .setExecuteTimeOut(parameter.getExecuteTimeOut()) - .setIsAlarm(parameter.getIsAlarm()) - .setCapacityAlarm(parameter.getCapacityAlarm()) - .setLivenessAlarm(parameter.getLivenessAlarm()) - .setAllowCoreThreadTimeOut(parameter.getAllowCoreThreadTimeOut()) - .setRejectedType(parameter.getRejectedType()); - return JSONUtil.toJSONString(threadPoolParameterInfo); + String getPoolContent = String.format("{\"tenantId\":\"%s\",\"itemId\":\"%s\",\"tpId\":" + + "\"%s\",\"queueType\":%d,\"capacity\":%d,\"keepAliveTime\":%d,\"rejectedType\":%d,\"isAlarm\"" + + ":%d,\"capacityAlarm\":%d,\"livenessAlarm\":%d,\"allowCoreThreadTimeOut\":%d}", parameter.getTenantId(), + parameter.getItemId(), parameter.getTpId(), parameter.getQueueType(), parameter.getCapacity(), + parameter.getKeepAliveTime(), parameter.getRejectedType(), parameter.getIsAlarm(),parameter.getCapacityAlarm(), + parameter.getLivenessAlarm(), parameter.getAllowCoreThreadTimeOut()); + return getPoolContent; } /** From db431a343b035956668923cc6806da1294e5c223 Mon Sep 17 00:00:00 2001 From: Kazi Akib Javed Date: Tue, 6 Jun 2023 21:44:50 +0600 Subject: [PATCH 4/6] refactord to resolve the flaky --- .../hippo4j/common/toolkit/ContentUtil.java | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java index ae5b6dfe..a4f5fcb4 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java @@ -19,7 +19,6 @@ package cn.hippo4j.common.toolkit; import cn.hippo4j.common.constant.Constants; import cn.hippo4j.common.model.ThreadPoolParameter; -import cn.hippo4j.common.model.ThreadPoolParameterInfo; /** * Content util. @@ -33,22 +32,13 @@ public class ContentUtil { * @return dynamic thread-pool content str */ public static String getPoolContent(ThreadPoolParameter parameter) { - ThreadPoolParameterInfo threadPoolParameterInfo = new ThreadPoolParameterInfo(); - threadPoolParameterInfo.setTenantId(parameter.getTenantId()) - .setItemId(parameter.getItemId()) - .setTpId(parameter.getTpId()) - .setCoreSize(parameter.getCoreSize()) - .setMaxSize(parameter.getMaxSize()) - .setQueueType(parameter.getQueueType()) - .setCapacity(parameter.getCapacity()) - .setKeepAliveTime(parameter.getKeepAliveTime()) - .setExecuteTimeOut(parameter.getExecuteTimeOut()) - .setIsAlarm(parameter.getIsAlarm()) - .setCapacityAlarm(parameter.getCapacityAlarm()) - .setLivenessAlarm(parameter.getLivenessAlarm()) - .setAllowCoreThreadTimeOut(parameter.getAllowCoreThreadTimeOut()) - .setRejectedType(parameter.getRejectedType()); - return JSONUtil.toJSONString(threadPoolParameterInfo); + String getPoolContent = String.format("{\"tenantId\":\"%s\",\"itemId\":\"%s\",\"tpId\":" + + "\"%s\",\"queueType\":%d,\"capacity\":%d,\"keepAliveTime\":%d,\"rejectedType\":%d,\"isAlarm\"" + + ":%d,\"capacityAlarm\":%d,\"livenessAlarm\":%d,\"allowCoreThreadTimeOut\":%d}", parameter.getTenantId(), + parameter.getItemId(), parameter.getTpId(), parameter.getQueueType(), parameter.getCapacity(), + parameter.getKeepAliveTime(), parameter.getRejectedType(), parameter.getIsAlarm(),parameter.getCapacityAlarm(), + parameter.getLivenessAlarm(), parameter.getAllowCoreThreadTimeOut()); + return getPoolContent; } /** From e3fe745aa8622126c8b5e21b88ca0bba552aac92 Mon Sep 17 00:00:00 2001 From: Kazi Akib Javed Date: Tue, 6 Jun 2023 21:46:33 +0600 Subject: [PATCH 5/6] refactord to resolve the flaky --- .../src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java index 4adb6245..f86f0df2 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/JacksonHandler.java @@ -45,7 +45,6 @@ public class JacksonHandler implements JsonFacade { MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL); MAPPER.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); - MAPPER.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true); } @Override From 683a7b868d7b2964a89d79cf77f307131fb45847 Mon Sep 17 00:00:00 2001 From: Kazi Akib Javed Date: Tue, 6 Jun 2023 21:54:37 +0600 Subject: [PATCH 6/6] test ci file deleted --- .github/workflows/main.yml | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index c63ac35b..00000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Test:ConnectHandlerTest.handlerTest -run-name: Known Flaky test -on: [push] -jobs: - Test_Without_Nondex_Shuffling: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 8 - uses: actions/setup-java@v3 - with: - java-version: '8' - distribution: 'temurin' - - name: Test - run: mvn -pl hippo4j-common test -Dtest=cn.hippo4j.common.toolkit.ContentUtilTest#assertGetPoolContent - - Test_With_Nondex_Shuffling: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 8 - uses: actions/setup-java@v3 - with: - java-version: '8' - distribution: 'temurin' - - name: Test - run: mvn -pl hippo4j-common edu.illinois:nondex-maven-plugin:2.1.1:nondex -Dtest=cn.hippo4j.common.toolkit.ContentUtilTest#assertGetPoolContent