From ea7fa62922983248cab88af9dd37c1eece38954b Mon Sep 17 00:00:00 2001 From: Thomas Georgios Giannos Date: Mon, 20 Nov 2023 12:29:24 +0200 Subject: [PATCH] Migrating packages to resolve conflicts with the refactored project (part 2) --- .../data/dao/criteria/DatasetCriteria.java | 2 +- .../dao/criteria/DatasetPublicCriteria.java | 2 +- .../eudat/elastic/criteria/Criteria.java | 2 +- .../elastic/criteria/DatasetCriteria.java | 4 +-- .../eudat/elastic/criteria/DmpCriteria.java | 2 +- .../eudat/elastic/criteria/SortCriteria.java | 2 +- .../eudat/elastic/criteria/TagCriteria.java | 2 +- .../eudat/elastic/entities/Collaborator.java | 2 +- .../eudat/elastic/entities/Dataset.java | 2 +- .../elastic/entities/DatasetTempalate.java | 2 +- .../{ => old}/eudat/elastic/entities/Dmp.java | 2 +- .../{ => old}/eudat/elastic/entities/Doi.java | 2 +- .../eudat/elastic/entities/ElasticEntity.java | 2 +- .../eudat/elastic/entities/Organization.java | 2 +- .../{ => old}/eudat/elastic/entities/Tag.java | 2 +- .../elastic/repository/DatasetRepository.java | 12 ++++---- .../elastic/repository/DmpRepository.java | 7 ++--- .../elastic/repository/ElasticRepository.java | 8 ++--- .../eudat/elastic/repository/Repository.java | 6 ++-- .../old/eudat/controllers/TagController.java | 6 ++-- .../logic/managers/DashBoardManager.java | 5 ++-- .../managers/DataManagementPlanManager.java | 24 +++++++-------- .../eudat/logic/managers/DatasetManager.java | 30 +++++++++---------- .../logic/managers/DatasetWizardManager.java | 2 +- .../MergeEmailConfirmationManager.java | 8 ++--- .../logic/managers/QuickWizardManager.java | 2 +- .../mapper/elastic/CollaboratorMapper.java | 2 +- .../logic/mapper/elastic/DatasetMapper.java | 8 ++--- .../mapper/elastic/DatasetTemplateMapper.java | 2 +- .../eudat/logic/mapper/elastic/DmpMapper.java | 6 ++-- .../mapper/elastic/OrganizationMapper.java | 2 +- .../elastic/criteria/DmpCriteriaMapper.java | 4 +-- .../mapper/prefilling/PrefillingMapper.java | 2 +- .../operations/ElasticRepository.java | 4 +-- .../operations/ElasticRepositoryImpl.java | 4 +-- .../datasetwizard/DatasetWizardModel.java | 2 +- .../models/rda/mapper/DatasetRDAMapper.java | 6 ++-- .../eudat/models/rda/mapper/DmpRDAMapper.java | 2 +- .../models/rda/mapper/KeywordRDAMapper.java | 2 +- .../dataset/DatasetPublicCriteria.java | 2 +- .../mapper/DmpPublicCriteriaMapper.java | 4 +-- .../managers/DatasetPublicManager.java | 8 ++--- .../overviewmodels/DatasetPublicModel.java | 2 +- 43 files changed, 100 insertions(+), 104 deletions(-) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/criteria/Criteria.java (67%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/criteria/DatasetCriteria.java (97%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/criteria/DmpCriteria.java (98%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/criteria/SortCriteria.java (95%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/criteria/TagCriteria.java (70%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/entities/Collaborator.java (96%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/entities/Dataset.java (99%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/entities/DatasetTempalate.java (97%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/entities/Dmp.java (99%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/entities/Doi.java (97%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/entities/ElasticEntity.java (90%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/entities/Organization.java (95%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/entities/Tag.java (96%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/repository/DatasetRepository.java (98%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/repository/DmpRepository.java (98%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/repository/ElasticRepository.java (86%) rename dmp-migration-tool/elastic/src/main/java/eu/{ => old}/eudat/elastic/repository/Repository.java (80%) diff --git a/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/dao/criteria/DatasetCriteria.java b/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/dao/criteria/DatasetCriteria.java index 74a4e7c27..2b99df0e1 100644 --- a/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/dao/criteria/DatasetCriteria.java +++ b/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/dao/criteria/DatasetCriteria.java @@ -1,7 +1,7 @@ package eu.old.eudat.data.dao.criteria; import eu.old.eudat.data.entities.Dataset; -import eu.eudat.elastic.entities.Tag; +import eu.old.eudat.elastic.entities.Tag; import java.util.Date; import java.util.List; diff --git a/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/dao/criteria/DatasetPublicCriteria.java b/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/dao/criteria/DatasetPublicCriteria.java index 30a138aab..acb462f07 100644 --- a/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/dao/criteria/DatasetPublicCriteria.java +++ b/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/dao/criteria/DatasetPublicCriteria.java @@ -1,7 +1,7 @@ package eu.old.eudat.data.dao.criteria; import eu.old.eudat.data.entities.Dataset; -import eu.eudat.elastic.entities.Tag; +import eu.old.eudat.elastic.entities.Tag; import eu.old.eudat.types.grant.GrantStateType; import java.util.List; diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/criteria/Criteria.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/criteria/Criteria.java similarity index 67% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/criteria/Criteria.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/criteria/Criteria.java index fa1bcd635..ffc7835e7 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/criteria/Criteria.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/criteria/Criteria.java @@ -1,4 +1,4 @@ -package eu.eudat.elastic.criteria; +package eu.old.eudat.elastic.criteria; /** * Created by ikalyvas on 7/5/2018. diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/criteria/DatasetCriteria.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/criteria/DatasetCriteria.java similarity index 97% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/criteria/DatasetCriteria.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/criteria/DatasetCriteria.java index b00fec7df..4443c84aa 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/criteria/DatasetCriteria.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/criteria/DatasetCriteria.java @@ -1,6 +1,6 @@ -package eu.eudat.elastic.criteria; +package eu.old.eudat.elastic.criteria; -import eu.eudat.elastic.entities.Tag; +import eu.old.eudat.elastic.entities.Tag; import java.util.List; import java.util.UUID; diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/criteria/DmpCriteria.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/criteria/DmpCriteria.java similarity index 98% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/criteria/DmpCriteria.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/criteria/DmpCriteria.java index e354ec3cf..b3db62656 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/criteria/DmpCriteria.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/criteria/DmpCriteria.java @@ -1,4 +1,4 @@ -package eu.eudat.elastic.criteria; +package eu.old.eudat.elastic.criteria; import java.util.List; import java.util.UUID; diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/criteria/SortCriteria.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/criteria/SortCriteria.java similarity index 95% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/criteria/SortCriteria.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/criteria/SortCriteria.java index 0d1876a76..6bed216b2 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/criteria/SortCriteria.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/criteria/SortCriteria.java @@ -1,4 +1,4 @@ -package eu.eudat.elastic.criteria; +package eu.old.eudat.elastic.criteria; public class SortCriteria { public enum OrderByType { diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/criteria/TagCriteria.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/criteria/TagCriteria.java similarity index 70% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/criteria/TagCriteria.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/criteria/TagCriteria.java index 37a8f9861..791905e9d 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/criteria/TagCriteria.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/criteria/TagCriteria.java @@ -1,4 +1,4 @@ -package eu.eudat.elastic.criteria; +package eu.old.eudat.elastic.criteria; /** * Created by ikalyvas on 7/5/2018. diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Collaborator.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Collaborator.java similarity index 96% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Collaborator.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Collaborator.java index 386a0fc22..61a0c9e8b 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Collaborator.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Collaborator.java @@ -1,4 +1,4 @@ -package eu.eudat.elastic.entities; +package eu.old.eudat.elastic.entities; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Dataset.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Dataset.java similarity index 99% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Dataset.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Dataset.java index 3a4e135ba..9535608e1 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Dataset.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Dataset.java @@ -1,4 +1,4 @@ -package eu.eudat.elastic.entities; +package eu.old.eudat.elastic.entities; import org.elasticsearch.common.xcontent.XContentBuilder; import org.slf4j.Logger; diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/DatasetTempalate.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/DatasetTempalate.java similarity index 97% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/DatasetTempalate.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/DatasetTempalate.java index a6a6a6782..f19a80e0e 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/DatasetTempalate.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/DatasetTempalate.java @@ -1,4 +1,4 @@ -package eu.eudat.elastic.entities; +package eu.old.eudat.elastic.entities; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Dmp.java similarity index 99% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Dmp.java index 70d981522..c6103f2e6 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Dmp.java @@ -1,4 +1,4 @@ -package eu.eudat.elastic.entities; +package eu.old.eudat.elastic.entities; import org.elasticsearch.common.xcontent.XContentBuilder; import org.slf4j.Logger; diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Doi.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Doi.java similarity index 97% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Doi.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Doi.java index 0b990a437..8380cf212 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Doi.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Doi.java @@ -1,4 +1,4 @@ -package eu.eudat.elastic.entities; +package eu.old.eudat.elastic.entities; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/ElasticEntity.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/ElasticEntity.java similarity index 90% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/ElasticEntity.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/ElasticEntity.java index 2f6b5f714..e4c57858d 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/ElasticEntity.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/ElasticEntity.java @@ -1,4 +1,4 @@ -package eu.eudat.elastic.entities; +package eu.old.eudat.elastic.entities; import org.elasticsearch.common.document.DocumentField; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Organization.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Organization.java similarity index 95% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Organization.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Organization.java index 4ddd55854..fab177349 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Organization.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Organization.java @@ -1,4 +1,4 @@ -package eu.eudat.elastic.entities; +package eu.old.eudat.elastic.entities; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Tag.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Tag.java similarity index 96% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Tag.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Tag.java index e79e91a34..357b0df49 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/entities/Tag.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/entities/Tag.java @@ -1,4 +1,4 @@ -package eu.eudat.elastic.entities; +package eu.old.eudat.elastic.entities; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/repository/DatasetRepository.java similarity index 98% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/repository/DatasetRepository.java index 8364d6c57..12a603224 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/repository/DatasetRepository.java @@ -1,9 +1,9 @@ -package eu.eudat.elastic.repository; +package eu.old.eudat.elastic.repository; -import eu.eudat.elastic.criteria.DatasetCriteria; -import eu.eudat.elastic.entities.Dataset; -import eu.eudat.elastic.entities.Dmp; -import eu.eudat.elastic.entities.Tag; +import eu.old.eudat.elastic.criteria.DatasetCriteria; +import eu.old.eudat.elastic.entities.Dataset; +import eu.old.eudat.elastic.entities.Dmp; +import eu.old.eudat.elastic.entities.Tag; import org.apache.lucene.search.join.ScoreMode; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.search.SearchRequest; @@ -28,8 +28,6 @@ import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.sort.SortBuilder; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/repository/DmpRepository.java similarity index 98% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/repository/DmpRepository.java index 6e18b0f88..5a5a425b7 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/repository/DmpRepository.java @@ -1,7 +1,7 @@ -package eu.eudat.elastic.repository; +package eu.old.eudat.elastic.repository; -import eu.eudat.elastic.criteria.DmpCriteria; -import eu.eudat.elastic.entities.Dmp; +import eu.old.eudat.elastic.criteria.DmpCriteria; +import eu.old.eudat.elastic.entities.Dmp; import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; import org.elasticsearch.action.get.GetRequest; import org.elasticsearch.action.get.GetResponse; @@ -9,7 +9,6 @@ import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.client.core.CountRequest; diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/repository/ElasticRepository.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/repository/ElasticRepository.java similarity index 86% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/repository/ElasticRepository.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/repository/ElasticRepository.java index 68e329396..1f8090392 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/repository/ElasticRepository.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/repository/ElasticRepository.java @@ -1,11 +1,9 @@ -package eu.eudat.elastic.repository; +package eu.old.eudat.elastic.repository; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.elastic.criteria.Criteria; -import eu.eudat.elastic.entities.ElasticEntity; -import org.elasticsearch.client.Client; +import eu.old.eudat.elastic.criteria.Criteria; +import eu.old.eudat.elastic.entities.ElasticEntity; import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestHighLevelClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/repository/Repository.java b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/repository/Repository.java similarity index 80% rename from dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/repository/Repository.java rename to dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/repository/Repository.java index 71cf4c209..caf84522c 100644 --- a/dmp-migration-tool/elastic/src/main/java/eu/eudat/elastic/repository/Repository.java +++ b/dmp-migration-tool/elastic/src/main/java/eu/old/eudat/elastic/repository/Repository.java @@ -1,7 +1,7 @@ -package eu.eudat.elastic.repository; +package eu.old.eudat.elastic.repository; -import eu.eudat.elastic.criteria.Criteria; -import eu.eudat.elastic.entities.ElasticEntity; +import eu.old.eudat.elastic.criteria.Criteria; +import eu.old.eudat.elastic.entities.ElasticEntity; import java.io.IOException; import java.util.List; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/controllers/TagController.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/controllers/TagController.java index 70bbecdd1..973d27ff9 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/controllers/TagController.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/controllers/TagController.java @@ -1,8 +1,8 @@ package eu.old.eudat.controllers; -import eu.eudat.elastic.criteria.DatasetCriteria; -import eu.eudat.elastic.entities.Dataset; -import eu.eudat.elastic.entities.Tag; +import eu.old.eudat.elastic.criteria.DatasetCriteria; +import eu.old.eudat.elastic.entities.Dataset; +import eu.old.eudat.elastic.entities.Tag; import eu.old.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.old.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.old.eudat.logic.services.ApiContext; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DashBoardManager.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DashBoardManager.java index ae68abed9..7ed5c77f2 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DashBoardManager.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DashBoardManager.java @@ -14,6 +14,7 @@ import eu.old.eudat.data.entities.Grant; import eu.old.eudat.data.entities.UserInfo; import eu.old.eudat.data.query.items.table.dataset.DatasetTableRequest; import eu.old.eudat.data.query.items.table.dmp.DataManagementPlanTableRequest; +import eu.old.eudat.elastic.criteria.DmpCriteria; import eu.old.eudat.logic.builders.model.models.RecentActivityDataBuilder; import eu.old.eudat.logic.services.ApiContext; import eu.old.eudat.logic.services.operations.DatabaseRepository; @@ -117,7 +118,7 @@ public class DashBoardManager { DatasetCriteria datasetCriteria = new DatasetCriteria(); if (apiContext.getOperationsContext().getElasticRepository().getDatasetRepository() != null) { try { - eu.eudat.elastic.criteria.DatasetCriteria datasetElasticCriteria = new eu.eudat.elastic.criteria.DatasetCriteria(); + eu.old.eudat.elastic.criteria.DatasetCriteria datasetElasticCriteria = new eu.old.eudat.elastic.criteria.DatasetCriteria(); datasetElasticCriteria.setAllowAllVersions(false); datasetElasticCriteria.setPublic(false); datasetElasticCriteria.setCollaborators(Collections.singletonList(principal.getId())); @@ -132,7 +133,7 @@ public class DashBoardManager { DataManagementPlanCriteria dataManagementPlanCriteria = new DataManagementPlanCriteria(); if (apiContext.getOperationsContext().getElasticRepository().getDmpRepository() != null) { try { - eu.eudat.elastic.criteria.DmpCriteria dmpElasticCriteria = new eu.eudat.elastic.criteria.DmpCriteria(); + DmpCriteria dmpElasticCriteria = new DmpCriteria(); dmpElasticCriteria.setAllowAllVersions(false); dmpElasticCriteria.setPublic(false); dmpElasticCriteria.setCollaborators(Collections.singletonList(principal.getId())); diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DataManagementPlanManager.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DataManagementPlanManager.java index 7a0366fca..2e2138c5a 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DataManagementPlanManager.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DataManagementPlanManager.java @@ -3,11 +3,11 @@ package eu.old.eudat.logic.managers; import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.depositinterface.models.DMPDepositModel; import eu.eudat.depositinterface.repository.RepositoryDeposit; -import eu.eudat.elastic.criteria.DmpCriteria; -import eu.eudat.elastic.entities.Collaborator; -import eu.eudat.elastic.entities.Dmp; -import eu.eudat.elastic.entities.Organization; -import eu.eudat.elastic.entities.Tag; +import eu.old.eudat.elastic.criteria.DmpCriteria; +import eu.old.eudat.elastic.entities.Collaborator; +import eu.old.eudat.elastic.entities.Dmp; +import eu.old.eudat.elastic.entities.Organization; +import eu.old.eudat.elastic.entities.Tag; import eu.old.eudat.configurations.dynamicgrant.DynamicGrantConfiguration; import eu.old.eudat.configurations.dynamicgrant.entities.Property; import eu.old.eudat.data.dao.criteria.*; @@ -880,7 +880,7 @@ public class DataManagementPlanManager { for (Dataset dataset: dmp.getDataset()) { try { List tags = new ArrayList<>(); - eu.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()); + eu.old.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()); if (elastic != null) { tags = elastic.getTags(); } @@ -1012,7 +1012,7 @@ public class DataManagementPlanManager { Dataset tempDataset = datasetDao.find(dataset.getId()); try { List tags = new ArrayList<>(); - eu.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()); + eu.old.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()); if (elastic != null) { tags = elastic.getTags(); } @@ -1077,7 +1077,7 @@ public class DataManagementPlanManager { }).thenApplyAsync(item -> { futures.add(datasetDao.createOrUpdateAsync(item).whenComplete(((dataset1, throwable) -> { metricsManager.increaseValue(MetricNames.DATASET, 1, MetricNames.DRAFT); - eu.eudat.elastic.entities.Dataset datasetElastic = new eu.eudat.elastic.entities.Dataset(); + eu.old.eudat.elastic.entities.Dataset datasetElastic = new eu.old.eudat.elastic.entities.Dataset(); datasetElastic.setId(dataset1.getId().toString()); datasetElastic.setLabel(dataset1.getLabel()); datasetElastic.setDescription(dataset1.getDescription()); @@ -1113,7 +1113,7 @@ public class DataManagementPlanManager { } try { - eu.eudat.elastic.entities.Dataset oldDatasetElastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()); + eu.old.eudat.elastic.entities.Dataset oldDatasetElastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()); if (oldDatasetElastic != null) { datasetElastic.setTags(oldDatasetElastic.getTags()); } @@ -1149,7 +1149,7 @@ public class DataManagementPlanManager { dmp1.getDataset().forEach(dataset -> { try { List tags = new ArrayList<>(); - eu.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()); + eu.old.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()); if (elastic != null) { tags = elastic.getTags(); } @@ -2187,7 +2187,7 @@ public class DataManagementPlanManager { dmp.setUsers(new HashSet<>(apiContext.getOperationsContext().getDatabaseRepository().getUserDmpDao().asQueryable().where((builder, root) -> builder.equal(root.get("dmp").get("id"), dmp.getId())).toList())); try { List tags = new ArrayList<>(); - eu.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()); + eu.old.eudat.elastic.entities.Dataset elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()); DatasetWizardModel datasetWizardModel = new DatasetWizardModel().fromDataModel(dataset); if (elastic != null) { tags = elastic.getTags(); @@ -2269,7 +2269,7 @@ public class DataManagementPlanManager { private void updateDatasetsIndex(List datasets) { datasets.forEach(dataset -> { List tags = new ArrayList<>(); - eu.eudat.elastic.entities.Dataset elastic = null; + eu.old.eudat.elastic.entities.Dataset elastic = null; try { elastic = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(dataset.getId().toString()); if (elastic != null) { diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DatasetManager.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DatasetManager.java index 0c63251a1..e1dc9e2fa 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DatasetManager.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DatasetManager.java @@ -16,9 +16,9 @@ import eu.old.eudat.data.enumeration.notification.NotifyState; import eu.old.eudat.data.query.items.table.dataset.DatasetPublicTableRequest; import eu.old.eudat.data.query.items.table.dataset.DatasetTableRequest; import eu.old.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem; -import eu.eudat.elastic.criteria.DatasetCriteria; -import eu.eudat.elastic.entities.Tag; -import eu.eudat.elastic.repository.DatasetRepository; +import eu.old.eudat.elastic.criteria.DatasetCriteria; +import eu.old.eudat.elastic.entities.Tag; +import eu.old.eudat.elastic.repository.DatasetRepository; import eu.old.eudat.exceptions.security.ForbiddenException; import eu.old.eudat.exceptions.security.UnauthorisedException; import eu.old.eudat.logic.builders.BuilderFactory; @@ -159,7 +159,7 @@ public class DatasetManager { } datasetCriteria.setOffset(datasetTableRequest.getOffset()); datasetCriteria.setSize(datasetTableRequest.getLength()); - List datasets; + List datasets; try { datasets = datasetRepository.exists() ? datasetRepository.queryIds(datasetCriteria) : null; @@ -233,7 +233,7 @@ public class DatasetManager { } datasetCriteria.setOffset(datasetTableRequest.getOffset()); datasetCriteria.setSize(datasetTableRequest.getLength()); - List datasets; + List datasets; try { datasets = datasetRepository.exists() ? datasetRepository.queryIds(datasetCriteria) : new LinkedList<>(); @@ -248,7 +248,7 @@ public class DatasetManager { if (datasets != null) { if (!datasets.isEmpty()) { items = databaseRepository.getDatasetDao().asQueryable().withHint(HintedModelFactory.getHint(DatasetListingModel.class)); - List finalDatasets = datasets; + List finalDatasets = datasets; items.where((builder, root) -> root.get("id").in(finalDatasets.stream().map(x -> UUID.fromString(x.getId())).collect(Collectors.toList()))); } else items = datasetTableRequest.applyCriteria(); @@ -328,10 +328,10 @@ public class DatasetManager { boolean latestVersion = profile.getVersion().toString().equals(datasetEntity.getProfile().getVersion().toString()); dataset.setIsProfileLatestVersion(latestVersion); - eu.eudat.elastic.entities.Dataset datasetElastic; + eu.old.eudat.elastic.entities.Dataset datasetElastic; try { datasetElastic = datasetRepository.exists() ? - datasetRepository.findDocument(id) : new eu.eudat.elastic.entities.Dataset(); + datasetRepository.findDocument(id) : new eu.old.eudat.elastic.entities.Dataset(); } catch (Exception ex) { logger.warn(ex.getMessage()); datasetElastic = null; @@ -793,12 +793,12 @@ public class DatasetManager { public void updateTags(Dataset datasetEntity, List tags) throws Exception { // if (datasetWizardModel.getTags() != null && !datasetWizardModel.getTags().isEmpty()) { - /*eu.eudat.elastic.entities.Dataset dataset = new eu.eudat.elastic.entities.Dataset(); + /*eu.old.eudat.entities.elastic.Dataset dataset = new eu.old.eudat.entities.elastic.Dataset(); dataset.setId(datasetWizardModel.getId().toString()); if (datasetWizardModel.getTags() != null && !datasetWizardModel.getTags().isEmpty()) { DatasetCriteria criteria = new DatasetCriteria(); criteria.setTags(datasetWizardModel.getTags()); - List tags = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().query(criteria).stream().map(eu.eudat.elastic.entities.Dataset::getTags).flatMap(Collection::stream) + List tags = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().query(criteria).stream().map(eu.old.eudat.entities.elastic.Dataset::getTags).flatMap(Collection::stream) .filter(StreamDistinctBy.distinctByKey(Tag::getId)).filter(tag -> datasetWizardModel.getTags().stream().anyMatch(tag1 -> tag1.getName().equals(tag.getName()))).collect(Collectors.toList()); if (tags.isEmpty()) { datasetWizardModel.getTags().forEach(tag -> tag.setId(UUID.randomUUID().toString())); @@ -847,7 +847,7 @@ public class DatasetManager { dataset.setGrantStatus(datasetWizardModel.getDmp().getGrant().getStatus()); dataset.setFormData(this.getWordDocumentText(datasetWizardModel));*/ DatasetMapper mapper = new DatasetMapper(apiContext, this); - eu.eudat.elastic.entities.Dataset dataset = mapper.toElastic(datasetEntity, tags); + eu.old.eudat.elastic.entities.Dataset dataset = mapper.toElastic(datasetEntity, tags); apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().createOrUpdate(dataset); // } } @@ -1054,10 +1054,10 @@ public class DatasetManager { // Now at latest version. dataset.setIsProfileLatestVersion(true); - eu.eudat.elastic.entities.Dataset datasetElastic; + eu.old.eudat.elastic.entities.Dataset datasetElastic; try { datasetElastic = datasetRepository.exists() ? - datasetRepository.findDocument(id) : new eu.eudat.elastic.entities.Dataset(); + datasetRepository.findDocument(id) : new eu.old.eudat.elastic.entities.Dataset(); } catch (Exception ex) { logger.warn(ex.getMessage()); datasetElastic = null; @@ -1104,7 +1104,7 @@ public class DatasetManager { List datasetEntities = new ArrayList<>(this.apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().asQueryable().toList()); datasetEntities.forEach(datasetEntity -> { try { - eu.eudat.elastic.entities.Dataset dataset = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(datasetEntity.getId().toString()); + eu.old.eudat.elastic.entities.Dataset dataset = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(datasetEntity.getId().toString()); UUID dmpId = datasetEntity.getDmp().getId(); datasetEntity.getDmp().setUsers(new HashSet<>(apiContext.getOperationsContext().getDatabaseRepository().getUserDmpDao().asQueryable().where((builder, root) -> builder.equal(root.get("dmp").get("id"), dmpId)).toList())); updateTags(datasetEntity, dataset != null ? dataset.getTags() : null); @@ -1133,7 +1133,7 @@ public class DatasetManager { JsonNode propertiesJson = mapper.readTree(json); DatasetCriteria criteria = new DatasetCriteria(); criteria.setHasTags(true); - List 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()); + List tags = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().query(criteria).stream().map(eu.old.eudat.elastic.entities.Dataset::getTags).flatMap(Collection::stream).filter(StreamDistinctBy.distinctByKey(Tag::getId)).collect(Collectors.toList()); Set tagNodes = new HashSet<>(); tagNodes.addAll(JsonSearcher.findNodes(propertiesJson, "renderStyle", "tags", true)); tagNodes.addAll(JsonSearcher.findNodes(propertiesJson, "schematics", "rda.dataset.keyword")); diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DatasetWizardManager.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DatasetWizardManager.java index 9f5356d69..9da84842c 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DatasetWizardManager.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/DatasetWizardManager.java @@ -59,7 +59,7 @@ public class DatasetWizardManager { public void delete(ApiContext apiContext, UUID uuid) throws IOException { Dataset oldDataset = apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().find(uuid); - eu.eudat.elastic.entities.Dataset oldDatasetElasitc = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(uuid.toString()); + eu.old.eudat.elastic.entities.Dataset oldDatasetElasitc = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().findDocument(uuid.toString()); oldDataset.setStatus(Dataset.Status.DELETED.getValue()); apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().createOrUpdate(oldDataset); if (oldDatasetElasitc != null && uuid != null && oldDatasetElasitc.getId()!= null) { diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/MergeEmailConfirmationManager.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/MergeEmailConfirmationManager.java index 590f1f23c..40ee1613e 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/MergeEmailConfirmationManager.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/MergeEmailConfirmationManager.java @@ -5,10 +5,10 @@ import eu.old.eudat.data.entities.EmailConfirmation; import eu.old.eudat.data.entities.UserDMP; import eu.old.eudat.data.entities.UserInfo; import eu.old.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.old.eudat.elastic.criteria.DmpCriteria; +import eu.old.eudat.elastic.entities.Collaborator; +import eu.old.eudat.elastic.entities.Dmp; +import eu.old.eudat.elastic.repository.DmpRepository; import eu.old.eudat.exceptions.emailconfirmation.HasConfirmedEmailException; import eu.old.eudat.exceptions.emailconfirmation.TokenExpiredException; import eu.old.eudat.logic.services.ApiContext; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/QuickWizardManager.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/QuickWizardManager.java index 1053ef119..31710c76f 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/QuickWizardManager.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/managers/QuickWizardManager.java @@ -3,7 +3,7 @@ package eu.old.eudat.logic.managers; import eu.old.eudat.data.dao.criteria.FunderCriteria; import eu.old.eudat.data.dao.criteria.GrantCriteria; import eu.old.eudat.data.dao.criteria.ProjectCriteria; -import eu.eudat.elastic.entities.Dmp; +import eu.old.eudat.elastic.entities.Dmp; import eu.old.eudat.data.entities.*; import eu.old.eudat.logic.mapper.elastic.DmpMapper; import eu.old.eudat.logic.services.ApiContext; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/CollaboratorMapper.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/CollaboratorMapper.java index 182cc9aff..b7dbf966e 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/CollaboratorMapper.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/CollaboratorMapper.java @@ -1,7 +1,7 @@ package eu.old.eudat.logic.mapper.elastic; import eu.old.eudat.data.entities.UserInfo; -import eu.eudat.elastic.entities.Collaborator; +import eu.old.eudat.elastic.entities.Collaborator; public class CollaboratorMapper { diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/DatasetMapper.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/DatasetMapper.java index 22fa0f101..7af7cc08c 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/DatasetMapper.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/DatasetMapper.java @@ -2,9 +2,9 @@ package eu.old.eudat.logic.mapper.elastic; import eu.old.eudat.data.dao.criteria.DataManagementPlanCriteria; import eu.old.eudat.data.entities.DMP; -import eu.eudat.elastic.criteria.DatasetCriteria; -import eu.eudat.elastic.entities.Dataset; -import eu.eudat.elastic.entities.Tag; +import eu.old.eudat.elastic.criteria.DatasetCriteria; +import eu.old.eudat.elastic.entities.Dataset; +import eu.old.eudat.elastic.entities.Tag; import eu.old.eudat.logic.managers.DatasetManager; import eu.old.eudat.logic.services.ApiContext; import eu.old.eudat.logic.utilities.helpers.StreamDistinctBy; @@ -32,7 +32,7 @@ public class DatasetMapper { DatasetCriteria criteria = new DatasetCriteria(); criteria.setTags(tags); criteria.setHasTags(true); - List tags1 = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().query(criteria).stream().map(eu.eudat.elastic.entities.Dataset::getTags).flatMap(Collection::stream) + List tags1 = apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().query(criteria).stream().map(Dataset::getTags).flatMap(Collection::stream) .filter(StreamDistinctBy.distinctByKey(Tag::getId)).filter(tag -> tags.stream().anyMatch(tag1 -> tag1.getName().equals(tag.getName()))).collect(Collectors.toList()); if (tags1.isEmpty()) { tags.forEach(tag -> tag.setId(UUID.randomUUID().toString())); diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/DatasetTemplateMapper.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/DatasetTemplateMapper.java index bfb97a96c..ad0e88f30 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/DatasetTemplateMapper.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/DatasetTemplateMapper.java @@ -3,7 +3,7 @@ package eu.old.eudat.logic.mapper.elastic; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import eu.old.eudat.data.entities.DMPDatasetProfile; -import eu.eudat.elastic.entities.DatasetTempalate; +import eu.old.eudat.elastic.entities.DatasetTempalate; import java.util.HashMap; import java.util.Map; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/DmpMapper.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/DmpMapper.java index a3bf2a200..9c5b9d43c 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/DmpMapper.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/DmpMapper.java @@ -2,9 +2,9 @@ package eu.old.eudat.logic.mapper.elastic; import eu.old.eudat.data.dao.criteria.DataManagementPlanCriteria; import eu.old.eudat.data.entities.DMP; -import eu.eudat.elastic.entities.Dataset; -import eu.eudat.elastic.entities.Dmp; -import eu.eudat.elastic.entities.Tag; +import eu.old.eudat.elastic.entities.Dataset; +import eu.old.eudat.elastic.entities.Dmp; +import eu.old.eudat.elastic.entities.Tag; import eu.old.eudat.logic.managers.DatasetManager; import eu.old.eudat.logic.services.ApiContext; import org.slf4j.Logger; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/OrganizationMapper.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/OrganizationMapper.java index f97b719b4..7564d7f8d 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/OrganizationMapper.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/OrganizationMapper.java @@ -1,7 +1,7 @@ package eu.old.eudat.logic.mapper.elastic; import eu.old.eudat.data.entities.Organisation; -import eu.eudat.elastic.entities.Organization; +import eu.old.eudat.elastic.entities.Organization; public class OrganizationMapper { diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java index a483d7193..80cfaeba2 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java @@ -4,8 +4,8 @@ import eu.old.eudat.data.dao.criteria.DataManagementPlanCriteria; import eu.old.eudat.data.entities.Grant; import eu.old.eudat.data.query.definition.helpers.ColumnOrderings; import eu.old.eudat.data.query.definition.helpers.Ordering; -import eu.eudat.elastic.criteria.DmpCriteria; -import eu.eudat.elastic.criteria.SortCriteria; +import eu.old.eudat.elastic.criteria.DmpCriteria; +import eu.old.eudat.elastic.criteria.SortCriteria; import java.util.ArrayList; import java.util.Collections; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/prefilling/PrefillingMapper.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/prefilling/PrefillingMapper.java index e36e2a00b..a7c8d3e9d 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/prefilling/PrefillingMapper.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/mapper/prefilling/PrefillingMapper.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import eu.old.eudat.data.entities.Dataset; import eu.old.eudat.data.entities.DescriptionTemplate; -import eu.eudat.elastic.entities.Tag; +import eu.old.eudat.elastic.entities.Tag; import eu.old.eudat.logic.managers.DatasetManager; import eu.old.eudat.logic.managers.DatasetProfileManager; import eu.old.eudat.logic.managers.LicenseManager; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/services/operations/ElasticRepository.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/services/operations/ElasticRepository.java index 804ad906b..a5ba175f0 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/services/operations/ElasticRepository.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/services/operations/ElasticRepository.java @@ -1,7 +1,7 @@ package eu.old.eudat.logic.services.operations; -import eu.eudat.elastic.repository.DatasetRepository; -import eu.eudat.elastic.repository.DmpRepository; +import eu.old.eudat.elastic.repository.DatasetRepository; +import eu.old.eudat.elastic.repository.DmpRepository; public interface ElasticRepository { diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/services/operations/ElasticRepositoryImpl.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/services/operations/ElasticRepositoryImpl.java index 6ccedbe2b..785da5fc2 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/services/operations/ElasticRepositoryImpl.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/services/operations/ElasticRepositoryImpl.java @@ -1,7 +1,7 @@ package eu.old.eudat.logic.services.operations; -import eu.eudat.elastic.repository.DatasetRepository; -import eu.eudat.elastic.repository.DmpRepository; +import eu.old.eudat.elastic.repository.DatasetRepository; +import eu.old.eudat.elastic.repository.DmpRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/data/datasetwizard/DatasetWizardModel.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/data/datasetwizard/DatasetWizardModel.java index 6673a0bcc..4fb8ee7f4 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/data/datasetwizard/DatasetWizardModel.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/data/datasetwizard/DatasetWizardModel.java @@ -1,6 +1,6 @@ package eu.old.eudat.models.data.datasetwizard; -import eu.eudat.elastic.entities.Tag; +import eu.old.eudat.elastic.entities.Tag; import eu.old.eudat.data.entities.*; import eu.old.eudat.models.DataModel; import eu.old.eudat.models.data.datasetprofile.DatasetProfileOverviewModel; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/rda/mapper/DatasetRDAMapper.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/rda/mapper/DatasetRDAMapper.java index 111161df7..94b73d182 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/rda/mapper/DatasetRDAMapper.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/rda/mapper/DatasetRDAMapper.java @@ -3,8 +3,8 @@ package eu.old.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.elastic.criteria.DatasetCriteria; -import eu.eudat.elastic.entities.Tag; +import eu.old.eudat.elastic.criteria.DatasetCriteria; +import eu.old.eudat.elastic.entities.Tag; import eu.old.eudat.data.entities.DescriptionTemplate; import eu.old.eudat.logic.managers.DatasetManager; import eu.old.eudat.logic.services.ApiContext; @@ -356,7 +356,7 @@ public class DatasetRDAMapper { // } DatasetCriteria criteria = new DatasetCriteria(); criteria.setHasTags(true); - List tags = this.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()); + List tags = this.apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().query(criteria).stream().map(eu.old.eudat.elastic.entities.Dataset::getTags).flatMap(Collection::stream).filter(StreamDistinctBy.distinctByKey(Tag::getId)).collect(Collectors.toList()); if(!rda.getKeyword().isEmpty()){ List templateTags = tags.stream().filter(tag -> rda.getKeyword().contains(tag.getName())).collect(Collectors.toList()); if(!templateTags.isEmpty()) { diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/rda/mapper/DmpRDAMapper.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/rda/mapper/DmpRDAMapper.java index 189210ab4..47177e01a 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/rda/mapper/DmpRDAMapper.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/rda/mapper/DmpRDAMapper.java @@ -115,7 +115,7 @@ public class DmpRDAMapper { rda.getContributor().addAll(dmp.getResearchers().stream().map(ContributorRDAMapper::toRDA).collect(Collectors.toList())); } // rda.getContributor().addAll(dmp.getUsers().stream().map(ContributorRDAMapper::toRDA).collect(Collectors.toList())); - rda.setDataset(dmp.getDataset().stream().filter(dataset -> dataset.getStatus() != eu.eudat.elastic.entities.Dmp.DMPStatus.DELETED.getValue()).map(dataset -> datasetRDAMapper.toRDA(dataset, rda)).collect(Collectors.toList())); + rda.setDataset(dmp.getDataset().stream().filter(dataset -> dataset.getStatus() != eu.old.eudat.elastic.entities.Dmp.DMPStatus.DELETED.getValue()).map(dataset -> datasetRDAMapper.toRDA(dataset, rda)).collect(Collectors.toList())); if (dmp.getProject() != null) { rda.setProject(Collections.singletonList(ProjectRDAMapper.toRDA(dmp.getProject(), dmp.getGrant()))); } diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/rda/mapper/KeywordRDAMapper.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/rda/mapper/KeywordRDAMapper.java index d6d00ee2d..9d7158974 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/rda/mapper/KeywordRDAMapper.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/models/rda/mapper/KeywordRDAMapper.java @@ -2,7 +2,7 @@ package eu.old.eudat.models.rda.mapper; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.elastic.entities.Tag; +import eu.old.eudat.elastic.entities.Tag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/criteria/dataset/DatasetPublicCriteria.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/criteria/dataset/DatasetPublicCriteria.java index a8be31234..af45ee92f 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/criteria/dataset/DatasetPublicCriteria.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/criteria/dataset/DatasetPublicCriteria.java @@ -2,7 +2,7 @@ package eu.old.eudat.publicapi.criteria.dataset; import eu.old.eudat.data.dao.criteria.Criteria; import eu.old.eudat.data.entities.Dataset; -import eu.eudat.elastic.entities.Tag; +import eu.old.eudat.elastic.entities.Tag; import io.swagger.annotations.ApiModelProperty; import java.util.Date; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/criteria/mapper/DmpPublicCriteriaMapper.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/criteria/mapper/DmpPublicCriteriaMapper.java index fcd211765..c438641fd 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/criteria/mapper/DmpPublicCriteriaMapper.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/criteria/mapper/DmpPublicCriteriaMapper.java @@ -2,8 +2,8 @@ package eu.old.eudat.publicapi.criteria.mapper; import eu.old.eudat.data.query.definition.helpers.ColumnOrderings; import eu.old.eudat.data.query.definition.helpers.Ordering; -import eu.eudat.elastic.criteria.DmpCriteria; -import eu.eudat.elastic.criteria.SortCriteria; +import eu.old.eudat.elastic.criteria.DmpCriteria; +import eu.old.eudat.elastic.criteria.SortCriteria; import eu.old.eudat.publicapi.criteria.dmp.DataManagementPlanPublicCriteria; import java.util.ArrayList; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/managers/DatasetPublicManager.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/managers/DatasetPublicManager.java index 98bd3de3e..ef7aef233 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/managers/DatasetPublicManager.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/managers/DatasetPublicManager.java @@ -3,8 +3,8 @@ package eu.old.eudat.publicapi.managers; import eu.old.eudat.data.entities.Dataset; import eu.old.eudat.data.entities.DescriptionTemplate; import eu.old.eudat.data.query.definition.helpers.ColumnOrderings; -import eu.eudat.elastic.criteria.DatasetCriteria; -import eu.eudat.elastic.repository.DatasetRepository; +import eu.old.eudat.elastic.criteria.DatasetCriteria; +import eu.old.eudat.elastic.repository.DatasetRepository; import eu.old.eudat.exceptions.security.ForbiddenException; import eu.old.eudat.logic.managers.PaginationManager; import eu.old.eudat.logic.services.ApiContext; @@ -69,7 +69,7 @@ public class DatasetPublicManager { } datasetCriteria.setOffset(datasetTableRequest.getOffset()); datasetCriteria.setSize(datasetTableRequest.getLength()); - List datasets; + List datasets; try { datasets = datasetRepository.exists() ? datasetRepository.queryIds(datasetCriteria) : new LinkedList<>(); @@ -89,7 +89,7 @@ public class DatasetPublicManager { if (datasets != null) { if (!datasets.isEmpty()) { items = databaseRepository.getDatasetDao().asQueryable().withHint(HintedModelFactory.getHint(DatasetPublicListingModel.class)); - List finalDatasets = datasets; + List finalDatasets = datasets; items.where((builder, root) -> root.get("id").in(finalDatasets.stream().map(x -> UUID.fromString(x.getId())).collect(Collectors.toList()))); } else items = datasetTableRequest.applyCriteria(); diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/models/overviewmodels/DatasetPublicModel.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/models/overviewmodels/DatasetPublicModel.java index 95e822709..655a0a99a 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/models/overviewmodels/DatasetPublicModel.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/publicapi/models/overviewmodels/DatasetPublicModel.java @@ -1,6 +1,6 @@ package eu.old.eudat.publicapi.models.overviewmodels; -import eu.eudat.elastic.entities.Tag; +import eu.old.eudat.elastic.entities.Tag; import eu.old.eudat.data.entities.*; import eu.old.eudat.models.DataModel; import eu.old.eudat.models.data.user.composite.PagedDatasetProfile;