mirrors/pig
1
0
Fork 0
mirror of https://gitee.com/log4j/pig.git synced 2024-12-23 05:00:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #660 from Hccake/patch-1

Browse Source 
⬆️ Bump spring-javaformat from 0.0.29 to 0.0.32
This commit is contained in:
冷冷 2022-05-26 12:42:19 +08:00 committed by GitHub
commit 4f7b2e3471
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.springjavaformatconfig Normal file
View File

@ -0,0 +1 @@
java-baseline=8

2
pig-common/pig-common-bom/pom.xml
View File

@ -22,7 +22,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<git.commit.plugin>4.9.9</git.commit.plugin>
<spring.checkstyle.plugin>0.0.29</spring.checkstyle.plugin>
<spring.checkstyle.plugin>0.0.32</spring.checkstyle.plugin>
<fastjson.version>1.2.83</fastjson.version>
<springdoc.version>1.6.6</springdoc.version>
<swagger.core.version>2.2.0</swagger.core.version>

26
pig-visual/pig-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java
View File

@ -8,22 +8,16 @@ import com.xxl.job.admin.core.util.I18nUtil;
*/
public enum ExecutorRouteStrategyEnum {
FIRST(I18nUtil.getString("jobconf_route_first"), new ExecutorRouteFirst()), LAST(
I18nUtil.getString("jobconf_route_last"), new ExecutorRouteLast()), ROUND(
I18nUtil.getString("jobconf_route_round"), new ExecutorRouteRound()), RANDOM(
I18nUtil.getString("jobconf_route_random"), new ExecutorRouteRandom()), CONSISTENT_HASH(
I18nUtil.getString("jobconf_route_consistenthash"),
new ExecutorRouteConsistentHash()), LEAST_FREQUENTLY_USED(
I18nUtil.getString("jobconf_route_lfu"),
new ExecutorRouteLFU()), LEAST_RECENTLY_USED(
I18nUtil.getString("jobconf_route_lru"),
new ExecutorRouteLRU()), FAILOVER(
I18nUtil.getString("jobconf_route_failover"),
new ExecutorRouteFailover()), BUSYOVER(
I18nUtil.getString("jobconf_route_busyover"),
new ExecutorRouteBusyover()), SHARDING_BROADCAST(
I18nUtil.getString("jobconf_route_shard"),
null);
FIRST(I18nUtil.getString("jobconf_route_first"), new ExecutorRouteFirst()),
LAST(I18nUtil.getString("jobconf_route_last"), new ExecutorRouteLast()),
ROUND(I18nUtil.getString("jobconf_route_round"), new ExecutorRouteRound()),
RANDOM(I18nUtil.getString("jobconf_route_random"), new ExecutorRouteRandom()),
CONSISTENT_HASH(I18nUtil.getString("jobconf_route_consistenthash"), new ExecutorRouteConsistentHash()),
LEAST_FREQUENTLY_USED(I18nUtil.getString("jobconf_route_lfu"), new ExecutorRouteLFU()),
LEAST_RECENTLY_USED(I18nUtil.getString("jobconf_route_lru"), new ExecutorRouteLRU()),
FAILOVER(I18nUtil.getString("jobconf_route_failover"), new ExecutorRouteFailover()),
BUSYOVER(I18nUtil.getString("jobconf_route_busyover"), new ExecutorRouteBusyover()),
SHARDING_BROADCAST(I18nUtil.getString("jobconf_route_shard"), null);
ExecutorRouteStrategyEnum(String title, ExecutorRouter router) {
this.title = title;

9
pig-visual/pig-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java
View File

@ -9,12 +9,9 @@ import com.xxl.job.admin.core.util.I18nUtil;
*/
public enum TriggerTypeEnum {
MANUAL(I18nUtil.getString("jobconf_trigger_type_manual")), CRON(
I18nUtil.getString("jobconf_trigger_type_cron")), RETRY(
I18nUtil.getString("jobconf_trigger_type_retry")), PARENT(
I18nUtil.getString("jobconf_trigger_type_parent")), API(
I18nUtil.getString("jobconf_trigger_type_api")), MISFIRE(
I18nUtil.getString("jobconf_trigger_type_misfire"));
MANUAL(I18nUtil.getString("jobconf_trigger_type_manual")), CRON(I18nUtil.getString("jobconf_trigger_type_cron")),
RETRY(I18nUtil.getString("jobconf_trigger_type_retry")), PARENT(I18nUtil.getString("jobconf_trigger_type_parent")),
API(I18nUtil.getString("jobconf_trigger_type_api")), MISFIRE(I18nUtil.getString("jobconf_trigger_type_misfire"));
private TriggerTypeEnum(String title) {
this.title = title;

2
pom.xml
View File

@ -50,7 +50,7 @@
<docker.username>username</docker.username>
<docker.password>password</docker.password>
<git.commit.plugin>4.9.9</git.commit.plugin>
<spring.checkstyle.plugin>0.0.29</spring.checkstyle.plugin>
<spring.checkstyle.plugin>0.0.32</spring.checkstyle.plugin>
</properties>
<!-- 以下依赖 全局所有的模块都会引入 -->