From c3bb9b8ffaeb7ee9de135c939577ba1268584a01 Mon Sep 17 00:00:00 2001 From: Thomas Georgios Giannos Date: Mon, 27 Nov 2023 14:46:30 +0200 Subject: [PATCH] Entities cleanup --- .../src/main/java/eu/eudat/data/DescriptionEntity.java | 1 - .../java/eu/eudat/data/DescriptionReferenceEntity.java | 1 - .../main/java/eu/eudat/data/DescriptionTagEntity.java | 3 --- .../java/eu/eudat/data/DescriptionTemplateEntity.java | 2 -- .../main/java/eu/eudat/data/DmpBlueprintEntity.java | 2 -- .../eu/eudat/data/DmpDescriptionTemplateEntity.java | 2 -- .../src/main/java/eu/eudat/data/DmpUserEntity.java | 2 -- .../core/src/main/java/eu/eudat/data/TagEntity.java | 2 -- .../main/java/eu/eudat/data/UserContactInfoEntity.java | 7 +------ .../main/java/eu/eudat/data/UserCredentialEntity.java | 9 ++++----- .../eu/eudat/data/UserDescriptionTemplateEntity.java | 3 --- .../core/src/main/java/eu/eudat/data/UserEntity.java | 6 +----- .../src/main/java/eu/eudat/data/UserRoleEntity.java | 10 ++++------ .../main/java/eu/eudat/data/UserSettingsEntity.java | 1 - 14 files changed, 10 insertions(+), 41 deletions(-) diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionEntity.java index e8265d54a..2ff4040e4 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionEntity.java @@ -3,7 +3,6 @@ package eu.eudat.data; import eu.eudat.commons.enums.DescriptionStatus; 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.IsActiveConverter; import eu.eudat.data.old.helpers.EntityBinder; diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionReferenceEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionReferenceEntity.java index f630f2543..918f56622 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionReferenceEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionReferenceEntity.java @@ -1,7 +1,6 @@ package eu.eudat.data; import eu.eudat.commons.enums.IsActive; -import eu.eudat.data.converters.DateToUTCConverter; import eu.eudat.data.converters.enums.IsActiveConverter; import jakarta.persistence.*; diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTagEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTagEntity.java index fdc88bb78..347add277 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTagEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTagEntity.java @@ -1,7 +1,6 @@ package eu.eudat.data; import eu.eudat.commons.enums.IsActive; -import eu.eudat.data.converters.DateToUTCConverter; import eu.eudat.data.converters.enums.IsActiveConverter; import jakarta.persistence.*; @@ -29,13 +28,11 @@ public class DescriptionTagEntity { public static final String _tagId = "tagId"; @Column(name = "created_at") - @Convert(converter = DateToUTCConverter.class) private Instant createdAt; public static final String _createdAt = "createdAt"; @Column(name = "updated_at") - @Convert(converter = DateToUTCConverter.class) private Instant updatedAt; public static final String _updatedAt = "updatedAt"; diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateEntity.java index 9dae0c4ae..0fd87a705 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateEntity.java @@ -1,6 +1,5 @@ package eu.eudat.data; - import eu.eudat.commons.enums.DescriptionTemplateStatus; import eu.eudat.commons.enums.DescriptionTemplateVersionStatus; import eu.eudat.commons.enums.IsActive; @@ -14,7 +13,6 @@ import java.time.Instant; import java.util.List; import java.util.UUID; - @Entity @Table(name = "\"DescriptionTemplate\"") public class DescriptionTemplateEntity implements DataEntity{ diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DmpBlueprintEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DmpBlueprintEntity.java index 990147269..ca3f7ad48 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/DmpBlueprintEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/DmpBlueprintEntity.java @@ -1,6 +1,5 @@ package eu.eudat.data; - import eu.eudat.commons.enums.DmpBlueprintStatus; import eu.eudat.commons.enums.IsActive; import eu.eudat.data.converters.enums.DmpBlueprintStatusConverter; @@ -10,7 +9,6 @@ import jakarta.persistence.*; import java.time.Instant; import java.util.UUID; - @Entity @Table(name = "\"DmpBlueprint\"") public class DmpBlueprintEntity { diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DmpDescriptionTemplateEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DmpDescriptionTemplateEntity.java index 760a5bb78..50c25af0f 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/DmpDescriptionTemplateEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/DmpDescriptionTemplateEntity.java @@ -2,11 +2,9 @@ package eu.eudat.data; import eu.eudat.commons.enums.IsActive; import eu.eudat.data.converters.enums.IsActiveConverter; -import eu.eudat.data.old.queryableentity.DataEntity; import jakarta.persistence.*; import java.time.Instant; -import java.util.List; import java.util.UUID; @Entity diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DmpUserEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DmpUserEntity.java index 4d86386b6..232470c21 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/DmpUserEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/DmpUserEntity.java @@ -4,11 +4,9 @@ import eu.eudat.commons.enums.DmpUserRole; import eu.eudat.commons.enums.IsActive; import eu.eudat.data.converters.enums.DmpUserRoleConverter; import eu.eudat.data.converters.enums.IsActiveConverter; -import eu.eudat.data.old.queryableentity.DataEntity; import jakarta.persistence.*; import java.time.Instant; -import java.util.List; import java.util.UUID; @Entity diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/TagEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/TagEntity.java index ac260f81b..c871bec31 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/TagEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/TagEntity.java @@ -1,6 +1,5 @@ package eu.eudat.data; - import eu.eudat.commons.enums.IsActive; import eu.eudat.data.converters.enums.IsActiveConverter; import jakarta.persistence.*; @@ -8,7 +7,6 @@ import jakarta.persistence.*; import java.time.Instant; import java.util.UUID; - @Entity @Table(name = "\"Tag\"") public class TagEntity { diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/UserContactInfoEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/UserContactInfoEntity.java index b4c0beecf..e347dd35f 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/UserContactInfoEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/UserContactInfoEntity.java @@ -1,21 +1,16 @@ package eu.eudat.data; 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.DescriptionStatusConverter; -import eu.eudat.data.old.helpers.EntityBinder; -import eu.eudat.data.old.queryableentity.DataEntity; import jakarta.persistence.*; import java.time.Instant; -import java.util.List; import java.util.UUID; - @Entity @Table(name = "\"UserContactInfo\"") public class UserContactInfoEntity { + @Id @Column(name = "id", columnDefinition = "uuid", updatable = false, nullable = false) private UUID id; diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/UserCredentialEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/UserCredentialEntity.java index 8575b8ed8..7ab13682c 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/UserCredentialEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/UserCredentialEntity.java @@ -1,14 +1,13 @@ package eu.eudat.data; -import eu.eudat.data.old.helpers.EntityBinder; -import eu.eudat.data.old.queryableentity.DataEntity; -import jakarta.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.time.Instant; -import java.util.List; import java.util.UUID; - @Entity @Table(name = "\"UserCredential\"") public class UserCredentialEntity { diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/UserDescriptionTemplateEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/UserDescriptionTemplateEntity.java index 6846e2336..49a845c2e 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/UserDescriptionTemplateEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/UserDescriptionTemplateEntity.java @@ -4,12 +4,9 @@ import eu.eudat.commons.enums.IsActive; import eu.eudat.commons.enums.UserDescriptionTemplateRole; import eu.eudat.data.converters.enums.IsActiveConverter; 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 java.time.Instant; -import java.util.List; import java.util.UUID; @Entity diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/UserEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/UserEntity.java index adc57a4c3..8d765e5c4 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/UserEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/UserEntity.java @@ -2,14 +2,10 @@ package eu.eudat.data; import eu.eudat.commons.enums.IsActive; 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 java.time.Instant; -import java.util.*; - +import java.util.UUID; @Entity @Table(name = "\"User\"") diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/UserRoleEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/UserRoleEntity.java index 4e414822b..049e0382b 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/UserRoleEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/UserRoleEntity.java @@ -1,15 +1,13 @@ package eu.eudat.data; -import eu.eudat.data.old.helpers.EntityBinder; -import eu.eudat.data.old.queryableentity.DataEntity; - -import jakarta.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.time.Instant; -import java.util.List; import java.util.UUID; - @Entity @Table(name = "\"UserRole\"") public class UserRoleEntity { diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/UserSettingsEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/UserSettingsEntity.java index dda975019..4118d413f 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/UserSettingsEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/UserSettingsEntity.java @@ -1,6 +1,5 @@ package eu.eudat.data; - import eu.eudat.commons.enums.UserSettingsType; import eu.eudat.data.converters.enums.UserSettingsTypeConverter; import jakarta.persistence.*;