From c0a994e75b71396bb4114d52c9ba813027260026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20B=C3=B6gershausen?= Date: Tue, 28 Jan 2025 19:43:16 +0100 Subject: [PATCH 1/7] add a`@DocumentedExample` and extend description --- .../openrewrite/staticanalysis/RemoveExtraSemicolons.java | 6 +++++- .../staticanalysis/RemoveExtraSemicolonsTest.java | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java b/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java index 45d8c1e93..8d668b974 100644 --- a/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java +++ b/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java @@ -36,7 +36,11 @@ public String getDisplayName() { @Override public String getDescription() { - return "Optional semicolons at the end of try-with-resources are also removed."; + //language=markdown + return "Removes not needed semicolons. Semicolons are considered not needed:\n" + + "* Optional semicolons at the end of try-with-resources\n" + + "* after the last enum value if no field or method is defined\n" + + "* no statement between two semicolon"; } @Override diff --git a/src/test/java/org/openrewrite/staticanalysis/RemoveExtraSemicolonsTest.java b/src/test/java/org/openrewrite/staticanalysis/RemoveExtraSemicolonsTest.java index 1de29550e..06ccb8641 100644 --- a/src/test/java/org/openrewrite/staticanalysis/RemoveExtraSemicolonsTest.java +++ b/src/test/java/org/openrewrite/staticanalysis/RemoveExtraSemicolonsTest.java @@ -68,7 +68,7 @@ void enumSemicolonsWithOtherStatements() { public enum FRUITS { BANANA, APPLE; - + void hiFruit() {} } """ @@ -215,6 +215,7 @@ int test() { } @Test + @DocumentExample void repeatedSemicolon() { rewriteRun( //language=java From a8efc83fc92789768940d18de952385ac085159e Mon Sep 17 00:00:00 2001 From: Laurens Westerlaken Date: Tue, 28 Jan 2025 19:55:44 +0100 Subject: [PATCH 2/7] Update RemoveExtraSemicolons.java Add trailing `.` --- .../org/openrewrite/staticanalysis/RemoveExtraSemicolons.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java b/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java index 8d668b974..b038f8b44 100644 --- a/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java +++ b/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java @@ -40,7 +40,7 @@ public String getDescription() { return "Removes not needed semicolons. Semicolons are considered not needed:\n" + "* Optional semicolons at the end of try-with-resources\n" + "* after the last enum value if no field or method is defined\n" + - "* no statement between two semicolon"; + "* no statement between two semicolon."; } @Override From 087d9ff100cb8bf2a9c91d6eb616fc6e60587077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20B=C3=B6gershausen?= Date: Tue, 28 Jan 2025 20:19:50 +0100 Subject: [PATCH 3/7] end description with dot --- .../openrewrite/staticanalysis/RemoveExtraSemicolons.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java b/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java index 8d668b974..e4089af2c 100644 --- a/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java +++ b/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java @@ -38,9 +38,9 @@ public String getDisplayName() { public String getDescription() { //language=markdown return "Removes not needed semicolons. Semicolons are considered not needed:\n" + - "* Optional semicolons at the end of try-with-resources\n" + - "* after the last enum value if no field or method is defined\n" + - "* no statement between two semicolon"; + "* Optional semicolons at the end of try-with-resources,\n" + + "* after the last enum value if no field or method is defined,\n" + + "* no statement between two semicolon."; } @Override From 7d477ed55a32453ebbe93bebd96b71e50e9260b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20B=C3=B6gershausen?= Date: Tue, 28 Jan 2025 20:22:52 +0100 Subject: [PATCH 4/7] end description with dot --- .../org/openrewrite/staticanalysis/RemoveExtraSemicolons.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java b/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java index b038f8b44..e4089af2c 100644 --- a/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java +++ b/src/main/java/org/openrewrite/staticanalysis/RemoveExtraSemicolons.java @@ -38,8 +38,8 @@ public String getDisplayName() { public String getDescription() { //language=markdown return "Removes not needed semicolons. Semicolons are considered not needed:\n" + - "* Optional semicolons at the end of try-with-resources\n" + - "* after the last enum value if no field or method is defined\n" + + "* Optional semicolons at the end of try-with-resources,\n" + + "* after the last enum value if no field or method is defined,\n" + "* no statement between two semicolon."; } From 92806ccf225e1afe91ccfe9b7bdaf185232a2bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20B=C3=B6gershausen?= Date: Tue, 28 Jan 2025 21:45:10 +0100 Subject: [PATCH 5/7] applying Rewrite best practices --- .../staticanalysis/AbstractClassPublicConstructorTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/openrewrite/staticanalysis/AbstractClassPublicConstructorTest.java b/src/test/java/org/openrewrite/staticanalysis/AbstractClassPublicConstructorTest.java index 35430e0bf..985c34a76 100644 --- a/src/test/java/org/openrewrite/staticanalysis/AbstractClassPublicConstructorTest.java +++ b/src/test/java/org/openrewrite/staticanalysis/AbstractClassPublicConstructorTest.java @@ -72,7 +72,8 @@ public Test() { void noReplaceOnPackageProtectedConstructor() { rewriteRun( //language=java - java(""" + java( + """ abstract class Test { Test() { } From 5ccc90653d8c0f0a5318e93e5b1bdf236e2cc88a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20B=C3=B6gershausen?= Date: Tue, 28 Jan 2025 22:01:37 +0100 Subject: [PATCH 6/7] partial rollback gradle update --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7f7d33fc6..b9a78ef1d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94 networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME From a066b691ebc6f8d7432cd91255e3df46ea625d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20B=C3=B6gershausen?= Date: Tue, 28 Jan 2025 22:07:58 +0100 Subject: [PATCH 7/7] rollback "partial rollback gradle update" --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b9a78ef1d..7f7d33fc6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94 networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME