From abcc4646d3225a23354f900960987b5a7305a71f Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Mon, 26 Aug 2024 09:12:29 +0300 Subject: [PATCH] checkstyle plugin definition refactoring --- ...essions.xml => checkstyle-suppressions.xml | 0 checkstyle.xml | 63 +++- pom.xml | 27 ++ redisson-helidon/pom.xml | 13 + redisson-helidon/redisson-helidon-20/pom.xml | 4 - .../redisson/helidon/RedissonExtension.java | 2 +- redisson-helidon/redisson-helidon-30/pom.xml | 4 - .../redisson/helidon/RedissonExtension.java | 2 +- redisson-helidon/redisson-helidon-40/pom.xml | 4 - .../redisson/helidon/RedissonExtension.java | 2 +- redisson/checkstyle.xml | 288 ------------------ redisson/pom.xml | 22 -- 12 files changed, 100 insertions(+), 331 deletions(-) rename redisson/suppressions.xml => checkstyle-suppressions.xml (100%) delete mode 100644 redisson/checkstyle.xml diff --git a/redisson/suppressions.xml b/checkstyle-suppressions.xml similarity index 100% rename from redisson/suppressions.xml rename to checkstyle-suppressions.xml diff --git a/checkstyle.xml b/checkstyle.xml index 571de1789..0600f4cb7 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -59,8 +59,6 @@ - - @@ -168,7 +166,7 @@ - + @@ -189,7 +187,58 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -226,12 +275,14 @@ + - + diff --git a/pom.xml b/pom.xml index d6c3880dd..279f3a149 100644 --- a/pom.xml +++ b/pom.xml @@ -255,6 +255,33 @@ + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.5.0 + + + verify + + check + + + + + true + /checkstyle.xml + /checkstyle-suppressions.xml + + + + com.puppycrawl.tools + checkstyle + 10.18.0 + + + + org.apache.maven.plugins maven-jar-plugin diff --git a/redisson-helidon/pom.xml b/redisson-helidon/pom.xml index 35dd27c4a..19e4b96bb 100644 --- a/redisson-helidon/pom.xml +++ b/redisson-helidon/pom.xml @@ -19,6 +19,19 @@ redisson-helidon-40 + + + + maven-javadoc-plugin + + + + maven-checkstyle-plugin + + + + + org.junit.jupiter diff --git a/redisson-helidon/redisson-helidon-20/pom.xml b/redisson-helidon/redisson-helidon-20/pom.xml index bf5e0d3be..447797e5f 100644 --- a/redisson-helidon/redisson-helidon-20/pom.xml +++ b/redisson-helidon/redisson-helidon-20/pom.xml @@ -47,10 +47,6 @@ - - - maven-javadoc-plugin - diff --git a/redisson-helidon/redisson-helidon-20/src/main/java/org/redisson/helidon/RedissonExtension.java b/redisson-helidon/redisson-helidon-20/src/main/java/org/redisson/helidon/RedissonExtension.java index 33c9645d9..5518d73f4 100644 --- a/redisson-helidon/redisson-helidon-20/src/main/java/org/redisson/helidon/RedissonExtension.java +++ b/redisson-helidon/redisson-helidon-20/src/main/java/org/redisson/helidon/RedissonExtension.java @@ -63,7 +63,7 @@ public class RedissonExtension implements Extension { .scope(ApplicationScoped.class) .addQualifiers(qualifiers) .addTransitiveTypeClosure(RedissonClient.class) - .produceWith((instance) -> { + .produceWith(instance -> { String instanceName = "default"; if (qualifier instanceof Named) { diff --git a/redisson-helidon/redisson-helidon-30/pom.xml b/redisson-helidon/redisson-helidon-30/pom.xml index 27f979ad3..7bd3fa658 100644 --- a/redisson-helidon/redisson-helidon-30/pom.xml +++ b/redisson-helidon/redisson-helidon-30/pom.xml @@ -47,10 +47,6 @@ - - - maven-javadoc-plugin - diff --git a/redisson-helidon/redisson-helidon-30/src/main/java/org/redisson/helidon/RedissonExtension.java b/redisson-helidon/redisson-helidon-30/src/main/java/org/redisson/helidon/RedissonExtension.java index 5393ed3b2..1cbe28032 100644 --- a/redisson-helidon/redisson-helidon-30/src/main/java/org/redisson/helidon/RedissonExtension.java +++ b/redisson-helidon/redisson-helidon-30/src/main/java/org/redisson/helidon/RedissonExtension.java @@ -63,7 +63,7 @@ public class RedissonExtension implements Extension { .scope(ApplicationScoped.class) .addQualifiers(qualifiers) .addTransitiveTypeClosure(RedissonClient.class) - .produceWith((instance) -> { + .produceWith(instance -> { String instanceName = "default"; if (qualifier instanceof Named) { diff --git a/redisson-helidon/redisson-helidon-40/pom.xml b/redisson-helidon/redisson-helidon-40/pom.xml index 2a3a2393a..fd33a6ed2 100644 --- a/redisson-helidon/redisson-helidon-40/pom.xml +++ b/redisson-helidon/redisson-helidon-40/pom.xml @@ -52,10 +52,6 @@ - - - maven-javadoc-plugin - diff --git a/redisson-helidon/redisson-helidon-40/src/main/java/org/redisson/helidon/RedissonExtension.java b/redisson-helidon/redisson-helidon-40/src/main/java/org/redisson/helidon/RedissonExtension.java index 5393ed3b2..1cbe28032 100644 --- a/redisson-helidon/redisson-helidon-40/src/main/java/org/redisson/helidon/RedissonExtension.java +++ b/redisson-helidon/redisson-helidon-40/src/main/java/org/redisson/helidon/RedissonExtension.java @@ -63,7 +63,7 @@ public class RedissonExtension implements Extension { .scope(ApplicationScoped.class) .addQualifiers(qualifiers) .addTransitiveTypeClosure(RedissonClient.class) - .produceWith((instance) -> { + .produceWith(instance -> { String instanceName = "default"; if (qualifier instanceof Named) { diff --git a/redisson/checkstyle.xml b/redisson/checkstyle.xml deleted file mode 100644 index ba40a4c95..000000000 --- a/redisson/checkstyle.xml +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/redisson/pom.xml b/redisson/pom.xml index 6000320ab..77dd8a1c0 100644 --- a/redisson/pom.xml +++ b/redisson/pom.xml @@ -506,29 +506,7 @@ - org.apache.maven.plugins maven-checkstyle-plugin - 3.4.0 - - - verify - - check - - - - - true - /checkstyle.xml - checkstyle.config.path=${basedir} - - - - com.puppycrawl.tools - checkstyle - 10.16.0 - -