(groovy) branch master updated: Trivial refactor: simplify code with `Objects.requireNonNullElse()`

[sunlan]

This is an automated email from the ASF dual-hosted git repository.

sunlan 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 107b21ca89 Trivial refactor: simplify code with 
`Objects.requireNonNullElse()`
107b21ca89 is described below

commit 107b21ca89ff17e89e66cd88d666bb2f4feefd85
Author: Daniel Sun <sun...@apache.org>
AuthorDate: Sun Jun 22 15:24:28 2025 +0900

    Trivial refactor: simplify code with `Objects.requireNonNullElse()`
---
 src/main/java/groovy/util/CharsetToolkit.java                      | 6 ++----
 src/main/java/groovy/util/Node.java                                | 6 ++----
 .../java/org/codehaus/groovy/ast/expr/MethodPointerExpression.java | 7 +++----
 .../java/org/codehaus/groovy/control/CompilerConfiguration.java    | 7 ++-----
 .../org/codehaus/groovy/control/messages/ExceptionMessage.java     | 6 +-----
 5 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/main/java/groovy/util/CharsetToolkit.java 
b/src/main/java/groovy/util/CharsetToolkit.java
index 6910524147..c9162cbd8e 100644
--- a/src/main/java/groovy/util/CharsetToolkit.java
+++ b/src/main/java/groovy/util/CharsetToolkit.java
@@ -29,6 +29,7 @@ import java.io.LineNumberReader;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
+import java.util.Objects;
 
 /**
  * Utility class to guess the encoding of a given text file.
@@ -98,10 +99,7 @@ public class CharsetToolkit {
      * if an 8-bit <code>Charset</code> is encountered.
      */
     public void setDefaultCharset(Charset defaultCharset) {
-        if (defaultCharset != null)
-            this.defaultCharset = defaultCharset;
-        else
-            this.defaultCharset = getDefaultSystemCharset();
+        this.defaultCharset = Objects.requireNonNullElseGet(defaultCharset, 
CharsetToolkit::getDefaultSystemCharset);
     }
 
     public Charset getCharset() {
diff --git a/src/main/java/groovy/util/Node.java 
b/src/main/java/groovy/util/Node.java
index 1edb31d5ab..c164b9502d 100644
--- a/src/main/java/groovy/util/Node.java
+++ b/src/main/java/groovy/util/Node.java
@@ -39,6 +39,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Stack;
 
 /**
@@ -393,10 +394,7 @@ public class Node implements Serializable, Cloneable {
             if (sb != null) {
                 return sb.toString();
             } else {
-                if (previousText != null) {
-                    return previousText;
-                }
-                return "";
+                return Objects.requireNonNullElse(previousText, "");
             }
         }
         return "" + value;
diff --git 
a/src/main/java/org/codehaus/groovy/ast/expr/MethodPointerExpression.java 
b/src/main/java/org/codehaus/groovy/ast/expr/MethodPointerExpression.java
index ae7edd8fd2..0c1fe9f315 100644
--- a/src/main/java/org/codehaus/groovy/ast/expr/MethodPointerExpression.java
+++ b/src/main/java/org/codehaus/groovy/ast/expr/MethodPointerExpression.java
@@ -22,6 +22,8 @@ import groovy.lang.Closure;
 import org.codehaus.groovy.ast.ClassHelper;
 import org.codehaus.groovy.ast.GroovyCodeVisitor;
 
+import java.util.Objects;
+
 /**
  * Represents a method pointer on an object such as
  * {@code foo.&bar} which means find the method pointer for the {@code bar} 
method on the {@code foo} instance.
@@ -41,10 +43,7 @@ public class MethodPointerExpression extends Expression {
     }
 
     public Expression getExpression() {
-        if (expression == null)
-            return VariableExpression.THIS_EXPRESSION;
-        else
-            return expression;
+        return Objects.requireNonNullElse(expression, 
VariableExpression.THIS_EXPRESSION);
     }
 
     public Expression getMethodName() {
diff --git 
a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java 
b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index a23a5873b6..07b0761076 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -35,6 +35,7 @@ import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
@@ -881,11 +882,7 @@ public class CompilerConfiguration {
      */
     @Deprecated
     public void setOutput(final PrintWriter output) {
-        if (output == null) {
-            this.output = new PrintWriter(NullWriter.DEFAULT);
-        } else {
-            this.output = output;
-        }
+        this.output = Objects.requireNonNullElseGet(output, () -> new 
PrintWriter(NullWriter.DEFAULT));
     }
 
     /**
diff --git 
a/src/main/java/org/codehaus/groovy/control/messages/ExceptionMessage.java 
b/src/main/java/org/codehaus/groovy/control/messages/ExceptionMessage.java
index 5edf74ed3c..9f549d04fe 100644
--- a/src/main/java/org/codehaus/groovy/control/messages/ExceptionMessage.java
+++ b/src/main/java/org/codehaus/groovy/control/messages/ExceptionMessage.java
@@ -54,11 +54,7 @@ public class ExceptionMessage extends Message {
         String description = "General error during " + 
owner.getPhaseDescription() + ": ";
 
         String message = cause.getMessage();
-        if (message != null) {
-            output.println(description + message);
-        } else {
-            output.println(description + cause);
-        }
+        output.println(description + Objects.requireNonNullElse(message, 
cause));
         output.println();
 
         /*if (debug)*/ cause.printStackTrace(output);