diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties index 75cb8a350e..070e81c7c0 100644 --- a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties +++ b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties @@ -29,10 +29,6 @@ che.websocket.endpoint=ws://${CHE_HOST}:${CHE_PORT}/api/websocket # for major WebSocket interactions and messaging. che.websocket.internal.endpoint=NULL -# By default, when users access a workspace with its URL, the workspace -# automatically starts (if currently stopped). Set this to `false` to disable this behavior. -che.workspace.auto_start=true - # Workspace threads pool configuration. This pool is used for workspace-related # operations that require asynchronous execution, for example, starting and stopping. # Possible values are: `fixed` and `cached`. diff --git a/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java index aed8489045..5cdf16af06 100644 --- a/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java +++ b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.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/ @@ -36,8 +36,6 @@ public final class Constants { public static final String WORKSPACE_STOPPED_BY = "stopped_by"; public static final String WORKSPACE_STOP_REASON = "stop_reason"; - public static final String CHE_WORKSPACE_AUTO_START = "che.workspace.auto_start"; - /** * The configuration property that defines available values for storage types that clients like * Dashboard should propose for users during workspace creation/update. diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceService.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceService.java index 95baf6e9c9..7bd09030ab 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceService.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceService.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/ @@ -21,7 +21,6 @@ import static org.eclipse.che.api.workspace.server.WorkspaceKeyValidator.validat import static org.eclipse.che.api.workspace.shared.Constants.CHE_DEVWORKSPACES_ENABLED_PROPERTY; import static org.eclipse.che.api.workspace.shared.Constants.CHE_FACTORY_DEFAULT_EDITOR_PROPERTY; import static org.eclipse.che.api.workspace.shared.Constants.CHE_FACTORY_DEFAULT_PLUGINS_PROPERTY; -import static org.eclipse.che.api.workspace.shared.Constants.CHE_WORKSPACE_AUTO_START; import static org.eclipse.che.api.workspace.shared.Constants.CHE_WORKSPACE_DEVFILE_REGISTRY_INTERNAL_URL_PROPERTY; import static org.eclipse.che.api.workspace.shared.Constants.CHE_WORKSPACE_DEVFILE_REGISTRY_URL_PROPERTY; import static org.eclipse.che.api.workspace.shared.Constants.CHE_WORKSPACE_PLUGIN_REGISTRY_INTERNAL_URL_PROPERTY; @@ -110,7 +109,6 @@ public class WorkspaceService extends Service { private final String devfileRegistryUrl; private final String devfileRegistryInternalUrl; private final String apiEndpoint; - private final boolean cheWorkspaceAutoStart; private final boolean cheDevWorkspacesEnabled; private final FileContentProvider devfileContentProvider; private final Long logLimitBytes; @@ -122,7 +120,6 @@ public class WorkspaceService extends Service { @Inject public WorkspaceService( @Named("che.api") String apiEndpoint, - @Named(CHE_WORKSPACE_AUTO_START) boolean cheWorkspaceAutoStart, WorkspaceManager workspaceManager, MachineTokenProvider machineTokenProvider, WorkspaceLinksGenerator linksGenerator, @@ -140,7 +137,6 @@ public class WorkspaceService extends Service { @Named(CHE_FACTORY_DEFAULT_PLUGINS_PROPERTY) @Nullable String defaultPlugins, @Named(CHE_DEVWORKSPACES_ENABLED_PROPERTY) boolean cheDevWorkspacesEnabled) { this.apiEndpoint = apiEndpoint; - this.cheWorkspaceAutoStart = cheWorkspaceAutoStart; this.workspaceManager = workspaceManager; this.machineTokenProvider = machineTokenProvider; this.linksGenerator = linksGenerator; @@ -469,7 +465,6 @@ public class WorkspaceService extends Service { settings.put( Constants.SUPPORTED_RECIPE_TYPES, Joiner.on(",").join(workspaceManager.getSupportedRecipes())); - settings.put(CHE_WORKSPACE_AUTO_START, Boolean.toString(cheWorkspaceAutoStart)); if (pluginRegistryUrl != null) { settings.put("cheWorkspacePluginRegistryUrl", pluginRegistryUrl); diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTest.java index dcb3a6f641..a91e2174d6 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTest.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/ @@ -26,7 +26,6 @@ import static org.eclipse.che.api.workspace.server.DtoConverter.asDto; import static org.eclipse.che.api.workspace.shared.Constants.CHE_DEVWORKSPACES_ENABLED_PROPERTY; import static org.eclipse.che.api.workspace.shared.Constants.CHE_FACTORY_DEFAULT_EDITOR_PROPERTY; import static org.eclipse.che.api.workspace.shared.Constants.CHE_FACTORY_DEFAULT_PLUGINS_PROPERTY; -import static org.eclipse.che.api.workspace.shared.Constants.CHE_WORKSPACE_AUTO_START; import static org.eclipse.che.api.workspace.shared.Constants.CHE_WORKSPACE_STORAGE_AVAILABLE_TYPES; import static org.eclipse.che.api.workspace.shared.Constants.CHE_WORKSPACE_STORAGE_PREFERRED_TYPE; import static org.eclipse.che.api.workspace.shared.Constants.DEBUG_WORKSPACE_START; @@ -175,7 +174,6 @@ public class WorkspaceServiceTest { service = new WorkspaceService( API_ENDPOINT, - true, wsManager, machineTokenProvider, linksGenerator, @@ -848,7 +846,6 @@ public class WorkspaceServiceTest { settings, new ImmutableMap.Builder<>() .put(SUPPORTED_RECIPE_TYPES, "dockerimage,dockerfile") - .put(CHE_WORKSPACE_AUTO_START, "true") .put("cheWorkspacePluginRegistryUrl", CHE_WORKSPACE_PLUGIN_REGISTRY_URL) .put( "cheWorkspacePluginRegistryInternalUrl", CHE_WORKSPACE_PLUGIN_REGISTRY_INTERNAL_URL)