diff --git a/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java b/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java index 31f69f9ce8..cc88d52c8b 100644 --- a/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java +++ b/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java @@ -163,5 +163,7 @@ public class WsMasterModule extends AbstractModule { // bind(org.eclipse.che.api.agent.server.filters.AddExecInstallerInStackFilter.class); bind(ServerCheckerFactory.class).to(ServerCheckerFactoryImpl.class); + + bind(org.eclipse.che.api.user.server.AppStatesPreferenceCleaner.class); } } diff --git a/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/RemoveLocalProjectsFolderOnWorkspaceRemove.java b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/RemoveLocalProjectsFolderOnWorkspaceRemove.java index faaa332590..4cdcff32f6 100644 --- a/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/RemoveLocalProjectsFolderOnWorkspaceRemove.java +++ b/infrastructures/docker/src/main/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/RemoveLocalProjectsFolderOnWorkspaceRemove.java @@ -25,7 +25,7 @@ import java.util.concurrent.Executors; import org.eclipse.che.api.core.model.workspace.Workspace; import org.eclipse.che.api.core.notification.EventService; import org.eclipse.che.api.core.notification.EventSubscriber; -import org.eclipse.che.api.workspace.server.event.WorkspaceRemovedEvent; +import org.eclipse.che.api.workspace.shared.event.WorkspaceRemovedEvent; import org.eclipse.che.commons.lang.concurrent.LoggingUncaughtExceptionHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/infrastructures/docker/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/RemoveLocalProjectsFolderOnWorkspaceRemoveTest.java b/infrastructures/docker/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/RemoveLocalProjectsFolderOnWorkspaceRemoveTest.java index c1299aafc7..89bc2a6b13 100644 --- a/infrastructures/docker/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/RemoveLocalProjectsFolderOnWorkspaceRemoveTest.java +++ b/infrastructures/docker/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/RemoveLocalProjectsFolderOnWorkspaceRemoveTest.java @@ -20,7 +20,7 @@ import static org.mockito.Mockito.when; import org.eclipse.che.api.core.model.workspace.Workspace; import org.eclipse.che.api.core.model.workspace.WorkspaceConfig; import org.eclipse.che.api.core.notification.EventService; -import org.eclipse.che.api.workspace.server.event.WorkspaceRemovedEvent; +import org.eclipse.che.api.workspace.shared.event.WorkspaceRemovedEvent; import org.mockito.Mock; import org.mockito.testng.MockitoTestNGListener; import org.testng.annotations.BeforeMethod; diff --git a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/project/RemoveProjectOnWorkspaceRemove.java b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/project/RemoveProjectOnWorkspaceRemove.java index 4fd3bcbef4..9c0cd7a156 100644 --- a/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/project/RemoveProjectOnWorkspaceRemove.java +++ b/infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/project/RemoveProjectOnWorkspaceRemove.java @@ -16,7 +16,7 @@ import com.google.inject.Singleton; import io.fabric8.openshift.client.OpenShiftClient; import org.eclipse.che.api.core.notification.EventService; import org.eclipse.che.api.core.notification.EventSubscriber; -import org.eclipse.che.api.workspace.server.event.WorkspaceRemovedEvent; +import org.eclipse.che.api.workspace.shared.event.WorkspaceRemovedEvent; import org.eclipse.che.workspace.infrastructure.openshift.OpenShiftClientFactory; /** diff --git a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/project/RemoveProjectOnWorkspaceRemoveTest.java b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/project/RemoveProjectOnWorkspaceRemoveTest.java index 10a859fe8d..11ff4231c7 100644 --- a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/project/RemoveProjectOnWorkspaceRemoveTest.java +++ b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/project/RemoveProjectOnWorkspaceRemoveTest.java @@ -19,7 +19,7 @@ import static org.mockito.Mockito.when; import org.eclipse.che.api.core.model.workspace.Workspace; import org.eclipse.che.api.core.notification.EventService; -import org.eclipse.che.api.workspace.server.event.WorkspaceRemovedEvent; +import org.eclipse.che.api.workspace.shared.event.WorkspaceRemovedEvent; import org.mockito.Mock; import org.mockito.testng.MockitoTestNGListener; import org.testng.annotations.BeforeMethod; diff --git a/multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/WorkspaceCreatorPermissionsProvider.java b/multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/WorkspaceCreatorPermissionsProvider.java index 64351fcae6..711e7482c3 100644 --- a/multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/WorkspaceCreatorPermissionsProvider.java +++ b/multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/WorkspaceCreatorPermissionsProvider.java @@ -18,7 +18,7 @@ import javax.inject.Singleton; import org.eclipse.che.api.core.ServerException; import org.eclipse.che.api.core.notification.EventService; import org.eclipse.che.api.core.notification.EventSubscriber; -import org.eclipse.che.api.workspace.server.event.WorkspaceCreatedEvent; +import org.eclipse.che.api.workspace.shared.event.WorkspaceCreatedEvent; import org.eclipse.che.commons.env.EnvironmentContext; import org.eclipse.che.multiuser.permission.workspace.server.model.impl.WorkerImpl; import org.eclipse.che.multiuser.permission.workspace.server.spi.WorkerDao; diff --git a/multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/MultiuserJpaWorkspaceDao.java b/multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/MultiuserJpaWorkspaceDao.java index 8bcb6020f8..d5a8e96c53 100644 --- a/multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/MultiuserJpaWorkspaceDao.java +++ b/multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/MultiuserJpaWorkspaceDao.java @@ -33,10 +33,10 @@ import org.eclipse.che.api.core.ServerException; import org.eclipse.che.api.core.notification.EventService; import org.eclipse.che.api.workspace.server.WorkspaceManager; import org.eclipse.che.api.workspace.server.event.BeforeWorkspaceRemovedEvent; -import org.eclipse.che.api.workspace.server.event.WorkspaceRemovedEvent; import org.eclipse.che.api.workspace.server.model.impl.ProjectConfigImpl; import org.eclipse.che.api.workspace.server.model.impl.WorkspaceImpl; import org.eclipse.che.api.workspace.server.spi.WorkspaceDao; +import org.eclipse.che.api.workspace.shared.event.WorkspaceRemovedEvent; import org.eclipse.che.core.db.cascade.CascadeEventSubscriber; import org.eclipse.che.core.db.jpa.DuplicateKeyException; diff --git a/plugins/plugin-docker/che-plugin-openshift-client/pom.xml b/plugins/plugin-docker/che-plugin-openshift-client/pom.xml index 7fee3133ac..828ab3e4e6 100644 --- a/plugins/plugin-docker/che-plugin-openshift-client/pom.xml +++ b/plugins/plugin-docker/che-plugin-openshift-client/pom.xml @@ -71,6 +71,10 @@ org.eclipse.che.core che-core-api-workspace + + org.eclipse.che.core + che-core-api-workspace-shared + org.eclipse.che.core che-core-commons-annotations diff --git a/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/OpenShiftWorkspaceFilesCleaner.java b/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/OpenShiftWorkspaceFilesCleaner.java index e6cec6d826..f808b84df2 100644 --- a/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/OpenShiftWorkspaceFilesCleaner.java +++ b/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/OpenShiftWorkspaceFilesCleaner.java @@ -24,7 +24,7 @@ import org.eclipse.che.api.core.model.workspace.Workspace; import org.eclipse.che.api.core.notification.EventService; import org.eclipse.che.api.core.notification.EventSubscriber; import org.eclipse.che.api.workspace.server.event.ServerIdleEvent; -import org.eclipse.che.api.workspace.server.event.WorkspaceRemovedEvent; +import org.eclipse.che.api.workspace.shared.event.WorkspaceRemovedEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/plugins/plugin-docker/che-plugin-openshift-client/src/test/java/org/eclipse/che/plugin/openshift/client/OpenShiftWorkspaceFilesCleanerTest.java b/plugins/plugin-docker/che-plugin-openshift-client/src/test/java/org/eclipse/che/plugin/openshift/client/OpenShiftWorkspaceFilesCleanerTest.java index 79a67aa2e5..93c1c2c990 100644 --- a/plugins/plugin-docker/che-plugin-openshift-client/src/test/java/org/eclipse/che/plugin/openshift/client/OpenShiftWorkspaceFilesCleanerTest.java +++ b/plugins/plugin-docker/che-plugin-openshift-client/src/test/java/org/eclipse/che/plugin/openshift/client/OpenShiftWorkspaceFilesCleanerTest.java @@ -30,9 +30,9 @@ import org.eclipse.che.api.core.model.workspace.Workspace; import org.eclipse.che.api.core.notification.EventService; import org.eclipse.che.api.core.notification.EventSubscriber; import org.eclipse.che.api.workspace.server.event.ServerIdleEvent; -import org.eclipse.che.api.workspace.server.event.WorkspaceRemovedEvent; import org.eclipse.che.api.workspace.server.model.impl.WorkspaceConfigImpl; import org.eclipse.che.api.workspace.server.model.impl.WorkspaceImpl; +import org.eclipse.che.api.workspace.shared.event.WorkspaceRemovedEvent; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml b/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml index 6d07e57f93..a86a1dcf12 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml +++ b/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml @@ -48,10 +48,6 @@ org.eclipse.che.core che-core-api-user - - org.eclipse.che.core - che-core-api-workspace - org.eclipse.che.core che-core-api-workspace-shared diff --git a/plugins/plugin-machine/che-plugin-machine-ext-server/src/main/java/org/eclipse/che/ide/ext/machine/server/ssh/WorkspaceSshKeys.java b/plugins/plugin-machine/che-plugin-machine-ext-server/src/main/java/org/eclipse/che/ide/ext/machine/server/ssh/WorkspaceSshKeys.java index b0fe2e25f6..449f2038c7 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-server/src/main/java/org/eclipse/che/ide/ext/machine/server/ssh/WorkspaceSshKeys.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-server/src/main/java/org/eclipse/che/ide/ext/machine/server/ssh/WorkspaceSshKeys.java @@ -21,8 +21,8 @@ import org.eclipse.che.api.core.notification.EventService; import org.eclipse.che.api.core.notification.EventSubscriber; import org.eclipse.che.api.ssh.server.SshManager; import org.eclipse.che.api.user.server.UserManager; -import org.eclipse.che.api.workspace.server.event.WorkspaceCreatedEvent; -import org.eclipse.che.api.workspace.server.event.WorkspaceRemovedEvent; +import org.eclipse.che.api.workspace.shared.event.WorkspaceCreatedEvent; +import org.eclipse.che.api.workspace.shared.event.WorkspaceRemovedEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-server/src/test/java/org/eclipse/che/ide/ext/machine/server/ssh/WorkspaceSshKeysTest.java b/plugins/plugin-machine/che-plugin-machine-ext-server/src/test/java/org/eclipse/che/ide/ext/machine/server/ssh/WorkspaceSshKeysTest.java index d9bde0d20f..b087da32ed 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-server/src/test/java/org/eclipse/che/ide/ext/machine/server/ssh/WorkspaceSshKeysTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-server/src/test/java/org/eclipse/che/ide/ext/machine/server/ssh/WorkspaceSshKeysTest.java @@ -22,8 +22,8 @@ import org.eclipse.che.api.core.notification.EventService; import org.eclipse.che.api.core.notification.EventSubscriber; import org.eclipse.che.api.ssh.server.SshManager; import org.eclipse.che.api.user.server.UserManager; -import org.eclipse.che.api.workspace.server.event.WorkspaceCreatedEvent; -import org.eclipse.che.api.workspace.server.event.WorkspaceRemovedEvent; +import org.eclipse.che.api.workspace.shared.event.WorkspaceCreatedEvent; +import org.eclipse.che.api.workspace.shared.event.WorkspaceRemovedEvent; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.InjectMocks; diff --git a/wsmaster/che-core-api-user/pom.xml b/wsmaster/che-core-api-user/pom.xml index 664814f7a7..25a1b7f155 100644 --- a/wsmaster/che-core-api-user/pom.xml +++ b/wsmaster/che-core-api-user/pom.xml @@ -24,6 +24,10 @@ false + + com.google.code.gson + gson + com.google.guava guava @@ -68,6 +72,10 @@ org.eclipse.che.core che-core-api-user-shared + + org.eclipse.che.core + che-core-api-workspace-shared + org.eclipse.che.core che-core-commons-lang @@ -80,6 +88,10 @@ org.everrest everrest-core + + org.slf4j + slf4j-api + com.google.inject.extensions guice-persist @@ -95,11 +107,6 @@ javax.persistence provided - - com.google.code.gson - gson - test - com.h2database h2 diff --git a/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/server/AppStatesPreferenceCleaner.java b/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/server/AppStatesPreferenceCleaner.java new file mode 100644 index 0000000000..4b422e65b9 --- /dev/null +++ b/wsmaster/che-core-api-user/src/main/java/org/eclipse/che/api/user/server/AppStatesPreferenceCleaner.java @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2012-2017 Red Hat, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + */ +package org.eclipse.che.api.user.server; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.google.inject.Inject; +import com.google.inject.Singleton; +import java.util.Map; +import javax.annotation.PostConstruct; +import org.eclipse.che.api.core.NotFoundException; +import org.eclipse.che.api.core.ServerException; +import org.eclipse.che.api.core.model.user.User; +import org.eclipse.che.api.core.model.workspace.Workspace; +import org.eclipse.che.api.core.notification.EventService; +import org.eclipse.che.api.core.notification.EventSubscriber; +import org.eclipse.che.api.workspace.shared.event.WorkspaceRemovedEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** Handler for clean up app state preference when workspace is removed. */ +@Singleton +public class AppStatesPreferenceCleaner implements EventSubscriber { + private static final Logger LOG = LoggerFactory.getLogger(AppStatesPreferenceCleaner.class); + + /** The name of the property for the mappings in user preferences. */ + public static final String APP_STATES_PREFERENCE_PROPERTY = "IdeAppStates"; + + private JsonParser jsonParser; + private EventService eventService; + private UserManager userManager; + private PreferenceManager preferenceManager; + + @Inject + public AppStatesPreferenceCleaner( + JsonParser jsonParser, + EventService eventService, + UserManager userManager, + PreferenceManager preferenceManager) { + this.jsonParser = jsonParser; + this.eventService = eventService; + this.userManager = userManager; + this.preferenceManager = preferenceManager; + } + + @PostConstruct + public void subscribe() { + eventService.subscribe(this); + } + + @Override + public void onEvent(WorkspaceRemovedEvent workspaceRemovedEvent) { + try { + Workspace workspace = workspaceRemovedEvent.getWorkspace(); + User user = userManager.getByName(workspace.getNamespace()); + if (user == null) { + return; + } + + String userId = user.getId(); + Map preferences = preferenceManager.find(userId); + String appStates = preferences.get(APP_STATES_PREFERENCE_PROPERTY); + if (appStates == null) { + return; + } + + JsonObject workspaces = jsonParser.parse(appStates).getAsJsonObject(); + JsonElement removedWorkspacePreferences = workspaces.remove(workspace.getId()); + if (removedWorkspacePreferences != null) { + preferences.put(APP_STATES_PREFERENCE_PROPERTY, workspaces.toString()); + preferenceManager.save(userId, preferences); + } + } catch (NotFoundException | ServerException e) { + Workspace workspace = workspaceRemovedEvent.getWorkspace(); + LOG.error( + "Unable to clean up preferences for owner of the workspace {} with namespace {}", + workspace.getId(), + workspace.getNamespace()); + } + } +} diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/event/WorkspaceCreatedEvent.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/event/WorkspaceCreatedEvent.java similarity index 94% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/event/WorkspaceCreatedEvent.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/event/WorkspaceCreatedEvent.java index 5a7ac90323..5472eb57c7 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/event/WorkspaceCreatedEvent.java +++ b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/event/WorkspaceCreatedEvent.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.api.workspace.server.event; +package org.eclipse.che.api.workspace.shared.event; import org.eclipse.che.api.core.model.workspace.Workspace; import org.eclipse.che.api.core.notification.EventOrigin; diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/event/WorkspaceRemovedEvent.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/event/WorkspaceRemovedEvent.java similarity index 94% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/event/WorkspaceRemovedEvent.java rename to wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/event/WorkspaceRemovedEvent.java index 2409b3bc73..bdd4fd9330 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/event/WorkspaceRemovedEvent.java +++ b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/event/WorkspaceRemovedEvent.java @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -package org.eclipse.che.api.workspace.server.event; +package org.eclipse.che.api.workspace.shared.event; import org.eclipse.che.api.core.model.workspace.Workspace; import org.eclipse.che.api.core.notification.EventOrigin; diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceManager.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceManager.java index f73028bdb8..7a355d5edc 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceManager.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceManager.java @@ -36,12 +36,12 @@ import org.eclipse.che.api.core.model.workspace.Workspace; import org.eclipse.che.api.core.model.workspace.WorkspaceConfig; import org.eclipse.che.api.core.model.workspace.WorkspaceStatus; import org.eclipse.che.api.core.notification.EventService; -import org.eclipse.che.api.workspace.server.event.WorkspaceCreatedEvent; import org.eclipse.che.api.workspace.server.model.impl.WorkspaceConfigImpl; import org.eclipse.che.api.workspace.server.model.impl.WorkspaceImpl; import org.eclipse.che.api.workspace.server.spi.InfrastructureException; import org.eclipse.che.api.workspace.server.spi.InternalInfrastructureException; import org.eclipse.che.api.workspace.server.spi.WorkspaceDao; +import org.eclipse.che.api.workspace.shared.event.WorkspaceCreatedEvent; import org.eclipse.che.commons.annotation.Nullable; import org.eclipse.che.commons.env.EnvironmentContext; import org.eclipse.che.commons.subject.Subject; diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/jpa/JpaWorkspaceDao.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/jpa/JpaWorkspaceDao.java index 6529733662..8afcdc689d 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/jpa/JpaWorkspaceDao.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/jpa/JpaWorkspaceDao.java @@ -33,10 +33,10 @@ import org.eclipse.che.api.core.ServerException; import org.eclipse.che.api.core.notification.EventService; import org.eclipse.che.api.workspace.server.WorkspaceManager; import org.eclipse.che.api.workspace.server.event.BeforeWorkspaceRemovedEvent; -import org.eclipse.che.api.workspace.server.event.WorkspaceRemovedEvent; import org.eclipse.che.api.workspace.server.model.impl.ProjectConfigImpl; import org.eclipse.che.api.workspace.server.model.impl.WorkspaceImpl; import org.eclipse.che.api.workspace.server.spi.WorkspaceDao; +import org.eclipse.che.api.workspace.shared.event.WorkspaceRemovedEvent; import org.eclipse.che.core.db.cascade.CascadeEventSubscriber; import org.eclipse.che.core.db.jpa.DuplicateKeyException; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/WorkspaceDaoTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/WorkspaceDaoTest.java index 384b4ef3ec..12b23f7b76 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/WorkspaceDaoTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/WorkspaceDaoTest.java @@ -39,7 +39,6 @@ import org.eclipse.che.api.core.NotFoundException; import org.eclipse.che.api.core.ServerException; import org.eclipse.che.api.core.notification.EventService; import org.eclipse.che.api.workspace.server.event.BeforeWorkspaceRemovedEvent; -import org.eclipse.che.api.workspace.server.event.WorkspaceRemovedEvent; import org.eclipse.che.api.workspace.server.model.impl.CommandImpl; import org.eclipse.che.api.workspace.server.model.impl.EnvironmentImpl; import org.eclipse.che.api.workspace.server.model.impl.MachineConfigImpl; @@ -50,6 +49,7 @@ import org.eclipse.che.api.workspace.server.model.impl.SourceStorageImpl; import org.eclipse.che.api.workspace.server.model.impl.WorkspaceConfigImpl; import org.eclipse.che.api.workspace.server.model.impl.WorkspaceImpl; import org.eclipse.che.api.workspace.server.spi.WorkspaceDao; +import org.eclipse.che.api.workspace.shared.event.WorkspaceRemovedEvent; import org.eclipse.che.commons.test.tck.TckListener; import org.eclipse.che.commons.test.tck.repository.TckRepository; import org.eclipse.che.commons.test.tck.repository.TckRepositoryException;