diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/ChangePasswordDialog.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/ChangePasswordDialog.java index d6caaf05441..b17ba989557 100644 --- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/ChangePasswordDialog.java +++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/ChangePasswordDialog.java @@ -36,8 +36,8 @@ public class ChangePasswordDialog extends SimpleDialog { - private final GwtCredentialServiceAsync credentialService = GWT.create(GwtCredentialService.class); - private final ConsoleMessages consoleMessages = GWT.create(ConsoleMessages.class); + private static final ConsoleMessages CONSOLE_MESSAGES = GWT.create(ConsoleMessages.class); + private static final GwtCredentialServiceAsync GWT_CREDENTIAL_SERVICE = GWT.create(GwtCredentialService.class); private TextField oldPassword; private TextField newPassword; @@ -82,7 +82,7 @@ public void createBody() { credentialFormPanel.add(confirmPassword); passwordTooltip = new LabelField(); - credentialService.getMinPasswordLength(currentSession.getAccountId(), new AsyncCallback() { + GWT_CREDENTIAL_SERVICE.getMinPasswordLength(currentSession.getAccountId(), new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -117,7 +117,7 @@ protected void addListeners() { @Override public void submit() { - credentialService.changePassword(xsrfToken, oldPassword.getValue(), newPassword.getValue(), code.getValue(), currentSession.getUserId(), currentSession.getAccountId(), new AsyncCallback() { + GWT_CREDENTIAL_SERVICE.changePassword(xsrfToken, oldPassword.getValue(), newPassword.getValue(), code.getValue(), currentSession.getUserId(), currentSession.getAccountId(), new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -130,17 +130,17 @@ public void onFailure(Throwable caught) { GwtKapuaException gwtCaught = (GwtKapuaException) caught; if (gwtCaught.getCode().equals(GwtKapuaErrorCode.INVALID_USERNAME_PASSWORD)) { if (credentialFormPanel.findComponent(code) != null) { - ConsoleInfo.display(consoleMessages.error(), ActionDialog.MSGS.changePasswordError(MSGS.changePasswordErrorWrongOldPasswordOrMfaCode())); + ConsoleInfo.display(CONSOLE_MESSAGES.error(), ActionDialog.MSGS.changePasswordError(MSGS.changePasswordErrorWrongOldPasswordOrMfaCode())); } else { - ConsoleInfo.display(consoleMessages.error(), ActionDialog.MSGS.changePasswordError(MSGS.changePasswordErrorWrongOldPassword())); + ConsoleInfo.display(CONSOLE_MESSAGES.error(), ActionDialog.MSGS.changePasswordError(MSGS.changePasswordErrorWrongOldPassword())); oldPassword.markInvalid(MSGS.changePasswordErrorWrongOldPassword()); } } else if (gwtCaught.getCode().equals(GwtKapuaErrorCode.UNAUTHENTICATED)) { - ConsoleInfo.display(consoleMessages.error(), ActionDialog.MSGS.changePasswordError(caught.getLocalizedMessage())); + ConsoleInfo.display(CONSOLE_MESSAGES.error(), ActionDialog.MSGS.changePasswordError(caught.getLocalizedMessage())); hide(); TokenCleaner.cleanToken(); } else { - ConsoleInfo.display(consoleMessages.error(), ActionDialog.MSGS.changePasswordError(caught.getLocalizedMessage())); + ConsoleInfo.display(CONSOLE_MESSAGES.error(), ActionDialog.MSGS.changePasswordError(caught.getLocalizedMessage())); } } } diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaCloudConsole.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaCloudConsole.java index 11f42bd7f1a..e9fc6e32624 100644 --- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaCloudConsole.java +++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaCloudConsole.java @@ -74,11 +74,11 @@ public class KapuaCloudConsole implements EntryPoint { private static final Logger LOG = Logger.getLogger(KapuaCloudConsole.class.getName()); - private final ConsoleMessages msgs = GWT.create(ConsoleMessages.class); - private final ConsoleCoreMessages coreMessages = GWT.create(ConsoleCoreMessages.class); + private static final ConsoleMessages CONSOLE_MESSAGES = GWT.create(ConsoleMessages.class); + private static final ConsoleCoreMessages CONSOLE_CORE_MESSAGES = GWT.create(ConsoleCoreMessages.class); - private final GwtAuthorizationServiceAsync gwtAuthorizationServiceAsync = GWT.create(GwtAuthorizationService.class); - private final GwtSettingsServiceAsync gwtSettingsServiceAsync = GWT.create(GwtSettingsService.class); + private static final GwtAuthorizationServiceAsync GWT_AUTHORIZATION_SERVICE = GWT.create(GwtAuthorizationService.class); + private static final GwtSettingsServiceAsync GWT_SETTINGS_SERVICE = GWT.create(GwtSettingsService.class); // OpenID Connect single sign-on parameters public static final String OPENID_ACCESS_TOKEN_PARAM = "access_token"; @@ -133,7 +133,7 @@ public void execute() { * @since 1.0.0 */ public void onModuleLoad2() { - gwtSettingsServiceAsync.getProductInformation(new AsyncCallback() { + GWT_SETTINGS_SERVICE.getProductInformation(new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -144,7 +144,7 @@ public void onFailure(Throwable caught) { public void onSuccess(GwtProductInformation result) { productInformation = result; // Check if a session has already been established on the server-side - gwtAuthorizationServiceAsync.getCurrentSession(new AsyncCallback() { + GWT_AUTHORIZATION_SERVICE.getCurrentSession(new AsyncCallback() { @Override public void onFailure(Throwable t) { @@ -360,7 +360,7 @@ private void renderLoginDialog() { // Check if coming from failed OpenID Connect login (the user exists but she does not have the authorizations) if (error != null && error.equals("access_denied")) { LOG.info("Access denied, OpenID Connect login failed"); - ConsoleInfo.display(coreMessages.loginSsoLoginError(), coreMessages.ssoClientAuthenticationFailed()); + ConsoleInfo.display(CONSOLE_CORE_MESSAGES.loginSsoLoginError(), CONSOLE_CORE_MESSAGES.ssoClientAuthenticationFailed()); } showLoginDialog(viewport); } @@ -380,7 +380,7 @@ public void handleEvent(ComponentEvent be) { } }); - loginDialog.setHeading(coreMessages.loginTitle(productInformation.getProductName())); + loginDialog.setHeading(CONSOLE_CORE_MESSAGES.loginTitle(productInformation.getProductName())); if (!UserAgentUtils.isIE()) { Window.addResizeHandler(new ResizeHandler() { @@ -399,14 +399,14 @@ private void performOpenIDLogin(final Viewport viewport, String accessToken, Str // show wait dialog final Dialog ssoLoginWaitDialog = new Dialog(); - ssoLoginWaitDialog.setHeading(msgs.ssoWaitDialog_title()); + ssoLoginWaitDialog.setHeading(CONSOLE_MESSAGES.ssoWaitDialog_title()); ssoLoginWaitDialog.setButtons(""); ssoLoginWaitDialog.setClosable(false); ssoLoginWaitDialog.setResizable(false); ssoLoginWaitDialog.setModal(true); ssoLoginWaitDialog.setOnEsc(false); - Label label = new Label(msgs.ssoWaitDialog_text()); + Label label = new Label(CONSOLE_MESSAGES.ssoWaitDialog_text()); ssoLoginWaitDialog.add(label); ssoLoginWaitDialog.show(); @@ -415,19 +415,19 @@ private void performOpenIDLogin(final Viewport viewport, String accessToken, Str // start login process final GwtJwtIdToken gwtIdToken = new GwtJwtIdToken(idToken); final GwtJwtCredential credentials = new GwtJwtCredential(accessToken); - gwtAuthorizationServiceAsync.login(credentials, gwtIdToken, new AsyncCallback() { + GWT_AUTHORIZATION_SERVICE.login(credentials, gwtIdToken, new AsyncCallback() { @Override public void onFailure(Throwable caught) { ssoLoginWaitDialog.hide(); LOG.info("OpenID Connect login failed."); - ConsoleInfo.display(coreMessages.loginSsoLoginError(), caught.getLocalizedMessage()); + ConsoleInfo.display(CONSOLE_CORE_MESSAGES.loginSsoLoginError(), caught.getLocalizedMessage()); // Invalidating the OpenID IdToken. We must use the OpenID logout here, since we don't have the KapuSession set yet, so we don't have the // openIDidToken set inside. This means we cannot realy on the OpenIDLogoutListener to invalidate the OpenID session, instead we must do that // as a 'real' user initiated logout. - gwtSettingsServiceAsync.getOpenIDLogoutUri(gwtIdToken.getIdToken(), new AsyncCallback() { + GWT_SETTINGS_SERVICE.getOpenIDLogoutUri(gwtIdToken.getIdToken(), new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -523,7 +523,7 @@ private void renderMainScreen(Viewport viewport, GwtSession session) { // or else - ConsoleInfo.display(msgs.error(), coreMessages.loginError()); + ConsoleInfo.display(CONSOLE_MESSAGES.error(), CONSOLE_CORE_MESSAGES.loginError()); showLoginDialog(viewport); } } diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaViewport.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaViewport.java index fcd86e391b0..41801ac6b3d 100644 --- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaViewport.java +++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/KapuaViewport.java @@ -24,7 +24,7 @@ */ public class KapuaViewport extends Viewport { - protected final ConsoleMessages consoleMessages = GWT.create(ConsoleMessages.class); + protected static final ConsoleMessages CONSOLE_MESSAGES = GWT.create(ConsoleMessages.class); /** * Minimum width of browser window. @@ -42,7 +42,7 @@ public KapuaViewport() { super(); setMonitorWindowResize(true); - infoPopup = new InfoPopup(consoleMessages.browserWindowTooSmall()); + infoPopup = new InfoPopup(CONSOLE_MESSAGES.browserWindowTooSmall()); infoPopup.setGlassStyleName("kapua-PopupPanelGlass"); int clientHeight = Window.getClientHeight(); int clientWidth = Window.getClientWidth(); diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/LoginDialog.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/LoginDialog.java index 981d6993ec8..2a7a0923bd4 100644 --- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/LoginDialog.java +++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/LoginDialog.java @@ -52,11 +52,11 @@ */ public class LoginDialog extends Dialog { - private final ConsoleMessages consoleMessages = GWT.create(ConsoleMessages.class); - private final ConsoleCoreMessages consoleCoreMessages = GWT.create(ConsoleCoreMessages.class); + private static final ConsoleMessages CONSOLE_MESSAGES = GWT.create(ConsoleMessages.class); + private static final ConsoleCoreMessages CONSOLE_CORE_MESSAGES = GWT.create(ConsoleCoreMessages.class); - private final GwtAuthorizationServiceAsync gwtAuthorizationService = GWT.create(GwtAuthorizationService.class); - private final GwtSettingsServiceAsync gwtSettingService = GWT.create(GwtSettingsService.class); + private static final GwtAuthorizationServiceAsync GWT_AUTHORIZATION_SERVICE = GWT.create(GwtAuthorizationService.class); + private static final GwtSettingsServiceAsync GWT_SETTINGS_SERVICE = GWT.create(GwtSettingsService.class); private GwtSession currentSession; private TextField username; @@ -114,7 +114,7 @@ public void handleEvent(BaseEvent be) { }; username = new TextField(); - username.setFieldLabel(consoleCoreMessages.loginUsername()); + username.setFieldLabel(CONSOLE_CORE_MESSAGES.loginUsername()); username.addKeyListener(keyListener); username.setAllowBlank(false); username.addListener(Events.OnBlur, changeListener); @@ -123,18 +123,18 @@ public void handleEvent(BaseEvent be) { password = new TextField(); password.setPassword(true); - password.setFieldLabel(consoleCoreMessages.loginPassword()); + password.setFieldLabel(CONSOLE_CORE_MESSAGES.loginPassword()); password.addKeyListener(keyListener); password.setAllowBlank(false); password.addListener(Events.OnBlur, changeListener); add(password); - gwtSettingService.getOpenIDEnabled(new AsyncCallback() { + GWT_SETTINGS_SERVICE.getOpenIDEnabled(new AsyncCallback() { @Override public void onFailure(Throwable caught) { - ConsoleInfo.display(consoleCoreMessages.loginSsoEnabledError(), caught.getLocalizedMessage()); + ConsoleInfo.display(CONSOLE_CORE_MESSAGES.loginSsoEnabledError(), caught.getLocalizedMessage()); } @Override @@ -190,14 +190,14 @@ protected void createButtons() { super.createButtons(); status = new Status(); - status.setBusy(consoleMessages.waitMsg()); + status.setBusy(CONSOLE_MESSAGES.waitMsg()); status.hide(); status.setAutoWidth(true); getButtonBar().add(status); getButtonBar().add(new FillToolItem()); - reset = new Button(consoleCoreMessages.loginReset()); + reset = new Button(CONSOLE_CORE_MESSAGES.loginReset()); reset.disable(); reset.addSelectionListener(new SelectionListener() { @@ -213,7 +213,7 @@ public void componentSelected(ButtonEvent ce) { } }); - login = new Button(consoleCoreMessages.loginLogin()); + login = new Button(CONSOLE_CORE_MESSAGES.loginLogin()); login.addSelectionListener(new SelectionListener() { @Override @@ -222,7 +222,7 @@ public void componentSelected(ButtonEvent ce) { } }); - ssoLogin = new Button(consoleCoreMessages.loginSsoLogin()); + ssoLogin = new Button(CONSOLE_CORE_MESSAGES.loginSsoLogin()); ssoLogin.addSelectionListener(new SelectionListener() { @Override @@ -239,11 +239,11 @@ public void componentSelected(ButtonEvent ce) { } protected void doSsoLogin() { - gwtSettingService.getOpenIDLoginUri(new AsyncCallback() { + GWT_SETTINGS_SERVICE.getOpenIDLoginUri(new AsyncCallback() { @Override public void onFailure(Throwable caught) { - ConsoleInfo.display(consoleCoreMessages.loginSsoLoginError(), caught.getLocalizedMessage()); + ConsoleInfo.display(CONSOLE_CORE_MESSAGES.loginSsoLoginError(), caught.getLocalizedMessage()); } @Override @@ -265,12 +265,12 @@ protected void onRender(Element parent, int pos) { */ protected void onSubmit() { if (username.getValue() == null && password.getValue() == null) { - ConsoleInfo.display(consoleMessages.dialogError(), consoleMessages.usernameAndPasswordRequired()); + ConsoleInfo.display(CONSOLE_MESSAGES.dialogError(), CONSOLE_MESSAGES.usernameAndPasswordRequired()); password.markInvalid(password.getErrorMessage()); } else if (username.getValue() == null) { - ConsoleInfo.display(consoleMessages.dialogError(), consoleMessages.usernameFieldRequired()); + ConsoleInfo.display(CONSOLE_MESSAGES.dialogError(), CONSOLE_MESSAGES.usernameFieldRequired()); } else if (password.getValue() == null) { - ConsoleInfo.display(consoleMessages.dialogError(), consoleMessages.passwordFieldRequired()); + ConsoleInfo.display(CONSOLE_MESSAGES.dialogError(), CONSOLE_MESSAGES.passwordFieldRequired()); password.markInvalid(password.getErrorMessage()); } else { @@ -299,7 +299,7 @@ public void performLogin(String trustKey) { GwtLoginCredential credentials = new GwtLoginCredential(username.getValue(), password.getValue()); credentials.setTrustKey(trustKey); - gwtAuthorizationService.login(credentials, false, new AsyncCallback() { + GWT_AUTHORIZATION_SERVICE.login(credentials, false, new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -309,7 +309,7 @@ public void onFailure(Throwable caught) { mfaLoginDialog.show(); return; } else { - ConsoleInfo.display(consoleCoreMessages.loginError(), caught.getLocalizedMessage()); + ConsoleInfo.display(CONSOLE_CORE_MESSAGES.loginError(), caught.getLocalizedMessage()); } CookieUtils.removeCookie(CookieUtils.KAPUA_COOKIE_TRUST + username.getValue()); } else { @@ -328,7 +328,7 @@ public void onSuccess(GwtSession gwtSession) { } public void performLogout() { - gwtAuthorizationService.logout(new AsyncCallback() { + GWT_AUTHORIZATION_SERVICE.logout(new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -337,7 +337,7 @@ public void onFailure(Throwable caught) { @Override public void onSuccess(Void arg0) { - ConsoleInfo.display(consoleMessages.popupInfo(), consoleMessages.loggedOut()); + ConsoleInfo.display(CONSOLE_MESSAGES.popupInfo(), CONSOLE_MESSAGES.loggedOut()); resetDialog(); show(); } diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaLoginDialog.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaLoginDialog.java index 0c5f625b934..1c05bc0dd9b 100644 --- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaLoginDialog.java +++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaLoginDialog.java @@ -45,11 +45,11 @@ */ public class MfaLoginDialog extends Dialog { - private final ConsoleMessages consoleMessages = GWT.create(ConsoleMessages.class); - private final ConsoleCredentialMessages consoleCredentialMessages = GWT.create(ConsoleCredentialMessages.class); - private final ConsoleCoreMessages consoleCoreMessages = GWT.create(ConsoleCoreMessages.class); + private static final ConsoleMessages CONSOLE_MESSAGES = GWT.create(ConsoleMessages.class); + private static final ConsoleCoreMessages CONSOLE_CORE_MESSAGES = GWT.create(ConsoleCoreMessages.class); + private static final ConsoleCredentialMessages CONSOLE_CREDENTIAL_MESSAGES = GWT.create(ConsoleCredentialMessages.class); - private final GwtAuthorizationServiceAsync gwtAuthorizationService = GWT.create(GwtAuthorizationService.class); + private static final GwtAuthorizationServiceAsync GWT_AUTHORIZATION_SERVICE = GWT.create(GwtAuthorizationService.class); private static final String BR = "
"; @@ -74,7 +74,7 @@ public MfaLoginDialog(LoginDialog loginDialog) { setButtons(""); // don't show OK button setIcon(IconHelper.createStyle("user")); - setHeading(consoleCredentialMessages.mfaLoginTitle()); + setHeading(CONSOLE_CREDENTIAL_MESSAGES.mfaLoginTitle()); setModal(true); setBodyBorder(true); @@ -96,29 +96,29 @@ public void componentKeyUp(ComponentEvent event) { } }; - Label title = new Label(consoleMessages.loginDialogMfaTitle()); + Label title = new Label(CONSOLE_MESSAGES.loginDialogMfaTitle()); title.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER); add(title); // MFA presentation text add(new HTML(BR)); - add(new Label(consoleMessages.loginMfa())); + add(new Label(CONSOLE_MESSAGES.loginMfa())); add(new HTML(BR)); - add(new Label(consoleMessages.loginMfa1())); + add(new Label(CONSOLE_MESSAGES.loginMfa1())); add(new HTML(BR)); // MFA code code = new TextField(); - code.setFieldLabel(consoleMessages.loginCode()); + code.setFieldLabel(CONSOLE_MESSAGES.loginCode()); code.addKeyListener(keyListener); add(code); // checkbox trustCheckbox = new CheckBox(); trustCheckbox.setName("Trustpc"); - trustCheckbox.setBoxLabel(consoleMessages.loginDialogMfaBoxLabel()); + trustCheckbox.setBoxLabel(CONSOLE_MESSAGES.loginDialogMfaBoxLabel()); trustCheckbox.setLabelSeparator(""); - trustCheckbox.setToolTip(consoleMessages.userFormLockedTooltip()); + trustCheckbox.setToolTip(CONSOLE_MESSAGES.userFormLockedTooltip()); add(trustCheckbox); if (this.isVisible()) { @@ -134,11 +134,11 @@ protected void onSubmit() { GwtLoginCredential credentials = new GwtLoginCredential(loginDialog.getUsername().getValue(), loginDialog.getPassword().getValue()); credentials.setAuthenticationCode(code.getValue()); - gwtAuthorizationService.login(credentials, trustCheckbox.getValue(), new AsyncCallback() { + GWT_AUTHORIZATION_SERVICE.login(credentials, trustCheckbox.getValue(), new AsyncCallback() { @Override public void onFailure(Throwable caught) { - ConsoleInfo.display(consoleCoreMessages.loginError(), caught.getLocalizedMessage()); + ConsoleInfo.display(CONSOLE_CORE_MESSAGES.loginError(), caught.getLocalizedMessage()); reset(); // Go back @@ -174,7 +174,7 @@ protected void createButtons() { super.createButtons(); status = new Status(); - status.setBusy(consoleMessages.waitMsg()); + status.setBusy(CONSOLE_MESSAGES.waitMsg()); status.hide(); status.setAutoWidth(true); @@ -182,7 +182,7 @@ protected void createButtons() { getButtonBar().add(new FillToolItem()); // submit - submit = new Button(consoleCoreMessages.loginLogin()); + submit = new Button(CONSOLE_CORE_MESSAGES.loginLogin()); submit.addSelectionListener(new SelectionListener() { @Override diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaManagementDialog.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaManagementDialog.java index acc76f76004..8ece95e0480 100644 --- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaManagementDialog.java +++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/MfaManagementDialog.java @@ -28,8 +28,8 @@ public class MfaManagementDialog extends SimpleDialog { - private final ConsoleCredentialMessages credentialMessages = GWT.create(ConsoleCredentialMessages.class); - private final ConsoleMessages messages = GWT.create(ConsoleMessages.class); + private static final ConsoleMessages CONSOLE_MESSAGES = GWT.create(ConsoleMessages.class); + private static final ConsoleCredentialMessages CONSOLE_CREDENTIAL_MESSAGES = GWT.create(ConsoleCredentialMessages.class); private GwtSession currentSession; @@ -59,7 +59,7 @@ public void submit() { @Override public String getHeaderMessage() { - return credentialMessages.mfaDialogHeader(); + return CONSOLE_CREDENTIAL_MESSAGES.mfaDialogHeader(); } @Override @@ -95,7 +95,7 @@ public void componentSelected(ButtonEvent ce) { @Override protected String getCancelButtonText() { - return messages.closeButton(); + return CONSOLE_MESSAGES.closeButton(); } } diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/NorthView.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/NorthView.java index 511ee36f3ad..cbc355e3683 100644 --- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/NorthView.java +++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/NorthView.java @@ -61,14 +61,14 @@ public class NorthView extends LayoutContainer { - private final ConsoleMessages messages = GWT.create(ConsoleMessages.class); - private final ConsoleCredentialMessages credentialMessages = GWT.create(ConsoleCredentialMessages.class); + private static final ConsoleMessages CONSOLE_MESSAGES = GWT.create(ConsoleMessages.class); + private static final ConsoleCredentialMessages CONSOLE_CREDENTIAL_MESSAGES = GWT.create(ConsoleCredentialMessages.class); - private final GwtAuthorizationServiceAsync gwtAuthorizationService = GWT.create(GwtAuthorizationService.class); - private final GwtAccountServiceAsync gwtAccountService = GWT.create(GwtAccountService.class); - private final GwtConsoleServiceAsync gwtConsoleService = GWT.create(GwtConsoleService.class); - private final GwtSettingsServiceAsync gwtSettingService = GWT.create(GwtSettingsService.class); - private final GwtMfaCredentialOptionsServiceAsync gwtMfaCredentialOptionsService = GWT.create(GwtMfaCredentialOptionsService.class); + private static final GwtAuthorizationServiceAsync GWT_AUTHORIZATION_SERVICE = GWT.create(GwtAuthorizationService.class); + private static final GwtAccountServiceAsync GWT_ACCOUNT_SERVICE = GWT.create(GwtAccountService.class); + private static final GwtConsoleServiceAsync GWT_CONSOLE_SERVICE = GWT.create(GwtConsoleService.class); + private static final GwtSettingsServiceAsync GWT_SETTINGS_SERVICE = GWT.create(GwtSettingsService.class); + private static final GwtMfaCredentialOptionsServiceAsync GWT_MFA_CREDENTIAL_OPTIONS_SERVICE = GWT.create(GwtMfaCredentialOptionsService.class); // UI stuff private final KapuaCloudConsole parent; @@ -184,13 +184,13 @@ public void handleEvent(BaseEvent be) { // (only if the current user is an INTERNAL one; note that an INTERNAL user has no ssoIdToken) if (currentSession.getOpenIDIdToken() == null) { KapuaMenuItem changePassword = new KapuaMenuItem(); - changePassword.setText(messages.changePassword()); + changePassword.setText(CONSOLE_MESSAGES.changePassword()); changePassword.setIcon(IconSet.KEY); changePassword.addSelectionListener(new SelectionListener() { @Override public void componentSelected(MenuEvent ce) { - gwtMfaCredentialOptionsService.findByUserId(currentSession.getAccountId(), currentSession.getUserId(), true, new AsyncCallback() { + GWT_MFA_CREDENTIAL_OPTIONS_SERVICE.findByUserId(currentSession.getAccountId(), currentSession.getUserId(), true, new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -211,7 +211,7 @@ public void onSuccess(GwtMfaCredentialOptions gwtMfaCredentialOptions) { } KapuaMenuItem manageMfa = new KapuaMenuItem(); - manageMfa.setText(credentialMessages.manageMfaMenuItem()); + manageMfa.setText(CONSOLE_CREDENTIAL_MESSAGES.manageMfaMenuItem()); manageMfa.setIcon(IconSet.LOCK); manageMfa.addSelectionListener(new SelectionListener() { @@ -226,13 +226,13 @@ public void componentSelected(MenuEvent ce) { userActionMenu.add(new SeparatorMenuItem()); // Logout menu item KapuaMenuItem userLogoutMenuItem = new KapuaMenuItem(); - userLogoutMenuItem.setText(messages.consoleHeaderUserActionLogout()); + userLogoutMenuItem.setText(CONSOLE_MESSAGES.consoleHeaderUserActionLogout()); userLogoutMenuItem.setIcon(IconSet.SIGN_OUT); userLogoutMenuItem.addSelectionListener(new SelectionListener() { @Override public void componentSelected(MenuEvent ce) { - gwtAuthorizationService.logout(new AsyncCallback() { + GWT_AUTHORIZATION_SERVICE.logout(new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -242,7 +242,7 @@ public void onFailure(Throwable caught) { @Override public void onSuccess(Void arg0) { if (currentSession.isSsoEnabled() && currentSession.getOpenIDIdToken() != null) { - gwtSettingService.getOpenIDLogoutUri(currentSession.getOpenIDIdToken(), new AsyncCallback() { + GWT_SETTINGS_SERVICE.getOpenIDLogoutUri(currentSession.getOpenIDIdToken(), new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -288,8 +288,8 @@ public void onSuccess(String result) { */ public MenuItem createAccountNavigationMenuItem() { KapuaMenuItem mainAccountMenuItem = new KapuaMenuItem(); - mainAccountMenuItem.setText(messages.accountSelectorItemYourAccount(accountName)); - mainAccountMenuItem.setToolTip(messages.accountSelectorTooltipYourAccount()); + mainAccountMenuItem.setText(CONSOLE_MESSAGES.accountSelectorItemYourAccount(accountName)); + mainAccountMenuItem.setToolTip(CONSOLE_MESSAGES.accountSelectorTooltipYourAccount()); mainAccountMenuItem.setIcon(IconSet.USER_MD); mainAccountMenuItem.setId(accountId); mainAccountMenuItem.addSelectionListener(switchToAccountListener); @@ -303,7 +303,7 @@ public MenuItem createAccountNavigationMenuItem() { populateNavigatorMenu(subAccountMenu, accountId); KapuaMenuItem switchToAccountMenuItem = new KapuaMenuItem(); - switchToAccountMenuItem.setText(messages.consoleHeaderUserActionSwitchToAccount()); + switchToAccountMenuItem.setText(CONSOLE_MESSAGES.consoleHeaderUserActionSwitchToAccount()); switchToAccountMenuItem.setIcon(IconSet.USERS); switchToAccountMenuItem.setSubMenu(subAccountMenu); @@ -319,15 +319,15 @@ public MenuItem createAccountNavigationMenuItem() { */ private void populateNavigatorMenu(final Menu menu, String accountId) { final KapuaMenuItem loadingChildAccounts; - loadingChildAccounts = new KapuaMenuItem(messages.accountSelectorLoadingChildAccounts()); - loadingChildAccounts.setToolTip(messages.accountSelectorTooltipYourAccount()); + loadingChildAccounts = new KapuaMenuItem(CONSOLE_MESSAGES.accountSelectorLoadingChildAccounts()); + loadingChildAccounts.setToolTip(CONSOLE_MESSAGES.accountSelectorTooltipYourAccount()); loadingChildAccounts.setIcon(IconSet.USER_MD); loadingChildAccounts.setId(accountId); loadingChildAccounts.disable(); menu.add(loadingChildAccounts); - gwtAccountService.find(accountId, new AsyncCallback() { + GWT_ACCOUNT_SERVICE.find(accountId, new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -339,7 +339,7 @@ public void onSuccess(GwtAccount result) { // If no children are found, add "No Child" label if (result.getChildAccounts() != null && result.getChildAccounts().isEmpty()) { menu.remove(loadingChildAccounts); - MenuItem noChildMenuItem = new MenuItem(messages.accountSelectorItemNoChild()); + MenuItem noChildMenuItem = new MenuItem(CONSOLE_MESSAGES.accountSelectorItemNoChild()); noChildMenuItem.disable(); menu.add(noChildMenuItem); } else { @@ -387,9 +387,9 @@ private void switchToAccount(MenuEvent ce) { String accountIdString = ce.getItem().getId(); // Mask the whole page - parent.getViewport().mask(messages.accountSelectorMenuMaskLoading(accountName)); + parent.getViewport().mask(CONSOLE_MESSAGES.accountSelectorMenuMaskLoading(accountName)); - gwtAccountService.find(accountIdString, new AsyncCallback() { + GWT_ACCOUNT_SERVICE.find(accountIdString, new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -399,7 +399,7 @@ public void onFailure(Throwable caught) { @Override public void onSuccess(final GwtAccount result) { - gwtConsoleService.getCustomEntityViews(new AsyncCallback>() { + GWT_CONSOLE_SERVICE.getCustomEntityViews(new AsyncCallback>() { @Override public void onFailure(Throwable caught) { @@ -451,7 +451,7 @@ private void updateUserActionButtonLabel() { userDisplayName = username; } - userActionButton.setText(messages.consoleHeaderUserActionButtonLabel(userDisplayName, accountName)); + userActionButton.setText(CONSOLE_MESSAGES.consoleHeaderUserActionButtonLabel(userDisplayName, accountName)); } } diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/WestNavigationView.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/WestNavigationView.java index bad2847d0f8..fd0f714d5f1 100644 --- a/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/WestNavigationView.java +++ b/console/core/src/main/java/org/eclipse/kapua/app/console/core/client/WestNavigationView.java @@ -65,7 +65,7 @@ public class WestNavigationView extends LayoutContainer { - private final ConsoleMessages messages = GWT.create(ConsoleMessages.class); + private static final ConsoleMessages CONSOLE_MESSAGES = GWT.create(ConsoleMessages.class); private final LayoutContainer centerPanel; private final KapuaCloudConsole kapuaCloudConsole; @@ -147,7 +147,7 @@ public void onSuccess(final List additionalViewDescriptors) accountManagementPanel = new ContentPanel(); accountManagementPanel.setBorders(false); accountManagementPanel.setBodyBorder(false); - accountManagementPanel.setHeading(messages.manageHeading()); + accountManagementPanel.setHeading(CONSOLE_MESSAGES.manageHeading()); cloudResourcesTreeStore = new TreeStore(); accountManagementTreeStore = new TreeStore(); @@ -175,8 +175,8 @@ public void selectionChanged(final SelectionChangedEvent se) { if ((currentSession.isFormDirty()) && (!skipNextSelChange)) { // ask for confirmation before switching - MessageBox.confirm(messages.confirm(), - messages.unsavedChanges(), + MessageBox.confirm(CONSOLE_MESSAGES.confirm(), + CONSOLE_MESSAGES.unsavedChanges(), new Listener() { @Override @@ -301,7 +301,7 @@ public void onSuccess(GwtAccount result) { settingView.setAccount(result); panel.setIcon(new KapuaIcon(IconSet.COG)); - panel.setHeading(messages.settings()); + panel.setHeading(CONSOLE_MESSAGES.settings()); panel.add(settingView); centerPanel.add(panel); diff --git a/console/web/pom.xml b/console/web/pom.xml index 406b3a25937..c616f150f27 100644 --- a/console/web/pom.xml +++ b/console/web/pom.xml @@ -359,7 +359,7 @@ org.eclipse.kapua.app.console.adminDev - OBF + DETAILED