(commons-jelly) branch master updated: Use Objects.requireNonNull()

[ggregory]

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

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git


The following commit(s) were added to refs/heads/master by this push:
     new 6cc38989 Use Objects.requireNonNull()
6cc38989 is described below

commit 6cc38989757f23df9b567c4e4500f34957343fb9
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Dec 26 14:15:40 2024 -0500

    Use Objects.requireNonNull()
---
 core/src/main/java/org/apache/commons/jelly/XMLOutput.java         | 6 ++----
 .../src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java    | 7 ++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/apache/commons/jelly/XMLOutput.java 
b/core/src/main/java/org/apache/commons/jelly/XMLOutput.java
index eac12dc2..23741d70 100644
--- a/core/src/main/java/org/apache/commons/jelly/XMLOutput.java
+++ b/core/src/main/java/org/apache/commons/jelly/XMLOutput.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -891,10 +892,7 @@ public class XMLOutput implements ContentHandler, 
LexicalHandler {
      *      This value cannot be null.
      */
     public void setContentHandler(ContentHandler contentHandler) {
-        if (contentHandler == null) {
-            throw new NullPointerException("ContentHandler cannot be null!");
-        }
-        this.contentHandler = contentHandler;
+        this.contentHandler = Objects.requireNonNull(contentHandler, 
"contentHandler");
     }
 
     /**
diff --git 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
index 3956c926..3336ef10 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/AntTag.java
@@ -23,6 +23,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Objects;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.MethodUtils;
@@ -309,11 +310,7 @@ public class AntTag extends MapTagSupport implements 
TaskSource {
     }
 
     public Project getAntProject() {
-        Project project = AntTagLibrary.getProject(context);
-        if (project == null) {
-            throw new NullPointerException("No Ant Project object is 
available");
-        }
-        return project;
+        return Objects.requireNonNull(AntTagLibrary.getProject(context), "No 
Ant Project object is available");
     }
 
     // Implementation methods