Remove Objects.nonNull from everywhere

descope · Jul 13, 2023 · 220d4fc · 220d4fc
1 parent 1609bc7
commit 220d4fc
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/src/main/java/com/descope/sdk/auth/impl/AuthenticationsBase.java b/src/main/java/com/descope/sdk/auth/impl/AuthenticationsBase.java
@@ -8,7 +8,6 @@
 import static com.descope.literals.Routes.AuthEndPoints.REFRESH_TOKEN_LINK;
 import static com.descope.utils.PatternUtils.EMAIL_PATTERN;
 import static com.descope.utils.PatternUtils.PHONE_PATTERN;
-import static java.util.Objects.nonNull;
 import static org.apache.commons.lang3.StringUtils.isEmpty;
 
 import com.descope.enums.DeliveryMethod;
@@ -143,7 +142,7 @@ Tokens provideTokens(HttpRequest request) {
                 .map(String::trim)
                 .findAny()
                 .orElse(null);
-        if (nonNull(sessionCookie)) {
+        if (sessionCookie != null) {
           tokens.setSessionToken(sessionCookie.split("=")[1]);
         }
 
@@ -152,7 +151,7 @@ Tokens provideTokens(HttpRequest request) {
                 .filter(cookie -> cookie.contains(REFRESH_COOKIE_NAME))
                 .findAny()
                 .orElse(null);
-        if (nonNull(refreshCookie)) {
+        if (refreshCookie != null) {
           tokens.setRefreshToken(refreshCookie.split("=")[1]);
         }
       }

diff --git a/src/main/java/com/descope/sdk/mgmt/impl/FlowServiceImpl.java b/src/main/java/com/descope/sdk/mgmt/impl/FlowServiceImpl.java
@@ -16,7 +16,6 @@
 import com.descope.sdk.mgmt.FlowService;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import org.apache.commons.lang3.StringUtils;
 
 class FlowServiceImpl extends ManagementsBase implements FlowService {

diff --git a/src/main/java/com/descope/sdk/mgmt/impl/UserServiceImpl.java b/src/main/java/com/descope/sdk/mgmt/impl/UserServiceImpl.java
@@ -41,7 +41,6 @@
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import org.apache.commons.lang3.StringUtils;
 
 class UserServiceImpl extends ManagementsBase implements UserService {

diff --git a/src/main/java/com/descope/utils/JwtUtils.java b/src/main/java/com/descope/utils/JwtUtils.java
@@ -1,7 +1,5 @@
 package com.descope.utils;
 
-import static java.util.Objects.nonNull;
-
 import com.descope.model.jwt.Token;
 import com.descope.model.magiclink.LoginOptions;
 import io.jsonwebtoken.Claims;
@@ -40,6 +38,6 @@ public static Jws<Claims> getClaimsJws(String jwt, Key key) {
   }
 
   public static boolean isJWTRequired(LoginOptions loginOptions) {
-    return nonNull(loginOptions) && (loginOptions.isStepUp() || loginOptions.isMfa());
+    return loginOptions != null && (loginOptions.isStepUp() || loginOptions.isMfa());
   }
 }