Opinionated code cleanup: use Objects#isNull (#117)

Change code using "== null" to use Objects#isNull instead
kiwiproject · Jul 5, 2024 · 206d5eb · 206d5eb
1 parent 3020102
commit 206d5eb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.../main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/example/ws/JavaFirstServiceImpl.java b/.../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/...c/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/BasicAuthenticationInterceptor.java b/...c/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/...rta-xml-ws/src/main/java/org/kiwiproject/dropwizard/jakarta/xml/ws/ValidatingInvoker.java b/...rta-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);
                     }
                 }