From 4c6050c167f8212fb416f44d8a578f2f85f52715 Mon Sep 17 00:00:00 2001
From: Jennifer Arps <jennifer@dedica.team>
Date: Wed, 2 Feb 2022 11:34:01 +0100
Subject: [PATCH] [#141] if/else instead of ternary op

---
 .../nivio/security/CustomOAuth2UserService.java  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/bonndan/nivio/security/CustomOAuth2UserService.java b/src/main/java/de/bonndan/nivio/security/CustomOAuth2UserService.java
index 41421a8ac..46bdfdeab 100644
--- a/src/main/java/de/bonndan/nivio/security/CustomOAuth2UserService.java
+++ b/src/main/java/de/bonndan/nivio/security/CustomOAuth2UserService.java
@@ -50,7 +50,12 @@ public static CustomOAuth2User fromGitHubUser(@NonNull final OAuth2User user,
     ) {
         var externalId = "";
         if (StringUtils.hasLength(nameAttribute)) {
-            externalId = String.valueOf(user.getAttribute("id") == null ? "" : user.getAttribute("id"));
+            final var id = user.getAttribute("id");
+            if (id == null) {
+                externalId = "";
+            } else {
+                externalId = String.valueOf(id);
+            }
         }
 
         var name = "";
@@ -64,9 +69,16 @@ public static CustomOAuth2User fromGitHubUser(@NonNull final OAuth2User user,
             }
         }
 
+        var alias = "";
+        if (StringUtils.hasLength(aliasAttribute)) {
+            alias = Optional.ofNullable((String) user.getAttribute(aliasAttribute)).orElse("");
+        } else {
+            alias = "";
+        }
+
         return new CustomOAuth2User(
                 externalId,
-                StringUtils.hasLength(aliasAttribute) ? Optional.ofNullable((String) user.getAttribute(aliasAttribute)).orElse("") : "",
+                alias,
                 name,
                 user.getAttributes(),
                 user.getAuthorities(),