MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Entities cleanup

This commit is contained in:
Thomas Georgios Giannos 2023-11-27 14:46:30 +02:00
parent 8dbf275f3a
commit c3bb9b8ffa
14 changed files with 10 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dmp-backend/core/src/main/java/eu/eudat/data/DescriptionEntity.java
View File

@ -3,7 +3,6 @@ package eu.eudat.data;
import eu.eudat.commons.enums.DescriptionStatus; import eu.eudat.commons.enums.DescriptionStatus;
import eu.eudat.commons.enums.IsActive; import eu.eudat.commons.enums.IsActive;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.data.converters.enums.DescriptionStatusConverter; import eu.eudat.data.converters.enums.DescriptionStatusConverter;
import eu.eudat.data.converters.enums.IsActiveConverter; import eu.eudat.data.converters.enums.IsActiveConverter;
import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.data.old.helpers.EntityBinder;

1
dmp-backend/core/src/main/java/eu/eudat/data/DescriptionReferenceEntity.java
View File

@ -1,7 +1,6 @@
package eu.eudat.data; package eu.eudat.data;
import eu.eudat.commons.enums.IsActive; import eu.eudat.commons.enums.IsActive;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.data.converters.enums.IsActiveConverter; import eu.eudat.data.converters.enums.IsActiveConverter;
import jakarta.persistence.*; import jakarta.persistence.*;

3
dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTagEntity.java
View File

@ -1,7 +1,6 @@
package eu.eudat.data; package eu.eudat.data;
import eu.eudat.commons.enums.IsActive; import eu.eudat.commons.enums.IsActive;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.data.converters.enums.IsActiveConverter; import eu.eudat.data.converters.enums.IsActiveConverter;
import jakarta.persistence.*; import jakarta.persistence.*;
@ -29,13 +28,11 @@ public class DescriptionTagEntity {
public static final String _tagId = "tagId"; public static final String _tagId = "tagId";
@Column(name = "created_at") @Column(name = "created_at")
@Convert(converter = DateToUTCConverter.class)
private Instant createdAt; private Instant createdAt;
public static final String _createdAt = "createdAt"; public static final String _createdAt = "createdAt";
@Column(name = "updated_at") @Column(name = "updated_at")
@Convert(converter = DateToUTCConverter.class)
private Instant updatedAt; private Instant updatedAt;
public static final String _updatedAt = "updatedAt"; public static final String _updatedAt = "updatedAt";

2
dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateEntity.java
View File

@ -1,6 +1,5 @@
package eu.eudat.data; package eu.eudat.data;
import eu.eudat.commons.enums.DescriptionTemplateStatus; import eu.eudat.commons.enums.DescriptionTemplateStatus;
import eu.eudat.commons.enums.DescriptionTemplateVersionStatus; import eu.eudat.commons.enums.DescriptionTemplateVersionStatus;
import eu.eudat.commons.enums.IsActive; import eu.eudat.commons.enums.IsActive;
@ -14,7 +13,6 @@ import java.time.Instant;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
@Entity @Entity
@Table(name = "\"DescriptionTemplate\"") @Table(name = "\"DescriptionTemplate\"")
public class DescriptionTemplateEntity implements DataEntity<DescriptionTemplateEntity,UUID>{ public class DescriptionTemplateEntity implements DataEntity<DescriptionTemplateEntity,UUID>{

2
dmp-backend/core/src/main/java/eu/eudat/data/DmpBlueprintEntity.java
View File

@ -1,6 +1,5 @@
package eu.eudat.data; package eu.eudat.data;
import eu.eudat.commons.enums.DmpBlueprintStatus; import eu.eudat.commons.enums.DmpBlueprintStatus;
import eu.eudat.commons.enums.IsActive; import eu.eudat.commons.enums.IsActive;
import eu.eudat.data.converters.enums.DmpBlueprintStatusConverter; import eu.eudat.data.converters.enums.DmpBlueprintStatusConverter;
@ -10,7 +9,6 @@ import jakarta.persistence.*;
import java.time.Instant; import java.time.Instant;
import java.util.UUID; import java.util.UUID;
@Entity @Entity
@Table(name = "\"DmpBlueprint\"") @Table(name = "\"DmpBlueprint\"")
public class DmpBlueprintEntity { public class DmpBlueprintEntity {

2
dmp-backend/core/src/main/java/eu/eudat/data/DmpDescriptionTemplateEntity.java
View File

@ -2,11 +2,9 @@ package eu.eudat.data;
import eu.eudat.commons.enums.IsActive; import eu.eudat.commons.enums.IsActive;
import eu.eudat.data.converters.enums.IsActiveConverter; import eu.eudat.data.converters.enums.IsActiveConverter;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*; import jakarta.persistence.*;
import java.time.Instant; import java.time.Instant;
import java.util.List;
import java.util.UUID; import java.util.UUID;
@Entity @Entity

2
dmp-backend/core/src/main/java/eu/eudat/data/DmpUserEntity.java
View File

@ -4,11 +4,9 @@ import eu.eudat.commons.enums.DmpUserRole;
import eu.eudat.commons.enums.IsActive; import eu.eudat.commons.enums.IsActive;
import eu.eudat.data.converters.enums.DmpUserRoleConverter; import eu.eudat.data.converters.enums.DmpUserRoleConverter;
import eu.eudat.data.converters.enums.IsActiveConverter; import eu.eudat.data.converters.enums.IsActiveConverter;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*; import jakarta.persistence.*;
import java.time.Instant; import java.time.Instant;
import java.util.List;
import java.util.UUID; import java.util.UUID;
@Entity @Entity

2
dmp-backend/core/src/main/java/eu/eudat/data/TagEntity.java
View File

@ -1,6 +1,5 @@
package eu.eudat.data; package eu.eudat.data;
import eu.eudat.commons.enums.IsActive; import eu.eudat.commons.enums.IsActive;
import eu.eudat.data.converters.enums.IsActiveConverter; import eu.eudat.data.converters.enums.IsActiveConverter;
import jakarta.persistence.*; import jakarta.persistence.*;
@ -8,7 +7,6 @@ import jakarta.persistence.*;
import java.time.Instant; import java.time.Instant;
import java.util.UUID; import java.util.UUID;
@Entity @Entity
@Table(name = "\"Tag\"") @Table(name = "\"Tag\"")
public class TagEntity { public class TagEntity {

7
dmp-backend/core/src/main/java/eu/eudat/data/UserContactInfoEntity.java
View File

@ -1,21 +1,16 @@
package eu.eudat.data; package eu.eudat.data;
import eu.eudat.commons.enums.ContactInfoType; import eu.eudat.commons.enums.ContactInfoType;
import eu.eudat.commons.enums.DescriptionStatus;
import eu.eudat.data.converters.enums.ContactInfoTypeConverter; import eu.eudat.data.converters.enums.ContactInfoTypeConverter;
import eu.eudat.data.converters.enums.DescriptionStatusConverter;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*; import jakarta.persistence.*;
import java.time.Instant; import java.time.Instant;
import java.util.List;
import java.util.UUID; import java.util.UUID;
@Entity @Entity
@Table(name = "\"UserContactInfo\"") @Table(name = "\"UserContactInfo\"")
public class UserContactInfoEntity { public class UserContactInfoEntity {
@Id @Id
@Column(name = "id", columnDefinition = "uuid", updatable = false, nullable = false) @Column(name = "id", columnDefinition = "uuid", updatable = false, nullable = false)
private UUID id; private UUID id;

9
dmp-backend/core/src/main/java/eu/eudat/data/UserCredentialEntity.java
View File

@ -1,14 +1,13 @@
package eu.eudat.data; package eu.eudat.data;
import eu.eudat.data.old.helpers.EntityBinder; import jakarta.persistence.Column;
import eu.eudat.data.old.queryableentity.DataEntity; import jakarta.persistence.Entity;
import jakarta.persistence.*; import jakarta.persistence.Id;
import jakarta.persistence.Table;
import java.time.Instant; import java.time.Instant;
import java.util.List;
import java.util.UUID; import java.util.UUID;
@Entity @Entity
@Table(name = "\"UserCredential\"") @Table(name = "\"UserCredential\"")
public class UserCredentialEntity { public class UserCredentialEntity {

3
dmp-backend/core/src/main/java/eu/eudat/data/UserDescriptionTemplateEntity.java
View File

@ -4,12 +4,9 @@ import eu.eudat.commons.enums.IsActive;
import eu.eudat.commons.enums.UserDescriptionTemplateRole; import eu.eudat.commons.enums.UserDescriptionTemplateRole;
import eu.eudat.data.converters.enums.IsActiveConverter; import eu.eudat.data.converters.enums.IsActiveConverter;
import eu.eudat.data.converters.enums.UserDescriptionTemplateRoleConverter; import eu.eudat.data.converters.enums.UserDescriptionTemplateRoleConverter;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*; import jakarta.persistence.*;
import java.time.Instant; import java.time.Instant;
import java.util.List;
import java.util.UUID; import java.util.UUID;
@Entity @Entity

6
dmp-backend/core/src/main/java/eu/eudat/data/UserEntity.java
View File

@ -2,14 +2,10 @@ package eu.eudat.data;
import eu.eudat.commons.enums.IsActive; import eu.eudat.commons.enums.IsActive;
import eu.eudat.data.converters.enums.IsActiveConverter; import eu.eudat.data.converters.enums.IsActiveConverter;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*; import jakarta.persistence.*;
import java.time.Instant; import java.time.Instant;
import java.util.*; import java.util.UUID;
@Entity @Entity
@Table(name = "\"User\"") @Table(name = "\"User\"")

10
dmp-backend/core/src/main/java/eu/eudat/data/UserRoleEntity.java
View File

@ -1,15 +1,13 @@
package eu.eudat.data; package eu.eudat.data;
import eu.eudat.data.old.helpers.EntityBinder; import jakarta.persistence.Column;
import eu.eudat.data.old.queryableentity.DataEntity; import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.*; import jakarta.persistence.Table;
import java.time.Instant; import java.time.Instant;
import java.util.List;
import java.util.UUID; import java.util.UUID;
@Entity @Entity
@Table(name = "\"UserRole\"") @Table(name = "\"UserRole\"")
public class UserRoleEntity { public class UserRoleEntity {

1
dmp-backend/core/src/main/java/eu/eudat/data/UserSettingsEntity.java
View File

@ -1,6 +1,5 @@
package eu.eudat.data; package eu.eudat.data;
import eu.eudat.commons.enums.UserSettingsType; import eu.eudat.commons.enums.UserSettingsType;
import eu.eudat.data.converters.enums.UserSettingsTypeConverter; import eu.eudat.data.converters.enums.UserSettingsTypeConverter;
import jakarta.persistence.*; import jakarta.persistence.*;