From ed8827726cf7773ba4a366e4f6e975824133750c Mon Sep 17 00:00:00 2001
From: SirWayne <dennis.melzer@bosch-si.com>
Date: Thu, 9 Jun 2016 17:31:34 +0200
Subject: [PATCH] Refactor auditore aware

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
---
 .../security/SpringSecurityAuditorAware.java  | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SpringSecurityAuditorAware.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SpringSecurityAuditorAware.java
index 2d225c1dc..783d5344c 100644
--- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SpringSecurityAuditorAware.java
+++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SpringSecurityAuditorAware.java
@@ -14,12 +14,8 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 
 /**
- * Auditor class that allows {@link BaseEntity}s to insert currenlt logged in
- * user for repository changes.
- *
- *
- *
- *
+ * Auditor class that allows BaseEntitys to insert current logged in user for
+ * repository changes.
  *
  */
 public class SpringSecurityAuditorAware implements AuditorAware<String> {
@@ -29,16 +25,21 @@ public class SpringSecurityAuditorAware implements AuditorAware<String> {
 
         final Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 
-        if (authentication == null || !authentication.isAuthenticated()) {
+        if (isAuthentifactionInvalid(authentication)) {
             return null;
         }
 
-        if (authentication.getPrincipal() != null) {
-            if (authentication.getPrincipal() instanceof UserDetails) {
-                return ((UserDetails) authentication.getPrincipal()).getUsername();
-            }
-            return authentication.getPrincipal().toString();
+        return getCurrentAuditor(authentication);
+    }
+
+    private String getCurrentAuditor(final Authentication authentication) {
+        if (authentication.getPrincipal() instanceof UserDetails) {
+            return ((UserDetails) authentication.getPrincipal()).getUsername();
         }
-        return null;
+        return authentication.getPrincipal().toString();
+    }
+
+    private static boolean isAuthentifactionInvalid(final Authentication authentication) {
+        return authentication == null || !authentication.isAuthenticated() || authentication.getPrincipal() == null;
     }
 }