From 206d5eb8a1a075d40ff0a911856ceee3ee2fe21e Mon Sep 17 00:00:00 2001
From: Scott Leberknight <174812+sleberknight@users.noreply.github.com>
Date: Fri, 5 Jul 2024 14:16:29 -0400
Subject: [PATCH] Opinionated code cleanup: use Objects#isNull (#117)

Change code using "== null" to use Objects#isNull instead
---
 .../jakarta/xml/ws/example/ws/JavaFirstServiceImpl.java      | 4 +++-
 .../jakarta/xml/ws/BasicAuthenticationInterceptor.java       | 5 +++--
 .../dropwizard/jakarta/xml/ws/ValidatingInvoker.java         | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/JavaFirstServiceImpl.java b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/JavaFirstServiceImpl.java
index 8d9f7d3..ed1d6be 100644
--- a/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/JavaFirstServiceImpl.java
+++ b/dropwizard-jakarta-xml-ws-example/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/JavaFirstServiceImpl.java
@@ -1,5 +1,7 @@
 package org.kiwiproject.dropwizard.jakarta.xml.ws.example.ws;
 
+import static java.util.Objects.isNull;
+
 import com.codahale.metrics.annotation.ExceptionMetered;
 import com.codahale.metrics.annotation.Metered;
 import jakarta.annotation.Resource;
@@ -23,7 +25,7 @@ public class JavaFirstServiceImpl implements JavaFirstService {
     @Metered
     @ExceptionMetered
     public String echo(String in) throws JavaFirstServiceException {
-        if (in == null || in.isBlank()) {
+        if (isNull(in) || in.isBlank()) {
             throw new JavaFirstServiceException("Invalid parameter");
         }
 
diff --git a/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/BasicAuthenticationInterceptor.java b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/BasicAuthenticationInterceptor.java
index 06d4726..ba768a6 100644
--- a/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/BasicAuthenticationInterceptor.java
+++ b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/BasicAuthenticationInterceptor.java
@@ -1,6 +1,7 @@
 package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
 import static java.util.Collections.singletonList;
+import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
 
 import io.dropwizard.auth.AuthenticationException;
@@ -70,7 +71,7 @@ public void handleMessage(final Message message) throws Fault {
                 }
             }
 
-            if (credentials == null) {
+            if (isNull(credentials)) {
                 sendErrorResponse(message, HttpURLConnection.HTTP_UNAUTHORIZED);
                 return;
             }
@@ -112,7 +113,7 @@ private void sendErrorResponse(Message message, int responseCode) {
     private Message getOutMessage(Message inMessage) {
         var exchange = inMessage.getExchange();
         var outMessage = exchange.getOutMessage();
-        if (outMessage == null) {
+        if (isNull(outMessage)) {
             var endpoint = exchange.get(Endpoint.class);
             outMessage = endpoint.getBinding().createMessage();
             exchange.setOutMessage(outMessage);
diff --git a/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ValidatingInvoker.java b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ValidatingInvoker.java
index fbe25f4..f02ce4c 100644
--- a/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ValidatingInvoker.java
+++ b/dropwizard-jakarta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ValidatingInvoker.java
@@ -1,5 +1,6 @@
 package org.kiwiproject.dropwizard.jakarta.xml.ws;
 
+import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
 
 import io.dropwizard.validation.ConstraintViolations;
@@ -55,7 +56,7 @@ public Object invoke(Exchange exchange, Object o) {
             var i = 0;
             try {
                 for (var parameter : params) {
-                    if (parameter == null || !AsyncHandler.class.isAssignableFrom(parameter.getClass())) {
+                    if (isNull(parameter) || !AsyncHandler.class.isAssignableFrom(parameter.getClass())) {
                         validate(parameterAnnotations[i++], parameter);
                     }
                 }