From 7176f93ca4bf25089a0a0c3a2a51b7b0be99ee11 Mon Sep 17 00:00:00 2001
From: "Marcel Mager (INST-IOT/ESB)" <Marcel.Mager@bosch-si.com>
Date: Fri, 23 Sep 2016 10:11:36 +0200
Subject: [PATCH] Fix code smells.

Signed-off-by: Marcel Mager (INST-IOT/ESB) <Marcel.Mager@bosch-si.com>
---
 .../ControllerPreAuthenticatedSecurityHeaderFilter.java     | 1 -
 .../PreAuthTokenSourceTrustAuthenticationProvider.java      | 6 +++---
 .../ControllerPreAuthenticatedSecurityHeaderFilterTest.java | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilter.java b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilter.java
index c3d6bd3bd..6965afe3f 100644
--- a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilter.java
+++ b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilter.java
@@ -9,7 +9,6 @@
 package org.eclipse.hawkbit.security;
 
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
diff --git a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProvider.java b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProvider.java
index 4abf0deb0..0809f6691 100644
--- a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProvider.java
+++ b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProvider.java
@@ -111,7 +111,7 @@ public class PreAuthTokenSourceTrustAuthenticationProvider implements Authentica
         throw new BadCredentialsException("The provided principal and credentials are not match");
     }
 
-	/**
+    /**
      *
      * The credentials may either be of type HeaderAuthentication or of type
      * Collection<HeaderAuthentication> depending on the authentication mode in
@@ -129,7 +129,7 @@ public class PreAuthTokenSourceTrustAuthenticationProvider implements Authentica
      *         <code>false</code>
      */
     private boolean calculateAuthenticationSuccess(Object principal, Object credentials, Object tokenDetails) {
-    	boolean successAuthentication = false;
+        boolean successAuthentication = false;
         if (Collection.class.isAssignableFrom(credentials.getClass())) {
             final Collection<?> multiValueCredentials = (Collection<?>) credentials;
             if (multiValueCredentials.contains(principal)) {
@@ -139,7 +139,7 @@ public class PreAuthTokenSourceTrustAuthenticationProvider implements Authentica
             successAuthentication = checkSourceIPAddressIfNeccessary(tokenDetails);
         }
 
-    	return successAuthentication;
+        return successAuthentication;
     }
 
     private boolean checkSourceIPAddressIfNeccessary(final Object tokenDetails) {
diff --git a/hawkbit-security-integration/src/test/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilterTest.java b/hawkbit-security-integration/src/test/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilterTest.java
index 59605b76d..1275e44b0 100644
--- a/hawkbit-security-integration/src/test/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilterTest.java
+++ b/hawkbit-security-integration/src/test/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilterTest.java
@@ -126,7 +126,7 @@ public class ControllerPreAuthenticatedSecurityHeaderFilterTest {
         assertThat(credentials.contains(expected)).isTrue();
 
         Object principal = underTest.getPreAuthenticatedPrincipal(securityToken);
-        assertEquals(expected, principal);
+        assertEquals("hash1 expected in principal!", expected, principal);
 
         securityToken = prepareSecurityToken();
         securityToken.getHeaders().put(X_SSL_ISSUER_HASH_1, "hash2");
@@ -135,7 +135,7 @@ public class ControllerPreAuthenticatedSecurityHeaderFilterTest {
         assertThat(credentials.contains(expected)).isTrue();
 
         principal = underTest.getPreAuthenticatedPrincipal(securityToken);
-        assertEquals(expected, principal);
+        assertEquals("hash2 expected in principal!", expected, principal);
 
     }