From 6ecd52dd2f68697fb034e57ebe7a5f1c32a10970 Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Tue, 9 Apr 2024 18:19:10 +0300 Subject: [PATCH] remove allowNullTenant --- .../java/eu/eudat/commons/scope/tenant/TenantScoped.java | 2 -- .../main/java/eu/eudat/data/ActionConfirmationEntity.java | 6 ------ .../src/main/java/eu/eudat/data/DescriptionEntity.java | 6 ------ .../java/eu/eudat/data/DescriptionReferenceEntity.java | 6 ------ .../src/main/java/eu/eudat/data/DescriptionTagEntity.java | 6 ------ .../main/java/eu/eudat/data/DescriptionTemplateEntity.java | 6 ------ .../java/eu/eudat/data/DescriptionTemplateTypeEntity.java | 6 ------ .../src/main/java/eu/eudat/data/DmpBlueprintEntity.java | 6 ------ .../java/eu/eudat/data/DmpDescriptionTemplateEntity.java | 6 ------ .../core/src/main/java/eu/eudat/data/DmpEntity.java | 6 ------ .../src/main/java/eu/eudat/data/DmpReferenceEntity.java | 6 ------ .../core/src/main/java/eu/eudat/data/DmpUserEntity.java | 6 ------ .../core/src/main/java/eu/eudat/data/EntityDoiEntity.java | 7 ------- .../core/src/main/java/eu/eudat/data/LanguageEntity.java | 6 ------ .../core/src/main/java/eu/eudat/data/LockEntity.java | 6 ------ .../main/java/eu/eudat/data/PrefillingSourceEntity.java | 6 ------ .../core/src/main/java/eu/eudat/data/ReferenceEntity.java | 6 ------ .../src/main/java/eu/eudat/data/ReferenceTypeEntity.java | 6 ------ .../src/main/java/eu/eudat/data/StorageFileEntity.java | 6 ------ .../main/java/eu/eudat/data/SupportiveMaterialEntity.java | 6 ------ .../core/src/main/java/eu/eudat/data/TagEntity.java | 6 ------ .../core/src/main/java/eu/eudat/data/TenantUserEntity.java | 6 ------ .../java/eu/eudat/data/UserDescriptionTemplateEntity.java | 6 ------ .../core/src/main/java/eu/eudat/data/UserRoleEntity.java | 6 ------ .../src/main/java/eu/eudat/data/UserSettingsEntity.java | 6 ------ 25 files changed, 147 deletions(-) diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/scope/tenant/TenantScoped.java b/dmp-backend/core/src/main/java/eu/eudat/commons/scope/tenant/TenantScoped.java index e46c1acaf..d81e11fca 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/scope/tenant/TenantScoped.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/scope/tenant/TenantScoped.java @@ -6,6 +6,4 @@ import java.util.UUID; public interface TenantScoped { void setTenantId(UUID tenantId); UUID getTenantId(); - @Transient - boolean allowNullTenant(); } diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/ActionConfirmationEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/ActionConfirmationEntity.java index e0dccab68..03cdc174c 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/ActionConfirmationEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/ActionConfirmationEntity.java @@ -140,10 +140,4 @@ public class ActionConfirmationEntity extends TenantScopedBaseEntity { public void setIsActive(IsActive isActive) { this.isActive = isActive; } - - @Override - @Transient - public boolean allowNullTenant() { - return false; - } } 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 35ca528f9..07a289b3d 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 @@ -188,11 +188,5 @@ public class DescriptionEntity extends TenantScopedBaseEntity { public void setDescriptionTemplateId(UUID descriptionTemplateId) { this.descriptionTemplateId = descriptionTemplateId; } - - @Override - @Transient - public boolean allowNullTenant() { - return false; - } } 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 892eac70f..748955a22 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 @@ -104,10 +104,4 @@ public class DescriptionReferenceEntity extends TenantScopedBaseEntity { public void setData(String data) { this.data = data; } - - @Override - @Transient - public boolean allowNullTenant() { - return false; - } } 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 e0e3cf58a..29eeb14dd 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 @@ -92,10 +92,4 @@ public class DescriptionTagEntity extends TenantScopedBaseEntity { this.isActive = isActive; } - @Override - @Transient - public boolean allowNullTenant() { - return false; - } - } 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 411216982..e83f93056 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 @@ -162,10 +162,4 @@ public class DescriptionTemplateEntity extends TenantScopedBaseEntity { public void setVersionStatus(DescriptionTemplateVersionStatus versionStatus) { this.versionStatus = versionStatus; } - - @Override - @Transient - public boolean allowNullTenant() { - return true; - } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateTypeEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateTypeEntity.java index fff2aac27..fb25418f3 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateTypeEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateTypeEntity.java @@ -95,10 +95,4 @@ public class DescriptionTemplateTypeEntity extends TenantScopedBaseEntity { public void setStatus(DescriptionTemplateTypeStatus status) { this.status = status; } - - @Override - @Transient - public boolean allowNullTenant() { - return true; - } } 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 86b3dee8d..e31fb9bb2 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 @@ -154,10 +154,4 @@ public class DmpBlueprintEntity extends TenantScopedBaseEntity { public void setIsActive(IsActive isActive) { this.isActive = isActive; } - - @Override - @Transient - public boolean allowNullTenant() { - return true; - } } 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 f692c559d..d75fd1100 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 @@ -104,10 +104,4 @@ public class DmpDescriptionTemplateEntity extends TenantScopedBaseEntity { public void setIsActive(IsActive isActive) { this.isActive = isActive; } - - @Override - @Transient - public boolean allowNullTenant() { - return false; - } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DmpEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DmpEntity.java index bde053329..74cf5ade2 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/DmpEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/DmpEntity.java @@ -244,10 +244,4 @@ public class DmpEntity extends TenantScopedBaseEntity { public void setVersionStatus(DmpVersionStatus versionStatus) { this.versionStatus = versionStatus; } - - @Override - @Transient - public boolean allowNullTenant() { - return false; - } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DmpReferenceEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DmpReferenceEntity.java index 64eeca134..201900d20 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/DmpReferenceEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/DmpReferenceEntity.java @@ -97,10 +97,4 @@ public class DmpReferenceEntity extends TenantScopedBaseEntity { public void setIsActive(IsActive isActive) { this.isActive = isActive; } - - @Override - @Transient - public boolean allowNullTenant() { - return false; - } } 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 4339f60b7..d5ce454ea 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 @@ -119,10 +119,4 @@ public class DmpUserEntity extends TenantScopedBaseEntity { public void setIsActive(IsActive isActive) { this.isActive = isActive; } - - @Override - @Transient - public boolean allowNullTenant() { - return false; - } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/EntityDoiEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/EntityDoiEntity.java index ee2ea78a6..adcaa7020 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/EntityDoiEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/EntityDoiEntity.java @@ -120,11 +120,4 @@ public class EntityDoiEntity extends TenantScopedBaseEntity { public void setEntityId(UUID entityId) { this.entityId = entityId; } - - @Override - @Transient - public boolean allowNullTenant() { - return false; - } - } diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/LanguageEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/LanguageEntity.java index 324172c21..3a8292ae3 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/LanguageEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/LanguageEntity.java @@ -98,10 +98,4 @@ public class LanguageEntity extends TenantScopedBaseEntity { public void setOrdinal(Integer ordinal) { this.ordinal = ordinal; } - - @Override - @Transient - public boolean allowNullTenant() { - return true; - } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/LockEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/LockEntity.java index 42ccbece6..751198891 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/LockEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/LockEntity.java @@ -87,10 +87,4 @@ public class LockEntity extends TenantScopedBaseEntity { public void setTouchedAt(Instant touchedAt) { this.touchedAt = touchedAt; } - - @Override - @Transient - public boolean allowNullTenant() { - return false; - } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/PrefillingSourceEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/PrefillingSourceEntity.java index c38fa4298..f6afb774f 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/PrefillingSourceEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/PrefillingSourceEntity.java @@ -89,10 +89,4 @@ public class PrefillingSourceEntity extends TenantScopedBaseEntity { public void setUpdatedAt(Instant updatedAt) { this.updatedAt = updatedAt; } - - @Override - @Transient - public boolean allowNullTenant() { - return true; - } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/ReferenceEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/ReferenceEntity.java index 734aeb9c2..07896263f 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/ReferenceEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/ReferenceEntity.java @@ -204,10 +204,4 @@ public class ReferenceEntity extends TenantScopedBaseEntity { this.createdById = createdById; } - @Override - @Transient - public boolean allowNullTenant() { - return true; - } - } diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/ReferenceTypeEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/ReferenceTypeEntity.java index 41784a3ca..ebc5dc00e 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/ReferenceTypeEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/ReferenceTypeEntity.java @@ -108,10 +108,4 @@ public class ReferenceTypeEntity extends TenantScopedBaseEntity { public void setUpdatedAt(Instant updatedAt) { this.updatedAt = updatedAt; } - - @Override - @Transient - public boolean allowNullTenant() { - return true; - } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/StorageFileEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/StorageFileEntity.java index d0185bc59..29be0b222 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/StorageFileEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/StorageFileEntity.java @@ -139,10 +139,4 @@ public class StorageFileEntity extends TenantScopedBaseEntity { public void setOwnerId(UUID ownerId) { this.ownerId = ownerId; } - - @Override - @Transient - public boolean allowNullTenant() { - return false; - } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/SupportiveMaterialEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/SupportiveMaterialEntity.java index d11b38987..40bdf128d 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/SupportiveMaterialEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/SupportiveMaterialEntity.java @@ -101,10 +101,4 @@ public class SupportiveMaterialEntity extends TenantScopedBaseEntity { public void setIsActive(IsActive isActive) { this.isActive = isActive; } - - @Override - @Transient - public boolean allowNullTenant() { - return true; - } } 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 12f2b91a7..ef609f06a 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 @@ -86,10 +86,4 @@ public class TagEntity extends TenantScopedBaseEntity { public void setCreatedById(UUID createdById) { this.createdById = createdById; } - - @Override - @Transient - public boolean allowNullTenant() { - return false; - } } diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/TenantUserEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/TenantUserEntity.java index a86feecb7..d720d3be6 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/data/TenantUserEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/TenantUserEntity.java @@ -83,10 +83,4 @@ public class TenantUserEntity extends TenantScopedBaseEntity { public void setUpdatedAt(Instant updatedAt) { this.updatedAt = updatedAt; } - - @Override - @Transient - public boolean allowNullTenant() { - return false; - } } 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 f83244c9f..21a176324 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 @@ -100,10 +100,4 @@ public class UserDescriptionTemplateEntity extends TenantScopedBaseEntity { public void setRole(UserDescriptionTemplateRole role) { this.role = role; } - - @Override - @Transient - public boolean allowNullTenant() { - return true; - } } 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 e768558ff..56c1d1a5a 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 @@ -61,10 +61,4 @@ public class UserRoleEntity extends TenantScopedBaseEntity { this.createdAt = createdAt; } - @Override - @Transient - public boolean allowNullTenant() { - return true; - } - } 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 d6a245738..d4a277697 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 @@ -109,10 +109,4 @@ public class UserSettingsEntity extends TenantScopedBaseEntity { public void setName(String name) { this.name = name; } - - @Override - @Transient - public boolean allowNullTenant() { - return true; - } }