add debugging logs in configurable login provider

.gitignore

@@ -48,4 +48,3 @@ bin/
 *.classpath
 openDMP/dmp-backend/uploads/
 openDMP/dmp-backend/tmp/
-dmp-frontend/.angular/

README.md

@@ -1,9 +1,3 @@
-
-**Important note: The deployment, troubleshooting, maintenance and operation of on-premises / self-served OpenDMP instances for development, testing or production use, shall be the sole responsibility of the adopter. No support is guaranteed by OpenDMP implentation team for issues that may be encountered during deployment, extension or operation of such installations.**
-
-**Documentation is provided on a best-effort basis for the code and processes around the development, deployment and operation of OpenDMP. If you find any misalignment of the actual processes with the related documentation, please let us know so that the misalignment is addressed for the benefit of future adopters.**
-
-
 # Using Docker Compose with Argos
 
 ARGOS is an open extensible service that simplifies the management, validation, monitoring and maintenance and of Data Management Plans. It allows actors (researchers, managers, supervisors etc) to create actionable DMPs that may be freely exchanged among infrastructures for carrying out specific aspects of the Data management process in accordance with the intentions and commitment of Data owners.

dmp-backend/Dockerfile.CI

@@ -12,4 +12,4 @@ RUN mvn package
 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"]
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=${PROF}", "-Dspring.config.additional-location=/files/config/", "-jar","/app/app.jar"]

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanBlueprintCriteria.java

@@ -1,16 +0,0 @@
-package eu.eudat.data.dao.criteria;
-
-import eu.eudat.data.entities.DMPProfile;
-
-public class DataManagementPlanBlueprintCriteria extends Criteria<DMPProfile> {
-
-    private Integer status;
-
-    public Integer getStatus() {
-        return status;
-    }
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-}

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanCriteria.java

@@ -1,7 +1,6 @@
 package eu.eudat.data.dao.criteria;
 
 import eu.eudat.data.entities.DMP;
-import eu.eudat.data.entities.DMPProfile;
 import eu.eudat.data.entities.Grant;
 
 import java.util.Date;
@@ -11,7 +10,6 @@ import java.util.UUID;
 public class DataManagementPlanCriteria extends Criteria<DMP> {
     private Date periodStart;
     private Date periodEnd;
-    private DMPProfile profile;
     private List<eu.eudat.data.entities.Grant> grants;
     private boolean allVersions;
     private List<UUID> groupIds;
@@ -39,13 +37,6 @@ public class DataManagementPlanCriteria extends Criteria<DMP> {
         this.periodEnd = periodEnd;
     }
 
-    public DMPProfile getProfile() {
-        return profile;
-    }
-    public void setProfile(DMPProfile profile) {
-        this.profile = profile;
-    }
-
     public List<Grant> getGrants() {
         return grants;
     }

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java

@@ -1,13 +1,13 @@
 package eu.eudat.data.dao.criteria;
 
 
-import eu.eudat.data.entities.DescriptionTemplate;
+import eu.eudat.data.entities.DatasetProfile;
 
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
-public class DatasetProfileCriteria extends Criteria<DescriptionTemplate> {
+public class DatasetProfileCriteria extends Criteria<DatasetProfile> {
 
     public enum DatasetProfileFilter {
         DMPs((short) 0), Datasets((short) 1);
@@ -25,7 +25,7 @@ public class DatasetProfileCriteria extends Criteria<DescriptionTemplate> {
                 case 1:
                     return Datasets;
                 default:
-                    throw new RuntimeException("Unsupported DescriptionTemplate filter");
+                    throw new RuntimeException("Unsupported DatasetProfile filter");
             }
         }
     }

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileWizardCriteria.java

@@ -1,11 +1,11 @@
 package eu.eudat.data.dao.criteria;
 
-import eu.eudat.data.entities.DescriptionTemplate;
+import eu.eudat.data.entities.DatasetProfile;
 
 import java.util.UUID;
 
 
-public class DatasetProfileWizardCriteria extends Criteria<DescriptionTemplate> {
+public class DatasetProfileWizardCriteria extends Criteria<DatasetProfile> {
     private UUID id;
 
     public UUID getId() {

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java

@@ -42,8 +42,6 @@ public class DMPDaoImpl extends DatabaseAccess<DMP> implements DMPDao {
 			query.where((builder, root) -> builder.lessThan(root.get("created"), criteria.getPeriodEnd()));
 		if (criteria.getPeriodStart() != null)
 			query.where((builder, root) -> builder.greaterThan(root.get("created"), criteria.getPeriodStart()));
-		if (criteria.getProfile() != null)
-			query.where((builder, root) -> builder.equal(root.get("profile"), criteria.getProfile()));
 		if (criteria.getGrants() != null && !criteria.getGrants().isEmpty())
 			query.where(((builder, root) -> root.get("grant").in(criteria.getGrants())));
 		if (!criteria.getAllVersions())
@@ -77,7 +75,7 @@ public class DMPDaoImpl extends DatabaseAccess<DMP> implements DMPDao {
 			query.where((builder, root) -> root.join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id").in(criteria.getCollaborators()));
 		}
 		if (criteria.getDatasetTemplates() != null && !criteria.getDatasetTemplates().isEmpty()) {
-			query.where((builder, root) -> root.join("associatedDmps", JoinType.LEFT).get("datasetprofile").get("id").in(criteria.getDatasetTemplates()));
+			query.where((builder, root) -> root.join("associatedDmps", JoinType.LEFT).get("id").in(criteria.getDatasetTemplates()));
 		}
 		if (criteria.getGrantStatus() != null) {
 			if (criteria.getGrantStatus().equals(GrantStateType.FINISHED.getValue().shortValue()))
@@ -89,7 +87,7 @@ public class DMPDaoImpl extends DatabaseAccess<DMP> implements DMPDao {
 		}
 
 		if (criteria.hasDoi()) {
-			query.where((builder, root) -> builder.not(builder.isNull(root.join("dois").get("id"))));
+			query.where((builder, root) -> builder.not(builder.isNull(root.get("doi"))));
 		}
 		query.where((builder, root) -> builder.notEqual(root.get("status"), DMP.DMPStatus.DELETED.getValue()));
 		return query;

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPProfileDao.java

@@ -1,7 +1,6 @@
 package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccessLayer;
-import eu.eudat.data.dao.criteria.DataManagementPlanBlueprintCriteria;
 import eu.eudat.data.dao.criteria.DataManagementPlanProfileCriteria;
 import eu.eudat.data.entities.DMP;
 import eu.eudat.data.entities.DMPProfile;
@@ -16,6 +15,4 @@ public interface DMPProfileDao extends DatabaseAccessLayer<DMPProfile, UUID> {
 
     QueryableList<DMPProfile> getWithCriteria(DataManagementPlanProfileCriteria criteria);
 
-    QueryableList<DMPProfile> getWithCriteriaBlueprint(DataManagementPlanBlueprintCriteria criteria);
-
 }

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPProfileDaoImpl.java

@@ -1,7 +1,6 @@
 package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccess;
-import eu.eudat.data.dao.criteria.DataManagementPlanBlueprintCriteria;
 import eu.eudat.data.dao.criteria.DataManagementPlanProfileCriteria;
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
 import eu.eudat.data.entities.DMPProfile;
@@ -66,20 +65,4 @@ public class DMPProfileDaoImpl extends DatabaseAccess<DMPProfile> implements DMP
         query.where(((builder, root) -> builder.notEqual(root.get("status"), DMPProfile.Status.DELETED.getValue())));
         return query;
     }
-
-    @Override
-    public QueryableList<DMPProfile> getWithCriteriaBlueprint(DataManagementPlanBlueprintCriteria criteria){
-        QueryableList<DMPProfile> query = getDatabaseService().getQueryable(DMPProfile.class);
-        if (criteria.getLike() != null && !criteria.getLike().isEmpty())
-            query.where((builder, root) -> builder.like(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"));
-        if (criteria.getStatus() != null) {
-            if (criteria.getStatus() == DMPProfile.Status.FINALIZED.getValue()) {
-                query.where((builder, root) -> builder.equal(root.get("status"), DMPProfile.Status.FINALIZED.getValue()));
-            } else if (criteria.getStatus() == DMPProfile.Status.SAVED.getValue()) {
-                query.where((builder, root) -> builder.equal(root.get("status"), DMPProfile.Status.SAVED.getValue()));
-            }
-        }
-        query.where(((builder, root) -> builder.notEqual(root.get("status"), DMPProfile.Status.DELETED.getValue())));
-        return query;
-    }
 }

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java

@@ -80,7 +80,7 @@ public class DatasetDaoImpl extends DatabaseAccess<Dataset> implements DatasetDa
             query.where((builder, root) -> root.get("profile").get("id").in(criteria.getDatasetTemplates()));
 
         if (criteria.hasDoi()) {
-            query.where((builder, root) -> builder.not(builder.isNull(root.join("dmp").join("dois").get("id"))));
+            query.where((builder, root) -> builder.not(builder.isNull(root.get("dmp").get("doi"))));
         }
         query.where((builder, root) -> builder.notEqual(root.get("status"), Dataset.Status.DELETED.getValue()));
         query.where((builder, root) -> builder.notEqual(root.get("status"), Dataset.Status.CANCELED.getValue()));

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetExternalDatasetDaoImpl.java

@@ -3,6 +3,7 @@ package eu.eudat.data.dao.entities;
 import eu.eudat.data.dao.DatabaseAccess;
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
 import eu.eudat.data.entities.DatasetExternalDataset;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDao.java

@@ -2,23 +2,18 @@ package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccessLayer;
 import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
-import eu.eudat.data.entities.DescriptionTemplate;
-import eu.eudat.data.entities.DescriptionTemplateType;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.List;
 import java.util.UUID;
 
-public interface DatasetProfileDao extends DatabaseAccessLayer<DescriptionTemplate, UUID> {
+public interface DatasetProfileDao extends DatabaseAccessLayer<DatasetProfile, UUID> {
 
-    QueryableList<DescriptionTemplate> getWithCriteria(DatasetProfileCriteria criteria);
+    QueryableList<DatasetProfile> getWithCriteria(DatasetProfileCriteria criteria);
 
-    QueryableList<DescriptionTemplate> getAll();
+    QueryableList<DatasetProfile> getAll();
 
-    QueryableList<DescriptionTemplate> getAuthenticated(QueryableList<DescriptionTemplate> query, UUID principal, List<Integer> roles);
-
-    List<DescriptionTemplate> getAllIds();
-
-    Long countWithType(DescriptionTemplateType type);
+    QueryableList<DatasetProfile> getAuthenticated(QueryableList<DatasetProfile> query, UUID principal, List<Integer> roles);
 
 }

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java

@@ -3,8 +3,8 @@ package eu.eudat.data.dao.entities;
 import eu.eudat.data.dao.DatabaseAccess;
 import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.data.entities.DescriptionTemplate;
-import eu.eudat.data.entities.DescriptionTemplateType;
+import eu.eudat.data.entities.DMP;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;
@@ -15,22 +15,21 @@ import org.springframework.stereotype.Component;
 import javax.persistence.criteria.Join;
 import javax.persistence.criteria.JoinType;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
 @Component("datasetProfileDao")
-public class DatasetProfileDaoImpl extends DatabaseAccess<DescriptionTemplate> implements DatasetProfileDao {
+public class DatasetProfileDaoImpl extends DatabaseAccess<DatasetProfile> implements DatasetProfileDao {
 
     @Autowired
-    public DatasetProfileDaoImpl(DatabaseService<DescriptionTemplate> databaseService) {
+    public DatasetProfileDaoImpl(DatabaseService<DatasetProfile> databaseService) {
         super(databaseService);
     }
 
     @Override
-    public QueryableList<DescriptionTemplate> getWithCriteria(DatasetProfileCriteria criteria) {
-        QueryableList<DescriptionTemplate> query = getDatabaseService().getQueryable(DescriptionTemplate.class);
+    public QueryableList<DatasetProfile> getWithCriteria(DatasetProfileCriteria criteria) {
+        QueryableList<DatasetProfile> query = getDatabaseService().getQueryable(DatasetProfile.class);
         if (criteria.getLike() != null && !criteria.getLike().isEmpty())
             query.where((builder, root) -> builder.like(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"));
         if (!criteria.getAllVersions())
@@ -63,9 +62,9 @@ public class DatasetProfileDaoImpl extends DatabaseAccess<DescriptionTemplate> i
             query.where(((builder, root) -> root.get("id").in(criteria.getIds())));
         }
         if (criteria.getFinalized()) {
-            query.where(((builder, root) -> builder.equal(root.get("status"), DescriptionTemplate.Status.FINALIZED.getValue())));
+            query.where(((builder, root) -> builder.equal(root.get("status"), DatasetProfile.Status.FINALIZED.getValue())));
         } else {
-            query.where(((builder, root) -> builder.notEqual(root.get("status"), DescriptionTemplate.Status.DELETED.getValue())));
+            query.where(((builder, root) -> builder.notEqual(root.get("status"), DatasetProfile.Status.DELETED.getValue())));
         }
         if (criteria.getPeriodStart() != null)
             query.where((builder, root) -> builder.greaterThanOrEqualTo(root.get("created"), criteria.getPeriodStart()));
@@ -73,48 +72,43 @@ public class DatasetProfileDaoImpl extends DatabaseAccess<DescriptionTemplate> i
     }
 
     @Override
-    public DescriptionTemplate createOrUpdate(DescriptionTemplate item) {
-        return this.getDatabaseService().createOrUpdate(item, DescriptionTemplate.class);
+    public DatasetProfile createOrUpdate(DatasetProfile item) {
+        return this.getDatabaseService().createOrUpdate(item, DatasetProfile.class);
     }
 
     @Override
-    public DescriptionTemplate find(UUID id) {
-        return getDatabaseService().getQueryable(DescriptionTemplate.class).where((builder, root) -> builder.equal(root.get("id"), id)).getSingle();
+    public DatasetProfile find(UUID id) {
+        return getDatabaseService().getQueryable(DatasetProfile.class).where((builder, root) -> builder.equal(root.get("id"), id)).getSingle();
     }
 
     @Override
-    public QueryableList<DescriptionTemplate> getAll() {
-        return getDatabaseService().getQueryable(DescriptionTemplate.class);
+    public QueryableList<DatasetProfile> getAll() {
+        return getDatabaseService().getQueryable(DatasetProfile.class);
     }
 
     @Override
-    public List<DescriptionTemplate> getAllIds(){
-        return getDatabaseService().getQueryable(DescriptionTemplate.class).withFields(Collections.singletonList("id")).toList();
-    }
-
-    @Override
-    public void delete(DescriptionTemplate item) {
+    public void delete(DatasetProfile item) {
         this.getDatabaseService().delete(item);
     }
 
     @Override
-    public QueryableList<DescriptionTemplate> asQueryable() {
-        return this.getDatabaseService().getQueryable(DescriptionTemplate.class);
+    public QueryableList<DatasetProfile> asQueryable() {
+        return this.getDatabaseService().getQueryable(DatasetProfile.class);
     }
 
     @Async
     @Override
-    public CompletableFuture<DescriptionTemplate> createOrUpdateAsync(DescriptionTemplate item) {
+    public CompletableFuture<DatasetProfile> createOrUpdateAsync(DatasetProfile item) {
         return CompletableFuture.supplyAsync(() -> this.createOrUpdate(item));
     }
 
     @Override
-    public DescriptionTemplate find(UUID id, String hint) {
+    public DatasetProfile find(UUID id, String hint) {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public QueryableList<DescriptionTemplate> getAuthenticated(QueryableList<DescriptionTemplate> query, UUID principal, List<Integer> roles) {
+    public QueryableList<DatasetProfile> getAuthenticated(QueryableList<DatasetProfile> query, UUID principal, List<Integer> roles) {
         if (roles != null && !roles.isEmpty()) {
             query.where((builder, root) -> {
                 Join userJoin = root.join("users", JoinType.LEFT);
@@ -126,9 +120,4 @@ public class DatasetProfileDaoImpl extends DatabaseAccess<DescriptionTemplate> i
 
         return query;
     }
-
-    @Override
-    public Long countWithType(DescriptionTemplateType type) {
-        return this.getDatabaseService().getQueryable(DescriptionTemplate.class).where((builder, root) -> builder.equal(root.get("type"), type)).count();
-    }
 }

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetServiceDao.java

@@ -1,6 +1,7 @@
 package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.data.entities.DatasetService;
 
 import java.util.UUID;

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetServiceDaoImpl.java

@@ -2,6 +2,8 @@ package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccess;
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.DatasetExternalDataset;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.data.entities.DatasetService;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DescriptionTemplateTypeDao.java

@@ -1,10 +0,0 @@
-package eu.eudat.data.dao.entities;
-
-import eu.eudat.data.dao.DatabaseAccessLayer;
-import eu.eudat.data.entities.DescriptionTemplateType;
-
-import java.util.UUID;
-
-public interface DescriptionTemplateTypeDao extends DatabaseAccessLayer<DescriptionTemplateType, UUID> {
-    DescriptionTemplateType findFromName(String name);
-}

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DescriptionTemplateTypeDaoImpl.java

@@ -1,65 +0,0 @@
-package eu.eudat.data.dao.entities;
-
-import eu.eudat.data.dao.DatabaseAccess;
-import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.data.entities.DescriptionTemplateType;
-import eu.eudat.queryable.QueryableList;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-
-import javax.transaction.Transactional;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-
-@Component("descriptionTemplateTypeDao")
-public class DescriptionTemplateTypeDaoImpl extends DatabaseAccess<DescriptionTemplateType> implements DescriptionTemplateTypeDao {
-
-    @Autowired
-    public DescriptionTemplateTypeDaoImpl(DatabaseService<DescriptionTemplateType> databaseService) {
-        super(databaseService);
-    }
-
-    @Override
-    public DescriptionTemplateType findFromName(String name){
-        try {
-            return this.getDatabaseService().getQueryable(DescriptionTemplateType.class).where((builder, root) -> builder.and(builder.equal(root.get("name"), name), builder.notEqual(root.get("status"), DescriptionTemplateType.Status.DELETED.getValue()))).getSingle();
-        }
-        catch(Exception e){
-            return null;
-        }
-    }
-
-    @Override
-    @Transactional
-    public DescriptionTemplateType createOrUpdate(DescriptionTemplateType item) {
-        return this.getDatabaseService().createOrUpdate(item, DescriptionTemplateType.class);
-    }
-
-    @Override
-    public DescriptionTemplateType find(UUID id) {
-        return getDatabaseService().getQueryable(DescriptionTemplateType.class).where((builder, root) -> builder.equal((root.get("id")), id)).getSingle();
-    }
-
-    @Override
-    public void delete(DescriptionTemplateType item) {
-        this.getDatabaseService().delete(item);
-    }
-
-    @Override
-    public QueryableList<DescriptionTemplateType> asQueryable() {
-        return this.getDatabaseService().getQueryable(DescriptionTemplateType.class).where((builder, root) -> builder.notEqual((root.get("status")), DescriptionTemplateType.Status.DELETED.getValue()));
-    }
-
-    @Async
-    @Override
-    public CompletableFuture<DescriptionTemplateType> createOrUpdateAsync(DescriptionTemplateType item) {
-        return CompletableFuture.supplyAsync(() -> this.createOrUpdate(item));
-    }
-
-    @Override
-    public DescriptionTemplateType find(UUID id, String hint) {
-        throw new UnsupportedOperationException();
-    }
-
-}

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DmpDatasetProfileDao.java

@@ -1,9 +0,0 @@
-package eu.eudat.data.dao.entities;
-
-import eu.eudat.data.dao.DatabaseAccessLayer;
-import eu.eudat.data.entities.DMPDatasetProfile;
-
-import java.util.UUID;
-
-public interface DmpDatasetProfileDao extends DatabaseAccessLayer<DMPDatasetProfile, UUID> {
-}

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DmpDatasetProfileDaoImpl.java

@@ -1,52 +0,0 @@
-package eu.eudat.data.dao.entities;
-
-import eu.eudat.data.dao.DatabaseAccess;
-import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.data.entities.Content;
-import eu.eudat.data.entities.DMPDatasetProfile;
-import eu.eudat.queryable.QueryableList;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-
-@Service("dmpDatasetProfileDao")
-public class DmpDatasetProfileDaoImpl extends DatabaseAccess<DMPDatasetProfile> implements DmpDatasetProfileDao {
-    @Autowired
-    public DmpDatasetProfileDaoImpl(DatabaseService<DMPDatasetProfile> databaseService) {
-        super(databaseService);
-    }
-
-    @Override
-    public DMPDatasetProfile createOrUpdate(DMPDatasetProfile item) {
-        return this.getDatabaseService().createOrUpdate(item, DMPDatasetProfile.class);
-    }
-
-    @Override
-    @Async
-    public CompletableFuture<DMPDatasetProfile> createOrUpdateAsync(DMPDatasetProfile item) {
-        return CompletableFuture.supplyAsync(() -> this.createOrUpdate(item));
-    }
-
-    @Override
-    public DMPDatasetProfile find(UUID id) {
-        return this.getDatabaseService().getQueryable(DMPDatasetProfile.class).where((builder, root) -> builder.equal(root.get("id"), id)).getSingle();
-    }
-
-    @Override
-    public DMPDatasetProfile find(UUID id, String hint) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void delete(DMPDatasetProfile item) {
-        this.getDatabaseService().delete(item);
-    }
-
-    @Override
-    public QueryableList<DMPDatasetProfile> asQueryable() {
-        return this.getDatabaseService().getQueryable(DMPDatasetProfile.class);
-    }
-}

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDao.java

@@ -1,10 +0,0 @@
-package eu.eudat.data.dao.entities;
-
-import eu.eudat.data.dao.DatabaseAccessLayer;
-import eu.eudat.data.entities.EntityDoi;
-
-import java.util.UUID;
-
-public interface EntityDoiDao extends DatabaseAccessLayer<EntityDoi, UUID> {
-    EntityDoi findFromDoi(String doi);
-}

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDaoImpl.java

@@ -1,56 +0,0 @@
-package eu.eudat.data.dao.entities;
-
-import eu.eudat.data.dao.DatabaseAccess;
-import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.data.entities.EntityDoi;
-import eu.eudat.queryable.QueryableList;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-
-@Component("EntityDoiDao")
-public class EntityDoiDaoImpl extends DatabaseAccess<EntityDoi> implements EntityDoiDao {
-
-    @Autowired
-    public EntityDoiDaoImpl(DatabaseService<EntityDoi> databaseService){
-        super(databaseService);
-    }
-
-
-    @Override
-    public EntityDoi createOrUpdate(EntityDoi item) {
-        return this.getDatabaseService().createOrUpdate(item, EntityDoi.class);
-    }
-
-    @Override
-    public CompletableFuture<EntityDoi> createOrUpdateAsync(EntityDoi item) {
-        return CompletableFuture.supplyAsync(() -> this.createOrUpdate(item));
-    }
-
-    @Override
-    public EntityDoi find(UUID id) {
-        return this.getDatabaseService().getQueryable(EntityDoi.class).where((builder, root) -> builder.equal(root.get("id"), id)).getSingle();
-    }
-
-    @Override
-    public EntityDoi findFromDoi(String doi) {
-        return this.getDatabaseService().getQueryable(EntityDoi.class).where((builder, root) -> builder.equal(root.get("doi"), doi)).getSingle();
-    }
-
-    @Override
-    public EntityDoi find(UUID id, String hint) {
-        return null;
-    }
-
-    @Override
-    public void delete(EntityDoi item) {
-        this.getDatabaseService().delete(item);
-    }
-
-    @Override
-    public QueryableList<EntityDoi> asQueryable() {
-        return this.getDatabaseService().getQueryable(EntityDoi.class);
-    }
-}

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FileUploadDao.java

@@ -3,9 +3,7 @@ package eu.eudat.data.dao.entities;
 import eu.eudat.data.dao.DatabaseAccessLayer;
 import eu.eudat.data.entities.FileUpload;
 
-import java.util.List;
 import java.util.UUID;
 
 public interface FileUploadDao extends DatabaseAccessLayer<FileUpload, UUID> {
-    List<FileUpload> getFileUploads(UUID entityId);
 }

dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FileUploadDaoImpl.java

@@ -7,7 +7,6 @@ import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
@@ -34,11 +33,6 @@ public class FileUploadDaoImpl extends DatabaseAccess<FileUpload> implements Fil
         return getDatabaseService().getQueryable(FileUpload.class).where((builder, root) -> builder.equal(root.get("id"), id)).getSingle();
     }
 
-    @Override
-    public List<FileUpload> getFileUploads(UUID entityId) {
-        return this.getDatabaseService().getQueryable(FileUpload.class).where((builder, root) -> builder.equal(root.get("entityId"), entityId)).toList();
-    }
-
     @Override
     public FileUpload find(UUID id, String hint) {
         return null;

dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java

@@ -25,12 +25,7 @@ import java.util.stream.Collectors;
                 name = "fullyDetailed",
                 attributeNodes = {
                         @NamedAttributeNode("grant"), @NamedAttributeNode("profile"),
-                        @NamedAttributeNode(value = "users", subgraph = "users"), @NamedAttributeNode("organisations"), @NamedAttributeNode("researchers")
-                },
-                subgraphs = {
-                        @NamedSubgraph(name = "users", attributeNodes = {@NamedAttributeNode("user")})
-                }
-        ),
+                        @NamedAttributeNode("users"), @NamedAttributeNode("organisations"), @NamedAttributeNode("researchers")}),
         @NamedEntityGraph(
                 name = "dmpRecentActivity",
                 attributeNodes = {
@@ -112,8 +107,12 @@ public class DMP implements DataEntity<DMP, UUID> {
     /*@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
     @Column(name = "\"AssociatedDmps\"", columnDefinition = "xml", nullable = true)
     private String associatedDmps;*/
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "dmp")
-    private Set<DMPDatasetProfile> associatedDmps;
+    @OneToMany(fetch = FetchType.LAZY)
+    @JoinTable(name = "\"DMPDatasetProfile\"",
+            joinColumns = {@JoinColumn(name = "\"dmp\"", referencedColumnName = "\"ID\"")},
+            inverseJoinColumns = {@JoinColumn(name = "\"datasetprofile\"", referencedColumnName = "\"ID\"")}
+    )
+    private Set<DatasetProfile> associatedDmps;
 
 
     @ManyToOne(fetch = FetchType.LAZY)
@@ -182,8 +181,8 @@ public class DMP implements DataEntity<DMP, UUID> {
     @Convert(converter = DateToUTCConverter.class)
     private Date publishedAt;
 
-    @OneToMany(mappedBy = "entityId", fetch = FetchType.LAZY)
-    private Set<EntityDoi> dois;
+    @Column(name = "\"DOI\"")
+    private String doi;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "\"Project\"")
@@ -270,10 +269,10 @@ public class DMP implements DataEntity<DMP, UUID> {
         this.grant = grant;
     }
 
-    public Set<DMPDatasetProfile> getAssociatedDmps() {
+    public Set<DatasetProfile> getAssociatedDmps() {
         return associatedDmps;
     }
-    public void setAssociatedDmps(Set<DMPDatasetProfile> associatedDmps) {
+    public void setAssociatedDmps(Set<DatasetProfile> associatedDmps) {
         this.associatedDmps = associatedDmps;
     }
 
@@ -340,12 +339,12 @@ public class DMP implements DataEntity<DMP, UUID> {
         this.publishedAt = publishedAt;
     }
 
-    public Set<EntityDoi> getDois() {
-        return dois;
-    }
-    public void setDois(Set<EntityDoi> dois) {
-        this.dois = dois;
-    }
+	public String getDoi() {
+		return doi;
+	}
+	public void setDoi(String doi) {
+		this.doi = doi;
+	}
 
     public Project getProject() {
         return project;
@@ -381,7 +380,7 @@ public class DMP implements DataEntity<DMP, UUID> {
         if (entity.getStatus().equals(DMPStatus.FINALISED.getValue())) this.setFinalizedAt(new Date());
         if (entity.isPublic) this.setPublishedAt(new Date());
         if (entity.getUsers() != null) this.users = entity.getUsers();
-        this.dois = entity.getDois();
+        if (entity.getDoi() != null && entity.getDoi().trim().isEmpty()) this.doi = entity.doi;
         this.extraProperties = entity.getExtraProperties();
     }
 

dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPDatasetProfile.java

@@ -1,76 +0,0 @@
-package eu.eudat.data.entities;
-
-import eu.eudat.queryable.queryableentity.DataEntity;
-import org.hibernate.annotations.GenericGenerator;
-
-import javax.persistence.*;
-import java.util.List;
-import java.util.UUID;
-
-@Entity
-@Table(name = "\"DMPDatasetProfile\"")
-public class DMPDatasetProfile implements DataEntity<DMPDatasetProfile, UUID> {
-
-    @Id
-    @GeneratedValue
-    @GenericGenerator(name = "uuid2", strategy = "uuid2")
-    @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)")
-    private UUID id;
-
-    @ManyToOne
-    @JoinColumn(name = "\"dmp\"")
-    private DMP dmp;
-
-    @ManyToOne
-    @JoinColumn(name = "\"datasetprofile\"")
-    private DescriptionTemplate datasetprofile;
-
-    @Column(name = "\"data\"")
-    private String data;
-
-    public UUID getId() {
-        return id;
-    }
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public DMP getDmp() {
-        return dmp;
-    }
-    public void setDmp(DMP dmp) {
-        this.dmp = dmp;
-    }
-
-    public DescriptionTemplate getDatasetprofile() {
-        return datasetprofile;
-    }
-    public void setDatasetprofile(DescriptionTemplate datasetprofile) {
-        this.datasetprofile = datasetprofile;
-    }
-
-    public String getData() {
-        return data;
-    }
-    public void setData(String data) {
-        this.data = data;
-    }
-
-    @Override
-    public void update(DMPDatasetProfile entity) {
-        this.dmp = entity.getDmp();
-        this.datasetprofile = entity.getDatasetprofile();
-        this.data = entity.getData();
-    }
-
-    @Override
-    public UUID getKeys() {
-        return this.id;
-    }
-
-    @Override
-    public DMPDatasetProfile buildFromTuple(List<Tuple> tuple, List<String> fields, String base) {
-        this.id = UUID.fromString((String) tuple.get(0).get(base.isEmpty() ? base + "." + "id" : "id"));
-        return this;
-    }
-}

dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java

@@ -100,9 +100,6 @@ public class Dataset implements DataEntity<Dataset, UUID> {
 	@JoinColumn(name = "\"DMP\"", nullable = false)
 	private DMP dmp;
 
-	@Column(name = "\"DmpSectionIndex\"")
-	private Integer dmpSectionIndex;
-
 	@Column(name = "\"Uri\"")
 	private String uri;
 
@@ -113,7 +110,7 @@ public class Dataset implements DataEntity<Dataset, UUID> {
 	@ManyToOne(fetch = FetchType.LAZY)
 	//@Cascade(value=org.hibernate.annotations.CascadeType.ALL)
 	@JoinColumn(name = "\"Profile\"")
-	private DescriptionTemplate profile;
+	private DatasetProfile profile;
 
 	@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
 	@Column(name = "\"Reference\"", columnDefinition = "xml")
@@ -235,12 +232,6 @@ public class Dataset implements DataEntity<Dataset, UUID> {
 		this.dmp = dmp;
 	}
 
-	public Integer getDmpSectionIndex() {
-		return dmpSectionIndex;
-	}
-	public void setDmpSectionIndex(Integer dmpSectionIndex) {
-		this.dmpSectionIndex = dmpSectionIndex;
-	}
 
 	public String getUri() {
 		return uri;
@@ -258,10 +249,10 @@ public class Dataset implements DataEntity<Dataset, UUID> {
 	}
 
 
-	public DescriptionTemplate getProfile() {
+	public DatasetProfile getProfile() {
 		return profile;
 	}
-	public void setProfile(DescriptionTemplate profile) {
+	public void setProfile(DatasetProfile profile) {
 		this.profile = profile;
 	}
 
@@ -337,7 +328,6 @@ public class Dataset implements DataEntity<Dataset, UUID> {
 		this.setRegistries(entity.getRegistries());
 
 		this.setDmp(entity.getDmp());
-		this.setDmpSectionIndex(entity.getDmpSectionIndex());
 		this.setStatus(entity.getStatus());
 		this.setProfile(entity.getProfile());
 		this.setModified(new Date());

dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetProfile.java

@@ -14,8 +14,8 @@ import java.util.UUID;
 
 
 @Entity
-@Table(name = "\"DescriptionTemplate\"")
-public class DescriptionTemplate implements DataEntity<DescriptionTemplate,UUID>{
+@Table(name = "\"DatasetProfile\"")
+public class DatasetProfile implements DataEntity<DatasetProfile,UUID>{
 
     public enum Status {
         SAVED((short) 0), FINALIZED((short) 1), DELETED((short) 99);
@@ -79,21 +79,19 @@ public class DescriptionTemplate implements DataEntity<DescriptionTemplate,UUID>
     @Column(name = "\"Version\"", nullable = false)
     private Short version;
 
-    @OneToMany(fetch = FetchType.LAZY)
-    private Set<DMP> dmps;
+    @ManyToMany(fetch = FetchType.LAZY)
+    @JoinTable(name = "\"DMPDatasetProfile\"",
+            joinColumns = {@JoinColumn(name = "\"datasetprofile\"", referencedColumnName = "\"ID\"")},
+            inverseJoinColumns = {@JoinColumn(name = "\"dmp\"", referencedColumnName = "\"ID\"")}
+    )
+    private List<DMP> dmps;
 
     @Column(name = "\"Language\"", nullable = false)
     private String language;
 
-    @OneToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "\"Type\"", nullable = false)
-    private DescriptionTemplateType type;
-
-    @OneToMany(mappedBy = "descriptionTemplate", fetch = FetchType.LAZY)
+    @OneToMany(mappedBy = "datasetProfile", fetch = FetchType.LAZY)
     private Set<UserDatasetProfile> users;
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "datasetprofile")
-    private Set<DMPDatasetProfile> associatedDmps;
 
     public String getDescription() {
         return description;
@@ -158,31 +156,26 @@ public class DescriptionTemplate implements DataEntity<DescriptionTemplate,UUID>
     public String getLanguage() {
         return language;
     }
+
     public void setLanguage(String language) {
         this.language = language;
     }
 
-    public DescriptionTemplateType getType() {
-        return type;
-    }
-    public void setType(DescriptionTemplateType type) {
-        this.type = type;
-    }
-
     public Set<UserDatasetProfile> getUsers() {
         return users;
     }
+
     public void setUsers(Set<UserDatasetProfile> users) {
         this.users = users;
     }
 
     @Override
     public String toString() {
-        return "DatasetProfileListingModel [id=" + id + ", label=" + label + ", dataset=" + dataset + ", definition=" + definition + ", version=" + version + ", language=" + language + ", type=" + type +"]";
+        return "DatasetProfileListingModel [id=" + id + ", label=" + label + ", dataset=" + dataset + ", definition=" + definition + ", version=" + version + ", language=" + language + "]";
     }
 
     @Override
-    public void update(DescriptionTemplate entity) {
+    public void update(DatasetProfile entity) {
     }
 
     @Override
@@ -191,7 +184,7 @@ public class DescriptionTemplate implements DataEntity<DescriptionTemplate,UUID>
     }
 
     @Override
-    public DescriptionTemplate buildFromTuple(List<Tuple> tuple, List<String> fields, String base) {
+    public DatasetProfile buildFromTuple(List<Tuple> tuple, List<String> fields, String base) {
         this.id = UUID.fromString((String) tuple.get(0).get(base.isEmpty() ? base + "." + "id" : "id"));
         return this;
     }

dmp-backend/data/src/main/java/eu/eudat/data/entities/DescriptionTemplateType.java

@@ -1,89 +0,0 @@
-package eu.eudat.data.entities;
-
-import eu.eudat.queryable.queryableentity.DataEntity;
-import org.hibernate.annotations.GenericGenerator;
-
-import javax.persistence.*;
-import java.util.List;
-import java.util.UUID;
-
-@Entity
-@Table(name = "\"DescriptionTemplateType\"")
-public class DescriptionTemplateType implements DataEntity<DescriptionTemplateType, UUID> {
-
-    public enum Status {
-        SAVED((short) 0), FINALIZED((short) 1), DELETED((short) 99);
-
-        private short value;
-
-        private Status(short value) {
-            this.value = value;
-        }
-        public short getValue() {
-            return value;
-        }
-
-        public static Status fromInteger(int value) {
-            switch (value) {
-                case 0:
-                    return SAVED;
-                case 1:
-                    return FINALIZED;
-                case 99:
-                    return DELETED;
-                default:
-                    throw new RuntimeException("Unsupported Description Template Type Status");
-            }
-        }
-    }
-
-    @Id
-    @GeneratedValue
-    @GenericGenerator(name = "uuid2", strategy = "uuid2")
-    @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)")
-    private UUID id;
-
-    @Column(name = "\"Name\"", nullable = false)
-    private String name;
-
-    @Column(name = "\"Status\"", nullable = false)
-    private Short status;
-
-    public UUID getId() {
-        return id;
-    }
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Short getStatus() {
-        return status;
-    }
-    public void setStatus(Short status) {
-        this.status = status;
-    }
-
-    @Override
-    public void update(DescriptionTemplateType entity) {
-        this.name = entity.name;
-        this.status = entity.status;
-    }
-
-    @Override
-    public UUID getKeys() {
-        return this.id;
-    }
-
-    @Override
-    public DescriptionTemplateType buildFromTuple(List<Tuple> tuple, List<String> fields, String base) {
-        this.id = UUID.fromString((String) tuple.get(0).get(!base.isEmpty() ? base + "." + "id" : "id"));
-        return this;
-    }
-}

dmp-backend/data/src/main/java/eu/eudat/data/entities/EntityDoi.java

@@ -1,121 +0,0 @@
-package eu.eudat.data.entities;
-
-import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.data.entities.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
-import org.hibernate.annotations.Type;
-
-import javax.persistence.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-@Entity
-@Table(name = "\"EntityDoi\"")
-public class EntityDoi implements DataEntity<EntityDoi, UUID> {
-    public enum EntityType {
-        DMP
-    }
-
-    @Id
-    @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)")
-    private UUID id;
-
-    @Enumerated(EnumType.STRING)
-    @Type(type = "eu.eudat.configurations.typedefinition.PostgreSQLEnumType")
-    @Column(name = "\"EntityType\"", nullable = false)
-    private EntityType entityType;
-
-    @Column(name = "\"RepositoryId\"", nullable = false)
-    private String repositoryId;
-
-    @Column(name = "\"Doi\"", nullable = false)
-    private String doi;
-
-    @Column(name = "\"CreatedAt\"", nullable = false)
-    @Convert(converter = DateToUTCConverter.class)
-    private Date createdAt;
-
-    @Column(name = "\"UpdatedAt\"", nullable = false)
-    @Convert(converter = DateToUTCConverter.class)
-    private Date updatedAt;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "\"EntityId\"", nullable = false)
-    private DMP entityId;
-
-    public UUID getId() {
-        return id;
-    }
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public EntityType getEntityType() {
-        return entityType;
-    }
-    public void setEntityType(EntityType entityType) {
-        this.entityType = entityType;
-    }
-
-    public String getRepositoryId() {
-        return repositoryId;
-    }
-    public void setRepositoryId(String repositoryId) {
-        this.repositoryId = repositoryId;
-    }
-
-    public String getDoi() {
-        return doi;
-    }
-    public void setDoi(String doi) {
-        this.doi = doi;
-    }
-
-    public Date getCreatedAt() {
-        return createdAt;
-    }
-    public void setCreatedAt(Date createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Date getUpdatedAt() {
-        return updatedAt;
-    }
-    public void setUpdatedAt(Date updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public DMP getEntityId() {
-        return entityId;
-    }
-    public void setEntityId(DMP entityId) {
-        this.entityId = entityId;
-    }
-
-    @Override
-    public void update(EntityDoi doi) {
-        this.entityType = doi.getEntityType();
-        this.repositoryId = doi.getRepositoryId();
-        this.doi = doi.getDoi();
-        this.createdAt = doi.getCreatedAt();
-        this.updatedAt = doi.getUpdatedAt();
-        this.entityId = doi.getEntityId();
-    }
-
-    @Override
-    public UUID getKeys() {
-        return this.id;
-    }
-
-    @Override
-    public EntityDoi buildFromTuple(List<Tuple> tuple, List<String> fields, String base) {
-        String currentBase = base.isEmpty() ? "" : base + ".";
-        if (fields.contains(currentBase + "id")) this.id = EntityBinder.fromTuple(tuple, currentBase + "id");
-        if (fields.contains(currentBase + "entityId"))
-            this.entityId = tuple.stream().map(x -> new DMP().buildFromTuple(Arrays.asList(x), fields , base.isEmpty() ? "entityId" : base + "." + "entityId")).collect(Collectors.toList()).get(0);
-        return this;
-    }
-}

dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDatasetProfile.java

@@ -22,8 +22,8 @@ public class UserDatasetProfile implements DataEntity<UserDatasetProfile, UUID>
     private UserInfo user;
 
     @OneToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "\"descriptionTemplate\"")
-    private DescriptionTemplate descriptionTemplate;
+    @JoinColumn(name = "\"datasetProfile\"")
+    private DatasetProfile datasetProfile;
 
     @Column(name = "role")
     private Integer role;
@@ -44,12 +44,12 @@ public class UserDatasetProfile implements DataEntity<UserDatasetProfile, UUID>
         this.user = user;
     }
 
-    public DescriptionTemplate getDatasetProfile() {
-        return descriptionTemplate;
+    public DatasetProfile getDatasetProfile() {
+        return datasetProfile;
     }
 
-    public void setDatasetProfile(DescriptionTemplate descriptionTemplate) {
-        this.descriptionTemplate = descriptionTemplate;
+    public void setDatasetProfile(DatasetProfile datasetProfile) {
+        this.datasetProfile = datasetProfile;
     }
 
     public Integer getRole() {

dmp-backend/data/src/main/java/eu/eudat/data/query/items/dmpblueprint/DataManagementPlanBlueprintTableRequest.java

@@ -1,27 +0,0 @@
-package eu.eudat.data.query.items.dmpblueprint;
-
-import eu.eudat.data.dao.criteria.DataManagementPlanBlueprintCriteria;
-import eu.eudat.data.entities.DMPProfile;
-import eu.eudat.data.query.PaginationService;
-import eu.eudat.data.query.definition.TableQuery;
-import eu.eudat.queryable.QueryableList;
-
-import java.util.UUID;
-
-public class DataManagementPlanBlueprintTableRequest extends TableQuery<DataManagementPlanBlueprintCriteria, DMPProfile, UUID> {
-
-    @Override
-    public QueryableList<DMPProfile> applyCriteria() {
-        QueryableList<DMPProfile> query = this.getQuery();
-        if (this.getCriteria().getLike() != null && !this.getCriteria().getLike().isEmpty())
-            query.where((builder, root) -> builder.like(root.get("label"), "%" + this.getCriteria().getLike() + "%"));
-        if (this.getCriteria().getStatus() != null)
-            query.where((builder, root) -> builder.equal(root.get("status"), this.getCriteria().getStatus()));
-        return query;
-    }
-
-    @Override
-    public QueryableList<DMPProfile> applyPaging(QueryableList<DMPProfile> items) {
-        return PaginationService.applyPaging(items, this);
-    }
-}

dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileAutocompleteRequest.java

@@ -1,24 +1,25 @@
 package eu.eudat.data.query.items.item.datasetprofile;
 
 import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
-import eu.eudat.data.entities.DescriptionTemplate;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.data.query.PaginationService;
+import eu.eudat.data.query.definition.Query;
 import eu.eudat.data.query.definition.TableQuery;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;
 
-public class DatasetProfileAutocompleteRequest extends TableQuery<DatasetProfileCriteria, DescriptionTemplate, UUID> {
+public class DatasetProfileAutocompleteRequest extends TableQuery<DatasetProfileCriteria,DatasetProfile, UUID> {
     @Override
-    public QueryableList<DescriptionTemplate> applyCriteria() {
-        QueryableList<DescriptionTemplate> query = this.getQuery();
+    public QueryableList<DatasetProfile> applyCriteria() {
+        QueryableList<DatasetProfile> query = this.getQuery();
         if (this.getCriteria().getLike() != null && !this.getCriteria().getLike().isEmpty())
             query.where((builder, root) -> builder.like(builder.upper(root.get("label")), "%" + this.getCriteria().getLike().toUpperCase() + "%"));
         return query;
     }
 
     @Override
-    public QueryableList<DescriptionTemplate> applyPaging(QueryableList<DescriptionTemplate> items) {
+    public QueryableList<DatasetProfile> applyPaging(QueryableList<DatasetProfile> items) {
         return PaginationService.applyPaging(items, this);
     }
 }

dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileWizardAutocompleteRequest.java

@@ -1,13 +1,15 @@
 package eu.eudat.data.query.items.item.datasetprofile;
 
 import eu.eudat.data.dao.criteria.DatasetProfileWizardCriteria;
-import eu.eudat.data.entities.DescriptionTemplate;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.data.query.definition.Query;
 import eu.eudat.queryable.QueryableList;
 
-public class DatasetProfileWizardAutocompleteRequest extends Query<DatasetProfileWizardCriteria, DescriptionTemplate> {
+import java.util.UUID;
+
+public class DatasetProfileWizardAutocompleteRequest extends Query<DatasetProfileWizardCriteria,DatasetProfile> {
     @Override
-    public QueryableList<DescriptionTemplate> applyCriteria() {
+    public QueryableList<DatasetProfile> applyCriteria() {
         return null;
     }
 }

dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/datasetprofile/DatasetProfileTableRequestItem.java

@@ -1,23 +1,23 @@
 package eu.eudat.data.query.items.table.datasetprofile;
 
 import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
-import eu.eudat.data.entities.DescriptionTemplate;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.data.query.definition.TableQuery;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;
 
-public class DatasetProfileTableRequestItem extends TableQuery<DatasetProfileCriteria, DescriptionTemplate, UUID> {
+public class DatasetProfileTableRequestItem extends TableQuery<DatasetProfileCriteria, DatasetProfile, UUID> {
     @Override
-    public QueryableList<DescriptionTemplate> applyCriteria() {
-        QueryableList<DescriptionTemplate> query = this.getQuery();
+    public QueryableList<DatasetProfile> applyCriteria() {
+        QueryableList<DatasetProfile> query = this.getQuery();
         if (this.getCriteria().getLike() != null && !this.getCriteria().getLike().isEmpty())
             query.where((builder, root) -> builder.like(builder.upper(root.get("label")), "%" + this.getCriteria().getLike().toUpperCase() + "%"));
         return query;
     }
 
     @Override
-    public QueryableList<DescriptionTemplate> applyPaging(QueryableList<DescriptionTemplate> items) {
+    public QueryableList<DatasetProfile> applyPaging(QueryableList<DatasetProfile> items) {
         return null;
     }
 }

dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dataset.java

@@ -231,9 +231,7 @@ public class Dataset implements ElasticEntity<Dataset> {
         if (this.group != null) {
             builder.field("group", this.group.toString());
         }
-        if (this.grant != null) {
-            builder.field("grant", this.grant.toString());
-        }
+        builder.field("grant", this.grant.toString());
         if (collaborators != null) {
             builder.startArray("collaborators");
             this.collaborators.forEach(x -> {
@@ -302,9 +300,7 @@ public class Dataset implements ElasticEntity<Dataset> {
                 this.status = Short.valueOf((String) fields.get("status"));
                 this.dmp = UUID.fromString((String) fields.get("dmp"));
                 this.group = UUID.fromString((String) fields.get("group"));
-                if (fields.get("grant") != null) {
-                    this.grant = UUID.fromString((String) fields.get("grant"));
-                }
+                this.grant = UUID.fromString((String) fields.get("grant"));
                 if (fields.get("created") != null)
                     this.created = Date.from(Instant.parse((String) fields.get("created")));
                 if (fields.get("modified") != null)

dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/DatasetTempalate.java

@@ -1,18 +1,14 @@
 package eu.eudat.elastic.entities;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
 public class DatasetTempalate implements ElasticEntity<DatasetTempalate> {
 	private UUID id;
 	private String name;
-	private Map<String, Object> data;
 
 	public UUID getId() {
 		return id;
@@ -30,25 +26,11 @@ public class DatasetTempalate implements ElasticEntity<DatasetTempalate> {
 		this.name = name;
 	}
 
-	public Map<String, Object> getData() {
-		return data;
-	}
-
-	public void setData(Map<String, Object> data) {
-		this.data = data;
-	}
-
 	@Override
 	public XContentBuilder toElasticEntity(XContentBuilder builder) throws IOException {
 		builder.startObject();
 		builder.field("id", this.id.toString());
 		builder.field("name", this.name);
-		if(this.data != null) {
-			builder.field("data", new ObjectMapper().writeValueAsString(this.data));
-		}
-		else{
-			builder.field("data", "");
-		}
 		builder.endObject();
 		return builder;
 	}
@@ -57,12 +39,6 @@ public class DatasetTempalate implements ElasticEntity<DatasetTempalate> {
 	public DatasetTempalate fromElasticEntity(Map<String, Object> fields) {
 		this.id = UUID.fromString((String) fields.get("id"));
 		this.name = (String) fields.get("name");
-		try {
-			this.data = new ObjectMapper().readValue((String) fields.get("data"), new TypeReference<Map<String, Object>>() {});
-		}
-		catch (Exception e){
-			this.data = new HashMap<>();
-		}
 		return this;
 	}
 }

dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java

@@ -57,7 +57,7 @@ public class Dmp implements ElasticEntity<Dmp> {
 	private Date modified;
 	private Date finalizedAt;
 	private Date publishedAt;
-	private List<Doi> dois;
+	private String doi;
 
 	public UUID getId() {
 		return id;
@@ -203,12 +203,12 @@ public class Dmp implements ElasticEntity<Dmp> {
 		this.publishedAt = publishedAt;
 	}
 
-	public List<Doi> getDois() {
-		return dois;
+	public String getDoi() {
+		return doi;
 	}
 
-	public void setDois(List<Doi> dois) {
-		this.dois = dois;
+	public void setDoi(String doi) {
+		this.doi = doi;
 	}
 
 	@Override
@@ -280,17 +280,7 @@ public class Dmp implements ElasticEntity<Dmp> {
 		builder.field(MapKey.MODIFIED.getName(), this.modified);
 		builder.field(MapKey.FINALIZEDAT.getName(), this.finalizedAt);
 		builder.field(MapKey.PUBLISHEDAT.getName(), this.publishedAt);
-		if (this.dois != null && !this.dois.isEmpty()) {
-			builder.startArray(MapKey.DOIS.getName());
-			this.dois.forEach(doi -> {
-				try {
-					doi.toElasticEntity(builder);
-				} catch (IOException e) {
-					logger.error(e.getMessage(), e);
-				}
-			});
-			builder.endArray();
-		}
+		builder.field(MapKey.DOI.getName(), this.doi);
 		builder.endObject();
 		return builder;
 	}
@@ -323,9 +313,7 @@ public class Dmp implements ElasticEntity<Dmp> {
 			if (fields.get(MapKey.DATASETS.getName()) != null) {
 				this.datasets = ((List<HashMap<String, Object>>) fields.get(MapKey.DATASETS.getName())).stream().map(map -> new Dataset().fromElasticEntity(map)).collect(Collectors.toList());
 			}
-			if (fields.containsKey(MapKey.GRANT.getName()) && fields.get(MapKey.GRANT.getName()) != null) {
-				this.grant = UUID.fromString((String) fields.get(MapKey.GRANT.getName()));
-			}
+			this.grant = UUID.fromString((String) fields.get(MapKey.GRANT.getName()));
 			if (fields.get(MapKey.GRANTSTATUS.getName()) != null) {
 				this.grantStatus = Short.valueOf(fields.get(MapKey.GRANTSTATUS.getName()).toString());
 			}
@@ -341,8 +329,8 @@ public class Dmp implements ElasticEntity<Dmp> {
 			if (fields.get(MapKey.PUBLISHEDAT.getName()) != null) {
 				this.publishedAt = Date.from(Instant.parse(fields.get(MapKey.PUBLISHEDAT.getName()).toString()));
 			}
-			if (fields.get(MapKey.DOIS.getName()) != null) {
-				this.dois = ((List<HashMap<String, Object>>) fields.get(MapKey.DOIS.getName())).stream().map(map -> new Doi().fromElasticEntity(map)).collect(Collectors.toList());
+			if (fields.get(MapKey.DOI.getName()) != null) {
+				this.doi = fields.get(MapKey.DOI.getName()).toString();
 			}
 		}
 		return this;
@@ -367,7 +355,7 @@ public class Dmp implements ElasticEntity<Dmp> {
 		MODIFIED ("modified"),
 		FINALIZEDAT ("finalizedAt"),
 		PUBLISHEDAT ("publishedAt"),
-		DOIS ("dois");
+		DOI ("doi");
 
 		private final String name;
 

dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Doi.java

@@ -1,65 +0,0 @@
-package eu.eudat.elastic.entities;
-
-import org.elasticsearch.common.xcontent.XContentBuilder;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.UUID;
-
-public class Doi implements ElasticEntity<Doi>{
-    private UUID id;
-    private String repositoryId;
-    private String doi;
-    private UUID dmp;
-
-    public UUID getId() {
-        return id;
-    }
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public String getRepositoryId() {
-        return repositoryId;
-    }
-    public void setRepositoryId(String repositoryId) {
-        this.repositoryId = repositoryId;
-    }
-
-    public String getDoi() {
-        return doi;
-    }
-    public void setDoi(String doi) {
-        this.doi = doi;
-    }
-
-    public UUID getDmp() {
-        return dmp;
-    }
-    public void setDmp(UUID dmp) {
-        this.dmp = dmp;
-    }
-
-    @Override
-    public XContentBuilder toElasticEntity(XContentBuilder builder) throws IOException {
-        builder.startObject();
-        builder.field("id", this.id.toString());
-        builder.field("repositoryId", this.repositoryId);
-        builder.field("doi", this.doi);
-        builder.field("dmp", this.dmp.toString());
-        builder.endObject();
-        return builder;
-    }
-
-    @Override
-    public Doi fromElasticEntity(Map<String, Object> fields) {
-        if (fields == null || fields.isEmpty()) {
-            return null;
-        }
-        this.id = UUID.fromString((String) fields.get("id"));
-        this.repositoryId = (String) fields.get("repositoryId");
-        this.doi = (String) fields.get("doi");
-        this.dmp = UUID.fromString((String) fields.get("dmp"));
-        return this;
-    }
-}

dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java

@@ -146,7 +146,7 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
 
             }
 
-            NestedQueryBuilder nestedQueryBuilder = QueryBuilders.nestedQuery("datasets", boolQuery, ScoreMode.Avg).innerHit(new InnerHitBuilder().setFetchSourceContext(new FetchSourceContext(true, new String[]{"datasets.tags"}, null)).setSize(this.environment.getProperty("elasticsearch.innerHitsSize", Integer.class)));
+            NestedQueryBuilder nestedQueryBuilder = QueryBuilders.nestedQuery("datasets", boolQuery, ScoreMode.Avg).innerHit(new InnerHitBuilder().setFetchSourceContext(new FetchSourceContext(true, new String[]{"datasets.tags"}, null)));
             searchSourceBuilder.query(nestedQueryBuilder)/*.from(criteria.getOffset())*/.fetchSource("datasets.tags", null);
             /*if (criteria.getSize() > 0) {
                 searchSourceBuilder.size(criteria.getSize());
@@ -206,7 +206,7 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
 
             }
 
-            NestedQueryBuilder nestedQueryBuilder = QueryBuilders.nestedQuery("datasets", boolQuery, ScoreMode.None).innerHit(new InnerHitBuilder().setFetchSourceContext(new FetchSourceContext(true, new String[]{"datasets.id"}, null)).setSize(this.environment.getProperty("elasticsearch.innerHitsSize", Integer.class)));
+            NestedQueryBuilder nestedQueryBuilder = QueryBuilders.nestedQuery("datasets", boolQuery, ScoreMode.None).innerHit(new InnerHitBuilder().setFetchSourceContext(new FetchSourceContext(true, new String[]{"datasets.id"}, null)));
             searchSourceBuilder.query(nestedQueryBuilder)/*.from(criteria.getOffset()).size(criteria.getSize())*/.fetchSource("datasets.id", null);
             sortBuilders.forEach(searchSourceBuilder::sort);
             searchRequest.source(searchSourceBuilder);
@@ -261,7 +261,6 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
         }
 
         if (criteria.getDatasetTemplates() != null && criteria.getDatasetTemplates().size() > 0) {
-            criteria.setDatasetTemplates(criteria.getDatasetTemplates().stream().filter(Objects::nonNull).collect(Collectors.toList()));
             boolQuery = boolQuery.should(QueryBuilders.termsQuery("datasets.template", criteria.getDatasetTemplates().stream().map(UUID::toString).collect(Collectors.toList())));
         }
 
@@ -270,17 +269,14 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
         }
 
         if (criteria.getDmps() != null && criteria.getDmps().size() > 0) {
-            criteria.setDmps(criteria.getDmps().stream().filter(Objects::nonNull).collect(Collectors.toList()));
             boolQuery = boolQuery.should(QueryBuilders.termsQuery("datasets.dmp", criteria.getDmps().stream().map(UUID::toString).collect(Collectors.toList())));
         }
 
         if (criteria.getGroupIds() != null && criteria.getGroupIds().size() > 0) {
-            criteria.setGroupIds(criteria.getGroupIds().stream().filter(Objects::nonNull).collect(Collectors.toList()));
             boolQuery = boolQuery.should(QueryBuilders.termsQuery("datasets.group", criteria.getGroupIds().stream().map(UUID::toString).collect(Collectors.toList())));
         }
 
         if (criteria.getGrants() != null && criteria.getGrants().size() > 0) {
-            criteria.setGrants(criteria.getGrants().stream().filter(Objects::nonNull).collect(Collectors.toList()));
             boolQuery = boolQuery.should(QueryBuilders.termsQuery("datasets.grant", criteria.getGrants().stream().map(UUID::toString).collect(Collectors.toList())));
         }
 
@@ -289,7 +285,6 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
         }
 
         if (criteria.getCollaborators() != null && criteria.getCollaborators().size() > 0) {
-            criteria.setCollaborators(criteria.getCollaborators().stream().filter(Objects::nonNull).collect(Collectors.toList()));
             boolQuery = boolQuery.should(QueryBuilders.termsQuery("datasets.collaborators.id.keyword", criteria.getCollaborators().stream().map(UUID::toString).collect(Collectors.toList())));
         }
 
@@ -300,12 +295,10 @@ public class DatasetRepository extends ElasticRepository<Dataset, DatasetCriteri
         }
 
         if (criteria.getOrganiztions() != null && criteria.getOrganiztions().size() > 0) {
-            criteria.setOrganiztions(criteria.getOrganiztions().stream().filter(Objects::nonNull).collect(Collectors.toList()));
             boolQuery = boolQuery.should(QueryBuilders.termsQuery("datasets.organizations.id", criteria.getOrganiztions()));
         }
 
         if (criteria.getTags() != null && criteria.getTags().size() > 0) {
-            criteria.setTags(criteria.getTags().stream().filter(Objects::nonNull).collect(Collectors.toList()));
             boolQuery = boolQuery.should(QueryBuilders.termsQuery("datasets.tags.name", criteria.getTags().stream().map(Tag::getName).collect(Collectors.toList())));
         }
 

dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/ElasticRepository.java

@@ -30,7 +30,6 @@ public abstract class ElasticRepository<T extends ElasticEntity,C extends Criter
             }
         } catch (IOException e) {
             logger.warn("Unable to connect to Elastic Services");
-            logger.error(e.getMessage(), e);
             this.client = null;
         }
     }

dmp-backend/pom.xml

@@ -327,18 +327,6 @@
                 <packaging.type>jar</packaging.type>
             </properties>
         </profile>
-        <profile>
-            <id>intellij-properties-launcher</id>
-
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-loader</artifactId>
-                    <version>2.5.2</version>
-                </dependency>
-            </dependencies>
-
-        </profile>
         <profile>
             <id>production</id>
             <properties>

dmp-backend/web/pom.xml

@@ -26,16 +26,13 @@
             <artifactId>queryable</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+
         <dependency>
             <groupId>eu.eudat</groupId>
             <artifactId>elastic</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>gr.cite.opendmp</groupId>
-            <artifactId>repositorydepositbase</artifactId>
-            <version>1.0.4</version>
-        </dependency>
+
 
 
         <dependency>
@@ -46,10 +43,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
         <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
 
@@ -226,40 +219,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>1.5.9.RELEASE</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <mainClass>eu.eudat.EuDatApplication</mainClass>
-                            <classpathPrefix>dependency-jars/</classpathPrefix>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.5.1</version>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>
-                                ${project.build.directory}/dependency-jars/
-                            </outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>

dmp-backend/web/src/main/java/eu/eudat/EuDatApplication.java

@@ -8,7 +8,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.scheduling.annotation.EnableAsync;
 
-@SpringBootApplication(scanBasePackages = {"eu.eudat", "eu.eudat.depositinterface"})
+@SpringBootApplication
 @EnableAsync
 public class EuDatApplication extends SpringBootServletInitializer {
     private static final Logger logger = LoggerFactory.getLogger(EuDatApplication.class);

dmp-backend/web/src/main/java/eu/eudat/configurations/ElasticSearchConfiguration.java

@@ -4,7 +4,6 @@ import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CredentialsProvider;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.nio.conn.PoolingNHttpClientConnectionManager;
@@ -73,34 +72,29 @@ public class ElasticSearchConfiguration {
             RestHighLevelClient client;
             if(this.environment.getProperty("elasticsearch.usingssl", Boolean.class)){
 
-//                Path caCertificatePath = Paths.get(this.environment.getProperty("elasticsearch.certPath"));
-//                CertificateFactory factory =
-//                        CertificateFactory.getInstance("X.509");
-//                Certificate trustedCa;
-//                try (InputStream is = Files.newInputStream(caCertificatePath)) {
-//                    trustedCa = factory.generateCertificate(is);
-//                }
-//                KeyStore trustStore = KeyStore.getInstance("pkcs12");
-//                trustStore.load(null, null);
-//                trustStore.setCertificateEntry("ca", trustedCa);
-//
-//                TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-//                tmf.init(trustStore);
-//
-//                SSLContext sslContext = SSLContext.getInstance("TLS");
-//                sslContext.init(null, tmf.getTrustManagers(), null);
+                Path caCertificatePath = Paths.get(this.environment.getProperty("elasticsearch.certPath"));
+                CertificateFactory factory =
+                        CertificateFactory.getInstance("X.509");
+                Certificate trustedCa;
+                try (InputStream is = Files.newInputStream(caCertificatePath)) {
+                    trustedCa = factory.generateCertificate(is);
+                }
+                KeyStore trustStore = KeyStore.getInstance("pkcs12");
+                trustStore.load(null, null);
+                trustStore.setCertificateEntry("ca", trustedCa);
+
+                TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+                tmf.init(trustStore);
+
+                SSLContext sslContext = SSLContext.getInstance("TLS");
+                sslContext.init(null, tmf.getTrustManagers(), null);
 
-                SSLContextBuilder sslBuilder = SSLContexts.custom()
-                        .loadTrustMaterial(null, (x509Certificates, s) -> true);
-                final SSLContext sslContext = sslBuilder.build();
                 client = new RestHighLevelClient(
                         RestClient.builder(
                                 new HttpHost(this.environment.getProperty("elasticsearch.host"),
                                         Integer.parseInt(this.environment.getProperty("elasticsearch.port")), "https"))
                                 .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder
-                                        .setDefaultCredentialsProvider(credentialsProvider).setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE).setSSLContext(sslContext))
-                                .setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder.setConnectTimeout(5000).setSocketTimeout(120000))
-                );
+                                        .setDefaultCredentialsProvider(credentialsProvider).setSSLContext(sslContext)));
             }
             else {
                  client = new RestHighLevelClient(

dmp-backend/web/src/main/java/eu/eudat/controllers/AboutController.java

@@ -1,39 +0,0 @@
-package eu.eudat.controllers;
-
-import eu.eudat.logic.managers.MaterialManager;
-import eu.eudat.logic.managers.MetricsManager;
-import eu.eudat.types.MetricNames;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Objects;
-import java.util.stream.Stream;
-
-@RestController
-@CrossOrigin
-@RequestMapping(value = {"/api/material/about/"})
-public class AboutController {
-
-    private Environment environment;
-    private MaterialManager materialManager;
-
-    @Autowired
-    public AboutController(Environment environment, MaterialManager materialManager, MetricsManager metricsManager) {
-        this.environment = environment;
-        this.materialManager = materialManager;
-    }
-
-    @RequestMapping(path = "{lang}", method = RequestMethod.GET )
-    public ResponseEntity<byte[]> getAbout(@PathVariable(name = "lang") String lang) throws IOException {
-        try (Stream<Path> paths = Files.walk(Paths.get(Objects.requireNonNull(this.environment.getProperty("about.path"))))) {
-            return this.materialManager.getResponseEntity(lang, paths);
-        }
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java

@@ -1,6 +1,5 @@
 package eu.eudat.controllers;
 
-import eu.eudat.data.entities.DescriptionTemplate;
 import eu.eudat.data.entities.UserDatasetProfile;
 import eu.eudat.data.entities.UserInfo;
 import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem;
@@ -17,6 +16,7 @@ import eu.eudat.models.data.admin.composite.DatasetProfile;
 import eu.eudat.models.data.datasetprofile.DatasetProfileListingModel;
 import eu.eudat.models.data.helpers.common.DataTableData;
 import eu.eudat.models.data.helpers.responses.ResponseItem;
+import eu.eudat.models.data.listingmodels.UserInfoListingModel;
 import eu.eudat.models.data.security.Principal;
 import eu.eudat.models.data.user.composite.PagedDatasetProfile;
 import eu.eudat.types.ApiMessageCode;
@@ -32,6 +32,7 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import static eu.eudat.types.Authorities.ADMIN;
 import static eu.eudat.types.Authorities.DATASET_PROFILE_MANAGER;
@@ -57,42 +58,41 @@ public class Admin extends BaseController {
 
 	@Transactional
 	@RequestMapping(method = RequestMethod.POST, value = {"/addDmp"}, consumes = "application/json", produces = "application/json")
-	public ResponseEntity<Object> addDmp(@Valid @RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN ,DATASET_PROFILE_MANAGER}) Principal principal) throws Exception {
+	public ResponseEntity<Object> addDmp(@Valid @RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN ,DATASET_PROFILE_MANAGER}) Principal principal) {
 		//this.getLoggerService().info(principal, "Admin Added Dataset Profile");
 		DatasetProfile shortenProfile = profile.toShort();
-		DescriptionTemplate modelDefinition = AdminManager.generateViewStyleDefinition(shortenProfile, getApiContext());
-		modelDefinition.setType(getApiContext().getOperationsContext().getDatabaseRepository().getDescriptionTemplateTypeDao().findFromName(profile.getType()));
+		eu.eudat.data.entities.DatasetProfile modelDefinition = AdminManager.generateViewStyleDefinition(shortenProfile, getApiContext());
 		modelDefinition.setGroupId(UUID.randomUUID());
 		modelDefinition.setVersion((short) 0);
 
-		DescriptionTemplate descriptionTemplate = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(modelDefinition);
+		eu.eudat.data.entities.DatasetProfile datasetProfile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(modelDefinition);
 		UserDatasetProfile userDatasetProfile = new UserDatasetProfile();
-		userDatasetProfile.setDatasetProfile(descriptionTemplate);
+		userDatasetProfile.setDatasetProfile(datasetProfile);
 		UserInfo userInfo = getApiContext().getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId());
 		userDatasetProfile.setUser(userInfo);
 		userDatasetProfile.setRole(0);
 		getApiContext().getOperationsContext().getDatabaseRepository().getUserDatasetProfileDao().createOrUpdate(userDatasetProfile);
-		datasetProfileManager.storeDatasetProfileUsers(descriptionTemplate, profile);
+		datasetProfileManager.storeDatasetProfileUsers(datasetProfile, profile);
 
-		metricsManager.increaseValue(MetricNames.DATASET_TEMPLATE, 1, MetricsManager.datasetTemplateStatus.get(descriptionTemplate.getStatus()) );
+		metricsManager.increaseValue(MetricNames.DATASET_TEMPLATE, 1, MetricsManager.datasetTemplateStatus.get(datasetProfile.getStatus()) );
 		return ResponseEntity.status(HttpStatus.OK).body(modelDefinition.getId());
 	}
 
 	@Transactional
 	@RequestMapping(method = RequestMethod.POST, value = {"/addDmp/{id}"}, consumes = "application/json", produces = "application/json")
-	public ResponseEntity<ResponseItem<UUID>> updateDmp(@PathVariable String id, @RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) throws Exception {
+	public ResponseEntity<ResponseItem<UUID>> updateDmp(@PathVariable String id, @RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) {
 		DatasetProfile shortenProfile = profile.toShort();
-		DescriptionTemplate modelDefinition = AdminManager.generateViewStyleDefinition(shortenProfile, getApiContext());
-		DescriptionTemplate datasetprofile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
+		eu.eudat.data.entities.DatasetProfile modelDefinition = AdminManager.generateViewStyleDefinition(shortenProfile, getApiContext());
+		eu.eudat.data.entities.DatasetProfile datasetprofile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
 		datasetprofile.setDefinition(modelDefinition.getDefinition());
 		Short oldStatus = datasetprofile.getStatus();
 		datasetprofile.setStatus(modelDefinition.getStatus());
 		datasetprofile.setLabel(modelDefinition.getLabel());
 		datasetprofile.setDescription(modelDefinition.getDescription());
 		datasetprofile.setLanguage(modelDefinition.getLanguage());
-		DescriptionTemplate descriptionTemplate = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(datasetprofile);
-		datasetProfileManager.storeDatasetProfileUsers(descriptionTemplate, profile);
-		if (descriptionTemplate.getStatus() == 1 && oldStatus == 0) {
+		eu.eudat.data.entities.DatasetProfile datasetProfile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(datasetprofile);
+		datasetProfileManager.storeDatasetProfileUsers(datasetProfile, profile);
+		if (datasetProfile.getStatus() == 1 && oldStatus == 0) {
 			metricsManager.increaseValue(MetricNames.DATASET_TEMPLATE, 1, MetricNames.ACTIVE);
 		}
 		return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<UUID>().status(ApiMessageCode.NO_MESSAGE));
@@ -102,7 +102,7 @@ public class Admin extends BaseController {
 	@RequestMapping(method = RequestMethod.POST, value = {"/newVersion/{id}"}, produces = "application/json")
 	public ResponseEntity newVersionDatasetProfile(@PathVariable String id, @RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) throws Exception {
 		try {
-			DescriptionTemplate modelDefinition = this.datasetProfileManager.createNewVersionDatasetProfile(id, profile);
+			eu.eudat.data.entities.DatasetProfile modelDefinition = this.datasetProfileManager.createNewVersionDatasetProfile(id, profile);
 			return ResponseEntity.status(HttpStatus.OK).body(modelDefinition.getId());
 		} catch (DatasetProfileNewVersionException exception) {
 			return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>().status(ApiMessageCode.ERROR_MESSAGE).message(exception.getMessage()));
@@ -124,8 +124,8 @@ public class Admin extends BaseController {
 	}
 
 	@RequestMapping(method = RequestMethod.POST, value = {"/preview"}, consumes = "application/json", produces = "application/json")
-	public ResponseEntity<ResponseItem<PagedDatasetProfile>> getPreview(@RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) throws Exception {
-		DescriptionTemplate modelDefinition = AdminManager.generateViewStyleDefinition(profile, getApiContext());
+	public ResponseEntity<ResponseItem<PagedDatasetProfile>> getPreview(@RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) {
+		eu.eudat.data.entities.DatasetProfile modelDefinition = AdminManager.generateViewStyleDefinition(profile, getApiContext());
 		eu.eudat.models.data.user.composite.DatasetProfile datasetProfile = userManager.generateDatasetProfileModel(modelDefinition);
 		PagedDatasetProfile pagedDatasetProfile = new PagedDatasetProfile();
 		pagedDatasetProfile.buildPagedDatasetProfile(datasetProfile);
@@ -145,7 +145,7 @@ public class Admin extends BaseController {
 	public @ResponseBody
 	ResponseEntity<ResponseItem<DatasetProfile>> inactivate(@PathVariable String id, @ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) {
 		try {
-			DescriptionTemplate ret = AdminManager.inactivate(this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao(), this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao(), id);
+			eu.eudat.data.entities.DatasetProfile ret = AdminManager.inactivate(this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao(), this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao(), id);
 			return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>().status(ApiMessageCode.SUCCESS_MESSAGE));
 		} catch (DatasetProfileWithDatasetsExeption exception) {
 			return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>().status(ApiMessageCode.UNSUCCESS_DELETE).message(exception.getMessage()));
@@ -156,12 +156,11 @@ public class Admin extends BaseController {
 	@RequestMapping(method = RequestMethod.GET, value = {"/getXml/{id}"}, produces = "application/json")
 	public ResponseEntity getDatasetProfileXml(@PathVariable String id, @RequestHeader("Content-Type") String contentType, @ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) throws IllegalAccessException, IOException, InstantiationException {
 		if (contentType.equals("application/xml")) {
-			DescriptionTemplate profile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
+			eu.eudat.data.entities.DatasetProfile profile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
 			eu.eudat.models.data.user.composite.DatasetProfile datasetProfile = userManager.generateDatasetProfileModel(profile);
 			datasetProfile.setStatus(profile.getStatus());
 			datasetProfile.setDescription(profile.getDescription());
 			datasetProfile.setLanguage(profile.getLanguage());
-			datasetProfile.setType(profile.getType().getName());
 			return this.datasetProfileManager.getDocument(datasetProfile, profile.getLabel());
 		} else {
 			return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>().status(ApiMessageCode.ERROR_MESSAGE).message("NOT AUTHORIZE"));
@@ -174,12 +173,12 @@ public class Admin extends BaseController {
 													   @ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) throws Exception {
 		eu.eudat.logic.utilities.documents.xml.datasetProfileXml.datasetProfileModel.DatasetProfile datasetProfileModel = this.datasetProfileManager.createDatasetProfileFromXml(file);
 		eu.eudat.models.data.admin.composite.DatasetProfile datasetProfileEntity = datasetProfileModel.toAdminCompositeModel(file.getOriginalFilename());
-		DescriptionTemplate modelDefinition;
+		eu.eudat.data.entities.DatasetProfile modelDefinition;
 		if (id == null) {
 			modelDefinition = AdminManager.generateViewStyleDefinition(datasetProfileEntity, getApiContext());
-			DescriptionTemplate descriptionTemplate = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(modelDefinition);
+			eu.eudat.data.entities.DatasetProfile datasetProfile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(modelDefinition);
 			UserDatasetProfile userDatasetProfile = new UserDatasetProfile();
-			userDatasetProfile.setDatasetProfile(descriptionTemplate);
+			userDatasetProfile.setDatasetProfile(datasetProfile);
 			UserInfo userInfo = getApiContext().getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId());
 			userDatasetProfile.setUser(userInfo);
 			userDatasetProfile.setRole(0);
@@ -187,14 +186,12 @@ public class Admin extends BaseController {
 		} else {
 			modelDefinition = datasetProfileManager.createNewVersionDatasetProfile(id, datasetProfileEntity);
 		}
-		return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<DescriptionTemplate>>()
+		return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<eu.eudat.data.entities.DatasetProfile>>()
 				.status(ApiMessageCode.SUCCESS_MESSAGE).message(""));
 	}
 
-
-	@RequestMapping(method = RequestMethod.GET, value = {"/getSemantics"}, produces = "application/json")
-	public ResponseEntity<ResponseItem<List<String>>> getSemantics(@RequestParam(value = "query", required = false) String query, @ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) {
-		List<String> semantics = this.datasetProfileManager.getSemantics(query);
-		return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<String>>().status(ApiMessageCode.SUCCESS_MESSAGE).payload(semantics));
+	@RequestMapping(method = RequestMethod.GET, value = {"/getRDACommonStandards"}, produces = "application/json")
+	public ResponseEntity getRDACommonStandards(@ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) {
+		return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<String>>().status(ApiMessageCode.SUCCESS_MESSAGE).payload(configLoader.getRdaProperties()));
 	}
 }

dmp-backend/web/src/main/java/eu/eudat/controllers/DMPProfileController.java

@@ -2,10 +2,7 @@ package eu.eudat.controllers;
 
 import eu.eudat.data.dao.criteria.RequestItem;
 import eu.eudat.data.entities.DMPProfile;
-import eu.eudat.data.entities.DescriptionTemplate;
-import eu.eudat.data.query.items.dmpblueprint.DataManagementPlanBlueprintTableRequest;
 import eu.eudat.data.query.items.table.dmpprofile.DataManagementPlanProfileTableRequest;
-import eu.eudat.exceptions.dmpblueprint.DmpBlueprintUsedException;
 import eu.eudat.logic.managers.DataManagementProfileManager;
 import eu.eudat.logic.security.claims.ClaimedAuthorities;
 import eu.eudat.logic.services.ApiContext;
@@ -13,7 +10,6 @@ import eu.eudat.models.data.helpermodels.Tuple;
 import eu.eudat.models.data.helpers.common.AutoCompleteLookupItem;
 import eu.eudat.models.data.helpers.common.DataTableData;
 import eu.eudat.models.data.helpers.responses.ResponseItem;
-import eu.eudat.models.data.listingmodels.DataManagementPlanBlueprintListingModel;
 import eu.eudat.models.data.listingmodels.DataManagementPlanProfileListingModel;
 import eu.eudat.models.data.security.Principal;
 import eu.eudat.types.ApiMessageCode;
@@ -30,7 +26,6 @@ import java.io.IOException;
 import java.util.List;
 
 import static eu.eudat.types.Authorities.ADMIN;
-import static eu.eudat.types.Authorities.DATASET_PROFILE_MANAGER;
 
 /**
  * Created by ikalyvas on 3/21/2018.
@@ -56,14 +51,6 @@ public class DMPProfileController extends BaseController {
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DMPProfile>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created"));
     }
 
-    @Transactional
-    @RequestMapping(method = RequestMethod.POST, value = {"/blueprint"}, consumes = "application/json", produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<DMPProfile>> createOrUpdateBlueprint(@RequestBody DataManagementPlanBlueprintListingModel dataManagementPlan, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws Exception {
-        this.dataManagementProfileManager.createOrUpdateBlueprint(dataManagementPlan, principal);
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DMPProfile>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created"));
-    }
-
     @RequestMapping(method = RequestMethod.GET, value = {"/getSingle/{id}"}, produces = "application/json")
     public @ResponseBody
     ResponseEntity<ResponseItem<DataManagementPlanProfileListingModel>> getSingle(@PathVariable String id, Principal principal) throws IllegalAccessException, InstantiationException {
@@ -71,13 +58,6 @@ public class DMPProfileController extends BaseController {
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataManagementPlanProfileListingModel>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlanProfileListingModel));
     }
 
-    @RequestMapping(method = RequestMethod.GET, value = {"/getSingleBlueprint/{id}"}, produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<DataManagementPlanBlueprintListingModel>> getSingleBlueprint(@PathVariable String id, Principal principal) {
-        DataManagementPlanBlueprintListingModel dataManagementPlanBlueprintListingModel = this.dataManagementProfileManager.getSingleBlueprint(id, principal);
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataManagementPlanBlueprintListingModel>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlanBlueprintListingModel));
-    }
-
     @RequestMapping(method = RequestMethod.POST, value = {"/getPaged"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
     ResponseEntity<ResponseItem<DataTableData<DataManagementPlanProfileListingModel>>> getPaged(@Valid @RequestBody DataManagementPlanProfileTableRequest dataManagementPlanProfileTableRequest, Principal principal) throws Exception {
@@ -85,51 +65,24 @@ public class DMPProfileController extends BaseController {
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<DataManagementPlanProfileListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(dataTable));
     }
 
-    @RequestMapping(method = RequestMethod.POST, value = {"/getPagedBlueprint"}, consumes = "application/json", produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<DataTableData<DataManagementPlanBlueprintListingModel>>> getPagedBlueprint(@Valid @RequestBody DataManagementPlanBlueprintTableRequest dataManagementPlanBlueprintTableRequest, Principal principal) throws Exception {
-        DataTableData<DataManagementPlanBlueprintListingModel> dataTable = this.dataManagementProfileManager.getPagedBlueprint(dataManagementPlanBlueprintTableRequest, principal);
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<DataManagementPlanBlueprintListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(dataTable));
-    }
-
-    @Transactional
-    @RequestMapping(method = RequestMethod.POST, value = {"/clone/{id}"}, consumes = "application/json", produces = "application/json")
-    public ResponseEntity<ResponseItem<DataManagementPlanBlueprintListingModel>> clone(@PathVariable String id, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) {
-        DataManagementPlanBlueprintListingModel dmpBlueprint = this.dataManagementProfileManager.getSingleBlueprint(id, principal);
-        dmpBlueprint.setLabel(dmpBlueprint.getLabel() + " new ");
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataManagementPlanBlueprintListingModel>().payload(dmpBlueprint));
-    }
-
-    @Transactional
-    @RequestMapping(method = RequestMethod.DELETE, value = {"{id}"}, consumes = "application/json", produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<Void>> inactivate(@PathVariable String id, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) {
-        try {
-            this.dataManagementProfileManager.inactivate(id);
-            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Void>().status(ApiMessageCode.SUCCESS_MESSAGE));
-        } catch (DmpBlueprintUsedException exception) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<Void>().status(ApiMessageCode.UNSUCCESS_DELETE).message(exception.getMessage()));
-        }
-    }
-
     @RequestMapping(method = RequestMethod.GET, value = {"/getXml/{id}"}, produces = "application/json")
     public @ResponseBody
-    ResponseEntity  getXml( @RequestHeader("Content-Type") String contentType, @PathVariable String id, Principal principal) throws IOException {
+    ResponseEntity  getXml( @RequestHeader("Content-Type") String contentType, @PathVariable String id, Principal principal) throws IllegalAccessException, InstantiationException, IOException {
         if (contentType.equals("application/xml")) {
-            DataManagementPlanBlueprintListingModel dataManagementPlanBlueprintListingModel = this.dataManagementProfileManager.getSingleBlueprint(id, principal);
-            return this.dataManagementProfileManager.getDocument(dataManagementPlanBlueprintListingModel);
+            DataManagementPlanProfileListingModel dataManagementPlanProfileListingModel = this.dataManagementProfileManager.getSingle(id, principal);
+            return this.dataManagementProfileManager.getDocument(dataManagementPlanProfileListingModel,dataManagementPlanProfileListingModel.getLabel());
         }else {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DataManagementPlanBlueprintListingModel>().status(ApiMessageCode.ERROR_MESSAGE).message("NOT AUTHORIZE"));
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DataManagementPlanProfileListingModel>().status(ApiMessageCode.ERROR_MESSAGE).message("NOT AUTHORIZE"));
         }
     }
 
     @RequestMapping(method = RequestMethod.POST, value = {"/upload"})
     public ResponseEntity<Object> setDatasetProfileXml(@RequestParam("file") MultipartFile file,
-                                                       @ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws Exception {
-        eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel.DmpBlueprint dmpBlueprintModel = this.dataManagementProfileManager.createDmpProfileFromXml(file);
-        DataManagementPlanBlueprintListingModel dmpBlueprint = dmpBlueprintModel.toDmpProfileCompositeModel(file.getOriginalFilename());
-        this.dataManagementProfileManager.createOrUpdateBlueprint(dmpBlueprint, principal);
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<DescriptionTemplate>>()
+                                                       @ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws IllegalAccessException,IOException,Exception{
+        eu.eudat.logic.utilities.documents.xml.dmpXml.dmpProfileModel.DmpProfile dmpProfileModel = this.dataManagementProfileManager.createDmpProfileFromXml(file);
+        DataManagementPlanProfileListingModel dataManagementPlan = dmpProfileModel.toDmpProfileCompositeModel(file.getOriginalFilename());
+        this.dataManagementProfileManager.createOrUpdate(dataManagementPlan, principal);
+        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<eu.eudat.data.entities.DatasetProfile>>()
                 .status(ApiMessageCode.SUCCESS_MESSAGE).message(""));
     }
 

dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java

@@ -9,10 +9,12 @@ import eu.eudat.data.entities.DMP;
 import eu.eudat.data.entities.Dataset;
 import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem;
 import eu.eudat.data.query.items.table.dmp.DataManagementPlanTableRequest;
+import eu.eudat.data.query.items.table.dmp.DataManagmentPlanPublicTableRequest;
 import eu.eudat.exceptions.datamanagementplan.DMPNewVersionException;
 import eu.eudat.exceptions.datamanagementplan.DMPWithDatasetsDeleteException;
 import eu.eudat.exceptions.security.UnauthorisedException;
 import eu.eudat.logic.managers.DataManagementPlanManager;
+import eu.eudat.logic.managers.DatasetManager;
 import eu.eudat.logic.proxy.config.configloaders.ConfigLoader;
 import eu.eudat.logic.security.claims.ClaimedAuthorities;
 import eu.eudat.logic.services.ApiContext;
@@ -150,7 +152,7 @@ public class DMPs extends BaseController {
 
     @RequestMapping(method = RequestMethod.GET, value = {"/publicOverview/{id}"})
     public @ResponseBody
-    ResponseEntity<ResponseItem<DataManagementPlanOverviewModel>> getOverviewSinglePublic(@PathVariable String id, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws Exception {
+    ResponseEntity getOverviewSinglePublic(@PathVariable String id, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws Exception {
 //        try {
         DataManagementPlanOverviewModel dataManagementPlan = this.dataManagementPlanManager.getOverviewSingle(id, principal, true);
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataManagementPlanOverviewModel>().status(ApiMessageCode.NO_MESSAGE).payload(dataManagementPlan));
@@ -182,21 +184,7 @@ public class DMPs extends BaseController {
     public @ResponseBody
     ResponseEntity getRDAJsonDocument(@PathVariable String id, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) {
     	try {
-            FileEnvelope rdaJsonDocument = this.dataManagementPlanManager.getRDAJsonDocument(id, principal);
-
-            HttpHeaders responseHeaders = new HttpHeaders();
-            responseHeaders.setContentLength(rdaJsonDocument.getFile().length());
-            responseHeaders.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-            responseHeaders.set("Content-Disposition", "attachment;filename=" + rdaJsonDocument.getFilename());
-            responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition");
-            responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type");
-
-            InputStream resource = new FileInputStream(rdaJsonDocument.getFile());
-            byte[] content = org.apache.poi.util.IOUtils.toByteArray(resource);
-            resource.close();
-            Files.deleteIfExists(rdaJsonDocument.getFile().toPath());
-
-            return new ResponseEntity<>(content, responseHeaders, HttpStatus.OK);
+        return this.dataManagementPlanManager.getRDAJsonDocument(id, principal);
     	} catch (Exception e) {
     		return ResponseEntity.status(HttpStatus.EXPECTATION_FAILED).body(new ResponseItem<>().message(e.getMessage()).status(ApiMessageCode.ERROR_MESSAGE));
     	}
@@ -260,7 +248,7 @@ public class DMPs extends BaseController {
     @RequestMapping(method = RequestMethod.POST, value = {"/clone/{id}"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody
     ResponseEntity<ResponseItem<UUID>> clone(@PathVariable UUID id, @RequestBody eu.eudat.models.data.dmp.DataManagementPlanNewVersionModel dataManagementPlan, Principal principal) throws Exception {
-        UUID cloneId = this.dataManagementPlanManager.clone(id, dataManagementPlan, principal);
+        UUID cloneId = this.dataManagementPlanManager.clone(dataManagementPlan, principal);
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<UUID>().status(ApiMessageCode.SUCCESS_MESSAGE).payload(cloneId));
     }
 
@@ -333,6 +321,21 @@ public class DMPs extends BaseController {
         }
     }
 
+    /*
+    * DOI Generation
+    * */
+
+    @RequestMapping(method = RequestMethod.POST, value = {"/createZenodoDoi/{id}"})
+    public ResponseEntity<ResponseItem<String>> createZenodoDoi(@PathVariable String id, Principal principal) {
+        try {
+            String zenodoDOI = this.dataManagementPlanManager.createZenodoDoi(UUID.fromString(id), principal);
+            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<String>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Successfully created DOI for Data Datamanagement Plan in question.").payload(zenodoDOI));
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<String>().status(ApiMessageCode.ERROR_MESSAGE).message("Failed to create DOI for the Data Management Plan: " + e.getMessage()));
+        }
+    }
+
     /*
     * Data Index
     * */

dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java

@@ -1,7 +1,6 @@
 package eu.eudat.controllers;
 
 import eu.eudat.data.dao.criteria.RequestItem;
-import eu.eudat.data.entities.DescriptionTemplate;
 import eu.eudat.logic.managers.AdminManager;
 import eu.eudat.logic.managers.DatasetProfileManager;
 import eu.eudat.logic.security.claims.ClaimedAuthorities;
@@ -9,7 +8,6 @@ import eu.eudat.logic.services.ApiContext;
 import eu.eudat.models.data.components.commons.datafield.AutoCompleteData;
 import eu.eudat.models.data.externaldataset.ExternalAutocompleteFieldModel;
 import eu.eudat.models.data.helpers.common.AutoCompleteLookupItem;
-import eu.eudat.models.data.helpers.common.AutoCompleteOptionsLookupItem;
 import eu.eudat.models.data.helpers.responses.ResponseItem;
 import eu.eudat.models.data.properties.PropertiesModel;
 import eu.eudat.models.data.security.Principal;
@@ -57,7 +55,7 @@ public class DatasetProfileController extends BaseController {
     @Transactional
     @RequestMapping(method = RequestMethod.POST, value = {"/datasetprofile/clone/{id}"}, consumes = "application/json", produces = "application/json")
     public ResponseEntity<ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>> clone(@PathVariable String id, @ClaimedAuthorities(claims = {ADMIN})Principal principal) {
-        DescriptionTemplate profile = this.datasetProfileManager.clone(id);
+        eu.eudat.data.entities.DatasetProfile profile = this.datasetProfileManager.clone(id);
         eu.eudat.models.data.admin.composite.DatasetProfile datasetprofile = AdminManager.generateDatasetProfileModel(profile);
         datasetprofile.setLabel(profile.getLabel() + " new ");
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>().payload(datasetprofile));
@@ -65,19 +63,11 @@ public class DatasetProfileController extends BaseController {
 
     @RequestMapping(method = RequestMethod.POST, value = {"/search/autocomplete"}, consumes = "application/json", produces = "application/json")
     public ResponseEntity<Object> getDataForAutocomplete(@RequestBody RequestItem<AutoCompleteLookupItem> lookupItem) throws XPathExpressionException {
-        DescriptionTemplate descriptionTemplate = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(lookupItem.getCriteria().getProfileID()));
-        eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field modelfield = this.datasetProfileManager.queryForField(descriptionTemplate.getDefinition(), lookupItem.getCriteria().getFieldID());
+        eu.eudat.data.entities.DatasetProfile datasetProfile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(lookupItem.getCriteria().getProfileID()));
+        eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field modelfield = this.datasetProfileManager.queryForField(datasetProfile.getDefinition(), lookupItem.getCriteria().getFieldID());
         AutoCompleteData data = (AutoCompleteData) modelfield.getData();
         List<ExternalAutocompleteFieldModel> items = this.datasetProfileManager.getAutocomplete(data, lookupItem.getCriteria().getLike());
         return ResponseEntity.status(HttpStatus.OK).body(items);
     }
 
-    @RequestMapping(method = RequestMethod.POST, value = {"/search/autocompleteOptions"}, consumes = "application/json", produces = "application/json")
-    public ResponseEntity<Object> getDataForAutocompleteOptions(@RequestBody RequestItem<AutoCompleteOptionsLookupItem> lookupItem) {
-        AutoCompleteData data = new AutoCompleteData();
-        data.setAutoCompleteSingleDataList(lookupItem.getCriteria().getAutoCompleteSingleDataList());
-        List<ExternalAutocompleteFieldModel> items = this.datasetProfileManager.getAutocomplete(data, lookupItem.getCriteria().getLike());
-        return ResponseEntity.status(HttpStatus.OK).body(items);
-    }
-
 }

dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfiles.java

@@ -6,7 +6,6 @@ import eu.eudat.logic.managers.DatasetProfileManager;
 import eu.eudat.logic.services.ApiContext;
 import eu.eudat.models.data.datasetprofile.DatasetProfileAutocompleteItem;
 import eu.eudat.models.data.datasetprofile.DatasetProfileListingModel;
-import eu.eudat.models.data.datasetprofile.DatasetProfileWithPrefillingPropertyModel;
 import eu.eudat.models.data.helpers.responses.ResponseItem;
 import eu.eudat.types.ApiMessageCode;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,12 +42,5 @@ public class DatasetProfiles extends BaseController {
         List<DatasetProfileListingModel> datasetProfileTableData = this.datasetProfileManager.getAll(tableRequestItem);
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<DatasetProfileListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData));
     }
-
-    @RequestMapping(method = RequestMethod.POST, value = {"/datasetprofiles/getAllWithPrefilling"}, produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<List<DatasetProfileWithPrefillingPropertyModel>>> getAllWithPrefilling(@RequestBody DatasetProfileTableRequestItem tableRequestItem) {
-        List<DatasetProfileWithPrefillingPropertyModel> datasetProfileTableData = this.datasetProfileManager.getAllWithPrefilling(tableRequestItem);
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<DatasetProfileWithPrefillingPropertyModel>>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData));
-    }
 }
 

dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java

@@ -1,7 +1,6 @@
 package eu.eudat.controllers;
 
 import eu.eudat.data.entities.Dataset;
-import eu.eudat.data.entities.DescriptionTemplate;
 import eu.eudat.data.query.items.item.dataset.DatasetWizardAutocompleteRequest;
 import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileWizardAutocompleteRequest;
 import eu.eudat.data.query.items.table.dataset.DatasetPublicTableRequest;
@@ -118,7 +117,7 @@ public class Datasets extends BaseController {
 
     @RequestMapping(method = RequestMethod.GET, value = {"/publicOverview/{id}"})
     public @ResponseBody
-    ResponseEntity<ResponseItem<DatasetOverviewModel>> getOverviewSinglePublic(@PathVariable String id, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws Exception {
+    ResponseEntity getOverviewSinglePublic(@PathVariable String id, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws Exception {
 //        try {
         DatasetOverviewModel dataset = this.datasetManager.getOverviewSingle(id, principal, true);
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DatasetOverviewModel>().status(ApiMessageCode.NO_MESSAGE).payload(dataset));
@@ -203,7 +202,7 @@ public class Datasets extends BaseController {
 
     @RequestMapping(method = RequestMethod.GET, value = {"/get/{id}"}, produces = "application/json")
     public ResponseEntity<ResponseItem<PagedDatasetProfile>> getSingle(@PathVariable String id) {
-        DescriptionTemplate profile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
+        eu.eudat.data.entities.DatasetProfile profile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
         eu.eudat.models.data.user.composite.DatasetProfile datasetprofile = userManager.generateDatasetProfileModel(profile);
         PagedDatasetProfile pagedDatasetProfile = new PagedDatasetProfile();
         pagedDatasetProfile.buildPagedDatasetProfile(datasetprofile);
@@ -257,8 +256,7 @@ public class Datasets extends BaseController {
     public @ResponseBody
     ResponseEntity<ResponseItem<DatasetWizardModel>> createOrUpdate(@RequestBody DatasetWizardModel profile, Principal principal) throws Exception {
     	DatasetWizardModel dataset = new DatasetWizardModel().fromDataModel(this.datasetManager.createOrUpdate(profile, principal));
-        dataset.setTags(profile.getTags());
-    	return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DatasetWizardModel>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created").payload(dataset));
+        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DatasetWizardModel>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created").payload(dataset));
     }
 
     @Transactional

dmp-backend/web/src/main/java/eu/eudat/controllers/DepositController.java

@@ -1,84 +0,0 @@
-package eu.eudat.controllers;
-
-import eu.eudat.logic.managers.DepositManager;
-import eu.eudat.logic.security.claims.ClaimedAuthorities;
-import eu.eudat.logic.services.ApiContext;
-import eu.eudat.models.data.doi.DepositCode;
-import eu.eudat.models.data.doi.DepositRequest;
-import eu.eudat.models.data.doi.Doi;
-import eu.eudat.models.data.doi.RepositoryConfig;
-import eu.eudat.models.data.helpers.responses.ResponseItem;
-import eu.eudat.models.data.security.Principal;
-import eu.eudat.types.ApiMessageCode;
-import eu.eudat.types.Authorities;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@CrossOrigin
-@RequestMapping(value = {"/api/deposit/"})
-public class DepositController extends BaseController {
-    private static final Logger logger = LoggerFactory.getLogger(DepositController.class);
-
-    private DepositManager depositManager;
-
-    @Autowired
-    public DepositController(ApiContext apiContext, DepositManager depositManager){
-        super(apiContext);
-        this.depositManager = depositManager;
-    }
-
-    @RequestMapping(method = RequestMethod.GET, value = {"/repos"})
-    public @ResponseBody
-    ResponseEntity<ResponseItem<List<RepositoryConfig>>> getAvailableRepos(@ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) {
-        List<RepositoryConfig> ids = this.depositManager.getAvailableRepos();
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<RepositoryConfig>>().status(ApiMessageCode.NO_MESSAGE).payload(ids));
-    }
-
-    @RequestMapping(method = RequestMethod.POST, value = {"/getAccessToken"})
-    public @ResponseBody
-    ResponseEntity<ResponseItem<String>> getAccessToken(@RequestBody DepositCode depositCode, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws Exception {
-        String accessToken = this.depositManager.authenticate(depositCode.getRepositoryId(), depositCode.getCode());
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<String>().status(ApiMessageCode.NO_MESSAGE).payload(accessToken));
-    }
-
-    @RequestMapping(method = RequestMethod.POST, value = {"/createDoi"})
-    public @ResponseBody
-    ResponseEntity<ResponseItem<Doi>> createDoi(@RequestBody DepositRequest depositRequest, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) {
-        try {
-            Doi doi = this.depositManager.deposit(depositRequest, principal);
-            if(doi != null){
-                return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Doi>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Successfully created DOI for Data Datamanagement Plan in question.").payload(doi));
-            }
-            else{
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<Doi>().status(ApiMessageCode.ERROR_MESSAGE).message("Failed to create DOI for the Data Management Plan"));
-            }
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<Doi>().status(ApiMessageCode.ERROR_MESSAGE).message("Failed to create DOI for the Data Management Plan: " + e.getMessage()));
-        }
-    }
-
-    @RequestMapping(method = RequestMethod.GET, value = {"/logo/{repositoryId}"})
-    public @ResponseBody
-    ResponseEntity<ResponseItem<String>> getLogo(@PathVariable("repositoryId") String repositoryId, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) {
-        try {
-            String encodedLogo = this.depositManager.getRepositoryLogo(repositoryId);
-            if(encodedLogo != null){
-                return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<String>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Successfully loaded " + repositoryId + "'s logo.").payload(encodedLogo));
-            }
-            else{
-                return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ResponseItem<String>().status(ApiMessageCode.ERROR_MESSAGE).message(repositoryId + " has no logo").payload(null));
-            }
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<String>().status(ApiMessageCode.ERROR_MESSAGE).message("Failed to load " + repositoryId + "'s logo: " + e.getMessage()));
-        }
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/controllers/DescriptionTemplateTypeController.java

@@ -1,94 +0,0 @@
-package eu.eudat.controllers;
-
-import eu.eudat.exceptions.descriptiontemplate.DescriptionTemplatesWithTypeException;
-import eu.eudat.logic.managers.DescriptionTemplateTypeManager;
-import eu.eudat.logic.security.claims.ClaimedAuthorities;
-import eu.eudat.logic.services.ApiContext;
-import eu.eudat.models.data.descriptiontemplatetype.DescriptionTemplateTypeModel;
-import eu.eudat.models.data.helpers.common.DataTableData;
-import eu.eudat.models.data.helpers.responses.ResponseItem;
-import eu.eudat.models.data.security.Principal;
-import eu.eudat.types.ApiMessageCode;
-import eu.eudat.types.Authorities;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import javax.transaction.Transactional;
-import java.util.UUID;
-
-import static eu.eudat.types.Authorities.ADMIN;
-
-@RestController
-@CrossOrigin
-@RequestMapping(value = {"/api/descriptionTemplateType/"})
-public class DescriptionTemplateTypeController extends BaseController {
-
-    private DescriptionTemplateTypeManager descriptionTemplateTypeManager;
-
-    @Autowired
-    public DescriptionTemplateTypeController(ApiContext apiContext, DescriptionTemplateTypeManager descriptionTemplateTypeManager){
-        super(apiContext);
-        this.descriptionTemplateTypeManager = descriptionTemplateTypeManager;
-    }
-
-    @Transactional
-    @RequestMapping(method = RequestMethod.POST, value = {"create"}, produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<DescriptionTemplateTypeModel>> create(@RequestBody DescriptionTemplateTypeModel type, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws Exception {
-        try {
-            this.descriptionTemplateTypeManager.create(type);
-            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DescriptionTemplateTypeModel>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created"));
-        }
-        catch(DescriptionTemplatesWithTypeException e){
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DescriptionTemplateTypeModel>().status(ApiMessageCode.ERROR_MESSAGE).message(e.getMessage()));
-        }
-    }
-
-    @Transactional
-    @RequestMapping(method = RequestMethod.POST, value = {"update"}, produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<DescriptionTemplateTypeModel>> update(@RequestBody DescriptionTemplateTypeModel type, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws Exception {
-        try {
-            this.descriptionTemplateTypeManager.update(type);
-            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DescriptionTemplateTypeModel>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Updated"));
-        }
-        catch(DescriptionTemplatesWithTypeException e){
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DescriptionTemplateTypeModel>().status(ApiMessageCode.ERROR_MESSAGE).message(e.getMessage()));
-        }
-    }
-
-    @RequestMapping(method = RequestMethod.GET, value = {"get"}, produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<DataTableData<DescriptionTemplateTypeModel>>> get(@ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws Exception {
-        DataTableData<DescriptionTemplateTypeModel> dataTable = this.descriptionTemplateTypeManager.get();
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<DescriptionTemplateTypeModel>>().status(ApiMessageCode.NO_MESSAGE).payload(dataTable));
-    }
-
-    @RequestMapping(method = RequestMethod.GET, value = {"get/{id}"}, produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<DescriptionTemplateTypeModel>> getSingle(@PathVariable(value = "id") UUID id, @ClaimedAuthorities(claims = {Authorities.ADMIN, Authorities.MANAGER, Authorities.USER, Authorities.ANONYMOUS}) Principal principal) throws Exception {
-        try {
-            DescriptionTemplateTypeModel typeModel = this.descriptionTemplateTypeManager.getSingle(id);
-            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DescriptionTemplateTypeModel>().status(ApiMessageCode.NO_MESSAGE).payload(typeModel));
-        }
-        catch(DescriptionTemplatesWithTypeException e){
-            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ResponseItem<DescriptionTemplateTypeModel>().status(ApiMessageCode.ERROR_MESSAGE).message(e.getMessage()));
-        }
-    }
-
-    @Transactional
-    @RequestMapping(method = RequestMethod.DELETE, value = {"/delete/{id}"}, produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem<DescriptionTemplateTypeModel>> delete(@PathVariable(value = "id") UUID id, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws Exception {
-        try{
-            this.descriptionTemplateTypeManager.delete(id);
-            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DescriptionTemplateTypeModel>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Deleted"));
-        }
-        catch(DescriptionTemplatesWithTypeException e){
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DescriptionTemplateTypeModel>().status(ApiMessageCode.UNSUCCESS_DELETE).message(e.getMessage()));
-        }
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/controllers/EmailMergeConfirmation.java

@@ -32,16 +32,16 @@ public class EmailMergeConfirmation {
 	@Transactional
 	@RequestMapping(method = RequestMethod.GET, value = {"/{emailToken}"})
 	public @ResponseBody
-	ResponseEntity<ResponseItem<String>> emailConfirmation(@PathVariable(value = "emailToken") String token) {
+	ResponseEntity<ResponseItem> emailConfirmation(@PathVariable(value = "emailToken") String token) {
 		try {
-			String emailToBeMerged = this.emailConfirmationManager.confirmEmail(token);
-			return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<String>().payload(emailToBeMerged).status(ApiMessageCode.SUCCESS_MESSAGE));
+			this.emailConfirmationManager.confirmEmail(token);
+			return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE));
 		} catch
 		(HasConfirmedEmailException | TokenExpiredException ex) {
 			if (ex instanceof  TokenExpiredException) {
-				return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<String>().status(ApiMessageCode.NO_MESSAGE));
+				return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE));
 			} else {
-				return ResponseEntity.status(HttpStatus.FOUND).body(new ResponseItem<String>().status(ApiMessageCode.WARN_MESSAGE));
+				return ResponseEntity.status(HttpStatus.FOUND).body(new ResponseItem().status(ApiMessageCode.WARN_MESSAGE));
 			}
 		}
 	}

dmp-backend/web/src/main/java/eu/eudat/controllers/EmailUnlinkConfirmation.java

@@ -1,57 +0,0 @@
-package eu.eudat.controllers;
-
-import eu.eudat.exceptions.emailconfirmation.HasConfirmedEmailException;
-import eu.eudat.exceptions.emailconfirmation.TokenExpiredException;
-import eu.eudat.logic.managers.UnlinkEmailConfirmationManager;
-import eu.eudat.models.data.helpers.responses.ResponseItem;
-import eu.eudat.models.data.security.Principal;
-import eu.eudat.models.data.userinfo.UserUnlinkRequestModel;
-import eu.eudat.types.ApiMessageCode;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import javax.transaction.Transactional;
-
-@RestController
-@CrossOrigin
-@RequestMapping(value = "api/emailUnlinkConfirmation")
-public class EmailUnlinkConfirmation {
-
-    private UnlinkEmailConfirmationManager unlinkEmailConfirmationManager;
-
-    @Autowired
-    public EmailUnlinkConfirmation(UnlinkEmailConfirmationManager unlinkEmailConfirmationManager){
-        this.unlinkEmailConfirmationManager = unlinkEmailConfirmationManager;
-    }
-
-    @Transactional
-    @RequestMapping(method = RequestMethod.GET, value = {"/{emailToken}"})
-    public @ResponseBody
-    ResponseEntity<ResponseItem> emailConfirmation(@PathVariable(value = "emailToken") String token) {
-        try {
-            this.unlinkEmailConfirmationManager.confirmEmail(token);
-            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE));
-        } catch (TokenExpiredException | HasConfirmedEmailException ex) {
-            if (ex instanceof TokenExpiredException) {
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE));
-            }
-            else {
-                return ResponseEntity.status(HttpStatus.FOUND).body(new ResponseItem().status(ApiMessageCode.WARN_MESSAGE));
-            }
-        }
-    }
-
-    @Transactional
-    @RequestMapping(method = RequestMethod.POST, consumes = "application/json", produces = "application/json")
-    public @ResponseBody
-    ResponseEntity<ResponseItem> sendUnlinkConfirmationEmail(@RequestBody UserUnlinkRequestModel requestModel, Principal principal) {
-        try {
-            this.unlinkEmailConfirmationManager.sendConfirmationEmail(requestModel.getEmail(), principal, requestModel.getUserId(), requestModel.getProvider());
-            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE));
-        } catch (Exception ex) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).message("Could not send unlink email."));
-        }
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/controllers/FaqController.java

@@ -1,38 +0,0 @@
-package eu.eudat.controllers;
-
-import eu.eudat.logic.managers.MaterialManager;
-import eu.eudat.logic.managers.MetricsManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Objects;
-import java.util.stream.Stream;
-
-@RestController
-@CrossOrigin
-@RequestMapping(value = {"/api/material/faq/"})
-public class FaqController {
-
-    private Environment environment;
-    private MaterialManager materialManager;
-
-    @Autowired
-    public FaqController(Environment environment, MaterialManager materialManager, MetricsManager metricsManager) {
-        this.environment = environment;
-        this.materialManager = materialManager;
-    }
-
-    @RequestMapping(path = "{lang}", method = RequestMethod.GET )
-    public ResponseEntity<byte[]> getFaq(@PathVariable(name = "lang") String lang) throws IOException {
-        try (Stream<Path> paths = Files.walk(Paths.get(Objects.requireNonNull(this.environment.getProperty("faq.path"))))) {
-            return this.materialManager.getResponseEntity(lang, paths);
-        }
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/controllers/GlossaryController.java

@@ -1,38 +0,0 @@
-package eu.eudat.controllers;
-
-import eu.eudat.logic.managers.MaterialManager;
-import eu.eudat.logic.managers.MetricsManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Objects;
-import java.util.stream.Stream;
-
-@RestController
-@CrossOrigin
-@RequestMapping(value = {"/api/material/glossary/"})
-public class GlossaryController {
-
-    private Environment environment;
-    private MaterialManager materialManager;
-
-    @Autowired
-    public GlossaryController(Environment environment, MaterialManager materialManager, MetricsManager metricsManager) {
-        this.environment = environment;
-        this.materialManager = materialManager;
-    }
-
-    @RequestMapping(path = "{lang}", method = RequestMethod.GET )
-    public ResponseEntity<byte[]> getGlossary(@PathVariable(name = "lang") String lang) throws IOException {
-        try (Stream<Path> paths = Files.walk(Paths.get(Objects.requireNonNull(this.environment.getProperty("glossary.path"))))) {
-            return this.materialManager.getResponseEntity(lang, paths);
-        }
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/controllers/ManagementController.java

@@ -1,54 +0,0 @@
-package eu.eudat.controllers;
-
-import eu.eudat.exceptions.datasetprofile.DatasetProfileNewVersionException;
-import eu.eudat.logic.managers.DatasetProfileManager;
-import eu.eudat.logic.security.claims.ClaimedAuthorities;
-import eu.eudat.logic.services.ApiContext;
-import eu.eudat.models.data.admin.composite.DatasetProfile;
-import eu.eudat.models.data.helpers.responses.ResponseItem;
-import eu.eudat.models.data.security.Principal;
-import eu.eudat.types.ApiMessageCode;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import javax.transaction.Transactional;
-
-import static eu.eudat.types.Authorities.ADMIN;
-
-@RestController
-@CrossOrigin
-@RequestMapping(value = {"/api/management/"})
-public class ManagementController extends BaseController {
-
-    private DatasetProfileManager datasetProfileManager;
-
-    @Autowired
-    public ManagementController(ApiContext apiContext, DatasetProfileManager datasetProfileManager){
-        super(apiContext);
-        this.datasetProfileManager = datasetProfileManager;
-    }
-
-    @Transactional
-    @RequestMapping(method = RequestMethod.POST, value = {"/addSemantics"})
-    public ResponseEntity addSemanticsInDatasetProfiles(@ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws Exception {
-        try {
-            this.datasetProfileManager.addSemanticsInDatasetProfiles();
-            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Void>().status(ApiMessageCode.SUCCESS_MESSAGE));
-        } catch (Exception exception) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<Void>().status(ApiMessageCode.ERROR_MESSAGE).message(exception.getMessage()));
-        }
-    }
-
-    @Transactional
-    @RequestMapping(method = RequestMethod.POST, value = {"/addRdaInSemantics"})
-    public ResponseEntity addRdaInSemanticsInDatasetProfiles(@ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws Exception {
-        try {
-            this.datasetProfileManager.addRdaInSemanticsInDatasetProfiles();
-            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Void>().status(ApiMessageCode.SUCCESS_MESSAGE));
-        } catch (Exception exception) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<Void>().status(ApiMessageCode.ERROR_MESSAGE).message(exception.getMessage()));
-        }
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/controllers/Prefillings.java

@@ -11,7 +11,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 
 @RestController
@@ -27,8 +26,8 @@ public class Prefillings {
     }
 
     @RequestMapping(method = RequestMethod.GET, value = {"/prefilling/list"}, produces = "application/json")
-    public ResponseEntity<ResponseItem<List<Prefilling>>> getPrefillingList(@RequestParam String like) {
-        List<Prefilling> prefillingList = prefillingManager.getPrefillings(like);
+    public ResponseEntity<ResponseItem<List<Prefilling>>> getPrefillingList(@RequestParam String like, @RequestParam String configId) {
+        List<Prefilling> prefillingList = prefillingManager.getPrefillings(like, configId);
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<Prefilling>>().payload(prefillingList).status(ApiMessageCode.NO_MESSAGE));
     }
 
@@ -37,10 +36,4 @@ public class Prefillings {
         DatasetWizardModel datasetWizardModel = prefillingManager.getPrefilledDataset(id, configId, profileId);
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DatasetWizardModel>().payload(datasetWizardModel).status(ApiMessageCode.NO_MESSAGE));
     }
-
-    @RequestMapping(method = RequestMethod.POST, value = {"/prefilling/generateUsingData"}, produces = "application/json")
-    public ResponseEntity<ResponseItem<DatasetWizardModel>> getPrefillingDataset(@RequestBody Map<String, Object> data, @RequestParam String configId, @RequestParam UUID profileId) throws Exception {
-        DatasetWizardModel datasetWizardModel = prefillingManager.getPrefilledDatasetUsingData(data, configId, profileId);
-        return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DatasetWizardModel>().payload(datasetWizardModel).status(ApiMessageCode.NO_MESSAGE));
-    }
 }

dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java

@@ -1,7 +1,8 @@
 package eu.eudat.controllers;
 
 
-import eu.eudat.data.entities.DescriptionTemplate;
+import eu.eudat.data.entities.Dataset;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.data.entities.Funder;
 import eu.eudat.data.entities.Project;
 import eu.eudat.logic.managers.DatasetManager;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.transaction.Transactional;
 import javax.validation.Valid;
+import java.util.UUID;
 
 @RestController
 @CrossOrigin
@@ -46,9 +48,9 @@ public class QuickWizardController extends BaseController {
         Funder funderEntity;
         //Create Funder
         if (quickWizard.getFunder() == null) {
-            funderEntity = null;
+            throw new Exception("Funder is a mandatory entity");
         } else if (quickWizard.getFunder().getExistFunder() == null && quickWizard.getFunder().getLabel() == null) {
-            funderEntity = null;
+            throw new Exception("Funder is a mandatory entity");
         } else if (quickWizard.getFunder().getExistFunder() == null && quickWizard.getFunder().getLabel() != null) {
             funderEntity = this.quickWizardManager.createOrUpdate(quickWizard.getFunder().toDataFunder(), principal);
         } else {
@@ -58,9 +60,9 @@ public class QuickWizardController extends BaseController {
         eu.eudat.data.entities.Grant grantEntity;
         //Create Grant
         if (quickWizard.getGrant() == null) {
-            grantEntity = null;
+            throw new Exception("Grant is a mandatory entity");
         } else if (quickWizard.getGrant().getExistGrant() == null && quickWizard.getGrant().getLabel() == null) {
-            grantEntity = null;
+            throw new Exception("Grant is a mandatory entity");
         } else if (quickWizard.getGrant().getExistGrant() == null) {
             grantEntity = this.quickWizardManager.createOrUpdate(quickWizard.getGrant().toDataGrant(), principal);
         } else {
@@ -86,7 +88,7 @@ public class QuickWizardController extends BaseController {
         quickWizard.getDmp().setId(dmpEntity.getId());
         for (DatasetDescriptionQuickWizardModel dataset : quickWizard.getDatasets().getDatasetsList()) {
             DataManagementPlan dmp = quickWizard.getDmp().toDataDmp(grantEntity, projectEntity, principal);
-            DescriptionTemplate profile = quickWizard.getDmp().getDatasetProfile();
+            DatasetProfile profile = quickWizard.getDmp().getDatasetProfile();
             DatasetWizardModel datasetWizardModel = dataset.toDataModel(dmp, profile);
             this.datasetManager.createOrUpdate(datasetWizardModel, principal);
         }
@@ -98,7 +100,7 @@ public class QuickWizardController extends BaseController {
     public @ResponseBody
     ResponseEntity<ResponseItem<DatasetCreateWizardModel>> addDatasetWizard(@RequestBody DatasetCreateWizardModel datasetCreateWizardModel, Principal principal) throws Exception{
         for(DatasetDescriptionQuickWizardModel dataset : datasetCreateWizardModel.getDatasets().getDatasetsList()){
-            DescriptionTemplate profile = new DescriptionTemplate();
+            DatasetProfile profile = new DatasetProfile();
             profile.setId(datasetCreateWizardModel.getDmpMeta().getDatasetProfile().getId());
             profile.setLabel(datasetCreateWizardModel.getDmpMeta().getDatasetProfile().getLabel());
             this.datasetManager.createOrUpdate(dataset.toDataModel(datasetCreateWizardModel.getDmpMeta().getDmp(), profile), principal);

dmp-backend/web/src/main/java/eu/eudat/controllers/Saml2MetadataController.java

@@ -1,79 +0,0 @@
-package eu.eudat.controllers;
-
-import eu.eudat.logic.proxy.config.configloaders.ConfigLoader;
-import eu.eudat.logic.security.customproviders.ConfigurableProvider.entities.saml2.Saml2ConfigurableProvider;
-import eu.eudat.logic.security.validators.configurableProvider.Saml2SSOUtils;
-import eu.eudat.logic.services.ApiContext;
-import eu.eudat.models.data.helpers.responses.ResponseItem;
-import eu.eudat.models.data.saml2.AuthnRequestModel;
-import eu.eudat.types.ApiMessageCode;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.nio.charset.StandardCharsets;
-
-@RestController
-@CrossOrigin
-@RequestMapping(value = {"/api/saml2/"})
-public class Saml2MetadataController extends BaseController {
-
-    private final ConfigLoader configLoader;
-
-    @Autowired
-    public Saml2MetadataController(ApiContext apiContext, ConfigLoader configLoader) {
-        super(apiContext);
-        this.configLoader = configLoader;
-    }
-
-    @RequestMapping(method = RequestMethod.GET, value = {"metadata/{configurableProviderId}"})
-    public @ResponseBody
-    ResponseEntity getMetadata(@PathVariable String configurableProviderId) {
-        Saml2ConfigurableProvider saml2ConfigurableProvider = (Saml2ConfigurableProvider) this.configLoader.getConfigurableProviders().getProviders().stream()
-                .filter(prov -> prov.getConfigurableLoginId().equals(configurableProviderId))
-                .findFirst().orElse(null);
-        if (saml2ConfigurableProvider != null) {
-            try {
-                String metadataXml = Saml2SSOUtils.getMetadata(saml2ConfigurableProvider);
-                HttpHeaders responseHeaders = new HttpHeaders();
-                responseHeaders.setContentLength(metadataXml.length());
-                responseHeaders.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-                responseHeaders.set("Content-Disposition", "attachment;filename=" + configurableProviderId + ".xml");
-                responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition");
-                responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type");
-                return new ResponseEntity<>(metadataXml.getBytes(StandardCharsets.UTF_8),
-                        responseHeaders,
-                        HttpStatus.OK);
-            } catch (Exception e) {
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<String>().status(ApiMessageCode.ERROR_MESSAGE).message("Failed to fetch metadata."));
-            }
-        }
-        else {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<String>().status(ApiMessageCode.ERROR_MESSAGE).message("Failed to fetch metadata."));
-        }
-    }
-    @RequestMapping(method = RequestMethod.GET, value = {"authnRequest/{configurableProviderId}"})
-    public @ResponseBody
-    ResponseEntity getAuthnRequest(@PathVariable String configurableProviderId) {
-        Saml2ConfigurableProvider saml2ConfigurableProvider = (Saml2ConfigurableProvider) this.configLoader.getConfigurableProviders().getProviders().stream()
-                .filter(prov -> prov.getConfigurableLoginId().equals(configurableProviderId))
-                .findFirst().orElse(null);
-        if (saml2ConfigurableProvider != null) {
-            try {
-                AuthnRequestModel authnRequest = Saml2SSOUtils.getAuthnRequest(saml2ConfigurableProvider);
-                return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<AuthnRequestModel>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created").payload(authnRequest));
-            }
-            catch (Exception e) {
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<String>().status(ApiMessageCode.ERROR_MESSAGE).message("Failed to create authentication request."));
-            }
-
-        }
-        else {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<String>().status(ApiMessageCode.ERROR_MESSAGE).message("Unknown provider."));
-        }
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/controllers/TermsOfServiceController.java

@@ -1,38 +0,0 @@
-package eu.eudat.controllers;
-
-import eu.eudat.logic.managers.MaterialManager;
-import eu.eudat.logic.managers.MetricsManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Objects;
-import java.util.stream.Stream;
-
-@RestController
-@CrossOrigin
-@RequestMapping(value = {"/api/material/termsofservice/"})
-public class TermsOfServiceController {
-
-    private Environment environment;
-    private MaterialManager materialManager;
-
-    @Autowired
-    public TermsOfServiceController(Environment environment, MaterialManager materialManager, MetricsManager metricsManager) {
-        this.environment = environment;
-        this.materialManager = materialManager;
-    }
-
-    @RequestMapping(path = "{lang}", method = RequestMethod.GET )
-    public ResponseEntity<byte[]> getTermsOfService(@PathVariable(name = "lang") String lang) throws IOException {
-        try (Stream<Path> paths = Files.walk(Paths.get(Objects.requireNonNull(this.environment.getProperty("termsofservice.path"))))) {
-            return this.materialManager.getResponseEntity(lang, paths);
-        }
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/controllers/UserGuideController.java

@@ -1,6 +1,5 @@
 package eu.eudat.controllers;
 
-import eu.eudat.logic.managers.MaterialManager;
 import eu.eudat.logic.managers.MetricsManager;
 import eu.eudat.logic.security.claims.ClaimedAuthorities;
 import eu.eudat.models.data.helpers.responses.ResponseItem;
@@ -33,19 +32,47 @@ import static eu.eudat.types.Authorities.ADMIN;
 public class UserGuideController {
 
 	private Environment environment;
-	private MaterialManager materialManager;
+	private final MetricsManager metricsManager;
 
 	@Autowired
-	public UserGuideController(Environment environment, MaterialManager materialManager, MetricsManager metricsManager) {
+	public UserGuideController(Environment environment, MetricsManager metricsManager) {
 		this.environment = environment;
-		this.materialManager = materialManager;
+		this.metricsManager = metricsManager;
 	}
 
 	@RequestMapping(path = "{lang}", method = RequestMethod.GET )
-	public ResponseEntity<byte[]> getUserGuide(@PathVariable(name = "lang") String lang) throws IOException {
-		try (Stream<Path> paths = Files.walk(Paths.get(Objects.requireNonNull(this.environment.getProperty("userguide.path"))))) {
-			return this.materialManager.getResponseEntity(lang, paths);
+	public ResponseEntity getUserGuide(@PathVariable(name = "lang") String lang) throws IOException {
+		long files = 0;
+		try (Stream<Path> paths = Files.list(Paths.get(Objects.requireNonNull(this.environment.getProperty("userguide.path"))))) {
+			files = paths.count();
 		}
+			metricsManager.calculateValue(MetricNames.LANGUAGES, (int) files, null);
+		try (Stream<Path> paths = Files.walk(Paths.get(Objects.requireNonNull(this.environment.getProperty("userguide.path"))))) {
+			List<String> result = paths.filter(Files::isRegularFile)
+					.map(Path::toString).collect(Collectors.toList());
+
+			String fileName = result.stream().filter(guide -> guide.contains("_" + lang)).findFirst().orElse(null);
+			if (fileName == null) {
+				fileName = result.stream().filter(guide -> guide.contains("_en")).findFirst().get();
+			}
+			InputStream is = new FileInputStream(fileName);
+
+			Path path = Paths.get(fileName);
+
+			HttpHeaders responseHeaders = new HttpHeaders();
+			responseHeaders.setContentLength(is.available());
+			responseHeaders.setContentType(MediaType.TEXT_HTML);
+			responseHeaders.set("Content-Disposition", "attachment;filename=" + path.getFileName().toString());
+			responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition");
+			responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type");
+
+			byte[] content = new byte[is.available()];
+			is.read(content);
+			is.close();
+
+			return new ResponseEntity<>(content, responseHeaders, HttpStatus.OK);
+		}
+
 	}
 
 	@RequestMapping(value = "current", method = RequestMethod.POST)

dmp-backend/web/src/main/java/eu/eudat/controllers/Users.java

@@ -88,6 +88,16 @@ public class Users extends BaseController {
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<UserListingModel>>().payload(dataTable).status(ApiMessageCode.NO_MESSAGE));
     }
 
+    @RequestMapping(method = RequestMethod.GET, value = {"/hasDOIToken"}, consumes = "application/json", produces = "application/json")
+    public @ResponseBody
+    ResponseEntity<ResponseItem<Boolean>> hasDOIToken(Principal principal) throws NullEmailException {
+        try {
+            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Boolean>().payload(this.userManager.isDOITokenValid(principal)).status(ApiMessageCode.NO_MESSAGE));
+        } catch (NonValidTokenException | ExpiredTokenException | IOException e) {
+            return ResponseEntity.status(460).body(new ResponseItem<Boolean>().payload(false).status(ApiMessageCode.ERROR_MESSAGE).message(e.getMessage()));
+        }
+    }
+
     @Transactional
     @RequestMapping(method = RequestMethod.POST, value = {"/registerDOIToken"}, consumes = "application/json", produces = "application/json")
     public @ResponseBody

dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java

@@ -1,11 +1,9 @@
 package eu.eudat.controllers.controllerhandler;
 
 
-import eu.eudat.logic.security.claims.ClaimedAuthorities;
 import eu.eudat.models.data.helpers.responses.ResponseItem;
 import eu.eudat.models.data.security.Principal;
 import eu.eudat.types.ApiMessageCode;
-import eu.eudat.types.Authorities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
@@ -27,7 +25,7 @@ public class ControllerErrorHandler {
     @ExceptionHandler(Exception.class)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ResponseBody
-    public ResponseItem<Exception> processValidationError( Exception ex) throws Exception {
+    public ResponseItem<Exception> processValidationError(Principal principal, Exception ex) throws Exception {
         logger.error(ex.getMessage(), ex);
         return new ResponseItem<Exception>().message(ex.getMessage()).status(ApiMessageCode.DEFAULT_ERROR_MESSAGE);
     }

dmp-backend/web/src/main/java/eu/eudat/criteria/RecentActivityCriteria.java

@@ -3,7 +3,6 @@ package eu.eudat.criteria;
 public class RecentActivityCriteria {
 	private String like;
 	private String order;
-	private Integer status;
 
 	public String getLike() {
 		return like;
@@ -20,12 +19,4 @@ public class RecentActivityCriteria {
 	public void setOrder(String order) {
 		this.order = order;
 	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
 }

dmp-backend/web/src/main/java/eu/eudat/exceptions/descriptiontemplate/DescriptionTemplatesWithTypeException.java

@@ -1,9 +0,0 @@
-package eu.eudat.exceptions.descriptiontemplate;
-
-public class DescriptionTemplatesWithTypeException extends RuntimeException {
-
-    public DescriptionTemplatesWithTypeException(String message) {
-        super(message);
-    }
-
-}

dmp-backend/web/src/main/java/eu/eudat/exceptions/dmpblueprint/DmpBlueprintUsedException.java

@@ -1,18 +0,0 @@
-package eu.eudat.exceptions.dmpblueprint;
-
-public class DmpBlueprintUsedException extends RuntimeException {
-    public DmpBlueprintUsedException() {
-    }
-
-    public DmpBlueprintUsedException(String message) {
-        super(message);
-    }
-
-    public DmpBlueprintUsedException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public DmpBlueprintUsedException(Throwable cause) {
-        super(cause);
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/DatasetProfileBuilder.java

@@ -1,9 +1,8 @@
 package eu.eudat.logic.builders.entity;
 
-import eu.eudat.data.entities.DescriptionTemplate;
-import eu.eudat.data.entities.DescriptionTemplateType;
 import eu.eudat.logic.builders.Builder;
 import eu.eudat.data.entities.Dataset;
+import eu.eudat.data.entities.DatasetProfile;
 
 import java.util.Date;
 import java.util.Set;
@@ -12,14 +11,12 @@ import java.util.UUID;
 /**
  * Created by ikalyvas on 2/15/2018.
  */
-public class DatasetProfileBuilder extends Builder<DescriptionTemplate> {
+public class DatasetProfileBuilder extends Builder<DatasetProfile> {
 
     private UUID id;
 
     private String label;
 
-    private DescriptionTemplateType type;
-
     private Set<Dataset> dataset;
 
     private String definition;
@@ -44,11 +41,6 @@ public class DatasetProfileBuilder extends Builder<DescriptionTemplate> {
         return this;
     }
 
-    public DatasetProfileBuilder type(DescriptionTemplateType type) {
-        this.type = type;
-        return this;
-    }
-
     public DatasetProfileBuilder dataset(Set<Dataset> dataset) {
         this.dataset = dataset;
         return this;
@@ -85,18 +77,17 @@ public class DatasetProfileBuilder extends Builder<DescriptionTemplate> {
     }
 
     @Override
-    public DescriptionTemplate build() {
-        DescriptionTemplate descriptionTemplate = new DescriptionTemplate();
-        descriptionTemplate.setCreated(created);
-        descriptionTemplate.setStatus(status);
-        descriptionTemplate.setId(id);
-        descriptionTemplate.setDataset(dataset);
-        descriptionTemplate.setDefinition(definition);
-        descriptionTemplate.setDescription(description);
-        descriptionTemplate.setModified(modified);
-        descriptionTemplate.setLabel(label);
-        descriptionTemplate.setLanguage(language);
-        descriptionTemplate.setType(type);
-        return descriptionTemplate;
+    public DatasetProfile build() {
+        DatasetProfile datasetProfile = new DatasetProfile();
+        datasetProfile.setCreated(created);
+        datasetProfile.setStatus(status);
+        datasetProfile.setId(id);
+        datasetProfile.setDataset(dataset);
+        datasetProfile.setDefinition(definition);
+        datasetProfile.setDescription(description);
+        datasetProfile.setModified(modified);
+        datasetProfile.setLabel(label);
+        datasetProfile.setLanguage(language);
+        return datasetProfile;
     }
 }

dmp-backend/web/src/main/java/eu/eudat/logic/managers/AdminManager.java

@@ -2,8 +2,6 @@ package eu.eudat.logic.managers;
 
 import eu.eudat.data.dao.entities.DatasetDao;
 import eu.eudat.data.dao.entities.DatasetProfileDao;
-import eu.eudat.data.entities.DescriptionTemplate;
-import eu.eudat.data.entities.DescriptionTemplateType;
 import eu.eudat.exceptions.datasetprofile.DatasetProfileWithDatasetsExeption;
 import eu.eudat.logic.builders.entity.DatasetProfileBuilder;
 import eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel;
@@ -19,9 +17,8 @@ import java.util.UUID;
 
 public class AdminManager {
 
-    public static DescriptionTemplate generateViewStyleDefinition(DatasetProfile profile, ApiContext apiContext) throws Exception {
+    public static eu.eudat.data.entities.DatasetProfile generateViewStyleDefinition(DatasetProfile profile, ApiContext apiContext) {
         ViewStyleModel viewStyleModel = new ViewStyleModel();
-        viewStyleModel.setEnablePrefilling(profile.isEnablePrefilling());
         viewStyleModel.setSections(new ModelBuilder().toViewStyleDefinition(profile.getSections(), eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Section.class));
         viewStyleModel.setPages(new ModelBuilder().toViewStyleDefinition(profile.getPages(), eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Page.class));
         Document viewStyleDoc = XmlBuilder.getDocument();
@@ -37,31 +34,22 @@ public class AdminManager {
             profile.setLanguage("en");
         }
 
-        DescriptionTemplateType type;
-        try {
-            type = apiContext.getOperationsContext().getDatabaseRepository().getDescriptionTemplateTypeDao().findFromName(profile.getType());
-        }
-        catch (Exception e) {
-            throw new Exception("Description template type '" + profile.getType() + "' could not be found.");
-        }
-
-        DescriptionTemplate descriptionTemplate = apiContext.getOperationsContext().getBuilderFactory().getBuilder(DatasetProfileBuilder.class).definition(xml).label(profile.getLabel())
+        eu.eudat.data.entities.DatasetProfile datasetProfile = apiContext.getOperationsContext().getBuilderFactory().getBuilder(DatasetProfileBuilder.class).definition(xml).label(profile.getLabel())
                 .status(profile.getStatus()).created(new Date()).description(profile.getDescription()).language(profile.getLanguage())
-                .type(type)
                 .build();
 
-        if (descriptionTemplate.getGroupId() == null) {
-            descriptionTemplate.setGroupId(UUID.randomUUID());
+        if (datasetProfile.getGroupId() == null) {
+            datasetProfile.setGroupId(UUID.randomUUID());
         }
 
-        if (descriptionTemplate.getVersion() == null) {
-            descriptionTemplate.setVersion((short)1);
+        if (datasetProfile.getVersion() == null) {
+            datasetProfile.setVersion((short)1);
         }
 
-        return descriptionTemplate;
+        return datasetProfile;
     }
 
-    public static eu.eudat.models.data.admin.composite.DatasetProfile generateDatasetProfileModel(DescriptionTemplate profile) {
+    public static eu.eudat.models.data.admin.composite.DatasetProfile generateDatasetProfileModel(eu.eudat.data.entities.DatasetProfile profile) {
         Document viewStyleDoc = XmlBuilder.fromXml(profile.getDefinition());
         Element root = viewStyleDoc.getDocumentElement();
         eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel viewstyle = new eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel().fromXml(root);
@@ -72,12 +60,12 @@ public class AdminManager {
     }
 
 
-    public static DescriptionTemplate inactivate(DatasetProfileDao datasetProfileRepository, DatasetDao datasetDao, String id) {
+    public static eu.eudat.data.entities.DatasetProfile inactivate(DatasetProfileDao datasetProfileRepository, DatasetDao datasetDao, String id) {
         eu.eudat.data.dao.criteria.DatasetCriteria datasetsForThatDatasetProfile = new eu.eudat.data.dao.criteria.DatasetCriteria();
         datasetsForThatDatasetProfile.setProfileDatasetId(UUID.fromString(id));
         if (datasetDao.getWithCriteria(datasetsForThatDatasetProfile).count() == 0) {
-            DescriptionTemplate detasetProfile = datasetProfileRepository.find(UUID.fromString(id));
-            detasetProfile.setStatus(DescriptionTemplate.Status.DELETED.getValue());
+            eu.eudat.data.entities.DatasetProfile detasetProfile = datasetProfileRepository.find(UUID.fromString(id));
+            detasetProfile.setStatus(eu.eudat.data.entities.DatasetProfile.Status.DELETED.getValue());
             detasetProfile = datasetProfileRepository.createOrUpdate(detasetProfile);
             return detasetProfile;
         } else {

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java

@@ -91,9 +91,7 @@ public class DashBoardManager {
         for (DMP dmp : dmps) {
             numberOfDatasets = numberOfDatasets + dmp.getDataset().stream()
                     .filter(item -> item.getStatus() == Dataset.Status.FINALISED.getValue()).count();
-            if (dmp.getGrant() != null) {
-                grants.add(dmp.getGrant());
-            }
+            grants.add(dmp.getGrant());
         }
 
         statistics.setTotalDataManagementPlanCount((long) dmps.size());
@@ -202,14 +200,14 @@ public class DashBoardManager {
                 .selectAsync(item -> recentActivityDataBuilder.label(item.getLabel()).timestamp(item.getModified()).id(item.getId().toString()).build())
                 .whenComplete((datasetActivities, throwable) -> activity.setRecentDatasetActivities(datasetActivities));
 
-        /*CompletableFuture<List<RecentActivityData>> grants = grantRepository.getAuthenticated(grantRepository.getWithCriteria(grantCriteria), user)
+        CompletableFuture<List<RecentActivityData>> grants = grantRepository.getAuthenticated(grantRepository.getWithCriteria(grantCriteria), user)
                 .withHint("grantRecentActivity")
                 .orderBy((builder, root) -> builder.desc(root.get("modified")))
                 .take(numberofactivities)
                 .selectAsync(item -> recentActivityDataBuilder.label(item.getLabel()).timestamp(item.getModified()).id(item.getId().toString()).build())
-                .whenComplete((grantActivities, throwable) -> activity.setRecentGrantActivities(grantActivities));*/
+                .whenComplete((grantActivities, throwable) -> activity.setRecentGrantActivities(grantActivities));
 
-        CompletableFuture.allOf(/*grants, */dmps, datasets).join();
+        CompletableFuture.allOf(grants, dmps, datasets).join();
         return activity;
     }
 
@@ -223,17 +221,11 @@ public class DashBoardManager {
         }
         DatasetCriteria datasetCriteria = new DatasetCriteria();
         datasetCriteria.setLike(tableRequest.getCriteria().getLike());
-        if(tableRequest.getCriteria().getStatus() != null) {
-            datasetCriteria.setStatus(tableRequest.getCriteria().getStatus());
-        }
         datasetCriteria.setAllVersions(false);
         datasetCriteria.setIsPublic(!isAuthenticated);
         DataManagementPlanCriteria dataManagementPlanCriteria = new DataManagementPlanCriteria();
         dataManagementPlanCriteria.setAllVersions(false);
         dataManagementPlanCriteria.setLike(tableRequest.getCriteria().getLike());
-        if(tableRequest.getCriteria().getStatus() != null) {
-            dataManagementPlanCriteria.setStatus(tableRequest.getCriteria().getStatus());
-        }
         dataManagementPlanCriteria.setIsPublic(!isAuthenticated);
         dataManagementPlanCriteria.setOnlyPublic(!isAuthenticated);
 

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementProfileManager.java

@@ -2,29 +2,21 @@ package eu.eudat.logic.managers;
 
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
-import eu.eudat.data.dao.criteria.DataManagementPlanCriteria;
 import eu.eudat.data.dao.criteria.RequestItem;
-import eu.eudat.data.dao.entities.DatasetDao;
-import eu.eudat.data.dao.entities.DatasetProfileDao;
+import eu.eudat.data.dao.entities.DMPProfileDao;
 import eu.eudat.data.entities.DMPProfile;
-import eu.eudat.data.entities.DescriptionTemplate;
-import eu.eudat.data.query.items.dmpblueprint.DataManagementPlanBlueprintTableRequest;
 import eu.eudat.data.query.items.item.dmpprofile.DataManagementPlanProfileCriteriaRequest;
 import eu.eudat.data.query.items.table.dmpprofile.DataManagementPlanProfileTableRequest;
-import eu.eudat.exceptions.datasetprofile.DatasetProfileWithDatasetsExeption;
-import eu.eudat.exceptions.dmpblueprint.DmpBlueprintUsedException;
 import eu.eudat.logic.services.operations.DatabaseRepository;
 import eu.eudat.logic.utilities.builders.XmlBuilder;
 import eu.eudat.logic.utilities.documents.helpers.FileEnvelope;
-import eu.eudat.logic.utilities.documents.xml.dmpXml.ExportXmlBuilderDmpBlueprint;
-import eu.eudat.logic.utilities.documents.xml.dmpXml.ImportXmlBuilderDmpBlueprint;
-import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.*;
-import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.types.FieldCategory;
-import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.types.SystemFieldType;
+import eu.eudat.logic.utilities.documents.xml.dmpXml.ExportXmlBuilderDmpProfile;
+import eu.eudat.logic.utilities.documents.xml.dmpXml.ImportXmlBuilderDmpProfile;
+import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DmpProfileExternalAutoComplete;
+import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.Field;
 import eu.eudat.models.data.helpermodels.Tuple;
 import eu.eudat.models.data.helpers.common.AutoCompleteLookupItem;
 import eu.eudat.models.data.helpers.common.DataTableData;
-import eu.eudat.models.data.listingmodels.DataManagementPlanBlueprintListingModel;
 import eu.eudat.models.data.listingmodels.DataManagementPlanProfileListingModel;
 import eu.eudat.models.data.security.Principal;
 import eu.eudat.queryable.QueryableList;
@@ -86,20 +78,6 @@ public class DataManagementProfileManager {
         return dataTable;
     }
 
-    public DataTableData<DataManagementPlanBlueprintListingModel> getPagedBlueprint(DataManagementPlanBlueprintTableRequest dataManagementPlanBlueprintTableRequest, Principal principal) throws Exception {
-
-        QueryableList<DMPProfile> items = apiContext.getOperationsContext().getDatabaseRepository().getDmpProfileDao().getWithCriteriaBlueprint(dataManagementPlanBlueprintTableRequest.getCriteria());
-        QueryableList<DMPProfile> pagedItems = PaginationManager.applyPaging(items, dataManagementPlanBlueprintTableRequest);
-
-        DataTableData<DataManagementPlanBlueprintListingModel> dataTable = new DataTableData<>();
-
-        CompletableFuture itemsFuture = pagedItems
-                .selectAsync(item -> new DataManagementPlanBlueprintListingModel().fromDataModel(item)).whenComplete((resultList, throwable) -> dataTable.setData(resultList));
-        CompletableFuture countFuture = items.countAsync().whenComplete((count, throwable) -> dataTable.setTotalCount(count));
-        CompletableFuture.allOf(itemsFuture, countFuture).join();
-        return dataTable;
-    }
-
     public DataManagementPlanProfileListingModel getSingle(String id, Principal principal) throws InstantiationException, IllegalAccessException {
         DMPProfile dmpProfile = databaseRepository.getDmpProfileDao().find(UUID.fromString(id));
         DataManagementPlanProfileListingModel dataManagementPlanProfileListingModel = new DataManagementPlanProfileListingModel();
@@ -107,45 +85,6 @@ public class DataManagementProfileManager {
         return dataManagementPlanProfileListingModel;
     }
 
-    public DataManagementPlanBlueprintListingModel getSingleBlueprint(String id, Principal principal) {
-        DMPProfile dmpProfile = databaseRepository.getDmpProfileDao().find(UUID.fromString(id));
-        DataManagementPlanBlueprintListingModel dataManagementPlanBlueprintListingModel = new DataManagementPlanBlueprintListingModel();
-        dataManagementPlanBlueprintListingModel.fromDataModel(dmpProfile);
-        return dataManagementPlanBlueprintListingModel;
-    }
-
-    public boolean fieldInBlueprint(String id, SystemFieldType type, Principal principal) {
-        DMPProfile dmpProfile = databaseRepository.getDmpProfileDao().find(UUID.fromString(id));
-        return this.fieldInBlueprint(dmpProfile, type, principal);
-    }
-
-    public boolean fieldInBlueprint(DMPProfile dmpProfile, SystemFieldType type, Principal principal) {
-        DataManagementPlanBlueprintListingModel dmpBlueprint = new DataManagementPlanBlueprintListingModel();
-        dmpBlueprint.fromDataModel(dmpProfile);
-        for(Section section: dmpBlueprint.getDefinition().getSections()){
-            for(FieldModel field: section.getFields()){
-                if(field.getCategory().equals(FieldCategory.SYSTEM)){
-                    SystemField systemField = field.toSystemField();
-                    if(systemField.getType().equals(type)){
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    public List<Integer> sectionIndexesForDescriptionTemplate(DMPProfile dmpProfile, UUID descriptionTemplateId) {
-        DataManagementPlanBlueprintListingModel dmpBlueprint = new DataManagementPlanBlueprintListingModel();
-        dmpBlueprint.fromDataModel(dmpProfile);
-        List<Integer> sectionIndexes = new ArrayList<>();
-        for(int i = 0; i < dmpBlueprint.getDefinition().getSections().size(); i++) {
-            Section section = dmpBlueprint.getDefinition().getSections().get(i);
-            if(section.getHasTemplates() && section.getDescriptionTemplates().stream().anyMatch(x -> x.getDescriptionTemplateId().equals(descriptionTemplateId))) sectionIndexes.add(i);
-        }
-        return sectionIndexes;
-    }
-
     public List<DataManagementPlanProfileListingModel> getWithCriteria(DataManagementPlanProfileCriteriaRequest dataManagementPlanProfileCriteriaRequest) throws IllegalAccessException, InstantiationException {
         QueryableList<DMPProfile> items = databaseRepository.getDmpProfileDao().getWithCriteria(dataManagementPlanProfileCriteriaRequest.getCriteria());
         List<DataManagementPlanProfileListingModel> datamanagementPlans = items.select(item -> new DataManagementPlanProfileListingModel().fromDataModel(item));
@@ -157,25 +96,8 @@ public class DataManagementProfileManager {
         apiContext.getOperationsContext().getDatabaseRepository().getDmpProfileDao().createOrUpdate(dmpProfile);
     }
 
-    public void createOrUpdateBlueprint(DataManagementPlanBlueprintListingModel dataManagementPlanBlueprintListingModel, Principal principal) throws Exception {
-        DMPProfile dmpProfile = dataManagementPlanBlueprintListingModel.toDataModel();
-        apiContext.getOperationsContext().getDatabaseRepository().getDmpProfileDao().createOrUpdate(dmpProfile);
-    }
-
-    public void inactivate(String id) {
-        DMPProfile dmpProfile = databaseRepository.getDmpProfileDao().find(UUID.fromString(id));
-        DataManagementPlanCriteria dataManagementPlanCriteria = new DataManagementPlanCriteria();
-        dataManagementPlanCriteria.setProfile(dmpProfile);
-        if (dmpProfile.getStatus() == DMPProfile.Status.SAVED.getValue() || databaseRepository.getDmpDao().getWithCriteria(dataManagementPlanCriteria).count() == 0) {
-            dmpProfile.setStatus(DMPProfile.Status.DELETED.getValue());
-            databaseRepository.getDmpProfileDao().createOrUpdate(dmpProfile);
-        } else {
-            throw new DmpBlueprintUsedException("This blueprint can not deleted, because DMPs are associated with it");
-        }
-    }
-
-    public ResponseEntity<byte[]> getDocument(DataManagementPlanBlueprintListingModel dmpProfile) throws IOException {
-        FileEnvelope envelope = getXmlDocument(dmpProfile);
+    public ResponseEntity<byte[]> getDocument(DataManagementPlanProfileListingModel dmpProfile, String label) throws IllegalAccessException, IOException, InstantiationException {
+        FileEnvelope envelope = getXmlDocument(dmpProfile, label);
         InputStream resource = new FileInputStream(envelope.getFile());
         logger.info("Mime Type of " + envelope.getFilename() + " is " +
                 new MimetypesFileTypeMap().getContentType(envelope.getFile()));
@@ -194,18 +116,18 @@ public class DataManagementProfileManager {
                 HttpStatus.OK);
     }
 
-    public FileEnvelope getXmlDocument(DataManagementPlanBlueprintListingModel dmpProfile) throws IOException {
-        ExportXmlBuilderDmpBlueprint xmlBuilder = new ExportXmlBuilderDmpBlueprint();
+    public FileEnvelope getXmlDocument(DataManagementPlanProfileListingModel dmpProfile, String label) throws InstantiationException, IllegalAccessException, IOException {
+        ExportXmlBuilderDmpProfile xmlBuilder = new ExportXmlBuilderDmpProfile();
         File file = xmlBuilder.build(dmpProfile, environment);
         FileEnvelope fileEnvelope = new FileEnvelope();
         fileEnvelope.setFile(file);
-        fileEnvelope.setFilename(dmpProfile.getLabel());
+        fileEnvelope.setFilename(label);
         return fileEnvelope;
     }
 
 
-    public eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel.DmpBlueprint createDmpProfileFromXml(MultipartFile multiPartFile) {
-        ImportXmlBuilderDmpBlueprint xmlBuilder = new ImportXmlBuilderDmpBlueprint();
+    public eu.eudat.logic.utilities.documents.xml.dmpXml.dmpProfileModel.DmpProfile createDmpProfileFromXml(MultipartFile multiPartFile) {
+        ImportXmlBuilderDmpProfile xmlBuilder = new ImportXmlBuilderDmpProfile();
         try {
             return xmlBuilder.build(convert(multiPartFile));
         } catch (IOException e) {

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java

@@ -289,45 +289,6 @@ public class DatasetManager {
                                     .stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId())
                                     .collect(Collectors.toList()).size() == 0 && !datasetEntity.getDmp().isPublic())
             throw new UnauthorisedException();
-        dataset.setDatasetProfileDefinition(getPagedProfile(dataset, datasetEntity));
-        dataset.fromDataModel(datasetEntity);
-
-        // Creates the Criteria to get all version of DescriptionTemplate in question.
-        DatasetProfileCriteria profileCriteria = new DatasetProfileCriteria();
-        UUID profileId = datasetEntity.getProfile().getGroupId();
-        List<UUID> uuidList = new LinkedList<>();
-        uuidList.add(profileId);
-        profileCriteria.setGroupIds(uuidList);
-        profileCriteria.setAllVersions(true);
-
-        List<DescriptionTemplate> profileVersions = databaseRepository.getDatasetProfileDao().getWithCriteria(profileCriteria)
-                .orderBy(((builder, root) -> builder.desc(root.get("version"))))
-                .toList();
-        List<DescriptionTemplate> profileVersionsIncluded = new LinkedList<>();
-
-        // Iterate through the versions and remove those that are not included in the DMP of the dataset in question.
-        for (DescriptionTemplate version : profileVersions) {
-            for (AssociatedProfile p : dataset.getDmp().getProfiles()) {
-                if (version.getId().toString().equals(p.getDescriptionTemplateId().toString())) {
-                    profileVersionsIncluded.add(version);
-                }
-            }
-        }
-
-        // Sort the list with the included Versions.
-        Stream<DescriptionTemplate> sorted = profileVersionsIncluded.stream().sorted(Comparator.comparing(DescriptionTemplate::getVersion).reversed());
-
-        // Make the Stream into List and get the first item.
-        List<DescriptionTemplate> profiles = sorted.collect(Collectors.toList());
-        if (profiles.isEmpty())
-            throw new NoSuchElementException("No profiles found for the specific Dataset");
-
-        DescriptionTemplate profile = profiles.get(0);
-
-        // Check if the dataset is on the latest Version.
-        boolean latestVersion = profile.getVersion().toString().equals(datasetEntity.getProfile().getVersion().toString());
-        dataset.setIsProfileLatestVersion(latestVersion);
-
         eu.eudat.elastic.entities.Dataset datasetElastic;
         try {
             datasetElastic = datasetRepository.exists() ?
@@ -336,6 +297,45 @@ public class DatasetManager {
             logger.warn(ex.getMessage());
             datasetElastic = null;
         }
+        dataset.setDatasetProfileDefinition(getPagedProfile(dataset, datasetEntity));
+        dataset.fromDataModel(datasetEntity);
+
+        // Creates the Criteria to get all version of DatasetProfile in question.
+        DatasetProfileCriteria profileCriteria = new DatasetProfileCriteria();
+        UUID profileId = datasetEntity.getProfile().getGroupId();
+        List<UUID> uuidList = new LinkedList<>();
+        uuidList.add(profileId);
+        profileCriteria.setGroupIds(uuidList);
+        profileCriteria.setAllVersions(true);
+
+        List<eu.eudat.data.entities.DatasetProfile> profileVersions = databaseRepository.getDatasetProfileDao().getWithCriteria(profileCriteria)
+                .orderBy(((builder, root) -> builder.desc(root.get("version"))))
+                .toList();
+        List<DatasetProfile> profileVersionsIncluded = new LinkedList<>();
+
+        // Iterate through the versions and remove those that are not included in the DMP of the dataset in question.
+        for (DatasetProfile version : profileVersions) {
+            for (AssociatedProfile p : dataset.getDmp().getProfiles()) {
+                if (version.getId().toString().equals(p.getId().toString())) {
+                    profileVersionsIncluded.add(version);
+                }
+            }
+        }
+
+        // Sort the list with the included Versions.
+        Stream<DatasetProfile> sorted = profileVersionsIncluded.stream().sorted(Comparator.comparing(DatasetProfile::getVersion).reversed());
+
+        // Make the Stream into List and get the first item.
+        List<DatasetProfile> profiles = sorted.collect(Collectors.toList());
+        if (profiles.isEmpty())
+            throw new NoSuchElementException("No profiles found for the specific Dataset");
+
+        DatasetProfile profile = profiles.get(0);
+
+        // Check if the dataset is on the latest Version.
+        boolean latestVersion = profile.getVersion().toString().equals(datasetEntity.getProfile().getVersion().toString());
+        dataset.setIsProfileLatestVersion(latestVersion);
+
         if (datasetElastic != null && datasetElastic.getTags() != null && !datasetElastic.getTags().isEmpty()) {
             dataset.setTags(datasetElastic.getTags());
         }
@@ -397,7 +397,7 @@ public class DatasetManager {
     }
 
     private XWPFDocument getWordDocument(ConfigLoader configLoader, eu.eudat.data.entities.Dataset datasetEntity, VisibilityRuleService visibilityRuleService, Principal principal) throws IOException {
-        WordBuilder wordBuilder = new WordBuilder(this.environment, configLoader);
+        WordBuilder wordBuilder = new WordBuilder(this.environment);
         DatasetWizardModel dataset = new DatasetWizardModel();
         XWPFDocument document = configLoader.getDatasetDocument();
 
@@ -406,7 +406,7 @@ public class DatasetManager {
         if (!dmpEntity.isPublic() && dmpEntity.getUsers().stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId()).collect(Collectors.toList()).size() == 0)
             throw new UnauthorisedException();
 
-        wordBuilder.fillFirstPage(dmpEntity, datasetEntity, document, true);
+        wordBuilder.fillFirstPage(dmpEntity, datasetEntity, document);
         wordBuilder.fillFooter(dmpEntity, datasetEntity, document, true);
 
         int powered_pos = wordBuilder.findPosOfPoweredBy(document);
@@ -509,7 +509,7 @@ public class DatasetManager {
     }
 
     private XWPFDocument getLightWordDocument(ConfigLoader configLoader, DatasetWizardModel dataset, VisibilityRuleService visibilityRuleService) throws IOException {
-        WordBuilder wordBuilder = new WordBuilder(this.environment, configLoader);
+        WordBuilder wordBuilder = new WordBuilder(this.environment);
         XWPFDocument document = configLoader.getDocument();
 
         // Space below Dataset title.
@@ -717,7 +717,7 @@ public class DatasetManager {
 
     public String checkDatasetValidation(Dataset dataset) throws Exception {
         List<String> datasetProfileValidators = new LinkedList<>();
-        DescriptionTemplate profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(dataset.getProfile().getId());
+        DatasetProfile profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(dataset.getProfile().getId());
         DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
         DocumentBuilder builder = builderFactory.newDocumentBuilder();
         Document xmlDocument = builder.parse(new ByteArrayInputStream(profile.getDefinition().getBytes()));
@@ -975,9 +975,9 @@ public class DatasetManager {
 
         // Checks if XML datasetProfileId GroupId matches the one selected.
         try {
-            DescriptionTemplate importDescriptionTemplate = databaseRepository.getDatasetProfileDao().find(UUID.fromString(importModel.getDatasetProfileId()));
-            DescriptionTemplate latestVersionDescriptionTemplate = databaseRepository.getDatasetProfileDao().find(UUID.fromString(datasetProfileId));
-            if (latestVersionDescriptionTemplate.getGroupId() != importDescriptionTemplate.getGroupId()) {
+            eu.eudat.data.entities.DatasetProfile importDatasetProfile = databaseRepository.getDatasetProfileDao().find(UUID.fromString(importModel.getDatasetProfileId()));
+            eu.eudat.data.entities.DatasetProfile latestVersionDatasetProfile = databaseRepository.getDatasetProfileDao().find(UUID.fromString(datasetProfileId));
+            if (latestVersionDatasetProfile.getGroupId() != importDatasetProfile.getGroupId()) {
                 throw new Exception();
             }
         } catch (Exception e) {
@@ -1010,7 +1010,7 @@ public class DatasetManager {
         entity.setStatus((short) 0);
         entity.setCreated(new Date());
         entity.setModified(new Date());
-        DescriptionTemplate profile = new DescriptionTemplate();
+        DatasetProfile profile = new DatasetProfile();
         profile.setId(UUID.fromString(datasetProfileId));
         entity.setProfile(profile);
 
@@ -1034,26 +1034,6 @@ public class DatasetManager {
     public DatasetWizardModel datasetUpdateProfile(String id) {
         DatasetWizardModel dataset = new DatasetWizardModel();
         eu.eudat.data.entities.Dataset datasetEntity = databaseRepository.getDatasetDao().find(UUID.fromString(id), HintedModelFactory.getHint(DatasetWizardModel.class));
-        dataset.setDatasetProfileDefinition(getPagedProfile(dataset, datasetEntity));
-        dataset.fromDataModel(datasetEntity);
-
-        // Creates the Criteria to get all version of DescriptionTemplate in question.
-        DatasetProfileCriteria profileCriteria = new DatasetProfileCriteria();
-        UUID profileId = datasetEntity.getProfile().getGroupId();
-        List<UUID> uuidList = new LinkedList<>();
-        uuidList.add(profileId);
-        profileCriteria.setGroupIds(uuidList);
-
-        // Gets the latest version of the datasetProfile.
-        DescriptionTemplate item = databaseRepository.getDatasetProfileDao().getWithCriteria(profileCriteria).getSingle();
-
-        // Sets the latest version of dataet Profile to the Dataset in question.
-        dataset.setDatasetProfileDefinition(getLatestDatasetProfile(datasetEntity, item));
-        dataset.setProfile(new DatasetProfileOverviewModel().fromDataModel(item));
-
-        // Now at latest version.
-        dataset.setIsProfileLatestVersion(true);
-
         eu.eudat.elastic.entities.Dataset datasetElastic;
         try {
             datasetElastic = datasetRepository.exists() ?
@@ -1062,6 +1042,26 @@ public class DatasetManager {
             logger.warn(ex.getMessage());
             datasetElastic = null;
         }
+        dataset.setDatasetProfileDefinition(getPagedProfile(dataset, datasetEntity));
+        dataset.fromDataModel(datasetEntity);
+
+        // Creates the Criteria to get all version of DatasetProfile in question.
+        DatasetProfileCriteria profileCriteria = new DatasetProfileCriteria();
+        UUID profileId = datasetEntity.getProfile().getGroupId();
+        List<UUID> uuidList = new LinkedList<>();
+        uuidList.add(profileId);
+        profileCriteria.setGroupIds(uuidList);
+
+        // Gets the latest version of the datasetProfile.
+        eu.eudat.data.entities.DatasetProfile item = databaseRepository.getDatasetProfileDao().getWithCriteria(profileCriteria).getSingle();
+
+        // Sets the latest version of dataet Profile to the Dataset in question.
+        dataset.setDatasetProfileDefinition(getLatestDatasetProfile(datasetEntity, item));
+        dataset.setProfile(new DatasetProfileOverviewModel().fromDataModel(item));
+
+        // Now at latest version.
+        dataset.setIsProfileLatestVersion(true);
+
         if (datasetElastic != null && datasetElastic.getTags() != null && !datasetElastic.getTags().isEmpty()) {
             dataset.setTags(datasetElastic.getTags());
         }
@@ -1071,7 +1071,7 @@ public class DatasetManager {
         return dataset;
     }
 
-    public PagedDatasetProfile getLatestDatasetProfile(Dataset datasetEntity, DescriptionTemplate profile) {
+    public PagedDatasetProfile getLatestDatasetProfile(Dataset datasetEntity, DatasetProfile profile) {
         eu.eudat.models.data.user.composite.DatasetProfile datasetprofile = userManager.generateDatasetProfileModel(profile);
         datasetprofile.setStatus(datasetEntity.getStatus());
         if (datasetEntity.getProperties() != null) {
@@ -1088,7 +1088,7 @@ public class DatasetManager {
         datasetProfileTableRequestItem.getCriteria().setFilter(DatasetProfileCriteria.DatasetProfileFilter.Datasets.getValue());
         datasetProfileTableRequestItem.getCriteria().setUserId(principal.getId());
 
-        QueryableList<DescriptionTemplate> items = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(datasetProfileTableRequestItem.getCriteria());
+        QueryableList<DatasetProfile> items = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(datasetProfileTableRequestItem.getCriteria());
         List<DatasetProfileListingModel> listingModels = items.select(item -> new DatasetProfileListingModel().fromDataModel(item));
 
         DataTableData<DatasetProfileListingModel> data = new DataTableData<>();
@@ -1136,28 +1136,26 @@ public class DatasetManager {
         List<Tag> tags = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().query(criteria).stream().map(eu.eudat.elastic.entities.Dataset::getTags).flatMap(Collection::stream).filter(StreamDistinctBy.distinctByKey(Tag::getId)).collect(Collectors.toList());
         Set<JsonNode> tagNodes = new HashSet<>();
         tagNodes.addAll(JsonSearcher.findNodes(propertiesJson, "renderStyle", "tags", true));
-        tagNodes.addAll(JsonSearcher.findNodes(propertiesJson, "schematics", "rda.dataset.keyword"));
+        tagNodes.addAll(JsonSearcher.findNodes(propertiesJson, "rdaProperty", "dataset.keyword"));
         if(wizardModel.getTags() == null){
             wizardModel.setTags(new ArrayList<>());
         }
         if (!tagNodes.isEmpty()) {
             tagNodes.forEach(node -> {
                 JsonNode value = node.get("value");
-                if (!value.toString().equals("\"\"") && !value.toString().equals("null")) {
-                    if (value.toString().startsWith("[")) {
-                        String stringValue = value.toString().replaceAll("=", ":");
-                        JSONArray values = new JSONArray(stringValue);
-                        values.iterator().forEachRemaining(element -> {
-                            Map<String, Object> data = ((JSONObject) element).toMap();
-                            this.addTag(tags, wizardModel.getTags(), data.get("id").toString(), data.get("name").toString());
-                        });
-                    } else {
-                        List<String> values = Arrays.asList(value.textValue().split(", "));
-                        List<Tag> tagValues = values.stream().map(stringValue -> new Tag(stringValue, stringValue)).collect(Collectors.toList());
-                        tagValues.iterator().forEachRemaining(tag -> {
-                            this.addTag(tags, wizardModel.getTags(), tag.getId(), tag.getName());
-                        });
-                    }
+                if (!value.toString().equals("\"\"") && !value.toString().equals("null") && value.toString().startsWith("[")) {
+                    String stringValue = value.toString().replaceAll("=", ":");
+                    JSONArray values = new JSONArray(stringValue);
+                    values.iterator().forEachRemaining(element -> {
+                        Map<String, Object> data = ((JSONObject) element).toMap();
+                        this.addTag(tags, wizardModel.getTags(), data.get("id").toString(), data.get("name").toString());
+                    });
+                } else {
+                    List<String> values = Arrays.asList(value.textValue().split(", "));
+                    List<Tag> tagValues = values.stream().map(stringValue -> new Tag(stringValue, stringValue)).collect(Collectors.toList());
+                    tagValues.iterator().forEachRemaining(tag -> {
+                        this.addTag(tags, wizardModel.getTags(), tag.getId(), tag.getName());
+                    });
                 }
             });
         }
@@ -1183,10 +1181,10 @@ public class DatasetManager {
         DatasetListingModel listingModel = new DatasetListingModel().fromDataModel(item);
         /*DatasetProfileCriteria criteria = new DatasetProfileCriteria();
         criteria.setGroupIds(Collections.singletonList(item.getProfile().getGroupId()));
-        List<DescriptionTemplate> profiles = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(criteria).toList();
+        List<DatasetProfile> profiles = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(criteria).toList();
         boolean islast = false;
         if (!profiles.isEmpty()) {
-            profiles = profiles.stream().sorted(Comparator.comparing(DescriptionTemplate::getVersion)).collect(Collectors.toList());
+            profiles = profiles.stream().sorted(Comparator.comparing(DatasetProfile::getVersion)).collect(Collectors.toList());
             islast = profiles.get(0).getId().equals(item.getProfile().getId());
         }
         listingModel.setProfileLatestVersion(islast);*/

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java

@@ -1,28 +1,25 @@
 package eu.eudat.logic.managers;
 
+import com.jayway.jsonpath.DocumentContext;
+import com.jayway.jsonpath.JsonPath;
 import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
-import eu.eudat.data.entities.DescriptionTemplate;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.data.entities.UserDatasetProfile;
 import eu.eudat.data.entities.UserInfo;
 import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileAutocompleteRequest;
 import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem;
 import eu.eudat.exceptions.datasetprofile.DatasetProfileNewVersionException;
 import eu.eudat.logic.builders.model.models.DataTableDataBuilder;
-import eu.eudat.logic.proxy.config.*;
-import eu.eudat.logic.proxy.config.configloaders.ConfigLoader;
-import eu.eudat.logic.proxy.config.entities.GeneralUrls;
-import eu.eudat.logic.proxy.fetching.RemoteFetcher;
 import eu.eudat.logic.services.ApiContext;
 import eu.eudat.logic.services.operations.DatabaseRepository;
 import eu.eudat.logic.utilities.builders.XmlBuilder;
 import eu.eudat.logic.utilities.documents.helpers.FileEnvelope;
 import eu.eudat.logic.utilities.documents.xml.datasetProfileXml.ExportXmlBuilderDatasetProfile;
 import eu.eudat.logic.utilities.documents.xml.datasetProfileXml.ImportXmlBuilderDatasetProfile;
-import eu.eudat.models.data.admin.composite.DatasetProfile;
+import eu.eudat.logic.utilities.helpers.StreamDistinctBy;
 import eu.eudat.models.data.components.commons.datafield.AutoCompleteData;
 import eu.eudat.models.data.datasetprofile.DatasetProfileAutocompleteItem;
 import eu.eudat.models.data.datasetprofile.DatasetProfileListingModel;
-import eu.eudat.models.data.datasetprofile.DatasetProfileWithPrefillingPropertyModel;
 import eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field;
 import eu.eudat.models.data.externaldataset.ExternalAutocompleteFieldModel;
 import eu.eudat.models.data.helpers.common.DataTableData;
@@ -36,31 +33,24 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
 import javax.activation.MimetypesFileTypeMap;
 import javax.transaction.Transactional;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
 import javax.xml.xpath.*;
 import java.io.*;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 
@@ -69,30 +59,27 @@ public class DatasetProfileManager {
     private static final Logger logger = LoggerFactory.getLogger(DatasetProfileManager.class);
     private static final List<String> cache = new ArrayList<>();
 
-    private final ApiContext apiContext;
-    private final DatabaseRepository databaseRepository;
-    private final Environment environment;
-    private final ConfigLoader configLoader;
+    private ApiContext apiContext;
+    private DatabaseRepository databaseRepository;
+    private Environment environment;
+
     private final MetricsManager metricsManager;
-    private final RemoteFetcher remoteFetcher;
+
     @Autowired
-    public DatasetProfileManager(ApiContext apiContext, Environment environment, ConfigLoader configLoader, MetricsManager metricsManager, RemoteFetcher remoteFetcher) {
+    public DatasetProfileManager(ApiContext apiContext, Environment environment, MetricsManager metricsManager) {
         this.apiContext = apiContext;
         this.databaseRepository = apiContext.getOperationsContext().getDatabaseRepository();
         this.environment = environment;
-        this.configLoader = configLoader;
         this.metricsManager = metricsManager;
-        this.remoteFetcher = remoteFetcher;
     }
 
     @Transactional
     public eu.eudat.models.data.admin.composite.DatasetProfile getDatasetProfile(String id) {
-        DescriptionTemplate profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
+        eu.eudat.data.entities.DatasetProfile profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
         eu.eudat.models.data.admin.composite.DatasetProfile datasetprofile = AdminManager.generateDatasetProfileModel(profile);
         datasetprofile.setLabel(profile.getLabel());
         datasetprofile.setStatus(profile.getStatus());
         datasetprofile.setDescription(profile.getDescription());
-        datasetprofile.setType(profile.getType().getName());
         datasetprofile.setLanguage(profile.getLanguage());
         datasetprofile.setUsers(new ArrayList<>());
         retrieveUsers(profile, datasetprofile);
@@ -100,55 +87,40 @@ public class DatasetProfileManager {
     }
 
     public List<DatasetProfileAutocompleteItem> getWithCriteria(DatasetProfileAutocompleteRequest datasetProfileAutocompleteRequest) throws IllegalAccessException, InstantiationException {
-        QueryableList<DescriptionTemplate> items = databaseRepository.getDatasetProfileDao().getWithCriteria(datasetProfileAutocompleteRequest.getCriteria());
-        QueryableList<DescriptionTemplate> pagedItems = datasetProfileAutocompleteRequest.applyPaging(items);
+        QueryableList<DatasetProfile> items = databaseRepository.getDatasetProfileDao().getWithCriteria(datasetProfileAutocompleteRequest.getCriteria());
+        QueryableList<DatasetProfile> pagedItems = datasetProfileAutocompleteRequest.applyPaging(items);
         List<DatasetProfileAutocompleteItem> datasetProfiles = pagedItems.select(item -> new DatasetProfileAutocompleteItem().fromDataModel(item));
         return datasetProfiles;
     }
 
-    public DescriptionTemplate clone(String id) {
-        DescriptionTemplate profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
+    public DatasetProfile clone(String id) {
+        DatasetProfile profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
         apiContext.getOperationsContext().getDatabaseRepository().detachEntity(profile);
         profile.setId(null);
         return profile;
     }
 
     public DataTableData<DatasetProfileListingModel> getPaged(DatasetProfileTableRequestItem datasetProfileTableRequestItem, Principal principal) throws Exception {
-        QueryableList<DescriptionTemplate> items = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(datasetProfileTableRequestItem.getCriteria());
-        QueryableList<DescriptionTemplate> authItems = null;
+        QueryableList<DatasetProfile> items = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(datasetProfileTableRequestItem.getCriteria());
+        QueryableList<DatasetProfile> authItems = null;
         if (principal.getAuthz().contains(Authorities.ADMIN)) {
             authItems = items;
         } else if (principal.getAuthz().contains(Authorities.DATASET_PROFILE_MANAGER)) {
             List<Integer> roles = Arrays.asList(0, 1);
             authItems = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getAuthenticated(items, principal.getId(), roles);
         }
-        QueryableList<DescriptionTemplate> pagedItems = PaginationManager.applyPaging(authItems, datasetProfileTableRequestItem);
+        QueryableList<DatasetProfile> pagedItems = PaginationManager.applyPaging(authItems, datasetProfileTableRequestItem);
         List<DatasetProfileListingModel> datasetProfiles = pagedItems.select(item -> new DatasetProfileListingModel().fromDataModel(item));
         return apiContext.getOperationsContext().getBuilderFactory().getBuilder(DataTableDataBuilder.class).data(datasetProfiles).totalCount(items.count()).build();
     }
 
     public List<DatasetProfileListingModel> getAll(DatasetProfileTableRequestItem tableRequestItem) throws IllegalAccessException, InstantiationException {
-        QueryableList<DescriptionTemplate> items = databaseRepository.getDatasetProfileDao().getWithCriteria(tableRequestItem.getCriteria());
+        QueryableList<DatasetProfile> items = databaseRepository.getDatasetProfileDao().getWithCriteria(tableRequestItem.getCriteria());
         List<DatasetProfileListingModel> datasetProfiles = items.select(item -> new DatasetProfileListingModel().fromDataModel(item));
 
         return datasetProfiles;
     }
 
-    public List<DatasetProfileWithPrefillingPropertyModel> getAllWithPrefilling(DatasetProfileTableRequestItem tableRequestItem) {
-        List<DatasetProfileWithPrefillingPropertyModel> datasetProfiles = new ArrayList<>();
-        if (!tableRequestItem.getCriteria().getIds().isEmpty()) {
-            tableRequestItem.getCriteria().getIds().forEach(id -> {
-                DatasetProfile datasetProfile = this.getDatasetProfile(id.toString());
-                DatasetProfileWithPrefillingPropertyModel profileModel = new DatasetProfileWithPrefillingPropertyModel();
-                profileModel.setId(id);
-                profileModel.setLabel(datasetProfile.getLabel());
-                profileModel.setEnablePrefilling(datasetProfile.isEnablePrefilling());
-                datasetProfiles.add(profileModel);
-            });
-        }
-        return datasetProfiles;
-    }
-
     public eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field queryForField(String xml, String fieldId) throws XPathExpressionException {
         eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field field = new Field();
         Document document = XmlBuilder.fromXml(xml);
@@ -161,10 +133,10 @@ public class DatasetProfileManager {
         return field;
     }
 
-    public List<ExternalAutocompleteFieldModel> getAutocomplete(AutoCompleteData data, String like) {
-        /*List<ExternalAutocompleteFieldModel> result = new LinkedList<>();
+    public static List<ExternalAutocompleteFieldModel> getAutocomplete(AutoCompleteData data, String like) {
+        List<ExternalAutocompleteFieldModel> result = new LinkedList<>();
         SimpleClientHttpRequestFactory simpleFactory = new SimpleClientHttpRequestFactory();
-
+        
         RestTemplate restTemplate = new RestTemplate(simpleFactory);
         HttpHeaders headers = new HttpHeaders();
         DocumentContext jsonContext = null;
@@ -183,7 +155,7 @@ public class DatasetProfileManager {
                     	if (url.contains("zenodo")) {
                     		url = url.replace("?", "/?");
                     	}
-
+       
                         url = url.replace("{like}", like.equals("") ? "*" : like);
                         url = url.replace("%20", " ");
                         url = url.replace("%22", "\"");
@@ -199,7 +171,7 @@ public class DatasetProfileManager {
                     headers.setContentType(MediaType.APPLICATION_JSON);
                     entity = new HttpEntity<>("parameters", headers);
 
-
+                   
                     response = restTemplate.exchange(url, HttpMethod.GET, entity, Object.class);
                     jsonContext = JsonPath.parse(response.getBody());
                     jsonItems = jsonContext.read(singleData.getOptionsRoot() + "['" + singleData.getAutoCompleteOptions().getLabel() + "','" + singleData.getAutoCompleteOptions().getValue() + "','" + singleData.getAutoCompleteOptions().getSource() + "','" + "uri" + "']");
@@ -225,72 +197,8 @@ public class DatasetProfileManager {
         }
 
         return result.stream().sorted(Comparator.comparing(ExternalAutocompleteFieldModel::getLabel)).collect(Collectors.toList());
-*/
-        List<ExternalAutocompleteFieldModel> result = new LinkedList<>();
-        ExternalUrlCriteria urlCriteria = new ExternalUrlCriteria();
-        GeneralUrls genericUrls = new GeneralUrls();
-        int ordinal = 1;
-        List<Map<String, String>> rawResults = new ArrayList<>();
-        genericUrls.setFetchMode(FetchStrategy.FIRST);
-        urlCriteria.setLike(like);
-        for (AutoCompleteData.AutoCompleteSingleData singleData : data.getAutoCompleteSingleDataList()) {
-            UrlConfiguration urlConfiguration = new UrlConfiguration();
-            try {
-                URI uri;
-                if (singleData.getUrl().contains("?")) {
-                    uri = new URI(singleData.getUrl().substring(0, singleData.getUrl().lastIndexOf("?")));
-                } else {
-                    uri = new URI(singleData.getUrl());
-                }
-                String source = singleData.getAutoCompleteOptions().getSource();
-                source = source != null && !source.isEmpty() ? source : uri.getHost();
-                String uriString = singleData.getAutoCompleteOptions().getUri();
-                uriString = uriString != null && !uriString.isEmpty() ? uriString : "uri";
-                String parsedUrl = singleData.getUrl();
-                parsedUrl = parsedUrl.replace("%20", " ");
-                parsedUrl = parsedUrl.replace("%22", "\"");
-                while (parsedUrl.contains("&amp;")) {
-                    parsedUrl = parsedUrl.replace("&amp;", "&");
-                }
-                urlConfiguration.setUrl(parsedUrl);
-                urlConfiguration.setOrdinal(ordinal);
-                urlConfiguration.setType("External");
-                urlConfiguration.setContentType(MediaType.APPLICATION_JSON_VALUE);
-                urlConfiguration.setFirstpage("1");
-                urlConfiguration.setRequestType(singleData.getMethod() != null ? singleData.getMethod() : "GET");
-                DataUrlConfiguration dataUrlConfiguration = new DataUrlConfiguration();
-                dataUrlConfiguration.setPath(singleData.getOptionsRoot());
-                DataFieldsUrlConfiguration fieldsUrlConfiguration = new DataFieldsUrlConfiguration();
-                fieldsUrlConfiguration.setId(singleData.getAutoCompleteOptions().getValue());
-                fieldsUrlConfiguration.setName(singleData.getAutoCompleteOptions().getLabel());
-                fieldsUrlConfiguration.setSource(singleData.getAutoCompleteOptions().getSource().isEmpty()? null : singleData.getAutoCompleteOptions().getSource());
-                fieldsUrlConfiguration.setUri(uriString);
-                dataUrlConfiguration.setFieldsUrlConfiguration(fieldsUrlConfiguration);
-                urlConfiguration.setKey(source);
-                urlConfiguration.setLabel(source);
-                urlConfiguration.setData(dataUrlConfiguration);
-                if (singleData.getHasAuth()) {
-                    AuthenticationConfiguration authenticationConfiguration = new AuthenticationConfiguration();
-                    authenticationConfiguration.setAuthUrl(singleData.getAuth().getUrl());
-                    authenticationConfiguration.setAuthMethod(singleData.getAuth().getMethod());
-                    authenticationConfiguration.setAuthTokenPath(singleData.getAuth().getPath());
-                    authenticationConfiguration.setAuthRequestBody(singleData.getAuth().getBody());
-                    authenticationConfiguration.setType(singleData.getAuth().getType());
-                    urlConfiguration.setAuth(authenticationConfiguration);
-                }
-                genericUrls.getUrls().add(urlConfiguration);
-                List<Map<String, String>> singleResults =  this.remoteFetcher.getExternalGeneric(urlCriteria, genericUrls);
-                if (!singleResults.isEmpty() && !singleResults.get(0).containsKey("source") && !singleData.getAutoCompleteOptions().getSource().isEmpty()) {
-                    singleResults.forEach(singleResult -> singleResult.put("source", singleData.getAutoCompleteOptions().getSource()));
-                }
-                rawResults.addAll(singleResults);
-                genericUrls.getUrls().clear();
-            } catch (URISyntaxException e) {
-                logger.error(e.getMessage(), e);
-            }
-        }
-        rawResults.forEach(item -> result.add(new ExternalAutocompleteFieldModel(parseItem(item.get("pid")), parseItem(item.get("name")), parseItem(item.get("source")), parseItem(item.get("uri")))));
-        return result;
+
+        //return result;
     }
 
     private static String parseItem(Object item) {
@@ -361,36 +269,36 @@ public class DatasetProfileManager {
         return convFile;
     }
 
-    public DescriptionTemplate createNewVersionDatasetProfile(String id, eu.eudat.models.data.admin.composite.DatasetProfile profile) throws Exception {
-        // Getting the DescriptionTemplate which we will create its new version.
-        DescriptionTemplate oldDescriptionTemplate = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
+    public eu.eudat.data.entities.DatasetProfile createNewVersionDatasetProfile(String id, eu.eudat.models.data.admin.composite.DatasetProfile profile) throws Exception {
+        // Getting the DatasetProfile which we will create its new version.
+        eu.eudat.data.entities.DatasetProfile oldDatasetProfile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
 
-        // Getting the DescriptionTemplate with the latest Version.
+        // Getting the DatasetProfile with the latest Version.
         DatasetProfileCriteria criteria = new DatasetProfileCriteria();
         LinkedList<UUID> list = new LinkedList<>();
-        list.push(oldDescriptionTemplate.getGroupId());
+        list.push(oldDatasetProfile.getGroupId());
         criteria.setGroupIds(list);
         criteria.setAllVersions(false);
-        QueryableList<DescriptionTemplate> datasetProfileQueryableList = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(criteria);
-        DescriptionTemplate latestVersionDescriptionTemplate = datasetProfileQueryableList.getSingle();
+        QueryableList<DatasetProfile> datasetProfileQueryableList = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(criteria);
+        eu.eudat.data.entities.DatasetProfile latestVersionDatasetProfile = datasetProfileQueryableList.getSingle();
 
-        if (latestVersionDescriptionTemplate.getVersion().equals(oldDescriptionTemplate.getVersion())){
+        if (latestVersionDatasetProfile.getVersion().equals(oldDatasetProfile.getVersion())){
             eu.eudat.models.data.admin.composite.DatasetProfile sortedProfile = profile.toShort();
-            DescriptionTemplate modelDefinition = AdminManager.generateViewStyleDefinition(sortedProfile, apiContext);
-//            modelDefinition.setLabel(oldDescriptionTemplate.getLabel());
-            modelDefinition.setVersion((short) (oldDescriptionTemplate.getVersion() + 1));
-            modelDefinition.setGroupId(oldDescriptionTemplate.getGroupId());
-//            modelDefinition.setLanguage(oldDescriptionTemplate.getLanguage());
+            eu.eudat.data.entities.DatasetProfile modelDefinition = AdminManager.generateViewStyleDefinition(sortedProfile, apiContext);
+//            modelDefinition.setLabel(oldDatasetProfile.getLabel());
+            modelDefinition.setVersion((short) (oldDatasetProfile.getVersion() + 1));
+            modelDefinition.setGroupId(oldDatasetProfile.getGroupId());
+//            modelDefinition.setLanguage(oldDatasetProfile.getLanguage());
             apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(modelDefinition);
-            DescriptionTemplate descriptionTemplate =  apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(modelDefinition);
-            this.storeDatasetProfileUsers(descriptionTemplate, profile);
+            eu.eudat.data.entities.DatasetProfile datasetProfile =  apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(modelDefinition);
+            this.storeDatasetProfileUsers(datasetProfile, profile);
             return modelDefinition;
         } else {
             throw new DatasetProfileNewVersionException("Version to update not the latest.");
         }
     }
 
-    public void storeDatasetProfileUsers(DescriptionTemplate entity, eu.eudat.models.data.admin.composite.DatasetProfile model) {
+    public void storeDatasetProfileUsers(DatasetProfile entity, eu.eudat.models.data.admin.composite.DatasetProfile model) {
         if (model.getUsers() != null && !model.getUsers().isEmpty()) {
             if (entity.getUsers() == null) {
                 entity.setUsers(new HashSet<>());
@@ -425,7 +333,7 @@ public class DatasetProfileManager {
     }
 
     @Transactional
-    public void retrieveUsers(DescriptionTemplate entity, eu.eudat.models.data.admin.composite.DatasetProfile model) {
+    public void retrieveUsers(DatasetProfile entity, eu.eudat.models.data.admin.composite.DatasetProfile model) {
         if (entity.getUsers() != null && !entity.getUsers().isEmpty()) {
             model.setUsers(entity.getUsers().stream().filter(userDatasetProfile -> userDatasetProfile.getRole() < 2).map(userDatasetProfile -> {
                 UserInfoListingModel userInfoListingModel = new UserInfoListingModel();
@@ -455,79 +363,4 @@ public class DatasetProfileManager {
             }
 
     }
-
-    public List<String> getSemantics(String query) {
-        List<Semantic> semantics = configLoader.getSemantics();
-        List<String> filteredSemantics = semantics.stream().map(Semantic::getName).collect(Collectors.toList());
-        if(query != null && !query.isEmpty()){
-            filteredSemantics = semantics.stream().filter(x -> x.getCategory().contains(query) || x.getName().contains(query)).map(Semantic::getName).collect(Collectors.toList());
-        }
-        return filteredSemantics;
-    }
-
-    public void addSemanticsInDatasetProfiles() throws XPathExpressionException {
-        List<DescriptionTemplate> ids = this.databaseRepository.getDatasetProfileDao().getAllIds();
-        for(DescriptionTemplate dp: ids){
-            DescriptionTemplate descriptionTemplate = this.databaseRepository.getDatasetProfileDao().find(dp.getId());
-            Document document = XmlBuilder.fromXml(descriptionTemplate.getDefinition());
-            XPathFactory xpathFactory = XPathFactory.newInstance();
-            XPath xpath = xpathFactory.newXPath();
-            XPathExpression expr = xpath.compile("//rdaCommonStandard");
-            NodeList rdaProperties = (NodeList) expr.evaluate(document, XPathConstants.NODESET);
-            for(int i = 0; i < rdaProperties.getLength(); i++){
-                Node rdaPropertyNode = rdaProperties.item(i);
-                String rdaProperty = rdaPropertyNode.getTextContent();
-                Element schematics = document.createElement("schematics");
-                Node fieldParent = rdaPropertyNode.getParentNode();
-                if(rdaProperty != null && !rdaProperty.isEmpty()){
-                    Element schematic = document.createElement("schematic");
-                    schematic.setTextContent("rda." + rdaProperty);
-                    schematics.appendChild(schematic);
-                }
-                fieldParent.insertBefore(schematics, rdaPropertyNode);
-                fieldParent.removeChild(rdaPropertyNode);
-            }
-            this.updateDatasetProfileXml(document, descriptionTemplate);
-        }
-    }
-
-    public void addRdaInSemanticsInDatasetProfiles() throws XPathExpressionException {
-        List<DescriptionTemplate> ids = this.databaseRepository.getDatasetProfileDao().getAllIds();
-        for(DescriptionTemplate dp: ids){
-            DescriptionTemplate descriptionTemplate = this.databaseRepository.getDatasetProfileDao().find(dp.getId());
-            Document document = XmlBuilder.fromXml(descriptionTemplate.getDefinition());
-            XPathFactory xpathFactory = XPathFactory.newInstance();
-            XPath xpath = xpathFactory.newXPath();
-            XPathExpression expr = xpath.compile("//schematic");
-            NodeList schematics = (NodeList) expr.evaluate(document, XPathConstants.NODESET);
-            for (int i = 0; i < schematics.getLength(); i++) {
-                Node schematicNode = schematics.item(i);
-                String schematicRda = schematicNode.getTextContent();
-                if (schematicRda != null && !schematicRda.isEmpty() && !schematicRda.startsWith("rda.")) {
-                    schematicNode.setTextContent("rda." + schematicRda);
-                }
-            }
-            this.updateDatasetProfileXml(document, descriptionTemplate);
-        }
-    }
-
-    private void updateDatasetProfileXml(Document document, DescriptionTemplate descriptionTemplate) {
-        try {
-            DOMSource domSource = new DOMSource(document);
-            StringWriter writer = new StringWriter();
-            StreamResult result = new StreamResult(writer);
-            TransformerFactory tf = TransformerFactory.newInstance();
-            Transformer transformer = tf.newTransformer();
-            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-            transformer.transform(domSource, result);
-            String newDefinition = writer.toString();
-            if(newDefinition != null){
-                descriptionTemplate.setDefinition(newDefinition);
-                this.databaseRepository.getDatasetProfileDao().createOrUpdate(descriptionTemplate);
-            }
-        }
-        catch(TransformerException ex) {
-            logger.error(ex.getMessage(), ex);
-        }
-    }
 }

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java

@@ -5,7 +5,7 @@ import eu.eudat.data.dao.entities.DMPDao;
 import eu.eudat.data.dao.entities.DatasetProfileDao;
 import eu.eudat.data.entities.DMP;
 import eu.eudat.data.entities.Dataset;
-import eu.eudat.data.entities.DescriptionTemplate;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.data.entities.UserInfo;
 import eu.eudat.data.query.items.item.dataset.DatasetWizardAutocompleteRequest;
 import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileWizardAutocompleteRequest;
@@ -40,12 +40,12 @@ public class DatasetWizardManager {
             return new LinkedList<>();
         }
         DatasetProfileCriteria criteria = new DatasetProfileCriteria();
-        criteria.setIds(dataManagementPlan.getProfiles().stream().map(AssociatedProfile::getDescriptionTemplateId).collect(Collectors.toList()));
-        List<DescriptionTemplate> descriptionTemplates = profileDao.getWithCriteria(criteria).toList();
+        criteria.setIds(dataManagementPlan.getProfiles().stream().map(AssociatedProfile::getId).collect(Collectors.toList()));
+        List<DatasetProfile> datasetProfiles = profileDao.getWithCriteria(criteria).toList();
         criteria.setIds(null);
-        criteria.setGroupIds(descriptionTemplates.stream().map(DescriptionTemplate::getGroupId).collect(Collectors.toList()));
-        descriptionTemplates = profileDao.getWithCriteria(criteria).toList();
-        List<AssociatedProfile> profiles = descriptionTemplates.stream().map(profile -> new AssociatedProfile().fromData(profile)).collect(Collectors.toList());
+        criteria.setGroupIds(datasetProfiles.stream().map(DatasetProfile::getGroupId).collect(Collectors.toList()));
+        datasetProfiles = profileDao.getWithCriteria(criteria).toList();
+        List<AssociatedProfile> profiles = datasetProfiles.stream().map(profile -> new AssociatedProfile().fromData(profile)).collect(Collectors.toList());
         return profiles;
     }
 

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DepositManager.java

@@ -1,67 +0,0 @@
-package eu.eudat.logic.managers;
-
-import eu.eudat.depositinterface.repository.RepositoryDeposit;
-import eu.eudat.depositinterface.repository.RepositoryDepositConfiguration;
-import eu.eudat.models.data.doi.DepositRequest;
-import eu.eudat.models.data.doi.Doi;
-import eu.eudat.models.data.doi.RepositoryConfig;
-import eu.eudat.models.data.security.Principal;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-@Component
-public class DepositManager {
-    private static final Logger logger = LoggerFactory.getLogger(DepositManager.class);
-
-    private List<RepositoryDeposit> repositories;
-    private DataManagementPlanManager dataManagementPlanManager;
-
-    @Autowired
-    public DepositManager(List<RepositoryDeposit> repositories, DataManagementPlanManager dataManagementPlanManager){
-        this.repositories = repositories;
-        this.dataManagementPlanManager = dataManagementPlanManager;
-    }
-
-    public List<RepositoryConfig> getAvailableRepos() {
-        List<RepositoryConfig> reposConfigModel = new ArrayList<>();
-        for (RepositoryDeposit r: this.repositories) {
-            List<RepositoryDepositConfiguration> repoConf = r.getConfiguration();
-            if(repoConf != null) {
-                for(RepositoryDepositConfiguration cf: repoConf){
-                    RepositoryConfig repoModel = new RepositoryConfig();
-                    reposConfigModel.add(repoModel.toModel(cf));
-                }
-            }
-        }
-        return reposConfigModel;
-    }
-
-    public String authenticate(String id, String code) {
-        for(RepositoryDeposit r: this.repositories){
-            if(r.getConfiguration().stream().anyMatch(x -> x.getRepositoryId().equals(id))){
-                return r.authenticate(id, code);
-            }
-        }
-        return null;
-    }
-
-    public Doi deposit(DepositRequest depositRequest, Principal principal) throws Exception {
-        return this.dataManagementPlanManager.createDoi(depositRequest, principal);
-    }
-
-    public String getRepositoryLogo(String repositoryId){
-        for(RepositoryDeposit r: this.repositories){
-            Optional<RepositoryDepositConfiguration> cf = r.getConfiguration().stream().filter(x -> x.getRepositoryId().equals(repositoryId)).findFirst();
-            if(cf.isPresent()){
-                return cf.get().isHasLogo() ?  r.getLogo(repositoryId) : null;
-            }
-        }
-        return null;
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DescriptionTemplateTypeManager.java

@@ -1,84 +0,0 @@
-package eu.eudat.logic.managers;
-
-import eu.eudat.data.entities.DescriptionTemplateType;
-import eu.eudat.exceptions.descriptiontemplate.DescriptionTemplatesWithTypeException;
-import eu.eudat.logic.services.ApiContext;
-import eu.eudat.logic.services.operations.DatabaseRepository;
-import eu.eudat.models.data.descriptiontemplatetype.DescriptionTemplateTypeModel;
-import eu.eudat.models.data.helpers.common.DataTableData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-@Component
-public class DescriptionTemplateTypeManager {
-    private static final Logger logger = LoggerFactory.getLogger(DescriptionTemplateTypeManager.class);
-
-    private ApiContext apiContext;
-    private DatabaseRepository databaseRepository;
-
-
-    @Autowired
-    public DescriptionTemplateTypeManager(ApiContext apiContext, DatabaseRepository databaseRepository) {
-        this.apiContext = apiContext;
-        this.databaseRepository = databaseRepository;
-    }
-
-    public DataTableData<DescriptionTemplateTypeModel> get() {
-        List<DescriptionTemplateType> types = this.databaseRepository.getDescriptionTemplateTypeDao().asQueryable().toList();
-        List<DescriptionTemplateTypeModel> typesModelList = types.stream().map(type -> new DescriptionTemplateTypeModel().fromDataModel(type)).collect(Collectors.toList());
-        DataTableData<DescriptionTemplateTypeModel> dataTableData = new DataTableData<>();
-        dataTableData.setData(typesModelList);
-        dataTableData.setTotalCount((long) typesModelList.size());
-        return dataTableData;
-    }
-
-    public DescriptionTemplateTypeModel getSingle(UUID id) throws Exception {
-        DescriptionTemplateType type = this.databaseRepository.getDescriptionTemplateTypeDao().find(id);
-        if (type != null) {
-            return new DescriptionTemplateTypeModel().fromDataModel(type);
-        }
-        else {
-            throw new DescriptionTemplatesWithTypeException("No description template type found with this id");
-        }
-    }
-
-    public void create(DescriptionTemplateTypeModel type) throws Exception {
-        DescriptionTemplateType existed = this.databaseRepository.getDescriptionTemplateTypeDao().findFromName(type.getName());
-        if (existed == null) {
-            this.databaseRepository.getDescriptionTemplateTypeDao().createOrUpdate(type.toDataModel());
-        }
-        else {
-            throw new DescriptionTemplatesWithTypeException("There is already a description template type with that name.");
-        }
-    }
-
-    public void update(DescriptionTemplateTypeModel type) throws Exception {
-        DescriptionTemplateType existed = this.databaseRepository.getDescriptionTemplateTypeDao().findFromName(type.getName());
-        if (existed != null) {
-            this.databaseRepository.getDescriptionTemplateTypeDao().createOrUpdate(type.toDataModel());
-        }
-        else {
-            throw new DescriptionTemplatesWithTypeException("No description template type found.");
-        }
-    }
-
-    public void delete(UUID id) throws DescriptionTemplatesWithTypeException {
-        DescriptionTemplateType type = this.databaseRepository.getDescriptionTemplateTypeDao().find(id);
-        if (type != null) {
-            Long descriptionsWithType = this.databaseRepository.getDatasetProfileDao().countWithType(type);
-            if(descriptionsWithType == 0) {
-                type.setStatus(DescriptionTemplateType.Status.DELETED.getValue());
-                this.databaseRepository.getDescriptionTemplateTypeDao().createOrUpdate(type);
-            }
-            else{
-                throw new DescriptionTemplatesWithTypeException("This type can not deleted, because Descriptions are associated with it");
-            }
-        }
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/logic/managers/EmailConfirmationManager.java

@@ -48,9 +48,6 @@ public class EmailConfirmationManager {
 		// Checks if mail is used by another user. If it is, merges the new the old.
 		Long existingUsers = databaseRepository.getUserInfoDao().asQueryable().where((builder, root) -> builder.equal(root.get("email"), loginConfirmationEmail.getEmail())).count();
 		if (existingUsers > 0) {
-			Credential credential = databaseRepository.getCredentialDao().asQueryable().where((builder, root) -> builder.equal(root.get("userInfo"), user)).getSingle();
-			credential.setEmail(loginConfirmationEmail.getEmail());
-			databaseRepository.getCredentialDao().createOrUpdate(credential);
 			UserInfo oldUser = databaseRepository.getUserInfoDao().asQueryable().where((builder, root) -> builder.equal(root.get("email"), loginConfirmationEmail.getEmail())).getSingle();
 			mergeNewUserToOld(user, oldUser);
 			expireUserToken(user);
@@ -60,12 +57,6 @@ public class EmailConfirmationManager {
 
 		user.setEmail(loginConfirmationEmail.getEmail());
 		databaseRepository.getUserInfoDao().createOrUpdate(user);
-		Credential credential = databaseRepository.getCredentialDao().asQueryable()
-				.where((builder, root) -> builder.equal(root.get("userInfo"), user)).getSingle();
-		if(credential.getEmail() == null){
-			credential.setEmail(user.getEmail());
-			databaseRepository.getCredentialDao().createOrUpdate(credential);
-		}
 		databaseRepository.getLoginConfirmationEmailDao().createOrUpdate(loginConfirmationEmail);
 	}
 

dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java

@@ -140,7 +140,6 @@ public class GrantManager {
 
             grants.add(grant);
         }
-        grants = grants.stream().filter(grant -> grant.getLabel() != null).collect(Collectors.toList());
         grants.sort(Comparator.comparing(Grant::getLabel));
         grants = grants.stream().filter(listHelper.distinctByKey(Grant::getLabel)).collect(Collectors.toList());
         return grants;

dmp-backend/web/src/main/java/eu/eudat/logic/managers/MaterialManager.java

@@ -1,51 +0,0 @@
-package eu.eudat.logic.managers;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-@Component
-public class MaterialManager {
-
-    @Autowired
-    public MaterialManager(){}
-
-    public ResponseEntity<byte[]> getResponseEntity(String lang, Stream<Path> paths) throws IOException {
-        List<String> result = paths.filter(Files::isRegularFile)
-                .map(Path::toString).collect(Collectors.toList());
-
-        String fileName = result.stream().filter(about -> about.contains("_" + lang)).findFirst().orElse(null);
-        if (fileName == null) {
-            fileName = result.stream().filter(about -> about.contains("_en")).findFirst().get();
-        }
-        InputStream is = new FileInputStream(fileName);
-
-        Path path = Paths.get(fileName);
-
-        HttpHeaders responseHeaders = new HttpHeaders();
-        responseHeaders.setContentLength(is.available());
-        responseHeaders.setContentType(MediaType.TEXT_HTML);
-        responseHeaders.set("Content-Disposition", "attachment;filename=" + path.getFileName().toString());
-        responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition");
-        responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type");
-
-        byte[] content = new byte[is.available()];
-        is.read(content);
-        is.close();
-
-        return new ResponseEntity<>(content, responseHeaders, HttpStatus.OK);
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/logic/managers/MergeEmailConfirmationManager.java

@@ -5,10 +5,6 @@ import eu.eudat.data.entities.EmailConfirmation;
 import eu.eudat.data.entities.UserDMP;
 import eu.eudat.data.entities.UserInfo;
 import eu.eudat.data.entities.UserToken;
-import eu.eudat.elastic.criteria.DmpCriteria;
-import eu.eudat.elastic.entities.Collaborator;
-import eu.eudat.elastic.entities.Dmp;
-import eu.eudat.elastic.repository.DmpRepository;
 import eu.eudat.exceptions.emailconfirmation.HasConfirmedEmailException;
 import eu.eudat.exceptions.emailconfirmation.TokenExpiredException;
 import eu.eudat.logic.services.ApiContext;
@@ -29,25 +25,21 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import javax.transaction.Transactional;
 import java.io.IOException;
 import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Component
 public class MergeEmailConfirmationManager {
 	private static Logger logger = LoggerFactory.getLogger(MergeEmailConfirmationManager.class);
 	private ApiContext apiContext;
 	private DatabaseRepository databaseRepository;
-	private DmpRepository dmpRepository;
 
 	@Autowired
 	public MergeEmailConfirmationManager(ApiContext apiContext) {
 		this.apiContext = apiContext;
 		this.databaseRepository = apiContext.getOperationsContext().getDatabaseRepository();
-		this.dmpRepository = apiContext.getOperationsContext().getElasticRepository().getDmpRepository();
 	}
 
 	@Transactional
-	public String confirmEmail(String token) throws TokenExpiredException, HasConfirmedEmailException {
+	public void confirmEmail(String token) throws TokenExpiredException, HasConfirmedEmailException {
 		EmailConfirmation loginConfirmationEmail = apiContext.getOperationsContext()
 				.getDatabaseRepository().getLoginConfirmationEmailDao().asQueryable()
 				.where((builder, root) -> builder.equal(root.get("token"), UUID.fromString(token))).getSingle();
@@ -57,7 +49,7 @@ public class MergeEmailConfirmationManager {
 
 		UserInfo userToBeMerged = databaseRepository.getUserInfoDao().asQueryable()
 				.where((builder, root) -> builder.equal(root.get("id"), loginConfirmationEmail.getUserId())).getSingle();
-		String userToBeMergedEmail = userToBeMerged.getEmail();
+		
 		try {
 			Map<String, Object> map = new ObjectMapper().readValue(loginConfirmationEmail.getData(), HashMap.class);
 			UUID otherUserId = UUID.fromString((String) map.get("userId"));
@@ -72,8 +64,6 @@ public class MergeEmailConfirmationManager {
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);
 		}
-
-		return userToBeMergedEmail;
 	}
 
 	public void sendConfirmationEmail(String email, Principal principal, UUID userId, Integer provider) throws HasConfirmedEmailException {
@@ -101,38 +91,6 @@ public class MergeEmailConfirmationManager {
 			userDmp.setUser(newUser);
 			databaseRepository.getUserDmpDao().createOrUpdate(userDmp);
 		});
-		try {
-			DmpCriteria dmpCriteria = new DmpCriteria();
-			dmpCriteria.setCollaborators(Collections.singletonList(oldUser.getId()));
-			List<Dmp> elasticDmpsIds = dmpRepository.query(dmpCriteria);
-			for(Dmp dmpId: elasticDmpsIds){
-				Dmp dmp = dmpRepository.findDocument(dmpId.getId().toString());
-				if(dmp.getDatasets() != null) {
-					dmp.getDatasets().forEach(dataset -> {
-						if(dataset.getCollaborators() != null) {
-							for (Collaborator collaborator : dataset.getCollaborators()) {
-								if (collaborator.getId().equals(oldUser.getId().toString())) {
-									collaborator.setId(newUser.getId().toString());
-									collaborator.setName(newUser.getName());
-								}
-							}
-						}
-					});
-				}
-				if(dmp.getCollaborators() != null) {
-					for (Collaborator collaborator : dmp.getCollaborators()) {
-						if (collaborator.getId().equals(oldUser.getId().toString())) {
-							collaborator.setId(newUser.getId().toString());
-							collaborator.setName(newUser.getName());
-						}
-					}
-				}
-				dmpRepository.createOrUpdate(dmp);
-			}
-		}
-		catch (IOException e){
-			logger.warn("Warning: Could not fetch dmps from elastic.", e);
-		}
 		oldUser.setUserStatus((short)1);
 		oldUser.setEmail(null);
 		List<Credential> credentials = databaseRepository.getCredentialDao().asQueryable().where((builder, root) -> builder.equal(root.get("userInfo"), oldUser)).toList();

dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java

@@ -1,7 +1,7 @@
 package eu.eudat.logic.managers;
 
 import eu.eudat.data.dao.criteria.*;
-import eu.eudat.data.entities.DescriptionTemplate;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.logic.services.ApiContext;
 import eu.eudat.types.MetricNames;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
@@ -33,8 +33,8 @@ public class MetricsManager {
     private final Map<String, Gauge> gauges;
 
     public static final Map<Short, String> datasetTemplateStatus = Stream.of(new Object[][] {
-            { DescriptionTemplate.Status.SAVED.getValue(), MetricNames.DRAFT },
-            { DescriptionTemplate.Status.FINALIZED.getValue(), MetricNames.ACTIVE },
+            { DatasetProfile.Status.SAVED.getValue(), MetricNames.DRAFT },
+            { DatasetProfile.Status.FINALIZED.getValue(), MetricNames.ACTIVE },
     }).collect(Collectors.toMap(data -> (Short) data[0], data -> (String) data[1]));
 
     public void increaseValue(String name, int amount,  String label) {
@@ -180,8 +180,6 @@ public class MetricsManager {
         try (Stream<Path> paths = Files.list(Paths.get(Objects.requireNonNull(this.environment.getProperty("userguide.path"))))) {
             long files = paths.count();
             calculateValue(MetricNames.LANGUAGES, (int) files, null);
-        } catch (Exception e) {
-            logger.error("Could not calculate languages.");
         }
 
         calculateValue(MetricNames.INSTALLATIONS, 1, null);
@@ -406,9 +404,9 @@ public class MetricsManager {
         criteria.setStatus(1);
         criteria.setAllVersions(false);
         if (countNexus) criteria.setPeriodStart(getNexusDate());
-        List<DescriptionTemplate> descriptionTemplates = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(criteria).withFields(Collections.singletonList("id")).toList();
+        List<DatasetProfile> datasetProfiles = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(criteria).withFields(Collections.singletonList("id")).toList();
         DatasetCriteria datasetCriteria = new DatasetCriteria();
-        datasetCriteria.setDatasetTemplates(descriptionTemplates.stream().map(DescriptionTemplate::getId).collect(Collectors.toList()));
+        datasetCriteria.setDatasetTemplates(datasetProfiles.stream().map(DatasetProfile::getId).collect(Collectors.toList()));
         return apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().getWithCriteria(datasetCriteria).select(root -> root.getProfile().getId()).stream().distinct().count();
     }
 

dmp-backend/web/src/main/java/eu/eudat/logic/managers/NotificationManager.java

@@ -60,20 +60,20 @@ public class NotificationManager {
 				case DMP_MODIFIED:
 				case DATASET_MODIFIED:
 					subjectTemplate = this.environment.getProperty("notification.modified.subject");
-					contentTemplate = mailService.getMailTemplateContent(this.environment.getProperty("notification.modified.template"));
+					contentTemplate = mailService.getMailTemplateContent("classpath:templates/notifications/modifiedNotification.html");
 					break;
 				case DMP_PUBLISH:
 					subjectTemplate = this.environment.getProperty("notification.publish.subject");
-					contentTemplate = mailService.getMailTemplateContent(this.environment.getProperty("notification.publish.template"));
+					contentTemplate = mailService.getMailTemplateContent("classpath:templates/notifications/publishNotification.html");
 					break;
 				case DMP_FINALISED:
 					subjectTemplate = this.environment.getProperty("notification.finalised.subject");
-					contentTemplate = mailService.getMailTemplateContent(this.environment.getProperty("notification.finalised.template"));
+					contentTemplate = mailService.getMailTemplateContent("classpath:templates/notifications/finalisedNotification.html");
 					break;
 				case DMP_MODIFIED_FINALISED:
 				case DATASET_MODIFIED_FINALISED:
 					subjectTemplate = this.environment.getProperty("notification.modifiedFinalised.subject");
-					contentTemplate = mailService.getMailTemplateContent(this.environment.getProperty("notification.modified_finalised.template"));
+					contentTemplate = mailService.getMailTemplateContent("classpath:templates/notifications/modifiedFinalisedNotification.html");
 					break;
 			}
 

dmp-backend/web/src/main/java/eu/eudat/logic/managers/PrefillingManager.java

@@ -1,8 +1,7 @@
 package eu.eudat.logic.managers;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.eudat.data.entities.DescriptionTemplate;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.logic.mapper.prefilling.PrefillingMapper;
 import eu.eudat.logic.proxy.config.ExternalUrlCriteria;
 import eu.eudat.logic.proxy.config.configloaders.ConfigLoader;
@@ -12,7 +11,10 @@ import eu.eudat.logic.services.ApiContext;
 import eu.eudat.models.data.datasetwizard.DatasetWizardModel;
 import eu.eudat.models.data.prefilling.Prefilling;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.*;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
@@ -27,51 +29,30 @@ public class PrefillingManager {
     private final ObjectMapper objectMapper;
     private final DatasetManager datasetManager;
     private final LicenseManager licenseManager;
-    private final PrefillingMapper prefillingMapper;
 
     @Autowired
-    public PrefillingManager(ApiContext apiContext, ConfigLoader configLoader, DatasetManager datasetManager, LicenseManager licenseManager, PrefillingMapper prefillingMapper) {
+    public PrefillingManager(ApiContext apiContext, ConfigLoader configLoader, DatasetManager datasetManager, LicenseManager licenseManager) {
         this.apiContext = apiContext;
         this.configLoader = configLoader;
-        this.prefillingMapper = prefillingMapper;
-        this.objectMapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        this.objectMapper = new ObjectMapper();
         this.datasetManager = datasetManager;
         this.licenseManager = licenseManager;
     }
 
-    public List<Prefilling> getPrefillings(String like) {
+    public List<Prefilling> getPrefillings(String like, String configId) {
+        PrefillingConfig prefillingConfig = configLoader.getExternalUrls().getPrefillings().get(configId);
         ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria();
         externalUrlCriteria.setLike(like);
-        List<Prefilling> prefillings = new ArrayList<>();
-        List<Map<String, String>> map;
-        Map<String, PrefillingConfig> prefillingConfigs = configLoader.getExternalUrls().getPrefillings();
-        for (PrefillingConfig prefillingConfig: prefillingConfigs.values()) {
-            map = apiContext.getOperationsContext().getRemoteFetcher().getExternalGeneric(externalUrlCriteria, prefillingConfig.getPrefillingSearch());
-            prefillings.addAll(map.stream().map(submap -> objectMapper.convertValue(submap, Prefilling.class)).collect(Collectors.toList()));
-            if (prefillingConfig.getPrefillingSearch().getUrlConfig().isDataInListing()) {
-                List<Map<String, Object>> mapData = apiContext.getOperationsContext().getRemoteFetcher().getExternalGenericWithData(externalUrlCriteria, prefillingConfig.getPrefillingSearch());
-                for (int i = 0; i < mapData.size(); i++) {
-                    prefillings.get(i).setData(mapData.get(i));
-                }
-                prefillings = prefillings.stream().filter(prefilling -> prefilling.getData() != null).collect(Collectors.toList());
-            }
-        }
-        return prefillings;
+        List<Map<String, String>> map = apiContext.getOperationsContext().getRemoteFetcher().getExternalGeneric(externalUrlCriteria, prefillingConfig.getPrefillingSearch());
+        return map.stream().map(submap -> objectMapper.convertValue(submap, Prefilling.class)).collect(Collectors.toList());
     }
 
     public DatasetWizardModel getPrefilledDataset(String prefillId, String configId, UUID profileId) throws Exception {
         PrefillingConfig prefillingConfig = configLoader.getExternalUrls().getPrefillings().get(configId);
         PrefillingGet prefillingGet = prefillingConfig.getPrefillingGet();
         Map<String, Object> prefillingEntity = getSingle(prefillingGet.getUrl(), prefillId);
-        DescriptionTemplate descriptionTemplate = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(profileId);
-        return prefillingMapper.mapPrefilledEntityToDatasetWizard(prefillingEntity, prefillingGet, prefillingConfig.getType(), descriptionTemplate, datasetManager, licenseManager);
-    }
-
-    public DatasetWizardModel getPrefilledDatasetUsingData(Map<String, Object> data, String configId, UUID profileId) throws Exception {
-        PrefillingConfig prefillingConfig = configLoader.getExternalUrls().getPrefillings().get(configId);
-        PrefillingGet prefillingGet = prefillingConfig.getPrefillingGet();
-        DescriptionTemplate descriptionTemplate = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(profileId);
-        return prefillingMapper.mapPrefilledEntityToDatasetWizard(data, prefillingGet, prefillingConfig.getType(), descriptionTemplate, datasetManager, licenseManager);
+        DatasetProfile datasetProfile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(profileId);
+        return PrefillingMapper.mapPrefilledEntityToDatasetWizard(prefillingEntity, prefillingGet, prefillingConfig.getType(), datasetProfile, datasetManager, licenseManager);
     }
 
     private Map<String, Object> getSingle(String url, String id) {

dmp-backend/web/src/main/java/eu/eudat/logic/managers/UnlinkEmailConfirmationManager.java

@@ -1,93 +0,0 @@
-package eu.eudat.logic.managers;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.eudat.data.entities.Credential;
-import eu.eudat.data.entities.EmailConfirmation;
-import eu.eudat.data.entities.UserInfo;
-import eu.eudat.data.entities.UserToken;
-import eu.eudat.exceptions.emailconfirmation.HasConfirmedEmailException;
-import eu.eudat.exceptions.emailconfirmation.TokenExpiredException;
-import eu.eudat.logic.builders.entity.UserTokenBuilder;
-import eu.eudat.logic.services.ApiContext;
-import eu.eudat.logic.services.operations.DatabaseRepository;
-import eu.eudat.models.data.security.Principal;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.transaction.Transactional;
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Component
-public class UnlinkEmailConfirmationManager {
-
-    private static Logger logger = LoggerFactory.getLogger(UnlinkEmailConfirmationManager.class);
-
-    private ApiContext apiContext;
-    private DatabaseRepository databaseRepository;
-
-    @Autowired
-    public UnlinkEmailConfirmationManager(ApiContext apiContext) {
-        this.apiContext = apiContext;
-        this.databaseRepository = apiContext.getOperationsContext().getDatabaseRepository();
-    }
-
-    @Transactional
-    public void confirmEmail(String token) throws TokenExpiredException, HasConfirmedEmailException {
-        EmailConfirmation loginConfirmationEmail = apiContext.getOperationsContext()
-                .getDatabaseRepository().getLoginConfirmationEmailDao().asQueryable()
-                .where((builder, root) -> builder.equal(root.get("token"), UUID.fromString(token))).getSingle();
-
-        if (loginConfirmationEmail.getExpiresAt().compareTo(new Date()) < 0)
-            throw new TokenExpiredException("Token has expired.");
-
-        if(loginConfirmationEmail.getIsConfirmed())
-            throw new HasConfirmedEmailException("Email is already confirmed.");
-
-//        UserInfo userAskingForUnlink = databaseRepository.getUserInfoDao().asQueryable()
-//                .where((builder, root) -> builder.equal(root.get("id"), loginConfirmationEmail.getUserId())).getSingle();
-
-        try {
-            Map<String, Object> map = new ObjectMapper().readValue(loginConfirmationEmail.getData(), new TypeReference<Map<String, Object>>() {});
-            String emailTobeUnlinked = (String) map.get("email");
-            Integer provider = Integer.valueOf((String) map.get("provider"));
-
-            unlinkUser(emailTobeUnlinked, provider);
-
-            loginConfirmationEmail.setIsConfirmed(true);
-            databaseRepository.getLoginConfirmationEmailDao().createOrUpdate(loginConfirmationEmail);
-        }
-        catch (Exception e) {
-            logger.error(e.getMessage(), e);
-        }
-    }
-
-    @Transactional
-    private void unlinkUser(String emailTobeUnlinked, Integer provider){
-        Credential credential = databaseRepository.getCredentialDao().asQueryable()
-                .where((builder, root) -> builder.and(builder.equal(root.get("email"), emailTobeUnlinked), builder.equal(root.get("provider"), provider))).getSingle();
-        if(credential != null) {
-            databaseRepository.getCredentialDao().delete(credential);
-        }
-    }
-
-    public void sendConfirmationEmail(String email, Principal principal, UUID userId, Integer provider) {
-        UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId());
-
-        if (user.getEmail() != null && !user.getEmail().equals(email)) {
-            apiContext.getUtilitiesService().getConfirmationEmailService().createUnlinkConfirmationEmail(
-                    databaseRepository.getLoginConfirmationEmailDao(),
-                    apiContext.getUtilitiesService().getMailService(),
-                    email,
-                    userId,
-                    principal,
-                    provider
-            );
-        }
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java

@@ -3,8 +3,13 @@ package eu.eudat.logic.managers;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.eudat.data.dao.criteria.DataManagementPlanCriteria;
 import eu.eudat.data.dao.entities.UserInfoDao;
-import eu.eudat.data.entities.*;
+import eu.eudat.data.entities.Credential;
+import eu.eudat.data.entities.DMP;
+import eu.eudat.data.entities.UserInfo;
+import eu.eudat.data.entities.UserRole;
 import eu.eudat.data.query.items.table.userinfo.UserInfoTableRequestItem;
+import eu.eudat.exceptions.security.ExpiredTokenException;
+import eu.eudat.exceptions.security.NonValidTokenException;
 import eu.eudat.exceptions.security.NullEmailException;
 import eu.eudat.exceptions.security.UnauthorisedException;
 import eu.eudat.logic.builders.entity.UserRoleBuilder;
@@ -67,7 +72,7 @@ public class UserManager {
 		this.environment = environment;
 	}
 
-	public eu.eudat.models.data.user.composite.DatasetProfile generateDatasetProfileModel(DescriptionTemplate profile) {
+	public eu.eudat.models.data.user.composite.DatasetProfile generateDatasetProfileModel(eu.eudat.data.entities.DatasetProfile profile) {
 		Document viewStyleDoc = XmlBuilder.fromXml(profile.getDefinition());
 		Element root = (Element) viewStyleDoc.getDocumentElement();
 		eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel viewstyle = new eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel().fromXml(root);
@@ -154,10 +159,31 @@ public class UserManager {
 		return dataTableData;
 	}
 
+	public Boolean isDOITokenValid(Principal principal) throws NonValidTokenException, ExpiredTokenException, IOException {
+		if (principal.getZenodoToken() != null && !principal.getZenodoToken().isEmpty()) {
+			if (Instant.now().isBefore(principal.getZenodoDuration())) {
+				return true;
+			}
+			try {
+				this.updateDOIToken(ZenodoAccessType.REFRESH_TOKEN, principal.getZenodoRefresh(), this.environment.getProperty("zenodo.login.redirect_uri"), principal);
+				return true;
+			}catch (Exception e) {
+				this.deleteDOIToken(principal);
+				throw new ExpiredTokenException("Zenodo Token is expired.");
+			}
+		}
+		throw new NonValidTokenException("This account has no Zenodo Token");
+	}
+
 	public void registerDOIToken(DOIRequest doiRequest, Principal principal) throws IOException {
-		ZenodoResponseToken responseToken = this.zenodoCustomProvider.getAccessToken(ZenodoAccessType.AUTHORIZATION_CODE,
-				doiRequest.getZenodoRequest().getCode(), this.environment.getProperty("zenodo.login.client_id"),
-				this.environment.getProperty("zenodo.login.client_secret"), doiRequest.getRedirectUri());
+		this.updateDOIToken(ZenodoAccessType.AUTHORIZATION_CODE, doiRequest.getZenodoRequest().getCode(), doiRequest.getRedirectUri(), principal);
+	}
+
+	private void updateDOIToken(ZenodoAccessType accessType, String code, String redirectUri, Principal principal) throws IOException {
+		ZenodoResponseToken responseToken = this.zenodoCustomProvider.getAccessToken(accessType, code
+				, this.environment.getProperty("zenodo.login.client_id")
+				, this.environment.getProperty("zenodo.login.client_secret")
+				, redirectUri);
 		Map<String, Object> settings = new HashMap<>();
 		settings.put("zenodoEmail", responseToken.getEmail());
 		settings.put("zenodoRefresh", responseToken.getRefreshToken());

dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java

@@ -50,9 +50,7 @@ public class DatasetMapper {
 		elastic.setStatus(dataset.getStatus());
 		elastic.setDmp(dataset.getDmp().getId());
 		elastic.setGroup(dataset.getDmp().getGroupId());
-		if (dataset.getDmp().getGrant() != null) {
-			elastic.setGrant(dataset.getDmp().getGrant().getId());
-		}
+		elastic.setGrant(dataset.getDmp().getGrant().getId());
 		elastic.setCreated(dataset.getCreated());
 		elastic.setModified(dataset.getModified());
 		elastic.setFinalizedAt(dataset.getFinalizedAt());
@@ -76,9 +74,7 @@ public class DatasetMapper {
 			elastic.setOrganizations(dataset.getDmp().getOrganisations().stream().map(OrganizationMapper::toElastic).collect(Collectors.toList()));
 		}
 		elastic.setPublic(dataset.getDmp().isPublic());
-		if (dataset.getDmp().getGrant() != null) {
-			elastic.setGrantStatus(dataset.getDmp().getGrant().getStatus());
-		}
+		elastic.setGrantStatus(dataset.getDmp().getGrant().getStatus());
 		elastic.setFormData(datasetManager.getWordDocumentText(dataset));
 
 		return elastic;

dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetTemplateMapper.java

@@ -1,26 +1,14 @@
 package eu.eudat.logic.mapper.elastic;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.eudat.data.entities.DMPDatasetProfile;
-import eu.eudat.data.entities.DescriptionTemplate;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.elastic.entities.DatasetTempalate;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class DatasetTemplateMapper {
 
-	public static DatasetTempalate toElastic(DMPDatasetProfile profile) {
+	public static DatasetTempalate toElastic(DatasetProfile profile) {
 		DatasetTempalate elastic = new DatasetTempalate();
-		elastic.setId(profile.getDatasetprofile().getId());
-		elastic.setName(profile.getDatasetprofile().getLabel());
-		try {
-			elastic.setData(new ObjectMapper().readValue(profile.getData(), new TypeReference<Map<String, Object>>() {}));
-		}
-		catch (Exception e){
-			elastic.setData(new HashMap<>());
-		}
+		elastic.setId(profile.getId());
+		elastic.setName(profile.getLabel());
 		return elastic;
 	}
 }

dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DmpMapper.java

@@ -37,9 +37,7 @@ public class DmpMapper {
 			elastic.setCollaborators(dmp.getUsers().stream().map(user -> CollaboratorMapper.toElastic(user.getUser(), user.getRole())).collect(Collectors.toList()));
 		}
 		elastic.setDescription(dmp.getDescription());
-		if (dmp.getGrant() != null) {
-			elastic.setGrant(dmp.getGrant().getId());
-		}
+		elastic.setGrant(dmp.getGrant().getId());
 		elastic.setLabel(dmp.getLabel());
 		elastic.setPublic(dmp.isPublic());
 		elastic.setStatus(dmp.getStatus());

dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.eudat.data.entities.Dataset;
-import eu.eudat.data.entities.DescriptionTemplate;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.elastic.entities.Tag;
 import eu.eudat.logic.managers.DatasetManager;
 import eu.eudat.logic.managers.DatasetProfileManager;
@@ -25,10 +25,6 @@ import eu.eudat.models.data.datasetwizard.DatasetWizardModel;
 import eu.eudat.models.data.externaldataset.ExternalAutocompleteFieldModel;
 import eu.eudat.models.data.license.LicenseModel;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -37,19 +33,11 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
-@Component
 public class PrefillingMapper {
-    private static final Logger logger = LoggerFactory.getLogger(PrefillingMapper.class);
     private static final ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
-    private final DatasetProfileManager datasetProfileManager;
 
-    @Autowired
-    public PrefillingMapper(DatasetProfileManager datasetProfileManager) {
-        this.datasetProfileManager = datasetProfileManager;
-    }
-
-    public DatasetWizardModel mapPrefilledEntityToDatasetWizard(Map<String, Object> prefilledEntity, PrefillingGet prefillingGet, String type,
-                                                                       DescriptionTemplate profile, DatasetManager datasetManager, LicenseManager licenseManager) throws Exception {
+    public static DatasetWizardModel mapPrefilledEntityToDatasetWizard(Map<String, Object> prefilledEntity, PrefillingGet prefillingGet, String type,
+                                                                       DatasetProfile profile, DatasetManager datasetManager, LicenseManager licenseManager) throws Exception {
         DatasetWizardModel datasetWizardModel = new DatasetWizardModel();
         datasetWizardModel.setProfile(new DatasetProfileOverviewModel().fromDataModel(profile));
         Dataset dataset = new Dataset();
@@ -66,17 +54,7 @@ public class PrefillingMapper {
                     sourceValue = ((Map)sourceValue).get(sourceKey);
                 }
             }
-            try {
-                setValue(prefillingMapping, mapper.writeValueAsString(sourceValue), datasetWizardModel, parentNode, properties, type, licenseManager);
-            }
-            catch (Exception e) {
-                if (prefillingMapping.getSemanticTarget() != null && !prefillingMapping.getSemanticTarget().isEmpty()) {
-                    logger.warn("Couldn't map " + prefillingMapping.getSemanticTarget());
-                }
-                else if (prefillingMapping.getTarget() != null && !prefillingMapping.getTarget().isEmpty()) {
-                    logger.warn("Couldn't map " + prefillingMapping.getTarget());
-                }
-            }
+            setValue(prefillingMapping, mapper.writeValueAsString(sourceValue), datasetWizardModel, parentNode, properties, type, licenseManager);
         }
         for (PrefillingFixedMapping fixedMapping: prefillingGet.getFixedMappings()) {
             setValue(fixedMapping, fixedMapping.getValue(), datasetWizardModel, parentNode, properties, type, licenseManager);
@@ -86,7 +64,7 @@ public class PrefillingMapper {
         return datasetWizardModel;
     }
 
-    private void setValue(PrefillingMapping prefillingMapping, String value, DatasetWizardModel datasetWizardModel, JsonNode parentNode, Map<String, Object> properties, String type, LicenseManager licenseManager) throws InvocationTargetException, IllegalAccessException, JsonProcessingException {
+    private static void setValue(PrefillingMapping prefillingMapping, String value, DatasetWizardModel datasetWizardModel, JsonNode parentNode, Map<String, Object> properties, String type, LicenseManager licenseManager) throws InvocationTargetException, IllegalAccessException, JsonProcessingException {
         String trimRegex = prefillingMapping.getTrimRegex() != null ? prefillingMapping.getTrimRegex() : "";
         if (!value.startsWith("\"") && !value.startsWith("[") && !value.equals("null")) {
             value = "\"" + value + "\"";
@@ -126,11 +104,7 @@ public class PrefillingMapper {
                 //GK: Tags Special logic
                 if (parsedValue != null && !parsedValue.equals("null") && prefillingMapping.getTarget().equals("tags")) {
                     parsedValue = mapper.valueToTree(parseTags(parsedValue)).toString();
-                }
-                else if(!parsedValues.isEmpty() && prefillingMapping.getTarget().equals("tags")) {
-                    parsedValue = mapper.valueToTree(parseTags(String.join(", ", parsedValues))).toString();
-                }
-                else {
+                } else {
                     parsedValue = mapper.valueToTree(parsedValue).toString();
                 }
                 setterMethod.invoke(datasetWizardModel, mapper.readValue(parsedValue, params[0]));
@@ -138,17 +112,17 @@ public class PrefillingMapper {
                 throw e;
             }
         } else {
-            List<JsonNode> nodes = JsonSearcher.findNodes(parentNode, "schematics", prefillingMapping.getSemanticTarget());
+            List<JsonNode> nodes = JsonSearcher.findNodes(parentNode, "rdaProperty", prefillingMapping.getMaDmpTarget());
 
             // zenodo prefilling customizations
             if(type.equals("zenodo")){
-                if(prefillingMapping.getSemanticTarget().equals("rda.dataset.distribution.data_access")){
+                if(prefillingMapping.getMaDmpTarget().equals("dataset.distribution.data_access")){
                     if(parsedValue != null && parsedValue.equals("open")){
-                        List<JsonNode> issuedNodes = JsonSearcher.findNodes(parentNode, "schematics", "rda.dataset.issued");
+                        List<JsonNode> issuedNodes = JsonSearcher.findNodes(parentNode, "rdaProperty", "dataset.issued");
                         if(!issuedNodes.isEmpty()){
                             String issuedIdNode = issuedNodes.get(0).get("id").asText();
                             String issuedValue = (String) properties.get(issuedIdNode);
-                            List<JsonNode> licStartDateNodes = JsonSearcher.findNodes(parentNode, "schematics", "rda.dataset.distribution.license.start_date");
+                            List<JsonNode> licStartDateNodes = JsonSearcher.findNodes(parentNode, "rdaProperty", "dataset.distribution.license.start_date");
                             for (JsonNode licStartDateNode : licStartDateNodes) {
                                 String licStartDateId = licStartDateNode.get(0) != null ? licStartDateNode.get(0).get("id").asText() : licStartDateNode.get("id").asText();
                                 properties.put(licStartDateId, issuedValue);
@@ -157,7 +131,7 @@ public class PrefillingMapper {
                     }
                 }
 
-                if (prefillingMapping.getSemanticTarget().equals("rda.dataset.distribution.available_until") && parsedValue != null && !parsedValue.equals("null")) {
+                if (prefillingMapping.getMaDmpTarget().equals("dataset.distribution.available_until") && parsedValue != null && !parsedValue.equals("null")) {
                     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("uuuu-MM-dd");
                     LocalDate date = LocalDate.parse(parsedValue, formatter);
                     date = date.plusYears(20);
@@ -178,12 +152,7 @@ public class PrefillingMapper {
                         }
                         break;
                     case TAGS:
-                        if(parsedValues.isEmpty()) {
-                            properties.put(id, mapper.valueToTree(parseTags(parsedValue)).toString());
-                        }
-                        else {
-                            properties.put(id, mapper.valueToTree(parseTags(String.join(", ", parsedValues))).toString());
-                        }
+                        properties.put(id, mapper.valueToTree(parseTags(parsedValue)).toString());
                         break;
                     case DATASET_IDENTIFIER:
                         JSONObject datasetID = new JSONObject();
@@ -225,7 +194,7 @@ public class PrefillingMapper {
         }
     }
 
-    private Object parseComboBoxValues(JsonNode node, List<String> parsedValues) throws JsonProcessingException {
+    private static Object parseComboBoxValues(JsonNode node, List<String> parsedValues) throws JsonProcessingException {
         List<Object> normalizedValues = new ArrayList<>();
         boolean isMultiSelect;
         String type = node.isArray() ? node.get(0).get("data").get("type").asText() : node.get("data").get("type").asText();
@@ -234,13 +203,7 @@ public class PrefillingMapper {
             AutoCompleteData autoCompleteData = mapper.treeToValue(dataNode, AutoCompleteData.class);
             isMultiSelect = autoCompleteData.getMultiAutoComplete();
             for (String format : parsedValues) {
-                List<ExternalAutocompleteFieldModel> result = new ArrayList<>();
-                try {
-                    result = datasetProfileManager.getAutocomplete(autoCompleteData, format);
-                }
-                catch (Exception e) {
-                    logger.error(e.getMessage(), e);
-                }
+                List<ExternalAutocompleteFieldModel> result = DatasetProfileManager.getAutocomplete(autoCompleteData, format);
                 result = result.stream().filter(StreamDistinctBy.distinctByKey(ExternalAutocompleteFieldModel::getId)).collect(Collectors.toList());
                 if(!result.isEmpty()){
                     List<String> tempValues = new LinkedList<>();

dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/AuthType.java

@@ -1,23 +0,0 @@
-package eu.eudat.logic.proxy.config;
-
-public enum AuthType {
-    ;
-    private final String name;
-
-    AuthType(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public static AuthType fromName(String name) {
-        for (AuthType authType : AuthType.values()) {
-            if (authType.getName().equals(name)) {
-                return authType;
-            }
-        }
-        throw new IllegalArgumentException("AuthType [" + name + "] is not supported");
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/AuthenticationConfiguration.java

@@ -1,57 +0,0 @@
-package eu.eudat.logic.proxy.config;
-
-import javax.xml.bind.annotation.XmlElement;
-
-public class AuthenticationConfiguration {
-
-    private String authUrl;
-    private String authMethod = "GET";
-    private String authTokenPath;
-    private String authRequestBody;
-    private String type;
-
-    public String getAuthUrl() {
-        return authUrl;
-    }
-
-    @XmlElement(name = "authUrl")
-    public void setAuthUrl(String authUrl) {
-        this.authUrl = authUrl;
-    }
-
-    public String getAuthMethod() {
-        return authMethod;
-    }
-
-    @XmlElement(name = "authUrlMethod")
-    public void setAuthMethod(String authMethod) {
-        this.authMethod = authMethod;
-    }
-
-    public String getAuthTokenPath() {
-        return authTokenPath;
-    }
-
-    @XmlElement(name = "authTokenJpath")
-    public void setAuthTokenPath(String authTokenPath) {
-        this.authTokenPath = authTokenPath;
-    }
-
-    public String getAuthRequestBody() {
-        return authRequestBody;
-    }
-
-    @XmlElement(name = "authUrlBody")
-    public void setAuthRequestBody(String authRequestBody) {
-        this.authRequestBody = authRequestBody;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    @XmlElement(name = "authType")
-    public void setType(String type) {
-        this.type = type;
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/DOIFunder.java

@@ -0,0 +1,27 @@
+package eu.eudat.logic.proxy.config;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class DOIFunder {
+
+    @JsonProperty("Funder")
+    private String funder;
+    @JsonProperty("DOI")
+    private String DOI;
+
+    public String getFunder() {
+        return funder;
+    }
+
+    public void setFunder(String funder) {
+        this.funder = funder;
+    }
+
+    public String getDOI() {
+        return DOI;
+    }
+
+    public void setDOI(String DOI) {
+        this.DOI = DOI;
+    }
+}

dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/DataFieldsUrlConfiguration.java

@@ -8,8 +8,6 @@ import javax.xml.bind.annotation.XmlElement;
 public class DataFieldsUrlConfiguration {
     private String id;
     private String name;
-    private String pid;
-    private String pidTypeField;
     private String uri;
     private String description;
     private String source;
@@ -38,23 +36,6 @@ public class DataFieldsUrlConfiguration {
         this.name = name;
     }
 
-    public String getPid() {
-        return pid;
-    }
-
-    @XmlElement(name = "pid")
-    public void setPid(String pid) {
-        this.pid = pid;
-    }
-
-    public String getPidTypeField() {
-        return pidTypeField;
-    }
-
-    @XmlElement(name = "pidTypeField")
-    public void setPidTypeField(String pidTypeField) {
-        this.pidTypeField = pidTypeField;
-    }
 
     public String getUri() {
         return uri;

dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/Semantic.java

@@ -1,25 +0,0 @@
-package eu.eudat.logic.proxy.config;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class Semantic {
-
-    @JsonProperty("category")
-    private String category;
-    @JsonProperty("name")
-    private String name;
-
-    public String getCategory() {
-        return category;
-    }
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-}

dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/UrlConfiguration.java

@@ -11,7 +11,6 @@ public class UrlConfiguration {
     private String label;
     private Integer ordinal;
     private String url;
-    private boolean dataInListing;
     private DataUrlConfiguration data;
     private String type;
     private String paginationPath;
@@ -21,7 +20,6 @@ public class UrlConfiguration {
     private String requestType = "GET";
     private String requestBody = "";
     private String filterType = "remote";
-    private AuthenticationConfiguration auth;
 
     private List<QueryConfig> queries;
 
@@ -49,14 +47,6 @@ public class UrlConfiguration {
         this.url = url;
     }
 
-    public boolean isDataInListing() {
-        return dataInListing;
-    }
-    @XmlElement(name = "dataInListing")
-    public void setDataInListing(boolean dataInListing) {
-        this.dataInListing = dataInListing;
-    }
-
     public Integer getOrdinal() {
         return ordinal;
     }
@@ -144,13 +134,4 @@ public class UrlConfiguration {
     public void setQueries(List<QueryConfig> queries) {
         this.queries = queries;
     }
-
-    public AuthenticationConfiguration getAuth() {
-        return auth;
-    }
-
-    @XmlElement(name="authentication")
-    public void setAuth(AuthenticationConfiguration auth) {
-        this.auth = auth;
-    }
 }

dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ConfigLoader.java

@@ -1,9 +1,8 @@
 package eu.eudat.logic.proxy.config.configloaders;
 
+import eu.eudat.logic.proxy.config.DOIFunder;
 import eu.eudat.logic.proxy.config.ExternalUrls;
-import eu.eudat.logic.proxy.config.Semantic;
 import eu.eudat.logic.security.customproviders.ConfigurableProvider.entities.ConfigurableProviders;
-import eu.eudat.models.data.pid.PidLinks;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 
 import java.util.List;
@@ -11,10 +10,10 @@ import java.util.Map;
 
 public interface ConfigLoader {
     ExternalUrls getExternalUrls();
-    List<Semantic> getSemantics();
+    List<String> getRdaProperties();
     XWPFDocument getDocument();
     XWPFDocument getDatasetDocument();
     ConfigurableProviders getConfigurableProviders();
-    PidLinks getPidLinks();
     Map<String, String> getKeyToSourceMap();
+    List<DOIFunder> getDOIFunders();
 }

dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/DefaultConfigLoader.java

@@ -1,12 +1,10 @@
 package eu.eudat.logic.proxy.config.configloaders;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import eu.eudat.logic.proxy.config.DOIFunder;
 import eu.eudat.logic.proxy.config.ExternalUrls;
-import eu.eudat.logic.proxy.config.Semantic;
 import eu.eudat.logic.security.customproviders.ConfigurableProvider.entities.ConfigurableProviders;
-import eu.eudat.models.data.pid.PidLinks;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,12 +36,12 @@ public class DefaultConfigLoader implements ConfigLoader {
     private static final ObjectMapper mapper = new ObjectMapper();
 
     private ExternalUrls externalUrls;
-    private List<Semantic> semantics;
+    private List<String> rdaProperties;
     private XWPFDocument document;
     private XWPFDocument datasetDocument;
     private ConfigurableProviders configurableProviders;
-    private PidLinks pidLinks;
     private Map<String, String> keyToSourceMap;
+    private List<DOIFunder> doiFunders = new ArrayList<>();
 
     @Autowired
     private Environment environment;
@@ -68,17 +66,24 @@ public class DefaultConfigLoader implements ConfigLoader {
         }
     }
 
-    private void setSemantics() {
-        String filePath = environment.getProperty("configuration.semantics");
+    private void setRdaProperties() {
+        String filePath = environment.getProperty("configuration.rda");
         logger.info("Loaded also config file: " + filePath);
-        if (filePath != null) {
-            try {
-                semantics = mapper.readValue(getStreamFromPath(filePath), new TypeReference<List<Semantic>>(){});
-            }
-            catch (IOException e) {
-                logger.error(e.getMessage(), e);
+        BufferedReader reader;
+        List<String> rdaList = new LinkedList<>();
+        try {
+            reader = new BufferedReader(new InputStreamReader(getStreamFromPath(filePath)));
+            String line = reader.readLine();
+            while (line != null) {
+                rdaList.add(line);
+                line = reader.readLine();
             }
+            reader.close();
+        } catch (IOException | NullPointerException e) {
+            logger.error(e.getMessage(), e);
         }
+
+        rdaProperties = rdaList;
     }
 
     private void setDocument() {
@@ -136,25 +141,6 @@ public class DefaultConfigLoader implements ConfigLoader {
         }
     }
 
-    private void setPidLinks() {
-        String filePath = environment.getProperty("configuration.pid_links");
-        logger.info("Loaded also config file: " + filePath);
-        InputStream is = null;
-        try {
-            is = getStreamFromPath(filePath);
-            ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-            this.pidLinks = mapper.readValue(is, PidLinks.class);
-        } catch (IOException | NullPointerException e) {
-            logger.error(e.getMessage(), e);
-        } finally {
-            try {
-                if (is != null) is.close();
-            } catch (IOException e) {
-                logger.warn("Warning: Could not close a stream after reading from file: " + filePath, e);
-            }
-        }
-    }
-
     private void setKeyToSourceMap() {
         String filePath = this.environment.getProperty("configuration.externalUrls");
         logger.info("Loaded also config file: " + filePath);
@@ -183,16 +169,32 @@ public class DefaultConfigLoader implements ConfigLoader {
         if (externalUrls == null) {
             externalUrls = new ExternalUrls();
             this.setExternalUrls();
+        } else {
+            while (externalUrls.getMaxresults() == null) {
+                try {
+                    Thread.sleep(100L);
+                } catch (InterruptedException e) {
+                    logger.error(e.getMessage(), e);
+                }
+            }
         }
         return externalUrls;
     }
 
-    public List<Semantic> getSemantics() {
-        if (semantics == null) {
-            semantics = new ArrayList<>();
-            this.setSemantics();
+    public List<String> getRdaProperties() {
+        if (rdaProperties == null) {
+            rdaProperties = new ArrayList<>();
+            this.setRdaProperties();
+        } else {
+            while (rdaProperties.size() == 0) {
+                try {
+                    Thread.sleep(100L);
+                } catch (InterruptedException e) {
+                    logger.error(e.getMessage(), e);
+                }
+            }
         }
-        return semantics;
+        return rdaProperties;
     }
 
     public XWPFDocument getDocument() {
@@ -209,26 +211,46 @@ public class DefaultConfigLoader implements ConfigLoader {
         if (configurableProviders == null) {
             configurableProviders = new ConfigurableProviders();
             this.setConfigurableProviders();
+        } else {
+            while (configurableProviders.getProviders().size() == 0) {
+                try {
+                    Thread.sleep(100L);
+                } catch (InterruptedException e) {
+                    logger.error(e.getMessage(), e);
+                }
+            }
         }
         return configurableProviders;
     }
 
-    public PidLinks getPidLinks() {
-        if (pidLinks == null) {
-            pidLinks = new PidLinks();
-            this.setPidLinks();
-        }
-        return pidLinks;
-    }
-
     public Map<String, String> getKeyToSourceMap() {
         if (keyToSourceMap == null) {
             keyToSourceMap = new HashMap<>();
             this.setKeyToSourceMap();
+        } else {
+            while (keyToSourceMap.size() == 0) {
+                try {
+                    Thread.sleep(100L);
+                } catch (InterruptedException e) {
+                    logger.error(e.getMessage(), e);
+                }
+            }
         }
         return keyToSourceMap;
     }
 
+    @Override
+    public List<DOIFunder> getDOIFunders() {
+        if (doiFunders == null || doiFunders.isEmpty()) {
+            try {
+                List<Map<String, Object>> tempdoiFunders = mapper.readValue(getStreamFromPath(environment.getProperty("configuration.doi_funder")), List.class);
+                doiFunders = tempdoiFunders.stream().map(map -> mapper.convertValue(map, DOIFunder.class) ).collect(Collectors.toList());
+            } catch (IOException e) {
+                logger.error(e.getLocalizedMessage(), e);
+            }
+        }
+        return doiFunders;
+    }
 
     private Document getXmlDocumentFromFilePath(String filePath) {
         InputStream is = null;