From 8dcfc8412d7f2ae72fbf59ce87a9be777bc9f069 Mon Sep 17 00:00:00 2001 From: SirWayne Date: Thu, 28 Apr 2016 16:05:37 +0200 Subject: [PATCH 1/2] Fix: Return trimmed username Signed-off-by: SirWayne --- .../hawkbit/ui/common/UserDetailsFormatter.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java index 04ad0c51a..d4a733de3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java @@ -88,12 +88,10 @@ public final class UserDetailsFormatter { * name to max 12 characters. @see * {@link UserDetailsFormatter#loadAndFormatUsername(String, int)} * - * @param baseEntity - * the entity * @return the formatted user name (max 12 characters) cannot be */ - public static String loadAndFormatCurrentUsername() { - return loadAndFormatUsername(getCurrentUser().getUsername(), 12); + public static String formatCurrentUsername() { + return loadAndFormatUsername(getCurrentUser().getUsername(), 5); } /** @@ -114,6 +112,10 @@ public final class UserDetailsFormatter { */ public static String loadAndFormatUsername(final String username, final int expectedNameLength) { final UserDetails userDetails = loadUserByUsername(username); + return formatUserName(expectedNameLength, userDetails); + } + + private static String formatUserName(final int expectedNameLength, final UserDetails userDetails) { if (!(userDetails instanceof UserPrincipal)) { return userDetails.getUsername(); } @@ -134,7 +136,7 @@ public final class UserDetailsFormatter { if (StringUtils.isEmpty(trimmedUsername)) { return trimAndFormatDetail(userPrincipal.getLoginname(), expectedNameLength); } - return firstAndLastname; + return trimmedUsername; } /** From 345e9a7cf3bf4cf25f7fbaf0ffe1409550cb0076 Mon Sep 17 00:00:00 2001 From: SirWayne Date: Thu, 28 Apr 2016 16:24:13 +0200 Subject: [PATCH 2/2] Rename method Signed-off-by: SirWayne --- .../main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java index 690cb51a2..5a822ff86 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java @@ -193,7 +193,7 @@ public final class DashboardMenu extends CustomComponent { final MenuItem settingsItem = settings.addItem("", new ThemeResource("images/profile-pic-57px.jpg"), null); final String formattedTenant = UserDetailsFormatter.formatCurrentTenant(); - final String formattedUsername = UserDetailsFormatter.loadAndFormatCurrentUsername(); + final String formattedUsername = UserDetailsFormatter.formatCurrentUsername(); String tenantAndUsernameHtml = ""; if (!StringUtils.isEmpty(formattedTenant)) { tenantAndUsernameHtml += formattedTenant + "
";