You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2023/10/17 21:29:40 UTC
[groovy] branch master updated: GROOVY-7861: `asType(String)` for `null` differs from `toString()`
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 8e5192d0c7 GROOVY-7861: `asType(String)` for `null` differs from `toString()`
8e5192d0c7 is described below
commit 8e5192d0c704042128133de81016c77a6b6250a3
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue Oct 17 16:29:09 2023 -0500
GROOVY-7861: `asType(String)` for `null` differs from `toString()`
---
.../org/codehaus/groovy/runtime/DefaultGroovyMethods.java | 2 +-
src/main/java/org/codehaus/groovy/runtime/NullObject.java | 1 -
.../org/codehaus/groovy/runtime/NullObjectTest.groovy | 15 ++++++++++++---
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index a8db52c4c9..d30768d292 100644
--- a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -1384,7 +1384,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
*/
@SuppressWarnings("unchecked")
public static <T> T asType(Object obj, Class<T> type) {
- if (String.class == type) {
+ if (obj != null && type == String.class) {
return (T) FormatHelper.toString(obj);
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/NullObject.java b/src/main/java/org/codehaus/groovy/runtime/NullObject.java
index a95b67ff40..fd8e62adaa 100644
--- a/src/main/java/org/codehaus/groovy/runtime/NullObject.java
+++ b/src/main/java/org/codehaus/groovy/runtime/NullObject.java
@@ -184,7 +184,6 @@ public class NullObject extends GroovyObjectSupport {
* @param closure the closure to call on the object
* @return result of calling the closure
*/
-
@Deprecated(since = "5.0.0") // GROOVY-4526
public <T> T with(final Closure<T> closure) {
return DefaultGroovyMethods.with(null, closure);
diff --git a/src/test/org/codehaus/groovy/runtime/NullObjectTest.groovy b/src/test/org/codehaus/groovy/runtime/NullObjectTest.groovy
index 495b0559b1..bb0bf6c560 100644
--- a/src/test/org/codehaus/groovy/runtime/NullObjectTest.groovy
+++ b/src/test/org/codehaus/groovy/runtime/NullObjectTest.groovy
@@ -18,6 +18,7 @@
*/
package org.codehaus.groovy.runtime
+import groovy.transform.CompileStatic
import org.junit.Test
import static groovy.test.GroovyAssert.shouldFail
@@ -116,18 +117,26 @@ final class NullObjectTest {
@Test
void testAsType1() {
def nil = null
- assert (nil as Number) == null
- assert (nil as String) == null
+ assert (nil as Number) === null
+ assert (nil as String) === null
}
@Test
void testAsType2() {
def nil = null
+ assert nil.asType(String) === null
shouldFail(IllegalArgumentException) {
- NullObject.getNullObject().asType(int.class)
+ NullObject.getNullObject().asType(int)
}
}
+ // GROOVY-7861
+ @Test @CompileStatic
+ void testAsType3() {
+ def nil = null
+ assert nil.asType(String) === null
+ }
+
@Test
void testIs() {
def nil = null