seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop che_workspace_expiration table (#15357) 

* Drop che_workspace_expiration table
Signed-off-by: Sergii Kabashniuk <skabashniuk@redhat.com>
7.20.x
Sergii Kabashniuk 2019-11-29 11:14:14 +01:00 committed by GitHub
parent ceec1d8bd3
commit deae8a8f70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assembly/assembly-wsmaster-war/src/main/resources/META-INF/persistence.xml
View File

@ -72,7 +72,6 @@
<class>org.eclipse.che.multiuser.organization.spi.impl.MemberImpl</class>
<class>org.eclipse.che.multiuser.organization.spi.impl.OrganizationDistributedResourcesImpl</class>
<class>org.eclipse.che.api.workspace.activity.WorkspaceExpiration</class>
<class>org.eclipse.che.api.workspace.activity.WorkspaceActivity</class>
<class>org.eclipse.che.multiuser.machine.authentication.server.signature.model.impl.SignatureKeyImpl</class>
<class>org.eclipse.che.multiuser.machine.authentication.server.signature.model.impl.SignatureKeyPairImpl</class>

5
wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/InmemoryWorkspaceActivityDao.java
View File

@ -32,11 +32,6 @@ public class InmemoryWorkspaceActivityDao implements WorkspaceActivityDao {
private final Map<String, WorkspaceActivity> workspaceActivities = new ConcurrentHashMap<>();
@Override
public void setExpiration(WorkspaceExpiration expiration) {
setExpirationTime(expiration.getWorkspaceId(), expiration.getExpiration());
}
@Override
public void setExpirationTime(String workspaceId, long expirationTime) {
findActivity(workspaceId).setExpiration(expirationTime);

5
wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/JpaWorkspaceActivityDao.java
View File

@ -38,11 +38,6 @@ public class JpaWorkspaceActivityDao implements WorkspaceActivityDao {
@Inject private Provider<EntityManager> managerProvider;
@Override
public void setExpiration(WorkspaceExpiration expiration) throws ServerException {
setExpirationTime(expiration.getWorkspaceId(), expiration.getExpiration());
}
@Override
public void setExpirationTime(String workspaceId, long expirationTime) throws ServerException {
requireNonNull(workspaceId, "Required non-null workspace id");

11
wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/WorkspaceActivityDao.java
View File

@ -24,17 +24,6 @@ import org.eclipse.che.api.core.model.workspace.WorkspaceStatus;
*/
public interface WorkspaceActivityDao {
/**
* Sets workspace expiration time. Any running workspace must prolongate expiration time
* periodically, otherwise it will be stopped by passing that time.
*
* @param expiration expiration object to store
* @throws ServerException when operation failed
* @deprecated use {@link #setExpirationTime(String, long)} instead
*/
@Deprecated
void setExpiration(WorkspaceExpiration expiration) throws ServerException;
/**
* Sets workspace expiration time. Any running workspace must prolong expiration time
* periodically, otherwise it will be stopped by passing that time.

104
wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/WorkspaceExpiration.java
View File

@ -1,104 +0,0 @@
/*
* Copyright (c) 2012-2018 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/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
*/
package org.eclipse.che.api.workspace.activity;
import java.util.Objects;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.Table;
import org.eclipse.che.api.workspace.server.model.impl.WorkspaceImpl;
/**
* Data object for storing workspace expiration times.
*
* @author Max Shaposhnik (mshaposh@redhat.com)
* @deprecated since 6.16.0, use {@link WorkspaceActivity} instead
*/
@Entity(name = "WorkspaceExpiration")
@NamedQueries({
@NamedQuery(
name = "WorkspaceExpiration.getExpired",
query = "SELECT e FROM WorkspaceExpiration e WHERE e.expiration < :expiration")
})
@Table(name = "che_workspace_expiration")
@Deprecated
public class WorkspaceExpiration {
@Id
@Column(name = "workspace_id")
private String workspaceId;
@PrimaryKeyJoinColumn private WorkspaceImpl workspace;
@Column(name = "expiration")
private long expiration;
public WorkspaceExpiration() {}
public WorkspaceExpiration(String workspaceId, long expiration) {
this.workspaceId = workspaceId;
this.expiration = expiration;
}
public String getWorkspaceId() {
return workspaceId;
}
public void setWorkspaceId(String workspaceId) {
this.workspaceId = workspaceId;
}
public long getExpiration() {
return expiration;
}
public void setExpiration(long expiration) {
this.expiration = expiration;
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (!(obj instanceof WorkspaceExpiration)) {
return false;
}
WorkspaceExpiration that = (WorkspaceExpiration) obj;
final WorkspaceExpiration other = (WorkspaceExpiration) obj;
return Objects.equals(workspaceId, other.getWorkspaceId())
&& Objects.equals(expiration, other.getExpiration());
}
@Override
public int hashCode() {
int hash = 7;
hash = 31 * hash + Objects.hashCode(workspaceId);
hash = 31 * hash + Objects.hashCode(expiration);
return hash;
}
@Override
public String toString() {
return "WorkspaceExpiration{"
+ "workspaceId='"
+ workspaceId
+ '\''
+ ", expiration="
+ expiration
+ '}';
}
}

14
wsmaster/che-core-sql-schema/src/main/resources/che-schema/7.6.0/1__drop_che_workspace_expiration.sql Normal file
View File

@ -0,0 +1,14 @@
--
-- Copyright (c) 2012-2019 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/
--
-- SPDX-License-Identifier: EPL-2.0
--
-- Contributors:
-- Red Hat, Inc. - initial API and implementation
--
DROP TABLE IF EXISTS che_workspace_expiration;

4
wsmaster/integration-tests/mysql-tck/src/test/java/MySqlTckModule.java
View File

@ -39,7 +39,6 @@ import org.eclipse.che.api.user.server.spi.UserDao;
import org.eclipse.che.api.workspace.activity.JpaWorkspaceActivityDao;
import org.eclipse.che.api.workspace.activity.WorkspaceActivity;
import org.eclipse.che.api.workspace.activity.WorkspaceActivityDao;
import org.eclipse.che.api.workspace.activity.WorkspaceExpiration;
import org.eclipse.che.api.workspace.server.devfile.SerializableConverter;
import org.eclipse.che.api.workspace.server.jpa.JpaWorkspaceDao;
import org.eclipse.che.api.workspace.server.model.impl.CommandImpl;
@ -197,9 +196,6 @@ public class MySqlTckModule extends TckModule {
bind(WorkspaceActivityDao.class).to(JpaWorkspaceActivityDao.class);
bind(new TypeLiteral<TckRepository<WorkspaceImpl>>() {}).toInstance(new WorkspaceRepository());
bind(new TypeLiteral<TckRepository<WorkspaceExpiration>>() {})
.toInstance(new JpaTckRepository<>(WorkspaceExpiration.class));
// sign keys
bind(SignatureKeyDao.class).to(JpaSignatureKeyDao.class);
bind(new TypeLiteral<TckRepository<SignatureKeyPairImpl>>() {})

3
wsmaster/integration-tests/postgresql-tck/src/test/java/PostgreSqlTckModule.java
View File

@ -39,7 +39,6 @@ import org.eclipse.che.api.user.server.spi.UserDao;
import org.eclipse.che.api.workspace.activity.JpaWorkspaceActivityDao;
import org.eclipse.che.api.workspace.activity.WorkspaceActivity;
import org.eclipse.che.api.workspace.activity.WorkspaceActivityDao;
import org.eclipse.che.api.workspace.activity.WorkspaceExpiration;
import org.eclipse.che.api.workspace.server.devfile.SerializableConverter;
import org.eclipse.che.api.workspace.server.jpa.JpaWorkspaceDao;
import org.eclipse.che.api.workspace.server.model.impl.CommandImpl;
@ -191,8 +190,6 @@ public class PostgreSqlTckModule extends TckModule {
bind(WorkspaceDao.class).to(JpaWorkspaceDao.class);
bind(WorkspaceActivityDao.class).to(JpaWorkspaceActivityDao.class);
bind(new TypeLiteral<TckRepository<WorkspaceImpl>>() {}).toInstance(new WorkspaceRepository());
bind(new TypeLiteral<TckRepository<WorkspaceExpiration>>() {})
.toInstance(new JpaTckRepository<>(WorkspaceExpiration.class));
// k8s runtimes
bind(new TypeLiteral<TckRepository<KubernetesRuntimeState>>() {})