Yet another fix and set proper file transformer base version

# Conflicts:
#	dmp-frontend/src/app/core/model/file/file-format.model.ts

.gitignore

@@ -46,5 +46,9 @@ ELK.Docker/shared/data-elk/
 .settings/
 bin/
 *.classpath
+.run
 openDMP/dmp-backend/uploads/
 openDMP/dmp-backend/tmp/
+logs/
+dmp-backend/web/src/main/resources/certificates/
+/storage/

dmp-backend/Dockerfile.CI

@@ -13,3 +13,4 @@ FROM adoptopenjdk/openjdk11:alpine-jre
 WORKDIR /app
 COPY --from=MAVEN_BUILD /build/web/target/web-1.0-SNAPSHOT.jar /app/app.jar
 ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=${PROF}", "-Dspring.config.additional-location=/files/config/", "-cp", "/app/app.jar", "-Dloader.path=/files/repo-jars", "org.springframework.boot.loader.PropertiesLauncher"]
+

dmp-backend/core/pom.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>eu.eudat</groupId>
+        <artifactId>dmp-backend</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>core</artifactId>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-csv</artifactId>
+            <version>1.10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>gr.cite</groupId>
+            <artifactId>validation</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>gr.cite</groupId>
+            <artifactId>oidc-authz</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>gr.cite.opendmp</groupId>
+            <artifactId>repositorydepositbase</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>gr.cite.opendmp</groupId>
+            <artifactId>file-transformer-base</artifactId>
+            <version>0.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>gr.cite</groupId>
+            <artifactId>elastic</artifactId>
+            <version>2.1.2</version>
+        </dependency>
+		<dependency>
+			<groupId>org.eclipse.angus</groupId>
+			<artifactId>jakarta.mail</artifactId>
+		</dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.4</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

dmp-backend/core/src/main/java/eu/eudat/audit/AuditableAction.java

@@ -0,0 +1,133 @@
+package eu.eudat.audit;
+
+import gr.cite.tools.logging.EventId;
+
+public class AuditableAction {
+
+    public static final EventId DescriptionTemplateType_Query = new EventId(1000, "DescriptionTemplateType_Query");
+    public static final EventId DescriptionTemplateType_Lookup = new EventId(1001, "DescriptionTemplateType_Lookup");
+    public static final EventId DescriptionTemplateType_Persist = new EventId(1002, "DescriptionTemplateType_Persist");
+    public static final EventId DescriptionTemplateType_Delete = new EventId(1003, "DescriptionTemplateType_Delete");
+
+    public static final EventId EntityDoi_Query = new EventId(2000, "EntityDoi_Query");
+    public static final EventId EntityDoi_Lookup = new EventId(2001, "EntityDoi_Lookup");
+    public static final EventId EntityDoi_Persist = new EventId(2002, "EntityDoi_Persist");
+    public static final EventId EntityDoi_Delete = new EventId(2003, "EntityDoi_Delete");
+
+    public static final EventId DmpBlueprint_Query = new EventId(3000, "DmpBlueprint_Query");
+    public static final EventId DmpBlueprint_Lookup = new EventId(3001, "DmpBlueprint_Lookup");
+    public static final EventId DmpBlueprint_Persist = new EventId(3002, "DmpBlueprint_Persist");
+    public static final EventId DmpBlueprint_Delete = new EventId(3003, "DmpBlueprint_Delete");
+    public static final EventId DmpBlueprint_Clone = new EventId(3004, "DmpBlueprint_Clone");
+    public static final EventId DmpBlueprint_GetXml = new EventId(3005, "DmpBlueprint_GetXml");
+    public static final EventId DmpBlueprint_Import = new EventId(3006, "DmpBlueprint_Import");
+
+    public static final EventId User_Settings_Query = new EventId(4000, "User_Settings_Query");
+    public static final EventId User_Settings_Lookup = new EventId(4001, "User_Settings_Lookup");
+    public static final EventId User_Settings_Persist = new EventId(4002, "User_Settings_Persist");
+    public static final EventId User_Settings_Delete = new EventId(4003, "User_Settings_Delete");
+
+    public static final EventId Dmp_Query = new EventId(5000, "Dmp_Query");
+    public static final EventId Dmp_Lookup = new EventId(5001, "Dmp_Lookup");
+    public static final EventId Dmp_Persist = new EventId(5002, "Dmp_Persist");
+    public static final EventId Dmp_Delete = new EventId(5003, "Dmp_Delete");
+    public static final EventId Dmp_Clone = new EventId(5004, "Dmp_Clone");
+    public static final EventId Dmp_PersistNewVersion = new EventId(5005, "Dmp_PersistNewVersion");
+    public static final EventId Dmp_Assign_Users = new EventId(5006, "Dmp_Assign_Users");
+    public static final EventId Dmp_RemoveUser = new EventId(5007, "Dmp_RemoveUser");
+    public static final EventId Dmp_Invite_Users = new EventId(5008, "Dmp_Invite_Users");
+    public static final EventId Dmp_Invite_Accept = new EventId(5009, "Dmp_Invite_Accept");
+    
+    public static final EventId Description_Query = new EventId(6000, "Description_Query");
+    public static final EventId Description_Lookup = new EventId(6001, "Description_Lookup");
+    public static final EventId Description_Persist = new EventId(6002, "Description_Persist");
+    public static final EventId Description_Delete = new EventId(6003, "Description_Delete");
+    public static final EventId Description_PublicQuery = new EventId(6004, "Description_PublicQuery");
+    public static final EventId Description_PublicLookup = new EventId(6005, "Description_PublicLookup");
+    public static final EventId Description_PersistStatus = new EventId(6006, "Description_PersistStatus");
+
+    public static final EventId Reference_Query = new EventId(7000, "Reference_Query");
+    public static final EventId Reference_Lookup = new EventId(7001, "Reference_Lookup");
+    public static final EventId Reference_Persist = new EventId(7002, "Reference_Persist");
+    public static final EventId Reference_Delete = new EventId(7003, "Reference_Delete");
+    public static final EventId Reference_Search = new EventId(7004, "Reference_Search");
+    
+    public static final EventId DescriptionTemplate_Query = new EventId(8000, "DescriptionTemplate_Query");
+    public static final EventId DescriptionTemplate_Lookup = new EventId(8001, "DescriptionTemplate_Lookup");
+    public static final EventId DescriptionTemplate_Persist = new EventId(8002, "DescriptionTemplate_Persist");
+    public static final EventId DescriptionTemplate_Delete = new EventId(8003, "DescriptionTemplate_Delete");
+    public static final EventId DescriptionTemplate_Clone = new EventId(8004, "DescriptionTemplate_Clone");
+    public static final EventId DescriptionTemplate_PersistNewVersion = new EventId(8005, "DescriptionTemplate_PersistNewVersion");
+    public static final EventId DescriptionTemplate_GetXml = new EventId(8006, "DescriptionTemplate_GetXml");
+    public static final EventId DescriptionTemplate_Import = new EventId(8007, "DescriptionTemplate_Import");
+    public static final EventId DescriptionTemplate_GetSemantics = new EventId(8007, "DescriptionTemplate_GetSemantics");
+    
+    public static final EventId SupportiveMaterial_Query = new EventId(9000, "SupportiveMaterial_Query");
+    public static final EventId SupportiveMaterial_Lookup = new EventId(9001, "SupportiveMaterial_Lookup");
+    public static final EventId SupportiveMaterial_Persist = new EventId(9002, "SupportiveMaterial_Persist");
+    public static final EventId SupportiveMaterial_Delete = new EventId(9003, "SupportiveMaterial_Delete");
+
+    public static final EventId ReferenceType_Query = new EventId(10000, "ReferenceType_Query");
+    public static final EventId ReferenceType_Lookup = new EventId(10001, "ReferenceType_Lookup");
+    public static final EventId ReferenceType_Persist = new EventId(10002, "ReferenceType_Persist");
+    public static final EventId ReferenceType_Delete = new EventId(10003, "ReferenceType_Delete");
+
+    public static final EventId User_Query = new EventId(11000, "User_Query");
+    public static final EventId User_Lookup = new EventId(11001, "User_Lookup");
+    public static final EventId User_Persist = new EventId(11002, "User_Persist");
+    public static final EventId User_Delete = new EventId(11003, "User_Delete");
+    public static final EventId User_LookupByEmail = new EventId(11004, "User_LookupByEmail");
+    public static final EventId User_ExportCsv = new EventId(11005, "User_ExportCsv");
+    public static final EventId User_PersistRoles = new EventId(11006, "User_PersistRoles");
+    public static final EventId User_LanguageMine = new EventId(11007, "User_LanguageMine");
+    public static final EventId User_TimezoneMine = new EventId(11008, "User_TimezoneMine");
+    public static final EventId User_CultureMine = new EventId(11009, "User_CultureMine");
+    public static final EventId User_MergeRequest = new EventId(11010, "User_MergeRequest");
+    public static final EventId User_MergeConfirm = new EventId(11011, "User_MergeConfirm");
+    public static final EventId User_RemoveCredentialRequest = new EventId(11012, "User_RemoveCredentialRequest");
+    public static final EventId User_RemoveCredentialConfirm = new EventId(11013, "User_RemoveCredentialConfirm");
+    public static final EventId User_DmpAssociatedQuery = new EventId(11014, "User_DmpAssociatedQuery");
+
+    public static final EventId Tenant_Query = new EventId(12000, "Tenant_Query");
+    public static final EventId Tenant_Lookup = new EventId(12001, "Tenant_Lookup");
+    public static final EventId Tenant_Persist = new EventId(12002, "Tenant_Persist");
+    public static final EventId Tenant_Delete = new EventId(12003, "Tenant_Delete");
+    
+    public static final EventId Language_Query = new EventId(13000, "Language_Query");
+    public static final EventId Language_Lookup = new EventId(13001, "Language_Lookup");
+    public static final EventId Language_Persist = new EventId(13002, "Language_Persist");
+    public static final EventId Language_Delete = new EventId(13003, "Language_Delete");
+
+    public static final EventId StorageFile_Download = new EventId(14000, "StorageFile_Download");
+    public static final EventId StorageFile_Upload = new EventId(14001, "StorageFile_Upload");
+
+    public static final EventId Dashboard_MyRecentActivityItems = new EventId(15000, "Dashboard_MyRecentActivityItems");
+    public static final EventId Dashboard_MyDashboardStatistics = new EventId(15001, "Dashboard_MyDashboardStatistics");
+    public static final EventId Dashboard_PublicDashboardStatistics = new EventId(15002, "Dashboard_PublicDashboardStatistics");
+
+    public static final EventId Notification_Persist = new EventId(16000, "Notification_Persist");
+
+    public static final EventId Lock_Query = new EventId(17000, "Lock_Query");
+    public static final EventId Lock_Lookup = new EventId(17001, "Lock_Lookup");
+    public static final EventId Lock_Persist = new EventId(17002, "Lock_Persist");
+    public static final EventId Lock_Delete = new EventId(17003, "Lock_Delete");
+    public static final EventId Lock_IsLocked = new EventId(17004, "Lock_IsLocked");
+    public static final EventId Lock_UnLocked = new EventId(17005, "Lock_UnLocked");
+
+    public static final EventId Deposit_GetAvailableRepositories = new EventId(18000, "Deposit_GetAvailableRepositories");
+    public static final EventId Deposit_GetAccessToken = new EventId(18001, "Deposit_GetAccessToken");
+    public static final EventId Deposit_Deposit = new EventId(18002, "Deposit_Deposit");
+    public static final EventId Deposit_GetLogo = new EventId(18003, "Deposit_GetLogo");
+
+    public static final EventId Tag_Query = new EventId(19000, "Tag_Query");
+    public static final EventId Tag_Lookup = new EventId(19001, "Tag_Lookup");
+    public static final EventId Tag_Persist = new EventId(19002, "Tag_Persist");
+    public static final EventId Tag_Delete = new EventId(19003, "Tag_Delete");
+
+    public static final EventId FileTransformer_GetAvailableConfigurations = new EventId(20000, "FileTransformer_GetAvailableConfigurations");
+
+    public static final EventId ContactSupport_Sent = new EventId(210000, "ContactSupport_Sent");
+    public static final EventId ContactSupport_PublicSent = new EventId(210001, "ContactSupport_PublicSent");
+
+    
+}

dmp-backend/core/src/main/java/eu/eudat/authorization/AuthorizationFlags.java

@@ -0,0 +1,8 @@
+package eu.eudat.authorization;
+
+import java.util.EnumSet;
+
+public enum AuthorizationFlags {
+	None, Permission, DmpAssociated, Public, Owner;
+	public static final EnumSet<AuthorizationFlags> OwnerOrDmpAssociatedOrPermissionOrPublic = EnumSet.of(DmpAssociated, Permission, Public, Owner);
+}

dmp-backend/core/src/main/java/eu/eudat/authorization/OwnedAuthorizationRequirement.java

@@ -0,0 +1,6 @@
+package eu.eudat.authorization;
+
+import gr.cite.commons.web.authz.policy.AuthorizationRequirement;
+
+public class OwnedAuthorizationRequirement implements AuthorizationRequirement {
+}

dmp-backend/core/src/main/java/eu/eudat/authorization/OwnedResource.java

@@ -0,0 +1,26 @@
+package eu.eudat.authorization;
+
+import gr.cite.commons.web.authz.policy.AuthorizationResource;
+
+import java.util.List;
+import java.util.UUID;
+
+public class OwnedResource extends AuthorizationResource {
+	private List<UUID> userIds;
+
+	public OwnedResource(UUID userId) {
+		this(List.of(userId));
+	}
+
+	public OwnedResource(List<UUID> userIds) {
+		this.userIds = userIds;
+	}
+
+	public List<UUID> getUserIds() {
+		return userIds;
+	}
+
+	public void setUserIds(List<UUID> userIds) {
+		this.userIds = userIds;
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/authorization/Permission.java

@@ -0,0 +1,182 @@
+package eu.eudat.authorization;
+
+public final class Permission {
+	/////// Should Remove after Refactor
+
+	public static String AnonymousRole = "AnonymousRole";
+	public static String AdminRole = "AdminRole";
+	public static String ManagerRole = "ManagerRole";
+	public static String UserRole = "UserRole";
+	public static String AuthenticatedRole = "AuthenticatedRole";
+	public static String PublicRole = "PublicRole";
+	public static String DatasetProfileManagerRole = "DatasetProfileManagerRole";
+
+	/////
+
+	//Public
+	public static String PublicBrowseDescription = "PublicBrowseDescription";
+	public static String PublicBrowseDescriptionTemplate = "BrowseDescriptionTemplate";
+	public static String PublicBrowseDmp = "PublicBrowseDmp";
+	public static String PublicBrowseDmpReference = "PublicBrowseDmpReference";
+	public static String PublicBrowseDmpUser = "PublicBrowseDmpUser";
+	public static String PublicBrowseReference = "PublicBrowseReference";
+	public static String PublicBrowseUser = "PublicBrowseUser";
+	public static String PublicBrowseDashboardStatistics = "PublicBrowseDashboardStatistics";
+	public static String PublicSendContactSupport = "PublicSendContactSupport";
+	//Elastic
+	public static String ManageElastic = "ManageElastic";
+
+	//Deposit
+	public static String BrowseDeposit = "BrowseDeposit";
+	public static String EditDeposit = "BrowseDeposit";
+
+
+	//Language
+	public static String BrowseLanguage = "BrowseLanguage";
+	public static String EditLanguage = "EditLanguage";
+	public static String DeleteLanguage = "DeleteLanguage";
+
+	//Language
+	public static String BrowseStatistics = "BrowseStatistics";
+	public static String BrowsePublicStatistics = "BrowsePublicStatistics";
+
+	//DescriptionTemplate
+	public static String BrowseDescriptionTemplate = "BrowseDescriptionTemplate";
+	public static String EditDescriptionTemplate = "EditDescriptionTemplate";
+	public static String DeleteDescriptionTemplate = "DeleteDescriptionTemplate";
+	public static String CloneDescriptionTemplate = "CloneDescriptionTemplate";
+	public static String CreateNewVersionDescriptionTemplate = "CreateNewVersionDescriptionTemplate";
+	public static String ImportDescriptionTemplate = "ImportDescriptionTemplate";
+	public static String ExportDescriptionTemplate = "ExportDescriptionTemplate";
+
+
+
+	//User
+	public static String BrowseUser = "BrowseUser";
+	public static String EditUser = "EditUser";
+	public static String DeleteUser = "DeleteUser";
+	public static String ExportUsers = "ExportUsers";
+	public static String BrowseDmpAssociatedUser = "BrowseDmpAssociatedUser";
+
+
+	//StorageFile
+	public static String BrowseStorageFile = "BrowseStorageFile";
+	public static String EditStorageFile = "EditStorageFile";
+	public static String DeleteStorageFile = "DeleteStorageFile";
+
+	//DescriptionTemplateType
+	public static String BrowseDescriptionTemplateType = "BrowseDescriptionTemplateType";
+	public static String EditDescriptionTemplateType = "EditDescriptionTemplateType";
+	public static String DeleteDescriptionTemplateType = "DeleteDescriptionTemplateType";
+
+	//Dmp
+	public static String BrowseDmp = "BrowseDmp";
+	public static String EditDmp = "EditDmp";
+	public static String DeleteDmp = "DeleteDmp";
+	public static String CloneDmp = "CloneDmp";
+	public static String CreateNewVersionDmp = "CreateNewVersionDmp";
+	public static String ExportDmp = "ExportDmp";
+	public static String FinalizeDmp = "FinalizeDmp";
+	public static String AssignDmpUsers = "AssignDmpUsers";
+	public static String InviteDmpUsers = "InviteDmpUsers";
+
+	//DmpBlueprint
+	public static String BrowseDmpBlueprint = "BrowseDmpBlueprint";
+	public static String EditDmpBlueprint = "EditDmpBlueprint";
+	public static String DeleteDmpBlueprint = "DeleteDmpBlueprint";
+	public static String CloneDmpBlueprint = "CloneDmpBlueprint";
+	public static String ExportDmpBlueprint = "ExportDmpBlueprint";
+	public static String ImportDmpBlueprint = "ImportDmpBlueprint";
+
+	//DmpDescriptionTemplate
+	public static String BrowseDmpDescriptionTemplate = "BrowseDmpDescriptionTemplate";
+	public static String EditDmpDescriptionTemplate = "EditDmpDescriptionTemplate";
+	public static String DeleteDmpDescriptionTemplate = "DeleteDmpDescriptionTemplate";
+
+	//DmpUser
+	public static String BrowseDmpUser = "BrowseDmpUser";
+	public static String EditDmpUser = "EditDmpUser";
+	public static String DeleteDmpUser = "DeleteDmpUser";
+
+	//Description
+	public static String BrowseDescription = "BrowseDescription";
+	public static String EditDescription = "EditDescription";
+	public static String DeleteDescription = "DeleteDescription";
+	public static String CloneDescription = "CloneDescription";
+
+	//DescriptionTag
+	public static String BrowseDescriptionTag = "BrowseDescriptionTag";
+	public static String EditDescriptionTag = "EditDescriptionTag";
+	public static String DeleteDescriptionTag = "DeleteDescriptionTag";
+
+	//DescriptionTemplateType
+	public static String BrowseEntityDoi = "BrowseEntityDoi";
+	public static String EditEntityDoi = "EditEntityDoi";
+	public static String DeleteEntityDoi = "DeleteEntityDoi";
+
+	//UserSettings
+	public static String BrowseUserSettings = "BrowseUserSettings";
+	public static String EditUserSettings = "EditUserSettings";
+	public static String DeleteUserSettings = "DeleteUserSettings";
+
+
+	// UI Pages
+	public static String ViewDescriptionTemplateTypePage = "ViewDescriptionTemplateTypePage";
+	public static String ViewDmpBlueprintPage = "ViewDmpBlueprintPage";
+
+	//Reference
+	public static String BrowseReference = "BrowseReference";
+	public static String EditReference = "EditReference";
+	public static String DeleteReference = "DeleteReference";
+
+	//Tag
+	public static String BrowseTag = "BrowseTag";
+	public static String EditTag = "EditTag";
+	public static String DeleteTag = "DeleteTag";
+
+	//DmpReference
+	public static String BrowseDmpReference = "BrowseDmpReference";
+	public static String EditDmpReference = "EditDmpReference";
+	public static String DeleteDmpReference = "DeleteDmpReference";
+
+	//DescriptionReference
+	public static String BrowseDescriptionReference = "BrowseDescriptionReference";
+	public static String EditDescriptionReference = "EditDescriptionReference";
+	public static String DeleteDescriptionReference = "DeleteDescriptionReference";
+
+	//SupportiveMaterial
+	public static String BrowseSupportiveMaterial = "BrowseSupportiveMaterial";
+	public static String EditSupportiveMaterial= "EditSupportiveMaterial";
+	public static String DeleteSupportiveMaterial = "DeleteSupportiveMaterial";
+
+	//ReferenceType
+	public static String BrowseReferenceType = "BrowseReferenceType";
+	public static String EditReferenceType= "EditReferenceType";
+	public static String DeleteReferenceType = "DeleteReferenceType";
+
+	//Tenant
+	public static String BrowseTenant = "BrowseTenant";
+	public static String EditTenant= "EditTenant";
+	public static String DeleteTenant = "DeleteTenant";
+	public static String AllowNoTenant = "AllowNoTenant";
+
+	//TenantUser
+	public static String BrowseTenantUser = "BrowseTenantUser";
+	public static String EditTenantUser = "EditTenantUser";
+	public static String DeleteTenantUser = "DeleteTenantUser";
+
+	//Lock
+	public static String BrowseLock = "BrowseLock";
+	public static String EditLock = "EditLock";
+	public static String DeleteLock = "DeleteLock";
+
+	//ContactSupport
+	public static String SendContactSupport = "SendContactSupport";
+
+	//ActionConfirmation
+	public static String BrowseActionConfirmation = "BrowseActionConfirmation";
+	public static String EditActionConfirmation = "EditActionConfirmation";
+	public static String DeleteActionConfirmation = "DeleteActionConfirmation";
+
+
+}

dmp-backend/core/src/main/java/eu/eudat/cache/transformer/FileTransformerConfigurationCache.java

@@ -0,0 +1,24 @@
+package eu.eudat.cache.transformer;
+
+
+import eu.eudat.configurations.deposit.DepositCacheOptions;
+import eu.eudat.configurations.transformer.TransformerCacheOptions;
+import eu.eudat.model.file.TransformerCacheModel;
+import gr.cite.tools.cache.CacheService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class FileTransformerConfigurationCache extends CacheService<TransformerCacheModel> {
+    @Autowired
+    public FileTransformerConfigurationCache(TransformerCacheOptions options) {
+        super(options);
+    }
+
+    @Override
+    protected Class<TransformerCacheModel> valueClass() {
+        return TransformerCacheModel.class;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/JsonHandlingService.java

@@ -0,0 +1,56 @@
+package eu.eudat.commons;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_SINGLETON)
+public class JsonHandlingService {
+    private final ObjectMapper objectMapper;
+
+    public JsonHandlingService() {
+        this.objectMapper = new ObjectMapper();
+        objectMapper.registerModule(new JavaTimeModule());
+    }
+
+    public String toJson(Object item) throws JsonProcessingException {
+        if (item == null) return null;
+        return objectMapper.writeValueAsString(item);
+    }
+
+    public String toJsonSafe(Object item) {
+        if (item == null) return null;
+        try {
+            return objectMapper.writeValueAsString(item);
+        } catch (Exception ex) {
+            return null;
+        }
+    }
+
+    public <T> T fromJson(Class<T> type, String json) throws JsonProcessingException {
+        if (json == null) return null;
+        return objectMapper.readValue(json, type);
+    }
+
+    public HashMap<String, String> mapFromJson(String json) throws JsonProcessingException {
+        ObjectReader reader = objectMapper.readerFor(Map.class);
+        return reader.readValue(json);
+    }
+
+    public <T> T fromJsonSafe(Class<T> type, String json) {
+        if (json == null) return null;
+        try {
+            return objectMapper.readValue(json, type);
+        } catch (Exception ex) {
+            return null;
+        }
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/XmlHandlingService.java

@@ -0,0 +1,118 @@
+package eu.eudat.commons;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import eu.eudat.commons.types.dmpblueprint.DefinitionEntity;
+import eu.eudat.commons.types.xml.XmlBuilder;
+import eu.eudat.commons.types.xml.XmlSerializable;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import javax.management.InvalidApplicationException;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.*;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_SINGLETON)
+public class XmlHandlingService {
+
+    public String generateXml(Document doc) throws TransformerException {
+        TransformerFactory tFact = TransformerFactory.newInstance();
+        Transformer trans = tFact.newTransformer();
+        StringWriter writer = new StringWriter();
+        StreamResult result = new StreamResult(writer);
+        DOMSource source = new DOMSource(doc);
+        trans.setOutputProperty(OutputKeys.INDENT, "yes");
+        trans.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
+        trans.transform(source, result);
+        return writer.toString();
+    }
+    
+    public String toXml(Object item) throws JsonProcessingException, JAXBException, ParserConfigurationException, InvalidApplicationException, TransformerException {
+        if (XmlSerializable.class.isAssignableFrom(item.getClass())){
+            Document document = this.getDocument();
+            if (document == null) throw new InvalidApplicationException("Can not create document");
+            document.appendChild(((XmlSerializable)item).toXml(document));
+            return this.generateXml(document);
+        }
+        
+        JAXBContext context = JAXBContext.newInstance(item.getClass());
+        Marshaller marshaller = context.createMarshaller();
+        StringWriter out = new StringWriter();
+        marshaller.marshal(item, out);
+        return out.toString();
+    }
+
+    public String toXmlSafe(Object item) {
+        if (item == null) return null;
+        try {
+            return this.toXml(item);
+        } catch (Exception ex) {
+            return null;
+        }
+    }
+
+    public <T> T fromXml(Class<T> type, String xmlString) throws JAXBException, InstantiationException, IllegalAccessException, ParserConfigurationException, IOException, SAXException {
+        if (XmlSerializable.class.isAssignableFrom(type)){
+            XmlSerializable<T> object = (XmlSerializable<T>)type.newInstance();
+            return (T) object.fromXml(this.getDocument(xmlString).getDocumentElement());
+        } else {
+            JAXBContext jaxbContext = JAXBContext.newInstance(type);
+            Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
+
+            return (T) jaxbUnmarshaller.unmarshal(new StringReader(xmlString));
+        }
+    }
+
+    public <T> T fromXmlSafe(Class<T> type, String xmlString) {
+        if (xmlString == null) return null;
+        try {
+            return this.fromXml(type, xmlString);
+        } catch (Exception ex) {
+            return null;
+        }
+    }
+
+//    public <T extends XmlSerializable<T>> T xmlSerializableFromXml(Class<T> type, String xmlString) throws JAXBException, InstantiationException, IllegalAccessException, ParserConfigurationException, IOException, SAXException {
+//        T object = type.newInstance();
+//        return (T) object.fromXml(this.getDocument(xmlString).getDocumentElement());
+//    }
+//    
+//    public <T extends XmlSerializable<T>> T xmlSerializableFromXmlSafe(Class<T> type, String xmlString) {
+//        if (xmlString == null) return null;
+//        try {
+//            return this.xmlSerializableFromXml(type, xmlString);
+//        } catch (Exception ex) {
+//            return null;
+//        }
+//    }
+
+    public Document getDocument(String xml) throws ParserConfigurationException, IOException, SAXException {
+        DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+        InputSource inputStream = new InputSource(new StringReader(xml));
+        return docBuilder.parse(inputStream);
+    }
+
+    public Document getDocument() throws ParserConfigurationException {
+        DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+        return docBuilder.newDocument();
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/ActionConfirmationStatus.java

@@ -0,0 +1,32 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum ActionConfirmationStatus implements DatabaseEnum<Short> {
+
+    Requested((short) 0),
+    Accepted((short) 1);
+
+    private final Short value;
+
+    ActionConfirmationStatus(Short value) {
+        this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, ActionConfirmationStatus> map = EnumUtils.getEnumValueMap(ActionConfirmationStatus.class);
+
+    public static ActionConfirmationStatus of(Short i) {
+        return map.get(i);
+    }
+
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/ActionConfirmationType.java

@@ -0,0 +1,33 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum ActionConfirmationType implements DatabaseEnum<Short> {
+
+    MergeAccount((short) 0),
+    RemoveCredential((short) 1),
+    DmpInvitation((short) 2);
+
+    private final Short value;
+
+    ActionConfirmationType(Short value) {
+        this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, ActionConfirmationType> map = EnumUtils.getEnumValueMap(ActionConfirmationType.class);
+
+    public static ActionConfirmationType of(Short i) {
+        return map.get(i);
+    }
+
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/ContactInfoType.java

@@ -0,0 +1,30 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum ContactInfoType implements DatabaseEnum<Short> {
+
+    Email((short) 0);
+
+    private final Short value;
+
+    ContactInfoType(Short value) {
+        this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, ContactInfoType> map = EnumUtils.getEnumValueMap(ContactInfoType.class);
+
+    public static ContactInfoType of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/DescriptionStatus.java

@@ -0,0 +1,31 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum DescriptionStatus implements DatabaseEnum<Short> {
+
+    Draft((short) 0),
+    Finalized((short) 1),
+    Canceled((short) 2);
+
+    private final Short value;
+
+    DescriptionStatus(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, DescriptionStatus> map = EnumUtils.getEnumValueMap(DescriptionStatus.class);
+
+    public static DescriptionStatus of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/DescriptionTemplateStatus.java

@@ -0,0 +1,30 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum DescriptionTemplateStatus implements DatabaseEnum<Short> {
+
+    Draft((short) 0), 
+    Finalized((short) 1);
+
+    private final Short value;
+
+    DescriptionTemplateStatus(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, DescriptionTemplateStatus> map = EnumUtils.getEnumValueMap(DescriptionTemplateStatus.class);
+
+    public static DescriptionTemplateStatus of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/DescriptionTemplateTypeStatus.java

@@ -0,0 +1,30 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum DescriptionTemplateTypeStatus implements DatabaseEnum<Short> {
+
+    Draft((short) 0), 
+    Finalized((short) 1);
+
+    private final Short value;
+
+    DescriptionTemplateTypeStatus(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, DescriptionTemplateTypeStatus> map = EnumUtils.getEnumValueMap(DescriptionTemplateTypeStatus.class);
+
+    public static DescriptionTemplateTypeStatus of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/DescriptionTemplateVersionStatus.java

@@ -0,0 +1,30 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum DescriptionTemplateVersionStatus implements DatabaseEnum<Short> {
+
+    Current((short) 0), Previous ((short) 1);
+
+    private final Short value;
+
+    DescriptionTemplateVersionStatus(Short value) {
+        this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, DescriptionTemplateVersionStatus> map = EnumUtils.getEnumValueMap(DescriptionTemplateVersionStatus.class);
+
+    public static DescriptionTemplateVersionStatus of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/DmpAccessType.java

@@ -0,0 +1,30 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum DmpAccessType implements DatabaseEnum<Short> {
+
+    Public((short) 0), Restricted((short) 1);
+
+    private final Short value;
+
+    DmpAccessType(Short value) {
+        this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, DmpAccessType> map = EnumUtils.getEnumValueMap(DmpAccessType.class);
+
+    public static DmpAccessType of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/DmpBlueprintExtraFieldDataType.java

@@ -0,0 +1,33 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum DmpBlueprintExtraFieldDataType implements DatabaseEnum<Short> {
+
+    Text((short) 0),
+    RichTex((short) 1),
+    Date((short) 2),
+    Number((short) 3),
+    ;
+
+    private final Short value;
+
+    DmpBlueprintExtraFieldDataType(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, DmpBlueprintExtraFieldDataType> map = EnumUtils.getEnumValueMap(DmpBlueprintExtraFieldDataType.class);
+
+    public static DmpBlueprintExtraFieldDataType of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/DmpBlueprintFieldCategory.java

@@ -0,0 +1,28 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum DmpBlueprintFieldCategory implements DatabaseEnum<Short> {
+    System((short) 0),
+    Extra((short) 1);
+
+    private final Short value;
+
+    DmpBlueprintFieldCategory(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, DmpBlueprintFieldCategory> map = EnumUtils.getEnumValueMap(DmpBlueprintFieldCategory.class);
+
+    public static DmpBlueprintFieldCategory of(Short i) {
+        return map.get(i);
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/DmpBlueprintStatus.java

@@ -0,0 +1,30 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum DmpBlueprintStatus implements DatabaseEnum<Short> {
+
+    Draft((short) 0),
+    Finalized((short) 1);
+
+    private final Short value;
+
+    DmpBlueprintStatus(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, DmpBlueprintStatus> map = EnumUtils.getEnumValueMap(DmpBlueprintStatus.class);
+
+    public static DmpBlueprintStatus of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/DmpBlueprintSystemFieldType.java

@@ -0,0 +1,37 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum DmpBlueprintSystemFieldType implements DatabaseEnum<Short> {
+
+    Text((short)0),
+    HtmlText((short)1),
+    Researchers((short)2),
+    Organizations((short)3),
+    Language((short)4),
+    Contact((short)5),
+    Funder((short)6),
+    Grant((short)7),
+    Project((short)8),
+    License((short)9),
+    AccessRights((short)10);
+    private final Short value;
+
+    DmpBlueprintSystemFieldType(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, DmpBlueprintSystemFieldType> map = EnumUtils.getEnumValueMap(DmpBlueprintSystemFieldType.class);
+
+    public static DmpBlueprintSystemFieldType of(Short i) {
+        return map.get(i);
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/DmpStatus.java

@@ -0,0 +1,31 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum DmpStatus implements DatabaseEnum<Short> {
+
+    Draft((short) 0), Finalized((short) 1);
+
+    private final Short value;
+
+    DmpStatus(Short value) {
+        this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, DmpStatus> map = EnumUtils.getEnumValueMap(DmpStatus.class);
+
+    public static DmpStatus of(Short i) {
+        return map.get(i);
+    }
+
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/DmpUserRole.java

@@ -0,0 +1,30 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum DmpUserRole implements DatabaseEnum<Short> {
+
+    Owner((short) 0), User((short) 1);
+
+    private final Short value;
+
+    DmpUserRole(Short value) {
+        this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, DmpUserRole> map = EnumUtils.getEnumValueMap(DmpUserRole.class);
+
+    public static DmpUserRole of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/DmpVersionStatus.java

@@ -0,0 +1,30 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum DmpVersionStatus implements DatabaseEnum<Short> {
+
+    Current((short) 0), Previous ((short) 1);
+
+    private final Short value;
+
+    DmpVersionStatus(Short value) {
+        this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, DmpVersionStatus> map = EnumUtils.getEnumValueMap(DmpVersionStatus.class);
+
+    public static DmpVersionStatus of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/EntityType.java

@@ -0,0 +1,30 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum EntityType implements DatabaseEnum<Short> {
+
+    DMP((short) 0);
+
+    private final Short value;
+
+    EntityType(Short value) {
+        this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, EntityType> map = EnumUtils.getEnumValueMap(EntityType.class);
+
+    public static EntityType of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/EnumUtils.java

@@ -0,0 +1,16 @@
+package eu.eudat.commons.enums;
+
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class EnumUtils {
+    public static  <EnumType extends Enum<EnumType> & DatabaseEnum<EnumValue>, EnumValue> Map<EnumValue, EnumType>  getEnumValueMap(Class<EnumType> enumType){
+        HashMap<EnumValue, EnumType> map = new HashMap<>();
+        for (EnumType v : enumType.getEnumConstants()) {
+            map.put(v.getValue(), v);
+        }
+        return map;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldDataComboBoxType.java

@@ -0,0 +1,27 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum FieldDataComboBoxType implements DatabaseEnum<String> {
+	Autocomplete("autocomplete"),
+	Wordlist("wordlist");
+	private final String value;
+
+	FieldDataComboBoxType(String value) {
+		this.value = value;
+	}
+
+	@JsonValue
+	public String getValue() {
+		return value;
+	}
+
+	private static final Map<String, FieldDataComboBoxType> map = EnumUtils.getEnumValueMap(FieldDataComboBoxType.class);
+
+	public static FieldDataComboBoxType of(String i) {
+		return map.get(i);
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldDataExternalDatasetType.java

@@ -0,0 +1,28 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum FieldDataExternalDatasetType implements DatabaseEnum<String> {
+	ReusedDataset("reused_dataset"),
+	ProducedDataset("produced_dataset"),
+	Other("other");
+	private final String value;
+
+	FieldDataExternalDatasetType(String value) {
+		this.value = value;
+	}
+
+	@JsonValue
+	public String getValue() {
+		return value;
+	}
+
+	private static final Map<String, FieldDataExternalDatasetType> map = EnumUtils.getEnumValueMap(FieldDataExternalDatasetType.class);
+
+	public static FieldDataExternalDatasetType of(String i) {
+		return map.get(i);
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldDataInternalDmpEntryType.java

@@ -0,0 +1,28 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum FieldDataInternalDmpEntryType implements DatabaseEnum<String> {
+	Researchers("researchers"),
+	Dmps("dmps"),
+	Datasets("datasets");
+	private final String value;
+
+	FieldDataInternalDmpEntryType(String value) {
+		this.value = value;
+	}
+
+	@JsonValue
+	public String getValue() {
+		return value;
+	}
+
+	private static final Map<String, FieldDataInternalDmpEntryType> map = EnumUtils.getEnumValueMap(FieldDataInternalDmpEntryType.class);
+
+	public static FieldDataInternalDmpEntryType of(String i) {
+		return map.get(i);
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldType.java

@@ -0,0 +1,88 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum FieldType implements DatabaseEnum<String> {
+	COMBO_BOX(Names.ComboBox), //TODO remove from xml an keep subtypes only AUTO_COMPLETE, WORD_LIST
+	AUTO_COMPLETE(Names.Autocomplete),
+	WORD_LIST(Names.Wordlist),
+	BOOLEAN_DECISION(Names.BooleanDecision),
+	RADIO_BOX(Names.RadioBox),
+	INTERNAL_DMP_ENTRIES(Names.InternalDmpEntities), //TODO remove from xml an keep subtypes only INTERNAL_DMP_ENTRIES_RESEARCHERS. INTERNAL_DMP_ENTRIES_DMPS, INTERNAL_DMP_ENTRIES_DATASETS
+	INTERNAL_DMP_ENTRIES_RESEARCHERS(Names.InternalDmpResearchers),
+	INTERNAL_DMP_ENTRIES_DMPS(Names.InternalDmpDmps),
+	INTERNAL_DMP_ENTRIES_DATASETS(Names.InternalDmpDatasets),
+	CHECK_BOX(Names.CheckBox),
+	FREE_TEXT(Names.FreeText),
+	TEXT_AREA(Names.TextArea),
+	RICH_TEXT_AREA(Names.RichTextarea),
+	UPLOAD(Names.Upload),
+	DATE_PICKER(Names.DatePicker),
+	EXTERNAL_DATASETS(Names.ExternalDatasets),
+	DATA_REPOSITORIES(Names.DataRepositories),
+	JOURNAL_REPOSITORIES(Names.JournalRepositories),
+	PUB_REPOSITORIES(Names.PubRepositories),
+	LICENSES(Names.Licenses),
+	TAXONOMIES(Names.Taxonomies),
+	PUBLICATIONS(Names.Publications),
+	REGISTRIES(Names.Registries),
+	SERVICES(Names.Services),
+	TAGS(Names.Tags),
+	RESEARCHERS(Names.Researchers),
+	ORGANIZATIONS(Names.Organizations),
+	DATASET_IDENTIFIER(Names.DatasetIdentifier),
+	CURRENCY(Names.Currency),
+	VALIDATION(Names.Validation);
+	private final String value;
+	
+	public static class Names {
+		public static final String ComboBox = "combobox";
+		public static final String Autocomplete = "autocomplete";
+		public static final String Wordlist = "wordlist";
+		public static final String BooleanDecision = "booleanDecision";
+		public static final String RadioBox = "radiobox";
+		public static final String InternalDmpEntities = "internalDmpEntities";
+		public static final String InternalDmpResearchers = "internalDmpResearchers";
+		public static final String InternalDmpDmps = "internalDmpDmps";
+		public static final String InternalDmpDatasets = "internalDmpDatasets";
+		public static final String CheckBox = "checkBox";
+		public static final String FreeText = "freetext";
+		public static final String TextArea = "textarea";
+		public static final String RichTextarea = "richTextarea";
+		public static final String Upload = "upload";
+		public static final String DatePicker = "datePicker";
+		public static final String ExternalDatasets = "externalDatasets";
+		public static final String DataRepositories = "dataRepositories";
+		public static final String JournalRepositories = "journalRepositories";
+		public static final String PubRepositories = "pubRepositories";
+		public static final String Licenses = "licenses";
+		public static final String Taxonomies = "taxonomies";
+		public static final String Publications = "publications";
+		public static final String Registries = "registries";
+		public static final String Services = "services";
+		public static final String Tags = "tags";
+		public static final String Researchers = "researchers";
+		public static final String Organizations = "organizations";
+		public static final String DatasetIdentifier = "datasetIdentifier";
+		public static final String Currency = "currency";
+		public static final String Validation = "validation";
+	}
+
+	FieldType(String value) {
+		this.value = value;
+	}
+
+	@JsonValue
+	public String getValue() {
+		return value;
+	}
+
+	private static final Map<String, FieldType> map = EnumUtils.getEnumValueMap(FieldType.class);
+
+	public static FieldType of(String i) {
+		return map.get(i);
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldValidationType.java

@@ -0,0 +1,33 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public enum FieldValidationType implements DatabaseEnum<Short> {
+
+    None((short) 0), 
+    Required((short) 1), 
+    Url((short) 2);
+
+    private final Short value;
+
+    FieldValidationType(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, FieldValidationType> map = EnumUtils.getEnumValueMap(FieldValidationType.class);
+
+    public static FieldValidationType of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/IsActive.java

@@ -0,0 +1,30 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum IsActive implements DatabaseEnum<Short> {
+
+    Inactive((short) 0),
+    Active((short) 1);
+
+    private final Short value;
+
+    IsActive(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, IsActive> map = EnumUtils.getEnumValueMap(IsActive.class);
+
+    public static IsActive of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/LockTargetType.java

@@ -0,0 +1,27 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum LockTargetType implements DatabaseEnum<Short> {
+	Dmp((short) 0),
+	Decription((short) 1);
+	private final Short value;
+
+	LockTargetType(Short value) {
+		this.value = value;
+	}
+
+	@JsonValue
+	public Short getValue() {
+		return value;
+	}
+
+	private static final Map<Short, LockTargetType> map = EnumUtils.getEnumValueMap(LockTargetType.class);
+
+	public static LockTargetType of(Short i) {
+		return map.get(i);
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/ProviderType.java

@@ -0,0 +1,36 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ProviderType implements DatabaseEnum<Integer> {
+
+    Google (1), 
+    Facebook ( 2), 
+    Twitter ( 3), 
+    LinkedIn  (4), 
+    NativeLogin ( 5), 
+    B2Access  ( 6), 
+    ORCID  (7), 
+    OpenAire  ( 8), 
+    Configurable  ( 9), 
+    Zenodo   (10), 
+    Keycloack ( 128);
+
+    private final Integer value;
+
+    ProviderType(Integer value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Integer getValue() { return this.value; }
+
+    private static final Map<Integer, ProviderType> map = EnumUtils.getEnumValueMap(ProviderType.class);
+    public static ProviderType of(Integer i) {
+        return map.get(i);
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/RecentActivityItemType.java

@@ -0,0 +1,31 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum RecentActivityItemType implements DatabaseEnum<Short> {
+
+    Dmp((short) 0),
+    Description((short) 1);
+
+    private final Short value;
+
+    RecentActivityItemType(Short value) {
+        this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, RecentActivityItemType> map = EnumUtils.getEnumValueMap(RecentActivityItemType.class);
+
+    public static RecentActivityItemType of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/RecentActivityOrder.java

@@ -0,0 +1,31 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum RecentActivityOrder implements DatabaseEnum<Short> {
+    UpdatedAt((short) 0),
+    Label((short) 1),
+    Status((short) 2);
+
+    private final Short value;
+
+    RecentActivityOrder(Short value) {
+        this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, RecentActivityOrder> map = EnumUtils.getEnumValueMap(RecentActivityOrder.class);
+
+    public static RecentActivityOrder of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/ReferenceFieldDataType.java

@@ -0,0 +1,27 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum ReferenceFieldDataType implements DatabaseEnum<Short> {
+	Text((short) 0),
+	Date((short) 1);
+	private final Short value;
+
+	ReferenceFieldDataType(Short value) {
+		this.value = value;
+	}
+
+	@JsonValue
+	public Short getValue() {
+		return value;
+	}
+
+	private static final Map<Short, ReferenceFieldDataType> map = EnumUtils.getEnumValueMap(ReferenceFieldDataType.class);
+
+	public static ReferenceFieldDataType of(Short i) {
+		return map.get(i);
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/ReferenceSourceType.java

@@ -0,0 +1,28 @@
+package eu.eudat.commons.enums;
+
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum ReferenceSourceType implements DatabaseEnum<Short> {
+
+    Internal((short) 0),
+    External((short) 1);
+
+    private final Short value;
+
+    ReferenceSourceType(Short value) {
+        this.value = value;
+    }
+
+    @Override
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, ReferenceSourceType> map = EnumUtils.getEnumValueMap(ReferenceSourceType.class);
+
+    public static ReferenceSourceType of(Short i) {
+        return map.get(i);
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/ReferenceType.java

@@ -0,0 +1,39 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum ReferenceType implements DatabaseEnum<Short> {
+	Taxonomies((short) 0),
+	Licenses((short) 1),
+	Publications((short) 2),
+	Journals((short) 3),
+	PubRepositories((short) 4),
+	DataRepositories((short) 5),
+	Registries((short) 6),
+	Services((short) 7),
+	Project((short) 8),
+	Funder((short) 9),
+	Datasets((short) 10),
+	Organizations((short) 11),
+	Grants((short) 12),
+	Researcher((short) 13);
+	private final Short value;
+
+	ReferenceType(Short value) {
+		this.value = value;
+	}
+
+	@JsonValue
+	public Short getValue() {
+		return value;
+	}
+
+	private static final Map<Short, ReferenceType> map = EnumUtils.getEnumValueMap(ReferenceType.class);
+
+	public static ReferenceType of(Short i) {
+		return map.get(i);
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/ReferenceTypeExternalApiHTTPMethodType.java

@@ -0,0 +1,30 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+
+import java.util.Map;
+
+public enum ReferenceTypeExternalApiHTTPMethodType implements DatabaseEnum<Short> {
+	@XmlEnumValue(value = "0")
+	GET((short) 0),
+	@XmlEnumValue(value = "1")
+	POST((short) 1);
+	private final Short value;
+
+	ReferenceTypeExternalApiHTTPMethodType(Short value) {
+		this.value = value;
+	}
+
+	@JsonValue
+	public Short getValue() {
+		return value;
+	}
+
+	private static final Map<Short, ReferenceTypeExternalApiHTTPMethodType> map = EnumUtils.getEnumValueMap(ReferenceTypeExternalApiHTTPMethodType.class);
+
+	public static ReferenceTypeExternalApiHTTPMethodType of(Short i) {
+		return map.get(i);
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/ReferenceTypeSourceType.java

@@ -0,0 +1,36 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlValue;
+
+import java.util.Map;
+
+public enum ReferenceTypeSourceType implements DatabaseEnum<Short> {
+	@XmlEnumValue(value = "0")
+	API((short) 0),
+	@XmlEnumValue(value = "1")
+	STATIC((short) 1);
+	private final Short value;
+
+	public static class Names {
+		public static final String API = "api";
+		public static final String STATIC = "static";
+	}
+
+	ReferenceTypeSourceType(Short value) {
+		this.value = value;
+	}
+
+	@JsonValue
+	public Short getValue() {
+		return value;
+	}
+
+	private static final Map<Short, ReferenceTypeSourceType> map = EnumUtils.getEnumValueMap(ReferenceTypeSourceType.class);
+
+	public static ReferenceTypeSourceType of(Short i) {
+		return map.get(i);
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/StorageFilePermission.java

@@ -0,0 +1,30 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum StorageFilePermission implements DatabaseEnum<Short> {
+
+    Read((short) 0),
+    Write((short) 1);
+
+    private final Short value;
+
+    StorageFilePermission(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, StorageFilePermission> map = EnumUtils.getEnumValueMap(StorageFilePermission.class);
+
+    public static StorageFilePermission of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/StorageType.java

@@ -0,0 +1,31 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum StorageType implements DatabaseEnum<Short> {
+
+    Temp((short) 0),
+    Main((short) 1),
+    Transformer((short)2);
+
+    private final Short value;
+
+    StorageType(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, StorageType> map = EnumUtils.getEnumValueMap(StorageType.class);
+
+    public static StorageType of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/SupportiveMaterialFieldType.java

@@ -0,0 +1,31 @@
+package eu.eudat.commons.enums;
+
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum SupportiveMaterialFieldType implements DatabaseEnum<Short> {
+
+    Faq((short) 0),
+    About((short) 1),
+    Glossary((short) 2),
+    TermsOfService((short) 3),
+    UserGuide((short) 4);
+
+    private final Short value;
+
+    SupportiveMaterialFieldType(Short value) {
+        this.value = value;
+    }
+
+    @Override
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, SupportiveMaterialFieldType> map = EnumUtils.getEnumValueMap(SupportiveMaterialFieldType.class);
+
+    public static SupportiveMaterialFieldType of(Short i) {
+        return map.get(i);
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/UserDescriptionTemplateRole.java

@@ -0,0 +1,30 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum UserDescriptionTemplateRole implements DatabaseEnum<Short> {
+
+    Owner((short) 0),
+    Member((short) 1);
+
+    private final Short value;
+
+    UserDescriptionTemplateRole(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, UserDescriptionTemplateRole> map = EnumUtils.getEnumValueMap(UserDescriptionTemplateRole.class);
+
+    public static UserDescriptionTemplateRole of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/UserSettingsType.java

@@ -0,0 +1,30 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum UserSettingsType implements DatabaseEnum<Short> {
+
+	Settings((short) 0),
+	Config((short) 1);
+
+	private final Short value;
+
+	UserSettingsType(Short value) {
+		this.value = value;
+	}
+
+	@JsonValue
+	public Short getValue() {
+		return value;
+	}
+
+	private static final Map<Short, UserSettingsType> map = EnumUtils.getEnumValueMap(UserSettingsType.class);
+
+	public static UserSettingsType of(Short i) {
+		return map.get(i);
+	}
+}
+

dmp-backend/core/src/main/java/eu/eudat/commons/enums/notification/NotificationContactType.java

@@ -0,0 +1,32 @@
+package eu.eudat.commons.enums.notification;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.commons.enums.EnumUtils;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum NotificationContactType implements DatabaseEnum<Short> {
+	EMAIL((short)0),
+	SLACK_BROADCAST((short)1),
+	SMS((short)2),
+	IN_APP((short)3);
+
+	private final Short value;
+
+	NotificationContactType(Short value) {
+		this.value = value;
+	}
+
+	@JsonValue
+	public Short getValue() {
+		return value;
+	}
+
+	private static final Map<Short, NotificationContactType> map = EnumUtils.getEnumValueMap(NotificationContactType.class);
+
+	public static NotificationContactType of(Short i) {
+		return map.get(i);
+	}
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/notification/NotificationNotifyState.java

@@ -0,0 +1,33 @@
+package eu.eudat.commons.enums.notification;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.commons.enums.EnumUtils;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum NotificationNotifyState implements DatabaseEnum<Short> {
+    PENDING((short)0),
+    PROCESSING((short)1),
+    SUCCESSFUL((short)2),
+    ERROR((short)3),
+    OMITTED((short)4);
+
+    private final Short value;
+
+    NotificationNotifyState(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, NotificationNotifyState> map = EnumUtils.getEnumValueMap(NotificationNotifyState.class);
+
+    public static NotificationNotifyState of(Short i) {
+        return map.get(i);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/notification/NotificationTrackingProcess.java

@@ -0,0 +1,32 @@
+package eu.eudat.commons.enums.notification;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.commons.enums.EnumUtils;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum NotificationTrackingProcess implements DatabaseEnum<Short> {
+    PENDING((short)0),
+    PROCESSING((short)1),
+    COMPLETED((short)2),
+    ERROR((short)3),
+    OMITTED((short)4);
+
+    private final Short value;
+
+    NotificationTrackingProcess(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, NotificationTrackingProcess> map = EnumUtils.getEnumValueMap(NotificationTrackingProcess.class);
+
+    public static NotificationTrackingProcess of(Short i) {
+        return map.get(i);
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/notification/NotificationTrackingState.java

@@ -0,0 +1,35 @@
+package eu.eudat.commons.enums.notification;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+import eu.eudat.commons.enums.EnumUtils;
+
+import java.util.Map;
+
+public enum NotificationTrackingState implements DatabaseEnum<Short> {
+    UNDEFINED((short)0),
+    NA((short)1),
+    QUEUED((short)2),
+    SENT((short)3),
+    DELIVERED((short)4),
+    UNDELIVERED((short)5),
+    FAILED((short)6),
+    UNSENT((short)7);
+
+    private final Short value;
+
+    NotificationTrackingState(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, NotificationTrackingState> map = EnumUtils.getEnumValueMap(NotificationTrackingState.class);
+
+    public static NotificationTrackingState of(Short i) {
+        return map.get(i);
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/exceptions/HugeResultSetException.java

@@ -0,0 +1,13 @@
+package eu.eudat.commons.exceptions;
+
+public class HugeResultSetException extends Exception {
+
+    private static final long serialVersionUID = -6961447213733280563L;
+
+
+    public HugeResultSetException(String message) {
+        super(message);
+    }
+
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/fake/FakeRequestAttributes.java

@@ -0,0 +1,126 @@
+package eu.eudat.commons.fake;
+
+import org.jetbrains.annotations.NotNull;
+import org.springframework.util.Assert;
+import org.springframework.web.context.request.RequestAttributes;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class FakeRequestAttributes implements RequestAttributes {
+    private final Map<String, Object> requestAttributeMap = new HashMap<>();
+    private final Map<String, Runnable> requestDestructionCallbacks = new LinkedHashMap<>(8);
+    private volatile boolean requestActive = true;
+
+    @Override
+    public Object getAttribute(@NotNull String name, int scope) {
+        if (scope == RequestAttributes.SCOPE_REQUEST) {
+            if (!isRequestActive()) {
+                throw new IllegalStateException("Cannot ask for request attribute - request is not active anymore!");
+            }
+            return this.requestAttributeMap.get(name);
+        } else {
+            throw new IllegalStateException("Only " + RequestAttributes.SCOPE_REQUEST + " allowed for " + FakeRequestAttributes.class.getSimpleName());
+        }
+    }
+
+    @Override
+    public void setAttribute(@NotNull String name, @NotNull Object value, int scope) {
+        if (scope == RequestAttributes.SCOPE_REQUEST) {
+            if (!isRequestActive()) {
+                throw new IllegalStateException("Cannot set request attribute - request is not active anymore!");
+            }
+            this.requestAttributeMap.put(name, value);
+        } else {
+            throw new IllegalStateException("Only " + RequestAttributes.SCOPE_REQUEST + " allowed for " + FakeRequestAttributes.class.getSimpleName());
+        }
+    }
+
+    @Override
+    public void removeAttribute(@NotNull String name, int scope) {
+        if (scope == RequestAttributes.SCOPE_REQUEST) {
+            if (isRequestActive()) {
+                removeRequestDestructionCallback(name);
+                this.requestAttributeMap.remove(name);
+            }
+        } else {
+            throw new IllegalStateException("Only " + RequestAttributes.SCOPE_REQUEST + " allowed for " + FakeRequestAttributes.class.getSimpleName());
+        }
+    }
+
+    @Override
+    public String @NotNull [] getAttributeNames(int scope) {
+        if (scope == RequestAttributes.SCOPE_REQUEST) {
+            if (!isRequestActive()) {
+                throw new IllegalStateException("Cannot ask for request attributes - request is not active anymore!");
+            }
+            return this.requestAttributeMap.keySet().toArray(new String[0]);
+        } else {
+            throw new IllegalStateException("Only " + RequestAttributes.SCOPE_REQUEST + " allowed for " + FakeRequestAttributes.class.getSimpleName());
+        }
+        //return new String[0];
+    }
+
+    @Override
+    public void registerDestructionCallback(@NotNull String name, @NotNull Runnable callback, int scope) {
+        if (scope == SCOPE_REQUEST) {
+            registerRequestDestructionCallback(name, callback);
+        } else {
+            throw new IllegalStateException("Only " + RequestAttributes.SCOPE_REQUEST + " allowed for " + FakeRequestAttributes.class.getSimpleName());
+        }
+    }
+
+    protected final void registerRequestDestructionCallback(String name, Runnable callback) {
+        Assert.notNull(name, "Name must not be null");
+        Assert.notNull(callback, "Callback must not be null");
+        synchronized (this.requestDestructionCallbacks) {
+            this.requestDestructionCallbacks.put(name, callback);
+        }
+    }
+
+    @Override
+    public Object resolveReference(@NotNull String key) {
+        // Not supported
+        return null;
+    }
+
+    @Override
+    public @NotNull String getSessionId() {
+        return "";
+    }
+
+    @Override
+    public @NotNull Object getSessionMutex() {
+        return new Object();
+    }
+
+    public void requestCompleted() {
+        executeRequestDestructionCallbacks();
+        for (String name : getAttributeNames(RequestAttributes.SCOPE_REQUEST)) {
+            this.removeAttribute(name, RequestAttributes.SCOPE_REQUEST);
+        }
+        this.requestActive = false;
+    }
+
+    private boolean isRequestActive() {
+        return this.requestActive;
+    }
+
+
+    private void removeRequestDestructionCallback(String name) {
+        Assert.notNull(name, "Name must not be null");
+        synchronized (this.requestDestructionCallbacks) {
+            this.requestDestructionCallbacks.remove(name);
+        }
+    }
+
+    private void executeRequestDestructionCallbacks() {
+        synchronized (this.requestDestructionCallbacks) {
+            for (Runnable runnable : this.requestDestructionCallbacks.values()) {
+                runnable.run();
+            }
+            this.requestDestructionCallbacks.clear();
+        }
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/fake/FakeRequestScope.java

@@ -0,0 +1,44 @@
+package eu.eudat.commons.fake;
+
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+
+import java.io.Closeable;
+
+public class FakeRequestScope implements Closeable {
+    private RequestAttributes initialRequestAttributes = null;
+    private FakeRequestAttributes currentRequestAttributes = null;
+    boolean isInUse = false;
+
+    public FakeRequestScope() {
+        this.reset();
+    }
+
+    public final void reset() {
+        this.close();
+        this.isInUse = true;
+
+        this.initialRequestAttributes = RequestContextHolder.getRequestAttributes();
+        this.currentRequestAttributes = new FakeRequestAttributes();
+        RequestContextHolder.setRequestAttributes(this.currentRequestAttributes);
+    }
+
+    @Override
+    public void close() {
+        if (!this.isInUse)
+            return;
+        this.isInUse = false;
+
+        if (initialRequestAttributes != null)
+            RequestContextHolder.setRequestAttributes(initialRequestAttributes);
+        else
+            RequestContextHolder.resetRequestAttributes();
+
+        if (currentRequestAttributes != null)
+            currentRequestAttributes.requestCompleted();
+
+        this.initialRequestAttributes = null;
+        this.currentRequestAttributes = null;
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/lock/LockByKeyManager.java

@@ -0,0 +1,58 @@
+package eu.eudat.commons.lock;
+
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantLock;
+
+@Service
+public class LockByKeyManager {
+
+	private static class LockWrapper {
+		private final ReentrantLock lock = new ReentrantLock();
+		private final AtomicInteger numberOfThreadsInQueue = new AtomicInteger(1);
+
+		private LockWrapper addThreadInQueue() {
+			numberOfThreadsInQueue.incrementAndGet();
+			return this;
+		}
+
+		private int removeThreadFromQueue() {
+			return numberOfThreadsInQueue.decrementAndGet();
+		}
+
+	}
+
+	private static ConcurrentHashMap<String, LockWrapper> locks = new ConcurrentHashMap<String, LockWrapper>();
+
+	public void lock(String key) {
+		LockWrapper lockWrapper = locks.compute(key, (k, v) -> v == null ? new LockWrapper() : v.addThreadInQueue());
+		lockWrapper.lock.lock();
+	}
+
+	public boolean tryLock(String key, long timeout, TimeUnit unit) throws InterruptedException {
+		LockWrapper lockWrapper = null;
+		try {
+			lockWrapper = locks.compute(key, (k, v) -> v == null ? new LockWrapper() : v.addThreadInQueue());
+			return lockWrapper.lock.tryLock(timeout, unit);
+		} catch (Exception ex){
+			if (lockWrapper != null && lockWrapper.removeThreadFromQueue() == 0) {
+				// NB : We pass in the specific value to remove to handle the case where another thread would queue right before the removal
+				locks.remove(key, lockWrapper);
+			}
+			throw ex;
+		}
+	}
+
+	public void unlock(String key) {
+		LockWrapper lockWrapper = locks.get(key);
+		lockWrapper.lock.unlock();
+		if (lockWrapper.removeThreadFromQueue() == 0) {
+			// NB : We pass in the specific value to remove to handle the case where another thread would queue right before the removal
+			locks.remove(key, lockWrapper);
+		}
+	}
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/scope/tenant/MultitenancyConfiguration.java

@@ -0,0 +1,9 @@
+package eu.eudat.commons.scope.tenant;
+
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableConfigurationProperties(MultitenancyProperties.class)
+public class MultitenancyConfiguration {
+}

dmp-backend/core/src/main/java/eu/eudat/commons/scope/tenant/MultitenancyProperties.java

@@ -0,0 +1,16 @@
+package eu.eudat.commons.scope.tenant;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "tenant.multitenancy")
+public class MultitenancyProperties {
+    private boolean isMultitenant;
+
+    public boolean isMultitenant() {
+        return isMultitenant;
+    }
+
+    public void setIsMultitenant(boolean multitenant) {
+        isMultitenant = multitenant;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/scope/tenant/TenantScope.java

@@ -0,0 +1,91 @@
+package eu.eudat.commons.scope.tenant;
+
+import eu.eudat.data.tenant.TenantScopedBaseEntity;
+import gr.cite.tools.logging.LoggerService;
+import jakarta.persistence.EntityManager;
+import org.hibernate.Session;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.annotation.RequestScope;
+
+import javax.management.InvalidApplicationException;
+
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+
+@Component
+//@RequestScope
+public class TenantScope {
+    public static final String TenantReplaceParameter = "::TenantCode::";
+    public static final String TenantCodesClaimName = "TenantCodes";
+    public static final String TenantClaimName = "x-tenant";
+
+    private final MultitenancyProperties multitenancy;
+    private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(TenantScope.class));
+    private final AtomicReference<UUID> tenant = new AtomicReference<>();
+    private final AtomicReference<String> tenantCode = new AtomicReference<>();
+    private final AtomicReference<UUID> initialTenant = new AtomicReference<>();
+    private final AtomicReference<String> initialTenantCode = new AtomicReference<>();
+
+    @Autowired
+    public TenantScope(MultitenancyProperties multitenancy) {
+        this.multitenancy = multitenancy;
+    }
+
+    public Boolean isMultitenant() {
+        return multitenancy.isMultitenant();
+    }
+
+    public Boolean isSet() {
+        if (!this.isMultitenant())
+            return Boolean.TRUE;
+        return this.tenant.get() != null;
+    }
+
+    public UUID getTenant() throws InvalidApplicationException {
+        if (!this.isMultitenant())
+            return null;
+        if (this.tenant.get() == null)
+            throw new InvalidApplicationException("tenant not set");
+        return this.tenant.get();
+    }
+
+    public String getTenantCode() throws InvalidApplicationException {
+        if (!this.isMultitenant())
+            return null;
+        if (this.tenant.get() == null)
+            throw new InvalidApplicationException("tenant not set");
+        return this.tenantCode.get();
+    }
+
+    public void setTempTenant(EntityManager entityManager, UUID tenant) {
+        this.tenant.set(tenant);
+
+        if (this.tenant.get() != null) {
+            entityManager
+                    .unwrap(Session.class)
+                    .enableFilter(TenantScopedBaseEntity.tenantFilter).setParameter(TenantScopedBaseEntity.tenantFilterTenantParam, this.tenant.get().toString());
+        }
+    }
+
+    public void removeTempTenant(EntityManager entityManager) {
+        this.tenant.set(this.initialTenant.get());
+        this.tenantCode.set(this.initialTenantCode.get());
+        if (this.initialTenant.get() != null) {
+            entityManager
+                    .unwrap(Session.class)
+                    .enableFilter(TenantScopedBaseEntity.tenantFilter).setParameter(TenantScopedBaseEntity.tenantFilterTenantParam, this.initialTenant.get().toString());
+        }
+    }
+
+    public void setTenant(UUID tenant, String tenantCode) {
+        if (this.isMultitenant()) {
+            this.tenant.set(tenant);
+            this.initialTenant.set(tenant);
+            this.tenantCode.set(tenantCode);
+            this.initialTenantCode.set(tenantCode);
+        }
+    }
+}
+

dmp-backend/core/src/main/java/eu/eudat/commons/scope/tenant/TenantScoped.java

@@ -0,0 +1,8 @@
+package eu.eudat.commons.scope.tenant;
+
+import java.util.UUID;
+
+public interface TenantScoped {
+    void setTenantId(UUID tenantId);
+    UUID getTenantId();
+}

dmp-backend/core/src/main/java/eu/eudat/commons/scope/user/UserScope.java

@@ -0,0 +1,35 @@
+package eu.eudat.commons.scope.user;
+
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.annotation.RequestScope;
+
+import javax.management.InvalidApplicationException;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+
+@Component
+@RequestScope
+public class UserScope {
+    private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(UserScope.class));
+    private final AtomicReference<UUID> userId = new AtomicReference<>();
+
+    public Boolean isSet() {
+        return this.userId.get() != null;
+    }
+
+    public UUID getUserId() throws InvalidApplicationException {
+        if (this.userId.get() == null) throw new InvalidApplicationException("user not set");
+        return this.userId.get();
+    }
+
+    public UUID getUserIdSafe() {
+        return this.userId.get();
+    }
+
+    public void setUserId(UUID userId) {
+        this.userId.set(userId);
+    }
+}
+

dmp-backend/core/src/main/java/eu/eudat/commons/types/actionconfirmation/DmpInvitationEntity.java

@@ -0,0 +1,44 @@
+package eu.eudat.commons.types.actionconfirmation;
+
+import eu.eudat.commons.enums.DmpUserRole;
+import jakarta.xml.bind.annotation.*;
+
+import java.util.UUID;
+
+@XmlRootElement(name = "dmp-invitation")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class DmpInvitationEntity {
+
+	@XmlAttribute(name = "email")
+	private String email;
+
+	@XmlAttribute(name = "dmp")
+	private UUID dmpId;
+
+	@XmlAttribute(name = "dmp-role")
+	private DmpUserRole role;
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public UUID getDmpId() {
+		return dmpId;
+	}
+
+	public void setDmpId(UUID dmpId) {
+		this.dmpId = dmpId;
+	}
+
+	public DmpUserRole getRole() {
+		return role;
+	}
+
+	public void setRole(DmpUserRole role) {
+		this.role = role;
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/actionconfirmation/EmailConfirmationEntity.java

@@ -0,0 +1,22 @@
+package eu.eudat.commons.types.actionconfirmation;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "email-confirmation")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class EmailConfirmationEntity {
+
+    @XmlAttribute(name = "email")
+    private String email;
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/common/DatabaseDefinition.java

@@ -0,0 +1,5 @@
+package eu.eudat.commons.types.common;
+
+
+public interface DatabaseDefinition {
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/common/DatabaseModelDefinition.java

@@ -0,0 +1,7 @@
+package eu.eudat.commons.types.common;
+
+import eu.eudat.commons.types.common.DatabaseDefinition;
+
+public interface DatabaseModelDefinition extends DatabaseDefinition {
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/common/DatabaseViewStyleDefinition.java

@@ -0,0 +1,7 @@
+package eu.eudat.commons.types.common;
+
+import eu.eudat.commons.types.common.DatabaseDefinition;
+
+public interface DatabaseViewStyleDefinition extends DatabaseDefinition {
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/dashborad/RecentActivityItemEntity.java

@@ -0,0 +1,62 @@
+package eu.eudat.commons.types.dashborad;
+
+import eu.eudat.commons.enums.RecentActivityItemType;
+
+import java.time.Instant;
+import java.util.UUID;
+
+public class RecentActivityItemEntity {
+	private RecentActivityItemType type;
+	private UUID id;
+	private Instant updatedAt;
+	private String label;
+	private Short statusValue;
+
+	public RecentActivityItemEntity(RecentActivityItemType type, UUID id, Instant updatedAt, String label, Short statusValue) {
+		this.type = type;
+		this.id = id;
+		this.updatedAt = updatedAt;
+		this.label = label;
+		this.statusValue = statusValue;
+	}
+
+	public RecentActivityItemType getType() {
+		return type;
+	}
+
+	public void setType(RecentActivityItemType type) {
+		this.type = type;
+	}
+
+	public UUID getId() {
+		return id;
+	}
+
+	public void setId(UUID id) {
+		this.id = id;
+	}
+
+	public Instant getUpdatedAt() {
+		return updatedAt;
+	}
+
+	public void setUpdatedAt(Instant updatedAt) {
+		this.updatedAt = updatedAt;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	public Short getStatusValue() {
+		return statusValue;
+	}
+
+	public void setStatusValue(Short statusValue) {
+		this.statusValue = statusValue;
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/description/FieldEntity.java

@@ -0,0 +1,22 @@
+package eu.eudat.commons.types.description;
+
+public class FieldEntity {
+    private String key;
+    private String value;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/description/PropertyDefinitionEntity.java

@@ -0,0 +1,15 @@
+package eu.eudat.commons.types.description;
+
+import java.util.List;
+
+public class PropertyDefinitionEntity {
+    private List<FieldEntity> fields;
+
+    public List<FieldEntity> getFields() {
+        return fields;
+    }
+
+    public void setFields(List<FieldEntity> fields) {
+        this.fields = fields;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/DefinitionEntity.java

@@ -0,0 +1,91 @@
+package eu.eudat.commons.types.descriptiontemplate;
+
+import eu.eudat.commons.types.xml.XmlBuilder;
+import eu.eudat.commons.types.xml.XmlSerializable;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+public class DefinitionEntity implements XmlSerializable<DefinitionEntity> {
+    private List<SectionEntity> sections;
+    private List<PageEntity> pages;
+
+    public List<SectionEntity> getSections() {
+        return sections;
+    }
+
+    public void setSections(List<SectionEntity> sections) {
+        this.sections = sections;
+    }
+
+    public List<PageEntity> getPages() {
+        return pages;
+    }
+
+    public void setPages(List<PageEntity> pageEntities) {
+        this.pages = pageEntities;
+    }
+
+    @Override
+    public Element toXml(Document doc) {
+        Element root = doc.createElement("root");
+        Element sections = doc.createElement("sections");
+        Element pages = doc.createElement("pages");
+        for (SectionEntity sectionEntity : this.sections) {
+            sectionEntity.setNumbering("" + (this.sections.indexOf(sectionEntity) + 1));
+            sections.appendChild(sectionEntity.toXml(doc));
+        }
+
+        for (PageEntity pageEntity : this.pages) {
+            pages.appendChild(pageEntity.toXml(doc));
+        }
+
+        root.appendChild(pages);
+        root.appendChild(sections);
+        return root;
+    }
+
+    @Override
+    public DefinitionEntity fromXml(Element element) {
+
+        this.sections = new LinkedList();
+        Element sections = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "sections");
+        if (sections != null) {
+            NodeList sectionElements = sections.getChildNodes();
+            for (int temp = 0; temp < sectionElements.getLength(); temp++) {
+                Node sectionElement = sectionElements.item(temp);
+                if (sectionElement.getNodeType() == Node.ELEMENT_NODE) {
+                    this.sections.add(new SectionEntity().fromXml((Element) sectionElement));
+                }
+            }
+        }
+        this.pages = new LinkedList<>();
+        Element pages = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "pages");
+        if (pages != null) {
+            NodeList pagesElements = pages.getChildNodes();
+            for (int temp = 0; temp < pagesElements.getLength(); temp++) {
+                Node pageElement = pagesElements.item(temp);
+                if (pageElement.getNodeType() == Node.ELEMENT_NODE) {
+                    this.pages.add(new PageEntity().fromXml((Element) pageElement));
+                }
+            }
+        }
+        return this;
+    }
+    public List<FieldEntity> getFieldById(String id){
+        List<FieldEntity> fieldEntities = new ArrayList<>();
+        if (id == null || id.isBlank()) return fieldEntities;
+        if (this.getSections() != null){
+            for (SectionEntity sectionEntity: this.getSections()) {
+                fieldEntities.addAll(sectionEntity.getFieldById(id));
+            }
+        }
+        return fieldEntities;
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldEntity.java

@@ -0,0 +1,227 @@
+package eu.eudat.commons.types.descriptiontemplate;
+
+import eu.eudat.commons.enums.FieldValidationType;
+import eu.eudat.commons.enums.FieldType;
+import eu.eudat.commons.types.common.DatabaseViewStyleDefinition;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.*;
+import eu.eudat.commons.types.xml.XmlSerializable;
+import eu.eudat.commons.types.xml.XmlBuilder;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class FieldEntity implements DatabaseViewStyleDefinition, XmlSerializable<FieldEntity> {
+    private String id;
+    private int ordinal;
+    private List<String> schematics;
+    private String numbering;
+    private String defaultValue;
+    private List<RuleEntity> visibilityRules;
+    private BaseFieldDataEntity<?> data;
+    private List<FieldValidationType> validations;
+    private Boolean includeInExport;
+
+    public String getId() {
+        return id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public int getOrdinal() {
+        return ordinal;
+    }
+    public void setOrdinal(int ordinal) {
+        this.ordinal = ordinal;
+    }
+
+    public List<String> getSchematics() {
+        return schematics;
+    }
+    public void setSchematics(List<String> schematics) {
+        this.schematics = schematics;
+    }
+
+    public BaseFieldDataEntity<?> getData() {
+        return data;
+    }
+    public void setData(BaseFieldDataEntity<?> data) {
+        this.data = data;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+    public void setDefaultValue(String defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+
+    public List<FieldValidationType> getValidations() {
+        return validations;
+    }
+    public void setValidations(List<FieldValidationType> validations) {
+        this.validations = validations;
+    }
+
+    public String getNumbering() {
+        return numbering;
+    }
+    public void setNumbering(String numbering) {
+        this.numbering = numbering;
+    }
+
+    public Boolean getIncludeInExport() {
+        return includeInExport;
+    }
+
+    public void setIncludeInExport(Boolean includeInExport) {
+        this.includeInExport = includeInExport;
+    }
+
+    public List<RuleEntity> getVisibilityRules() {
+        return visibilityRules;
+    }
+
+    public void setVisibilityRules(List<RuleEntity> visibilityRules) {
+        this.visibilityRules = visibilityRules;
+    }
+
+    @Override
+    public Element toXml(Document doc) {
+        Element rootElement = doc.createElement("field");
+        rootElement.setAttribute("id", this.id);
+        rootElement.setAttribute("ordinal", "" + this.ordinal);
+
+        Element schematics = doc.createElement("schematics");
+        if (this.schematics != null) {
+            for (String s : this.schematics) {
+                Element schematic = doc.createElement("schematic");
+                schematic.setTextContent(s);
+                schematics.appendChild(schematic);
+            }
+        }
+
+        Element viewStyle = doc.createElement("viewStyle");
+        if (this.data != null) {
+            switch (this.data.getFieldType()){
+                case COMBO_BOX:
+                case AUTO_COMPLETE:
+                case WORD_LIST:{
+                    viewStyle.setAttribute("renderstyle", FieldType.COMBO_BOX.getValue());
+                    break;
+                }
+                case INTERNAL_DMP_ENTRIES:
+                case INTERNAL_DMP_ENTRIES_DMPS:
+                case INTERNAL_DMP_ENTRIES_DATASETS:
+                case INTERNAL_DMP_ENTRIES_RESEARCHERS:{
+                    viewStyle.setAttribute("renderstyle", FieldType.INTERNAL_DMP_ENTRIES.getValue());
+                    break;
+                }
+                case BOOLEAN_DECISION: viewStyle.setAttribute("renderstyle", this.data.getFieldType().getValue());
+            }
+            
+        }
+        Element visibilityRulesElement = doc.createElement("visible");
+        if (this.visibilityRules != null && !this.visibilityRules.isEmpty()) {
+            for (RuleEntity rule : this.visibilityRules) {
+                visibilityRulesElement.appendChild(rule.toXml(doc));
+            }
+        }
+        Element defaultValue = doc.createElement("defaultValue");
+        defaultValue.setAttribute("value", this.getDefaultValue());
+
+        Element validations = doc.createElement("validations");
+        for (FieldValidationType validationType : this.validations) {
+            Element validation = doc.createElement("validation");
+            validation.setAttribute("type", "" + validationType.getValue());
+            validations.appendChild(validation);
+        }
+
+        Element numbering = doc.createElement("numbering");
+        numbering.setTextContent(this.numbering);
+
+        rootElement.appendChild(schematics);
+        rootElement.appendChild(numbering);
+        rootElement.appendChild(validations);
+        rootElement.appendChild(defaultValue);
+        rootElement.appendChild(visibilityRulesElement);
+        rootElement.appendChild(viewStyle);
+        if (this.data != null) {
+            rootElement.appendChild(this.data.toXml(doc));
+        
+        }
+        rootElement.setAttribute("export", this.includeInExport == null || this.includeInExport ? "true" : "false");
+        return rootElement;
+    }
+
+    @Override
+    public FieldEntity fromXml(Element element) {
+        this.id = element.getAttribute("id");
+        this.ordinal = Integer.parseInt(element.getAttribute("ordinal"));
+
+
+        Element viewStyle = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "viewStyle");
+
+        FieldType fieldType = FieldType.of(viewStyle.getAttribute("renderstyle"));
+        
+        Element visibility = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "visible");
+        NodeList rulesElements = visibility.getChildNodes();
+        this.visibilityRules = new LinkedList();
+        for (int temp = 0; temp < rulesElements.getLength(); temp++) {
+            Node ruleElement = rulesElements.item(temp);
+            if (ruleElement.getNodeType() == Node.ELEMENT_NODE) {
+                this.visibilityRules.add(new RuleEntity().fromXml((Element) ruleElement));
+            }
+        }
+
+        Element numbering = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "numbering");
+        if (numbering != null) this.numbering = numbering.getTextContent();
+
+        this.schematics = new LinkedList<>();
+        Element schematics = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "schematics");
+        if(schematics != null){
+            NodeList schematicElements = schematics.getChildNodes();
+            for (int temp = 0; temp < schematicElements.getLength(); temp++) {
+                Node schematicElement = schematicElements.item(temp);
+                if (schematicElement.getNodeType() == Node.ELEMENT_NODE) {
+                    this.schematics.add(schematicElement.getTextContent());
+                }
+            }
+        }
+
+        Element dataElement = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "data");
+
+        Element defaultValue = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "defaultValue");
+
+        this.defaultValue = defaultValue.getAttribute("value");
+        String subType = dataElement != null ? dataElement.getAttribute("type") : null;
+        this.data = new FieldDataHelper().create(fieldType, subType);
+        if (this.data != null) this.data.fromXml(dataElement);
+
+        this.validations = new LinkedList<>();
+        Element validations = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "validations");
+        if (validations != null) {
+            NodeList validationElements = validations.getChildNodes();
+            for (int temp = 0; temp < validationElements.getLength(); temp++) {
+                Node validationElement = validationElements.item(temp);
+                if (validationElement.getNodeType() == Node.ELEMENT_NODE) {
+                    Short enumValue = Short.parseShort(((Element) validationElement).getAttribute("type"));
+                    FieldValidationType validationType = FieldValidationType.of(enumValue);
+                    this.validations.add(validationType);
+                }
+            }
+        }
+        if (element.hasAttribute("export")) {
+            this.includeInExport = Boolean.parseBoolean(element.getAttribute("export"));
+        } else {
+            this.includeInExport = true;
+        }
+        return this;
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldSetEntity.java

@@ -0,0 +1,200 @@
+package eu.eudat.commons.types.descriptiontemplate;
+
+import eu.eudat.commons.types.common.DatabaseViewStyleDefinition;
+import eu.eudat.commons.types.xml.XmlSerializable;
+import eu.eudat.commons.types.xml.XmlBuilder;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+public class FieldSetEntity implements DatabaseViewStyleDefinition, XmlSerializable<FieldSetEntity> {
+    private String id;
+    private int ordinal;
+    private List<FieldEntity> fields;
+    private String numbering;
+    private String title;
+    private String description;
+    private String extendedDescription;
+    private String additionalInformation;
+    private MultiplicityEntity multiplicity;
+    private boolean hasCommentField;
+//    private String commentFieldValue; //TODO: DescriptionTemplate
+
+    public List<FieldEntity> getFields() {
+        return fields;
+    }
+    public void setFields(List<FieldEntity> fieldEntities) {
+        this.fields = fieldEntities;
+    }
+
+    public String getId() {
+        return id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public int getOrdinal() {
+        return ordinal;
+    }
+    public void setOrdinal(int ordinal) {
+        this.ordinal = ordinal;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getExtendedDescription() {
+        return extendedDescription;
+    }
+    public void setExtendedDescription(String extendedDescription) {
+        this.extendedDescription = extendedDescription;
+    }
+
+    public MultiplicityEntity getMultiplicity() {
+        return multiplicity;
+    }
+    public void setMultiplicity(MultiplicityEntity multiplicity) {
+        this.multiplicity = multiplicity;
+    }
+
+    public boolean getHasCommentField() {
+        return hasCommentField;
+    }
+    public void setHasCommentField(boolean hasCommentField) {
+        this.hasCommentField = hasCommentField;
+    }
+
+//    public String getCommentFieldValue() {
+//        return commentFieldValue;
+//    }
+//    public void setCommentFieldValue(String commentFieldValue) {
+//        this.commentFieldValue = commentFieldValue;
+//    }
+
+    public String getNumbering() {
+        return numbering;
+    }
+    public void setNumbering(String numbering) {
+        this.numbering = numbering;
+    }
+
+    public String getAdditionalInformation() {
+        return additionalInformation;
+    }
+    public void setAdditionalInformation(String additionalInformation) {
+        this.additionalInformation = additionalInformation;
+    }
+
+    @Override
+    public Element toXml(Document doc) {
+        Element fieldSet = doc.createElement("fieldSet");
+        fieldSet.setAttribute("id", this.id);
+        fieldSet.setAttribute("ordinal", "" + this.ordinal);
+        Element title = doc.createElement("title");
+        title.setTextContent(this.title);
+
+        Element description = doc.createElement("description");
+        description.setTextContent(this.description);
+
+        Element extendedDescription = doc.createElement("extendedDescription");
+        extendedDescription.setTextContent(this.extendedDescription);
+
+        Element additionalInformation = doc.createElement("additionalInformation");
+        additionalInformation.setTextContent(this.additionalInformation);
+
+        Element multiplicity = doc.createElement("multiplicity");
+        multiplicity.setAttribute("min", "" + this.multiplicity.getMin());
+        multiplicity.setAttribute("max", "" + this.multiplicity.getMax());
+        multiplicity.setAttribute("placeholder", this.multiplicity.getPlaceholder());
+        multiplicity.setAttribute("tableView", String.valueOf(this.multiplicity.getTableView()));
+
+        Element commentField = doc.createElement("commentField");
+        commentField.setAttribute("hasCommentField", "" + this.hasCommentField);
+//        commentField.setAttribute("commentFieldValue", this.commentFieldValue);
+
+        Element numbering = doc.createElement("numbering");
+        numbering.setTextContent(this.numbering);
+
+        Element fieldsElement = doc.createElement("fields");
+        for (FieldEntity fieldEntity : fields) {
+            fieldEntity.setNumbering(this.numbering + "." + (this.fields.indexOf(fieldEntity) + 1));
+            fieldsElement.appendChild(fieldEntity.toXml(doc));
+        }
+
+        fieldSet.appendChild(numbering);
+        fieldSet.appendChild(commentField);
+        fieldSet.appendChild(fieldsElement);
+        fieldSet.appendChild(multiplicity);
+        fieldSet.appendChild(title);
+        fieldSet.appendChild(description);
+        fieldSet.appendChild(extendedDescription);
+        fieldSet.appendChild(additionalInformation);
+        return fieldSet;
+    }
+
+    @Override
+    public FieldSetEntity fromXml(Element element) {
+        this.id = element.getAttribute("id");
+        this.ordinal = Integer.parseInt(element.getAttribute("ordinal"));
+        this.fields = new LinkedList();
+        Element title = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "title");
+        this.title = title.getTextContent();
+        Element description = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "description");
+        this.description = description.getTextContent();
+        Element extendedDescription = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "extendedDescription");
+        this.extendedDescription = extendedDescription.getTextContent();
+        Element additionalInformation = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "additionalInformation");
+        if (additionalInformation != null)
+            this.additionalInformation = additionalInformation.getTextContent();
+        Element commentField = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "commentField");
+        this.hasCommentField = Boolean.parseBoolean(commentField.getAttribute("hasCommentField"));
+//        this.commentFieldValue = commentField.getAttribute("commentFieldValue");
+        Element fields = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "fields");
+
+        Element numbering = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "numbering");
+        if (numbering != null) this.numbering = numbering.getTextContent();
+
+        if (fields != null) {
+            NodeList fieldElements = fields.getChildNodes();
+            for (int temp = 0; temp < fieldElements.getLength(); temp++) {
+                Node fieldElement = fieldElements.item(temp);
+                if (fieldElement.getNodeType() == Node.ELEMENT_NODE) {
+                    this.fields.add(new FieldEntity().fromXml((Element) fieldElement));
+                }
+            }
+        }
+
+        this.multiplicity = new MultiplicityEntity();
+        Element multiplicity = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "multiplicity");
+
+        this.multiplicity.setMin(Integer.parseInt(multiplicity.getAttribute("min")));
+        this.multiplicity.setMax(Integer.parseInt(multiplicity.getAttribute("max")));
+        this.multiplicity.setPlaceholder(multiplicity.getAttribute("placeholder"));
+        this.multiplicity.setTableView(Boolean.parseBoolean(multiplicity.getAttribute("tableView")));
+
+        return this;
+    }
+    
+    public List<FieldEntity> getFieldById(String id){
+        if (this.getFields() == null || id == null || id.isBlank()) return new ArrayList<>();
+        
+        return this.getFields().stream().filter(x-> id.equals(x.getId())).toList();
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/MultiplicityEntity.java

@@ -0,0 +1,41 @@
+package eu.eudat.commons.types.descriptiontemplate;
+
+public class MultiplicityEntity {
+
+    private int min;
+    private int max;
+    private String placeholder;
+    private boolean tableView;
+
+    public int getMin() {
+        return min;
+    }
+
+    public void setMin(int min) {
+        this.min = min;
+    }
+
+    public int getMax() {
+        return max;
+    }
+
+    public void setMax(int max) {
+        this.max = max;
+    }
+
+    public String getPlaceholder() {
+        return placeholder;
+    }
+
+    public void setPlaceholder(String placeholder) {
+        this.placeholder = placeholder;
+    }
+
+    public boolean getTableView() {
+        return tableView;
+    }
+
+    public void setTableView(boolean tableView) {
+        this.tableView = tableView;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/PageEntity.java

@@ -0,0 +1,54 @@
+package eu.eudat.commons.types.descriptiontemplate;
+
+import eu.eudat.commons.types.common.DatabaseViewStyleDefinition;
+import eu.eudat.commons.types.xml.XmlSerializable;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+
+public class PageEntity implements DatabaseViewStyleDefinition, XmlSerializable<PageEntity> {
+    private String id;
+    private int ordinal;
+    private String title;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public int getOrdinal() {
+        return ordinal;
+    }
+
+    public void setOrdinal(int ordinal) {
+        this.ordinal = ordinal;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @Override
+    public Element toXml(Document doc) {
+        Element root = doc.createElement("page");
+        root.setAttribute("title", this.title);
+        root.setAttribute("ordinal", "" + this.ordinal);
+        root.setAttribute("id", this.id);
+        return root;
+    }
+
+    @Override
+    public PageEntity fromXml(Element item) {
+        this.ordinal = Integer.parseInt(item.getAttribute("ordinal"));
+        this.id = item.getAttribute("id");
+        this.title = item.getAttribute("title");
+        return this;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/RuleEntity.java

@@ -0,0 +1,52 @@
+package eu.eudat.commons.types.descriptiontemplate;
+
+import eu.eudat.commons.types.xml.XmlSerializable;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+public class RuleEntity implements XmlSerializable<RuleEntity> {
+    private String target;
+    private String value;
+
+    public String getTarget() {
+        return target;
+    }
+
+    public void setTarget(String target) {
+        this.target = target;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public Element toXml(Document doc) {
+        Element rule = doc.createElement("rule");
+        rule.setAttribute("target", this.target);
+
+        Element value = doc.createElement("value");
+        value.setTextContent(this.value);
+
+        rule.appendChild(value);
+        return rule;
+    }
+
+    @Override
+    public RuleEntity fromXml(Element item) {
+        this.target = item.getAttribute("target");
+
+        Element value = (Element) item.getElementsByTagName("value").item(0);
+        if (value != null) {
+            this.value = value.getTextContent();
+        }
+
+        return this;
+    }
+
+
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/SectionEntity.java

@@ -0,0 +1,227 @@
+package eu.eudat.commons.types.descriptiontemplate;
+
+import eu.eudat.commons.types.common.DatabaseViewStyleDefinition;
+import eu.eudat.commons.types.xml.XmlBuilder;
+import eu.eudat.commons.types.xml.XmlSerializable;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+public class SectionEntity implements DatabaseViewStyleDefinition, XmlSerializable<SectionEntity> {
+    private String id;
+    private int ordinal;
+    private boolean defaultVisibility;
+    private String numbering;
+    private String page;
+    private String title;
+    private String description;
+    private String extendedDescription;
+    private List<SectionEntity> sections;
+    private List<FieldSetEntity> fieldSets;
+    private Boolean multiplicity;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public int getOrdinal() {
+        return ordinal;
+    }
+
+    public void setOrdinal(int ordinal) {
+        this.ordinal = ordinal;
+    }
+
+    public boolean isDefaultVisibility() {
+        return defaultVisibility;
+    }
+
+    public void setDefaultVisibility(boolean defaultVisibility) {
+        this.defaultVisibility = defaultVisibility;
+    }
+
+    public String getPage() {
+        return page;
+    }
+
+    public void setPage(String page) {
+        this.page = page;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public List<SectionEntity> getSections() {
+        return sections;
+    }
+
+    public void setSections(List<SectionEntity> sections) {
+        this.sections = sections;
+    }
+
+    public List<FieldSetEntity> getFieldSets() {
+        return fieldSets;
+    }
+
+    public void setFieldSets(List<FieldSetEntity> fieldSetEntities) {
+        this.fieldSets = fieldSetEntities;
+    }
+
+    public String getExtendedDescription() {
+        return extendedDescription;
+    }
+
+    public void setExtendedDescription(String extendedDescription) {
+        this.extendedDescription = extendedDescription;
+    }
+
+    public String getNumbering() {
+        return numbering;
+    }
+
+    public void setNumbering(String numbering) {
+        this.numbering = numbering;
+    }
+
+    public Boolean getMultiplicity() {
+        return multiplicity;
+    }
+
+    public void setMultiplicity(Boolean multiplicity) {
+        this.multiplicity = multiplicity;
+    }
+
+    @Override
+    public Element toXml(Document doc) {
+        Element rootElement = doc.createElement("section");
+        rootElement.setAttribute("id", this.id);
+        rootElement.setAttribute("ordinal", "" + this.ordinal);
+        rootElement.setAttribute("defaultVisibility", "" + this.defaultVisibility);
+        rootElement.setAttribute("page", "" + this.page);
+        rootElement.setAttribute("multiplicity", (this.multiplicity != null ? "" + this.multiplicity : "false"));
+
+        Element description = doc.createElement("description");
+        description.setTextContent(this.description);
+
+        Element extendedDescription = doc.createElement("extendedDescription");
+        extendedDescription.setTextContent(this.extendedDescription);
+
+        Element numbering = doc.createElement("numbering");
+        numbering.setTextContent(this.numbering);
+
+        Element title = doc.createElement("title");
+        title.setTextContent(this.title);
+
+        if (sections != null) {
+            Element sections = doc.createElement("sections");
+            for (SectionEntity sectionEntity : this.sections) {
+                sectionEntity.setNumbering(this.numbering + "." + (this.sections.indexOf(sectionEntity) + 1));
+                sections.appendChild(sectionEntity.toXml(doc));
+            }
+            rootElement.appendChild(sections);
+        }
+
+        if (this.fieldSets != null) {
+            Element formGroups = doc.createElement("fieldSets");
+            for (FieldSetEntity fieldSetEntity : this.fieldSets) {
+                fieldSetEntity.setNumbering(this.numbering + "." + (this.fieldSets.indexOf(fieldSetEntity) + 1));
+                formGroups.appendChild(fieldSetEntity.toXml(doc));
+            }
+            rootElement.appendChild(formGroups);
+        }
+
+        rootElement.appendChild(numbering);
+        rootElement.appendChild(title);
+        rootElement.appendChild(extendedDescription);
+        rootElement.appendChild(description);
+
+        return rootElement;
+    }
+
+    @Override
+    public SectionEntity fromXml(Element element) {
+
+        this.id = element.getAttribute("id");
+        this.ordinal = Integer.parseInt(element.getAttribute("ordinal"));
+        this.defaultVisibility = Boolean.valueOf(element.getAttribute("defaultVisibility"));
+        this.page = element.getAttribute("page");
+        this.multiplicity = element.hasAttribute("multiplicity") ? Boolean.valueOf(element.getAttribute("multiplicity")) : false;
+
+        Element description = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "description");
+        if (description != null) this.description = description.getTextContent();
+
+        Element extendedDescription = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "extendedDescription");
+        if (extendedDescription != null) this.extendedDescription = extendedDescription.getTextContent();
+
+        Element numbering = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "numbering");
+        if (numbering != null) this.numbering = numbering.getTextContent();
+
+        Element title = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "title");
+        if (title != null) this.title = title.getTextContent();
+
+        this.sections = new LinkedList<SectionEntity>();
+        Element sections = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "sections");
+        if (sections != null) {
+            NodeList sectionElements = sections.getChildNodes();
+            for (int temp = 0; temp < sectionElements.getLength(); temp++) {
+                Node sectionElement = sectionElements.item(temp);
+                if (sectionElement.getNodeType() == Node.ELEMENT_NODE) {
+                    this.sections.add(new SectionEntity().fromXml((Element) sectionElement));
+                }
+            }
+        }
+
+        this.fieldSets = new LinkedList<FieldSetEntity>();
+        Element fieldGroups = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "fieldSets");
+
+        if (fieldGroups != null) {
+            NodeList fieldGroupElements = fieldGroups.getChildNodes();
+            for (int temp = 0; temp < fieldGroupElements.getLength(); temp++) {
+                Node fieldGroupElement = fieldGroupElements.item(temp);
+                if (fieldGroupElement.getNodeType() == Node.ELEMENT_NODE) {
+                    this.fieldSets.add(new FieldSetEntity().fromXml((Element) fieldGroupElement));
+                }
+            }
+        }
+
+        return this;
+    }
+
+    public List<FieldEntity> getFieldById(String id){
+        List<FieldEntity> fieldEntities = new ArrayList<>();
+        if (id == null || id.isBlank()) return fieldEntities;
+        if (this.getFieldSets() != null){
+            for (FieldSetEntity fieldSetEntity: this.getFieldSets()) {
+                fieldEntities.addAll(fieldSetEntity.getFieldById(id));
+            }
+        }
+        if (this.getSections() != null){
+            for (SectionEntity sectionEntity: this.getSections()) {
+                fieldEntities.addAll(sectionEntity.getFieldById(id));
+            }
+        }
+        return fieldEntities;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/AutoCompleteDataEntity.java

@@ -0,0 +1,257 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.commons.enums.EnumUtils;
+import eu.eudat.commons.enums.FieldDataComboBoxType;
+import eu.eudat.commons.enums.FieldType;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class AutoCompleteDataEntity extends ComboBoxDataEntity<AutoCompleteDataEntity> {
+
+    public static class AuthAutoCompleteData {
+        private String url;
+        private String method;
+        private String body;
+        private String path;
+        private String type;
+
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+
+        public String getMethod() {
+            return method;
+        }
+
+        public void setMethod(String method) {
+            this.method = method;
+        }
+
+        public String getBody() {
+            return body;
+        }
+
+        public void setBody(String body) {
+            this.body = body;
+        }
+
+        public String getPath() {
+            return path;
+        }
+
+        public void setPath(String path) {
+            this.path = path;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+    }
+    public static class AutoCompleteSingleData {
+        private AutocompleteType autocompleteType;
+        private String url;
+        private ComboBoxDataEntity.Option autoCompleteOptions;
+        private String optionsRoot;
+        private Boolean hasAuth;
+        private AuthAutoCompleteData auth;
+        private String method;
+
+        public AutocompleteType getAutocompleteType() {
+            return autocompleteType;
+        }
+
+        public void setAutocompleteType(AutocompleteType autocompleteType) {
+            this.autocompleteType = autocompleteType;
+        }
+
+        public String getOptionsRoot() {
+            return optionsRoot;
+        }
+        public void setOptionsRoot(String optionsRoot) {
+            this.optionsRoot = optionsRoot;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+        public void setUrl(String url) {
+            this.url = url;
+        }
+
+        public Boolean getHasAuth() {
+            return hasAuth;
+        }
+
+        public void setHasAuth(Boolean hasAuth) {
+            this.hasAuth = hasAuth;
+        }
+
+        public AuthAutoCompleteData getAuth() {
+            return auth;
+        }
+
+        public void setAuth(AuthAutoCompleteData auth) {
+            this.auth = auth;
+        }
+
+        public ComboBoxDataEntity.Option getAutoCompleteOptions() {
+            return autoCompleteOptions;
+        }
+        public void setAutoCompleteOptions(ComboBoxDataEntity.Option autoCompleteOptions) {
+            this.autoCompleteOptions = autoCompleteOptions;
+        }
+
+        public String getMethod() {
+            return method;
+        }
+
+        public void setMethod(String method) {
+            this.method = method;
+        }
+    }
+
+    private Boolean multiAutoComplete;
+    private List<AutoCompleteSingleData> autoCompleteSingleDataList;
+
+    public Boolean getMultiAutoComplete() { return multiAutoComplete; }
+    public void setMultiAutoComplete(Boolean multiAutoComplete) { this.multiAutoComplete = multiAutoComplete; }
+
+    public List<AutoCompleteSingleData> getAutoCompleteSingleDataList() {
+        return autoCompleteSingleDataList;
+    }
+
+    public void setAutoCompleteSingleDataList(List<AutoCompleteSingleData> autoCompleteSingleDataList) {
+        this.autoCompleteSingleDataList = autoCompleteSingleDataList;
+    }
+
+    @Override
+    public FieldDataComboBoxType getFieldSubType() {
+        return FieldDataComboBoxType.Autocomplete;
+    }
+
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.AUTO_COMPLETE;
+    }
+
+    @Override
+    public Element toXml(Document doc) {
+        Element root = super.toXml(doc);
+        if (this.multiAutoComplete != null)
+            root.setAttribute("multiAutoComplete", this.multiAutoComplete.toString());
+        for (AutoCompleteSingleData singleData: this.autoCompleteSingleDataList) {
+            Element parent = doc.createElement("autocompleteSingle");
+            parent.setAttribute("url", singleData.url);
+            parent.setAttribute("optionsRoot", singleData.optionsRoot);
+            parent.setAttribute("autoCompleteType", Integer.toString(singleData.autocompleteType.getValue()));
+            parent.setAttribute("hasAuth", Boolean.toString(singleData.hasAuth));
+            parent.setAttribute("method", singleData.method);
+            Element element = doc.createElement("option");
+            element.setAttribute("label", singleData.autoCompleteOptions.getLabel());
+            element.setAttribute("value", singleData.autoCompleteOptions.getValue());
+            element.setAttribute("source", singleData.autoCompleteOptions.getSource());
+            parent.appendChild(element);
+            if (singleData.hasAuth) {
+                Element authElement = doc.createElement("auth");
+                authElement.setAttribute("url", singleData.auth.url);
+                authElement.setAttribute("method", singleData.auth.method);
+                authElement.setAttribute("body", singleData.auth.body);
+                authElement.setAttribute("path", singleData.auth.path);
+                authElement.setAttribute("type", singleData.auth.type);
+                parent.appendChild(authElement);
+            }
+            root.appendChild(parent);
+        }
+        return root;
+    }
+
+    @Override
+    public AutoCompleteDataEntity fromXml(Element item) {
+        super.fromXml(item);
+        this.autoCompleteSingleDataList = new ArrayList<>();
+        NodeList items = item.getElementsByTagName("autocompleteSingle");
+        if (items != null && items.getLength() > 0) {
+            for (int i = 0; i < items.getLength(); i++) {
+                this.autoCompleteSingleDataList.add(new AutoCompleteSingleData());
+                Element single = (Element) items.item(i);
+                this.mapFromXml(single, this.autoCompleteSingleDataList.get(i));
+            }
+        } else {
+            this.autoCompleteSingleDataList.add(new AutoCompleteSingleData());
+            this.mapFromXml(item, this.autoCompleteSingleDataList.get(0));
+        }
+        this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete"));
+        return this;
+    }
+
+    private void mapFromXml(Element item, AutoCompleteSingleData singleData) {
+        singleData.url = item.getAttribute("url");
+        singleData.optionsRoot = item.getAttribute("optionsRoot");
+        this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete"));
+        if (item.getAttribute("autoCompleteType") == null || item.getAttribute("autoCompleteType").equals("") ) {
+            singleData.autocompleteType = AutocompleteType.UNCACHED;
+        } else {
+            singleData.autocompleteType = AutocompleteType.of(Integer.parseInt(item.getAttribute("autoCompleteType")));
+        }
+        singleData.hasAuth = Boolean.parseBoolean(item.getAttribute("hasAuth"));
+        singleData.method = item.hasAttribute("method") ? item.getAttribute("method") : "GET";
+        Element optionElement = (Element) item.getElementsByTagName("option").item(0);
+        if (optionElement != null) {
+            singleData.autoCompleteOptions = new Option();
+            singleData.autoCompleteOptions.setLabel(optionElement.getAttribute("label"));
+            singleData.autoCompleteOptions.setValue(optionElement.getAttribute("value"));
+            singleData.autoCompleteOptions.setSource(optionElement.getAttribute("source"));
+            singleData.autoCompleteOptions.setUri(optionElement.getAttribute("uri"));
+        }
+        if (singleData.hasAuth) {
+            Element authElement = (Element) item.getElementsByTagName("auth").item(0);
+            if (authElement != null) {
+                singleData.auth = new AuthAutoCompleteData();
+                singleData.auth.setUrl(authElement.getAttribute("url"));
+                singleData.auth.setMethod(authElement.getAttribute("method"));
+                singleData.auth.setBody(authElement.getAttribute("body"));
+                singleData.auth.setPath(authElement.getAttribute("path"));
+                singleData.auth.setType(authElement.getAttribute("type"));
+            }
+        }
+    }
+    public enum AutocompleteType implements DatabaseEnum<Integer> {
+        UNCACHED(0),
+        CACHED(1);
+
+        private final int value;
+
+        AutocompleteType(int value) {
+            this.value = value;
+        }
+
+        @JsonValue
+        public Integer getValue() {
+            return value;
+        }
+
+        private static final Map<Integer, AutocompleteType> map = EnumUtils.getEnumValueMap(AutocompleteType.class);
+
+        public static AutocompleteType of(int i) {
+            return map.get(i);
+        }
+    }
+}
+
+

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/BaseFieldDataEntity.java

@@ -0,0 +1,34 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import eu.eudat.commons.types.xml.XmlSerializable;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.Map;
+
+public abstract class BaseFieldDataEntity<T> implements XmlSerializable<T> {
+    private String label;
+
+    public abstract FieldType getFieldType();
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public Element toXml(Document doc) {
+        Element root = doc.createElement("data");
+        root.setAttribute("label", this.getLabel());
+        return root;
+    }
+
+    public T fromXml(Element item) {
+
+        this.setLabel(item.getAttribute("label"));
+        return (T) this;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/BooleanDecisionDataEntity.java

@@ -0,0 +1,16 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class BooleanDecisionDataEntity extends BaseFieldDataEntity<BooleanDecisionDataEntity> {
+
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.BOOLEAN_DECISION;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/CheckBoxDataEntity.java

@@ -0,0 +1,16 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class CheckBoxDataEntity extends BaseFieldDataEntity<CheckBoxDataEntity> {
+
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.CHECK_BOX;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ComboBoxDataEntity.java

@@ -0,0 +1,83 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldDataComboBoxType;
+import eu.eudat.commons.types.xml.XmlSerializable;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public abstract class ComboBoxDataEntity<T> extends BaseFieldDataEntity<T> {
+
+    public abstract FieldDataComboBoxType getFieldSubType();
+    
+    public static class Option implements XmlSerializable<Option> {
+        private String label;
+        private String value;
+        private String source;
+        private String uri;
+
+        public String getLabel() {
+            return label;
+        }
+        public void setLabel(String label) {
+            this.label = label;
+        }
+
+        public String getValue() {
+            return value;
+        }
+        public void setValue(String value) {
+            this.value = value;
+        }
+
+        public String getSource() {
+            return source;
+        }
+        public void setSource(String source) {
+            this.source = source;
+        }
+
+        public String getUri() {
+            return uri;
+        }
+
+        public void setUri(String uri) {
+            this.uri = uri;
+        }
+
+        @Override
+        public Element toXml(Document doc) {
+            Element option = doc.createElement("option");
+            option.setAttribute("label", this.label);
+            option.setAttribute("value", this.value);
+            option.setAttribute("source", this.source);
+            option.setAttribute("uri", this.uri);
+            return option;
+        }
+
+        @Override
+        public ComboBoxDataEntity.Option fromXml(Element item) {
+            this.label = item.getAttribute("label");
+            this.value = item.getAttribute("value");
+            this.source = item.getAttribute("source");
+            this.uri = item.getAttribute("uri");
+            return this;
+        }
+
+    }
+
+    @Override
+    public Element toXml(Document doc) {
+        Element root = super.toXml(doc);
+        root.setAttribute("type", this.getFieldSubType().toString());
+        return root;
+    }
+
+    @Override
+    public T fromXml(Element item) {
+        super.fromXml(item);
+        return (T) this;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/CurrencyDataEntity.java

@@ -0,0 +1,15 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class CurrencyDataEntity extends BaseFieldDataEntity<CurrencyDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.CURRENCY;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DataRepositoryDataEntity.java

@@ -0,0 +1,41 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DataRepositoryDataEntity extends BaseFieldDataEntity<DataRepositoryDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.DATA_REPOSITORIES;
+    }
+    
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+    
+    @Override
+    public Element toXml(Document doc) {
+        Element root = super.toXml(doc);
+        if (this.getMultiAutoComplete() != null) {
+            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
+        }
+        return root;
+    }
+
+    @Override
+    public DataRepositoryDataEntity fromXml(Element item) {
+        super.fromXml(item);
+        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
+        return this;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatasetAutoCompleteDataEntity.java

@@ -0,0 +1,47 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldDataComboBoxType;
+import eu.eudat.commons.enums.FieldDataInternalDmpEntryType;
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DatasetAutoCompleteDataEntity extends InternalDmpBaseDataEntity<DatasetAutoCompleteDataEntity> {
+	private Boolean multiAutoComplete;
+
+	public Boolean getMultiAutoComplete() {
+		return multiAutoComplete;
+	}
+	public void setMultiAutoComplete(Boolean multiAutoComplete) {
+		this.multiAutoComplete = multiAutoComplete;
+	}
+
+	@Override
+	public FieldDataInternalDmpEntryType getFieldSubType() {
+		return FieldDataInternalDmpEntryType.Datasets;
+	}
+
+	@Override
+	public FieldType getFieldType() {
+		return FieldType.INTERNAL_DMP_ENTRIES_DATASETS;
+	}
+
+	@Override
+	public Element toXml(Document doc) {
+		Element root = super.toXml(doc);
+		root.setAttribute("multiAutoComplete", this.multiAutoComplete.toString());
+
+		return root;
+	}
+
+	@Override
+	public DatasetAutoCompleteDataEntity fromXml(Element item) {
+		super.fromXml(item);
+		this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete"));
+
+		return this;
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatasetIdentifierDataEntity.java

@@ -0,0 +1,15 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DatasetIdentifierDataEntity extends BaseFieldDataEntity<DatasetIdentifierDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.DATASET_IDENTIFIER;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatePickerDataEntity.java

@@ -0,0 +1,15 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DatePickerDataEntity extends BaseFieldDataEntity<DatePickerDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.DATE_PICKER;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DmpAutoCompleteDataEntity.java

@@ -0,0 +1,45 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldDataInternalDmpEntryType;
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DmpAutoCompleteDataEntity extends InternalDmpBaseDataEntity<DmpAutoCompleteDataEntity> {
+	private Boolean multiAutoComplete;
+
+	public Boolean getMultiAutoComplete() {
+		return multiAutoComplete;
+	}
+	public void setMultiAutoComplete(Boolean multiAutoComplete) {
+		this.multiAutoComplete = multiAutoComplete;
+	}
+
+	@Override
+	public FieldDataInternalDmpEntryType getFieldSubType() {
+		return FieldDataInternalDmpEntryType.Dmps;
+	}
+
+	@Override
+	public FieldType getFieldType() {
+		return FieldType.INTERNAL_DMP_ENTRIES_DMPS;
+	}
+	@Override
+	public Element toXml(Document doc) {
+		Element root = super.toXml(doc);
+		root.setAttribute("multiAutoComplete", this.multiAutoComplete.toString());
+
+		return root;
+	}
+
+	@Override
+	public DmpAutoCompleteDataEntity fromXml(Element item) {
+		super.fromXml(item);
+		this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete"));
+
+		return this;
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ExternalDatasetDataEntity.java

@@ -0,0 +1,55 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldDataExternalDatasetType;
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ExternalDatasetDataEntity extends BaseFieldDataEntity<ExternalDatasetDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.EXTERNAL_DATASETS;
+    }
+    private Boolean multiAutoComplete;
+    private FieldDataExternalDatasetType type;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+
+    public FieldDataExternalDatasetType getType() {
+        return type;
+    }
+
+    public void setType(FieldDataExternalDatasetType type) {
+        this.type = type;
+    }
+
+    @Override
+    public Element toXml(Document doc) {
+        Element root = doc.createElement("data");
+        root.setAttribute("label", this.getLabel());
+        if (this.getMultiAutoComplete() != null) {
+            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
+        }
+        if (this.getType() != null) {
+            root.setAttribute("type", this.getType().getValue());
+        }
+        return root;
+    }
+
+    @Override
+    public ExternalDatasetDataEntity fromXml(Element item) {
+        this.setLabel(item != null ? item.getAttribute("label") : "");
+        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
+        this.setType(item.getAttribute("type") != null ? FieldDataExternalDatasetType.of(item.getAttribute("type")): FieldDataExternalDatasetType.Other);
+        return this;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/FieldDataHelper.java

@@ -0,0 +1,69 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldDataComboBoxType;
+import eu.eudat.commons.enums.FieldDataInternalDmpEntryType;
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Element;
+import java.util.Map;
+
+public class FieldDataHelper {
+    public BaseFieldDataEntity<?> create(FieldType type, String subType) {
+        switch (type) {
+            case COMBO_BOX: {
+                if (subType != null && !subType.isBlank()) {
+                    switch (FieldDataComboBoxType.of(subType)) {
+                        case Wordlist: {
+                            return new WordListDataEntity();
+                        }
+                        case Autocomplete: {
+                            return new AutoCompleteDataEntity();
+                        }
+                    }
+                }
+                break;
+            }
+            case INTERNAL_DMP_ENTRIES: {
+                if (subType != null && !subType.isBlank()) {
+                    switch (FieldDataInternalDmpEntryType.of(subType)){
+                        case Dmps: {
+                            return new DmpAutoCompleteDataEntity();
+                        }
+                        case Datasets: {
+                            return new DatasetAutoCompleteDataEntity();
+                        }
+                        case Researchers : {
+                            return new ResearcherAutoCompleteDataEntity();
+                        }
+                    }
+                }
+                break;
+            }
+            case BOOLEAN_DECISION: return new BooleanDecisionDataEntity();
+            case RADIO_BOX: return new RadioBoxDataEntity();
+            case CHECK_BOX: return new CheckBoxDataEntity();
+            case FREE_TEXT: return new FreeTextDataEntity();
+            case TEXT_AREA: return new TextAreaDataEntity();
+            case RICH_TEXT_AREA: return new RichTextAreaDataEntity();
+            case UPLOAD: return new UploadDataEntity();
+            case DATE_PICKER: return new DatePickerDataEntity();
+            case EXTERNAL_DATASETS: return new ExternalDatasetDataEntity();
+            case DATA_REPOSITORIES: return new DataRepositoryDataEntity();
+            case PUB_REPOSITORIES: return new PublicationRepositoryDataEntity();
+            case JOURNAL_REPOSITORIES: return new JournalRepositoryDataEntity();
+            case TAXONOMIES: return new TaxonomyDataEntity();
+            case LICENSES: return new LicenseDataEntity();
+            case PUBLICATIONS: return new PublicationDataEntity();
+            case REGISTRIES: return new RegistryDataEntity();
+            case SERVICES: return new ServiceDataEntity();
+            case TAGS: return new TagDataEntity();
+            case RESEARCHERS: return new ResearcherDataEntity();
+            case ORGANIZATIONS: return new OrganizationDataEntity();
+            case DATASET_IDENTIFIER:  return new DatasetIdentifierDataEntity();
+            case CURRENCY:  return new CurrencyDataEntity();
+            case VALIDATION:  return new ValidationDataEntity();
+            default: return null;
+        }
+
+        return null;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/FreeTextDataEntity.java

@@ -0,0 +1,16 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class FreeTextDataEntity extends BaseFieldDataEntity<FreeTextDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.FREE_TEXT;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/InternalDmpBaseDataEntity.java

@@ -0,0 +1,26 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldDataInternalDmpEntryType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public abstract class InternalDmpBaseDataEntity<T> extends BaseFieldDataEntity<T> {
+
+	public abstract FieldDataInternalDmpEntryType getFieldSubType();
+	
+	@Override
+	public Element toXml(Document doc) {
+		Element root = super.toXml(doc);
+		root.setAttribute("type", this.getFieldSubType().toString());
+		return root;
+	}
+
+	@Override
+	public T fromXml(Element item) {
+		super.fromXml(item);
+		return (T) this;
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/JournalRepositoryDataEntity.java

@@ -0,0 +1,41 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class JournalRepositoryDataEntity extends BaseFieldDataEntity<JournalRepositoryDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.JOURNAL_REPOSITORIES;
+    }
+    
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+
+    @Override
+    public Element toXml(Document doc) {
+        Element root = super.toXml(doc);
+        if (this.getMultiAutoComplete() != null) {
+            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
+        }
+        return root;
+    }
+
+    @Override
+    public JournalRepositoryDataEntity fromXml(Element item) {
+        super.fromXml(item);
+        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
+        return this;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/LicenseDataEntity.java

@@ -0,0 +1,40 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class LicenseDataEntity extends BaseFieldDataEntity<LicenseDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.LICENSES;
+    }
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+    
+    @Override
+    public Element toXml(Document doc) {
+        Element root = super.toXml(doc);
+        if (this.getMultiAutoComplete() != null) {
+            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
+        }
+        return root;
+    }
+
+    @Override
+    public LicenseDataEntity fromXml(Element item) {
+        super.fromXml(item);
+        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
+        return this;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/OrganizationDataEntity.java

@@ -0,0 +1,40 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class OrganizationDataEntity extends BaseFieldDataEntity<OrganizationDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.ORGANIZATIONS;
+    }
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+
+    @Override
+    public Element toXml(Document doc) {
+        Element root = super.toXml(doc);
+        if (this.getMultiAutoComplete() != null) {
+            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
+        }
+        return root;
+    }
+
+    @Override
+    public OrganizationDataEntity fromXml(Element item) {
+        super.fromXml(item);
+        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
+        return this;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/PublicationDataEntity.java

@@ -0,0 +1,39 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class PublicationDataEntity extends BaseFieldDataEntity<PublicationDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.PUBLICATIONS;
+    }
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+    @Override
+    public Element toXml(Document doc) {
+        Element root = super.toXml(doc);
+        if (this.getMultiAutoComplete() != null) {
+            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
+        }
+        return root;
+    }
+
+    @Override
+    public PublicationDataEntity fromXml(Element item) {
+        super.fromXml(item);
+        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
+        return this;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/PublicationRepositoryDataEntity.java

@@ -0,0 +1,41 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class PublicationRepositoryDataEntity extends BaseFieldDataEntity<PublicationRepositoryDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.PUB_REPOSITORIES;
+    }
+    
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+    
+    @Override
+    public Element toXml(Document doc) {
+        Element root = super.toXml(doc);
+        if (this.getMultiAutoComplete() != null) {
+            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
+        }
+        return root;
+    }
+
+    @Override
+    public PublicationRepositoryDataEntity fromXml(Element item) {
+        super.fromXml(item);
+        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
+        return this;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RadioBoxDataEntity.java

@@ -0,0 +1,95 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import eu.eudat.commons.types.xml.XmlSerializable;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+public class RadioBoxDataEntity extends BaseFieldDataEntity<RadioBoxDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.RADIO_BOX;
+    }
+    public static class Option implements XmlSerializable<Option> {
+        private String label;
+        private String value;
+
+        public String getLabel() {
+            return label;
+        }
+
+        public void setLabel(String label) {
+            this.label = label;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public void setValue(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public Element toXml(Document doc) {
+            Element option = doc.createElement("option");
+            option.setAttribute("label", this.label);
+            option.setAttribute("value", this.value);
+            return option;
+        }
+
+        @Override
+        public Option fromXml(Element item) {
+            this.label = item.getAttribute("label");
+            this.value = item.getAttribute("value");
+            return this;
+        }
+
+
+    }
+
+    private List<Option> options;
+
+    public List<Option> getOptions() {
+        return options;
+    }
+
+    public void setOptions(List<Option> options) {
+        this.options = options;
+    }
+    
+    @Override
+    public Element toXml(Document doc) {
+        Element root = super.toXml(doc);
+        Element element = doc.createElement("options");
+        for (Option option : this.options) {
+            element.appendChild(option.toXml(doc));
+        }
+        root.appendChild(element);
+        return root;
+    }
+
+    @Override
+    public RadioBoxDataEntity fromXml(Element item) {
+        super.fromXml(item);
+        this.options = new LinkedList<>();
+        Element optionsElement = (Element) item.getElementsByTagName("options").item(0);
+        if (optionsElement != null) {
+            NodeList optionElements = optionsElement.getChildNodes();
+            for (int temp = 0; temp < optionElements.getLength(); temp++) {
+                Node optionElement = optionElements.item(temp);
+                if (optionElement.getNodeType() == Node.ELEMENT_NODE) {
+                    this.options.add(new Option().fromXml((Element) optionElement));
+                }
+            }
+        }
+        return this;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RegistryDataEntity.java

@@ -0,0 +1,39 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class RegistryDataEntity extends BaseFieldDataEntity<RegistryDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.REGISTRIES;
+    }
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+    @Override
+    public Element toXml(Document doc) {
+        Element root = super.toXml(doc);
+        if (this.getMultiAutoComplete() != null) {
+            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
+        }
+        return root;
+    }
+
+    @Override
+    public RegistryDataEntity fromXml(Element item) {
+        super.fromXml(item);
+        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
+        return this;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ResearcherAutoCompleteDataEntity.java

@@ -0,0 +1,46 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldDataInternalDmpEntryType;
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ResearcherAutoCompleteDataEntity extends InternalDmpBaseDataEntity<ResearcherAutoCompleteDataEntity> {
+	private Boolean multiAutoComplete;
+
+	public Boolean getMultiAutoComplete() {
+		return multiAutoComplete;
+	}
+	public void setMultiAutoComplete(Boolean multiAutoComplete) {
+		this.multiAutoComplete = multiAutoComplete;
+	}
+
+	@Override
+	public FieldDataInternalDmpEntryType getFieldSubType() {
+		return FieldDataInternalDmpEntryType.Researchers;
+	}
+
+	@Override
+	public FieldType getFieldType() {
+		return FieldType.INTERNAL_DMP_ENTRIES_RESEARCHERS;
+	}
+	
+	@Override
+	public Element toXml(Document doc) {
+		Element root = super.toXml(doc);
+		root.setAttribute("multiAutoComplete", this.multiAutoComplete != null ? this.multiAutoComplete.toString() : "false");
+
+		return root;
+	}
+
+	@Override
+	public ResearcherAutoCompleteDataEntity fromXml(Element item) {
+		super.fromXml(item);
+		this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete"));
+
+		return this;
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ResearcherDataEntity.java

@@ -0,0 +1,40 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ResearcherDataEntity extends BaseFieldDataEntity<ResearcherDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.RESEARCHERS;
+    }
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+    
+    @Override
+    public Element toXml(Document doc) {
+        Element root = super.toXml(doc);
+        if (this.getMultiAutoComplete() != null) {
+            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
+        }
+        return root;
+    }
+
+    @Override
+    public ResearcherDataEntity fromXml(Element item) {
+        super.fromXml(item);
+        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
+        return this;
+    }
+}