This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git
commit e478d0c52753bc2605eb9a3680af2935ba9d46c4 Author: Paul King <[email protected]> AuthorDate: Thu Mar 26 18:51:33 2026 +1000 minor refactor: remove some compiler warnings --- src/main/java/org/codehaus/groovy/control/Janitor.java | 6 ++---- .../groovy-test/src/main/java/groovy/test/GroovyTestCase.java | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/codehaus/groovy/control/Janitor.java b/src/main/java/org/codehaus/groovy/control/Janitor.java index 1c4a579d64..308d8a1ac0 100644 --- a/src/main/java/org/codehaus/groovy/control/Janitor.java +++ b/src/main/java/org/codehaus/groovy/control/Janitor.java @@ -26,7 +26,7 @@ import java.util.Set; * a later time. Users much implement the HasCleanup interface. */ public class Janitor implements HasCleanup { - private final Set pending = new HashSet(); // All objects pending cleanup + private final Set<HasCleanup> pending = new HashSet<>(); public void register(HasCleanup object) { pending.add(object); @@ -34,9 +34,7 @@ public class Janitor implements HasCleanup { @Override public void cleanup() { - for (Object o : pending) { - HasCleanup object = (HasCleanup) o; - + for (HasCleanup object : pending) { try { object.cleanup(); } catch (Exception e) { diff --git a/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestCase.java b/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestCase.java index 48e37f4535..272a0ab2b1 100644 --- a/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestCase.java +++ b/subprojects/groovy-test/src/main/java/groovy/test/GroovyTestCase.java @@ -213,6 +213,7 @@ public class GroovyTestCase extends TestCase { /** * see {@link groovy.test.GroovyAssert#shouldFail(Class, groovy.lang.Closure)} */ + @SuppressWarnings("unchecked") protected String shouldFail(Class clazz, Closure code) { return GroovyAssert.shouldFail(clazz, code).getMessage(); } @@ -220,6 +221,7 @@ public class GroovyTestCase extends TestCase { /** * see {@link groovy.test.GroovyAssert#shouldFailWithCause(Class, groovy.lang.Closure)} */ + @SuppressWarnings("unchecked") protected String shouldFailWithCause(Class clazz, Closure code) { return GroovyAssert.shouldFailWithCause(clazz, code).getMessage(); } @@ -227,6 +229,7 @@ public class GroovyTestCase extends TestCase { /** * see {@link groovy.test.GroovyAssert#shouldFail(Class, String)} */ + @SuppressWarnings("unchecked") protected String shouldFail(Class clazz, String script) { return GroovyAssert.shouldFail(clazz, script).getMessage(); }
