Fix some merge issues

dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java

@@ -15,7 +15,6 @@ import eu.eudat.commons.types.prefilling.PrefillingEntity;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.ReferenceEntity;
-import eu.eudat.file.transformer.utils.helpers.StreamDistinctBy;
 import eu.eudat.model.*;
 import eu.eudat.model.builder.DescriptionTemplateBuilder;
 import eu.eudat.model.builder.PrefillingBuilder;
@@ -35,6 +34,7 @@ import eu.eudat.service.remotefetcher.config.entities.*;
 import eu.eudat.service.remotefetcher.criteria.ExternalReferenceCriteria;
 import eu.eudat.service.remotefetcher.criteria.FetchStrategy;
 import eu.eudat.service.remotefetcher.models.ExternalAutocompleteFieldResult;
+import eu.eudat.utilities.helpers.StreamDistinctBy;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyApplicationException;

dmp-backend/core/src/main/java/eu/eudat/utilities/helpers/StreamDistinctBy.java

@@ -1,4 +1,4 @@
-package eu.eudat.logic.utilities.helpers;
+package eu.eudat.utilities.helpers;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

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

@@ -19,7 +19,6 @@ import eu.eudat.data.query.items.table.dataset.DatasetTableRequest;
 import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem;
 import eu.eudat.exceptions.security.ForbiddenException;
 import eu.eudat.exceptions.security.UnauthorisedException;
-import eu.eudat.file.transformer.enums.old.notification.NotificationType;
 import eu.eudat.logic.builders.BuilderFactory;
 import eu.eudat.logic.builders.entity.UserInfoBuilder;
 import eu.eudat.logic.proxy.config.configloaders.ConfigLoader;
@@ -667,9 +666,9 @@ public class DatasetManager {
         //updateTags(descriptionEntity1, datasetWizardModel.getTags()); //TODO
         if (sendNotification) {
             if (descriptionEntity1.getStatus() != DescriptionStatus.Finalized) {
-                this.sendNotification(descriptionEntity1, dmp1, userInfo, null/*NotificationType.DATASET_MODIFIED*/);
+                this.sendNotification(descriptionEntity1, dmp1, userInfo/*, NotificationType.DATASET_MODIFIED*/);
             } else {
-                this.sendNotification(descriptionEntity1, dmp1, userInfo, null/*NotificationType.DATASET_MODIFIED_FINALISED*/);
+                this.sendNotification(descriptionEntity1, dmp1, userInfo/*, NotificationType.DATASET_MODIFIED_FINALISED*/);
             }
         }
 
@@ -717,7 +716,7 @@ public class DatasetManager {
         });
     }
 
-    private void sendNotification(DescriptionEntity descriptionEntity, DmpEntity dmp, UserEntity user, NotificationType notificationType) throws InvalidApplicationException {
+    private void sendNotification(DescriptionEntity descriptionEntity, DmpEntity dmp, UserEntity user/*, NotificationType notificationType*/) throws InvalidApplicationException {
         List<DmpUserEntity> userDMPS = this.queryFactory.query(DmpUserQuery.class).dmpIds(dmp.getId()).collect();
         for (DmpUserEntity userDMP : userDMPS) {
             if (!userDMP.getUserId().equals(user.getId())) {

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

@@ -1,7 +1,7 @@
 package eu.eudat.logic.managers;
 
 import eu.eudat.logic.proxy.fetching.LocalFetcher;
-import eu.eudat.logic.utilities.helpers.StreamDistinctBy;
+import eu.eudat.utilities.helpers.StreamDistinctBy;
 import eu.eudat.models.data.local.LocalFetchModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -13,7 +13,7 @@ import eu.eudat.service.remotefetcher.config.entities.DefaultPrefillingMapping;
 import eu.eudat.service.remotefetcher.config.entities.PrefillingFixedMapping;
 import eu.eudat.service.remotefetcher.config.entities.PrefillingGet;
 import eu.eudat.service.remotefetcher.config.entities.PrefillingMapping;
-import eu.eudat.logic.utilities.helpers.StreamDistinctBy;
+import eu.eudat.utilities.helpers.StreamDistinctBy;
 import eu.eudat.logic.utilities.json.JsonSearcher;
 import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity;
 import eu.eudat.models.data.datasetprofile.DatasetProfileOverviewModel;

dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java

@@ -3,13 +3,11 @@ package eu.eudat.models.rda.mapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import eu.eudat.commons.enums.IsActive;
 import eu.eudat.data.DescriptionEntity;
 import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.TagEntity;
 import eu.eudat.logic.managers.DatasetManager;
 import eu.eudat.logic.services.ApiContext;
-import eu.eudat.logic.utilities.helpers.StreamDistinctBy;
 import eu.eudat.logic.utilities.json.JsonSearcher;
 import eu.eudat.models.data.datasetwizard.DatasetWizardModel;
 import eu.eudat.models.rda.*;