diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/UserPreferencesConfigurator.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/UserPreferencesConfigurator.java index 80391c6f102..98e0c933e90 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/UserPreferencesConfigurator.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/UserPreferencesConfigurator.java @@ -17,9 +17,10 @@ import javax.inject.Singleton; import org.eclipse.che.api.user.server.PreferenceManager; import org.eclipse.che.api.user.server.UserManager; -import org.eclipse.che.api.workspace.server.spi.InfrastructureException; import org.eclipse.che.api.workspace.server.spi.NamespaceResolutionContext; import org.eclipse.che.workspace.infrastructure.kubernetes.KubernetesClientFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Creates {@link Secret} with user preferences. This serves as a way for DevWorkspaces to acquire @@ -30,6 +31,7 @@ @Deprecated @Singleton public class UserPreferencesConfigurator implements NamespaceConfigurator { + private static final Logger LOG = LoggerFactory.getLogger(UserProfileConfigurator.class); private static final String USER_PREFERENCES_SECRET_NAME = "user-preferences"; private static final String USER_PREFERENCES_SECRET_MOUNT_PATH = "/config/user/preferences"; private static final int PREFERENCE_NAME_MAX_LENGTH = 253; @@ -48,10 +50,11 @@ public UserPreferencesConfigurator( this.preferenceManager = preferenceManager; } - /** 'user-preferences' secret is obsolete and not used anymore by DevWorkspaces */ @Override - public void configure(NamespaceResolutionContext namespaceResolutionContext, String namespaceName) - throws InfrastructureException {} + public void configure( + NamespaceResolutionContext namespaceResolutionContext, String namespaceName) { + LOG.debug("'user-preferences' secret is obsolete and not configured anymore for DevWorkspaces"); + } /** * Some preferences names are not compatible with k8s restrictions on key field in secret. The diff --git a/multiuser/personal-account/src/main/java/org/eclipse/che/multiuser/api/account/personal/PersonalAccountUserManager.java b/multiuser/personal-account/src/main/java/org/eclipse/che/multiuser/api/account/personal/PersonalAccountUserManager.java index e172edacc7b..6092ef6160c 100644 --- a/multiuser/personal-account/src/main/java/org/eclipse/che/multiuser/api/account/personal/PersonalAccountUserManager.java +++ b/multiuser/personal-account/src/main/java/org/eclipse/che/multiuser/api/account/personal/PersonalAccountUserManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 Red Hat, Inc. + * Copyright (c) 2012-2022 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -56,10 +56,6 @@ public PersonalAccountUserManager( @Override public User create(User newUser, boolean isTemporary) throws ConflictException, ServerException { User createdUser = super.create(newUser, isTemporary); - - accountManager.create( - new AccountImpl(createdUser.getId(), createdUser.getName(), PERSONAL_ACCOUNT)); - return createdUser; } diff --git a/wsmaster/che-core-api-account/src/main/java/org/eclipse/che/account/api/AccountManager.java b/wsmaster/che-core-api-account/src/main/java/org/eclipse/che/account/api/AccountManager.java index 2ab00712a9b..667dc796a27 100644 --- a/wsmaster/che-core-api-account/src/main/java/org/eclipse/che/account/api/AccountManager.java +++ b/wsmaster/che-core-api-account/src/main/java/org/eclipse/che/account/api/AccountManager.java @@ -51,7 +51,7 @@ public AccountManager(AccountDao accountDao, EventService eventService) { * @throws ServerException when any other error occurs during account creating */ public void create(Account account) throws ConflictException, ServerException { - requireNonNull(account, "Required non-null account"); + throw new ServerException("Account creation is obsolete and not expected to be invoked"); } /** diff --git a/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/server/CheUserCreator.java b/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/server/CheUserCreator.java index 445666c1bc5..4e69ae21956 100644 --- a/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/server/CheUserCreator.java +++ b/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/server/CheUserCreator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2021 Red Hat, Inc. + * Copyright (c) 2012-2022 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -17,7 +17,6 @@ import javax.inject.Inject; import javax.inject.Singleton; import org.eclipse.che.account.api.AccountManager; -import org.eclipse.che.account.spi.AccountImpl; import org.eclipse.che.api.core.ConflictException; import org.eclipse.che.api.core.NotFoundException; import org.eclipse.che.api.core.ServerException; @@ -29,6 +28,7 @@ * * @author Anton Korneta */ +@Deprecated @Singleton public class CheUserCreator { @@ -52,14 +52,5 @@ public void createCheUser() throws ServerException { } catch (ConflictException ignore) { } } - - try { - accountManager.getById("che"); - } catch (NotFoundException e) { - try { - accountManager.create(new AccountImpl("che", "che", "personal")); - } catch (ConflictException ignore) { - } - } } }