From 57d5496855cf0e1f75283ed2123091ed5cc33cbb Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Fri, 31 Mar 2023 16:13:52 +0200 Subject: [PATCH] moved some classes into the model module --- .../openaire/dsm/DsmApiController.java | 4 +- .../openaire/dsm/DsmApiControllerV2.java | 4 +- .../java/eu/dnetlib/openaire/dsm/DsmCore.java | 10 ++-- .../openaire/dsm/dao/MongoLoggerClient.java | 2 +- .../dsm/dao/MongoLoggerClientImpl.java | 12 ++-- .../openaire/dsm/dao/ResponseUtils.java | 4 +- .../dsm/dao/utils/DsmMappingUtils.java | 4 +- .../dsm/domain/DatasourceDetailResponse.java | 1 + .../dsm/domain/DatasourceDetailsUpdate.java | 1 + .../dsm/domain/DatasourceDetailsWithApis.java | 1 + .../dsm/domain/DatasourceSearchResponse.java | 1 + .../dsm/domain/DatasourceSnippetExtended.java | 1 + .../dsm/DatasourceApiControllerTest.java | 2 +- libs/dnet-exporter-model/TODO.txt | 8 --- libs/dnet-exporter-model/pom.xml | 17 ++++-- .../dsm}/AggregationHistoryResponseV1.java | 4 +- .../dsm}/AggregationHistoryResponseV2.java | 5 +- .../exporter/model/dsm/AggregationInfo.java | 56 +++++++++++++++++++ .../model/dsm}/AggregationInfoV1.java | 4 +- .../exporter/model/dsm/AggregationStage.java | 25 +++++++++ .../exporter/model/dsm}/CollectionInfoV1.java | 2 +- .../exporter/model/dsm}/CollectionInfoV2.java | 5 +- .../exporter/model/dsm}/CollectionMode.java | 2 +- .../model/dsm}/DatasourceDetails.java | 2 +- .../dsm}/DatasourceIgnoredProperties.java | 2 +- .../exporter/model/dsm}/DatasourceInfo.java | 3 +- .../model/dsm}/IdentitiesDetails.java | 2 +- .../model/dsm}/OrganizationDetails.java | 2 +- .../dsm}/OrganizationIgnoredProperties.java | 2 +- .../model/dsm}/SimpleDatasourceInfo.java | 2 +- .../model/dsm}/TransformationInfoV1.java | 2 +- .../model/dsm}/TransformationInfoV2.java | 4 +- 32 files changed, 133 insertions(+), 63 deletions(-) rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm}/AggregationHistoryResponseV1.java (85%) rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm}/AggregationHistoryResponseV2.java (77%) create mode 100644 libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationInfo.java rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm}/AggregationInfoV1.java (68%) create mode 100644 libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationStage.java rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm}/CollectionInfoV1.java (89%) rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm}/CollectionInfoV2.java (72%) rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm}/CollectionMode.java (78%) rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm}/DatasourceDetails.java (99%) rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm}/DatasourceIgnoredProperties.java (98%) rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm}/DatasourceInfo.java (96%) rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm}/IdentitiesDetails.java (90%) rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm}/OrganizationDetails.java (96%) rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm}/OrganizationIgnoredProperties.java (96%) rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm}/SimpleDatasourceInfo.java (98%) rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm}/TransformationInfoV1.java (80%) rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm}/TransformationInfoV2.java (63%) diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmApiController.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmApiController.java index d08d2350..cf995d11 100755 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmApiController.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmApiController.java @@ -26,11 +26,9 @@ import org.springframework.web.bind.annotation.RestController; import eu.dnetlib.openaire.common.AbstractExporterController; import eu.dnetlib.openaire.common.OperationManager; -import eu.dnetlib.openaire.dsm.domain.AggregationHistoryResponseV1; import eu.dnetlib.openaire.dsm.domain.ApiDetails; import eu.dnetlib.openaire.dsm.domain.ApiDetailsResponse; import eu.dnetlib.openaire.dsm.domain.DatasourceDetailResponse; -import eu.dnetlib.openaire.dsm.domain.DatasourceDetails; import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsUpdate; import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsWithApis; import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetResponse; @@ -41,6 +39,8 @@ import eu.dnetlib.openaire.dsm.domain.RequestSortOrder; import eu.dnetlib.openaire.exporter.exceptions.DsmException; import eu.dnetlib.openaire.exporter.exceptions.DsmForbiddenException; import eu.dnetlib.openaire.exporter.exceptions.DsmNotFoundException; +import eu.dnetlib.openaire.exporter.model.dsm.AggregationHistoryResponseV1; +import eu.dnetlib.openaire.exporter.model.dsm.DatasourceDetails; import eu.dnetlib.openaire.exporter.model.dsm.SimpleResponse; import eu.dnetlib.openaire.exporter.model.vocabularies.Country; import io.swagger.v3.oas.annotations.Operation; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmApiControllerV2.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmApiControllerV2.java index 70977f45..68107164 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmApiControllerV2.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmApiControllerV2.java @@ -17,9 +17,9 @@ import org.springframework.web.bind.annotation.RestController; import eu.dnetlib.openaire.common.AbstractExporterController; import eu.dnetlib.openaire.dsm.dao.ResponseUtils; -import eu.dnetlib.openaire.dsm.domain.AggregationHistoryResponseV2; -import eu.dnetlib.openaire.dsm.domain.SimpleDatasourceInfo; import eu.dnetlib.openaire.exporter.exceptions.DsmException; +import eu.dnetlib.openaire.exporter.model.dsm.AggregationHistoryResponseV2; +import eu.dnetlib.openaire.exporter.model.dsm.SimpleDatasourceInfo; import eu.dnetlib.openaire.exporter.model.dsm.SimpleResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmCore.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmCore.java index 2cad2a0f..e17b5bb9 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmCore.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmCore.java @@ -37,13 +37,9 @@ import eu.dnetlib.openaire.dsm.dao.MongoLoggerClient; import eu.dnetlib.openaire.dsm.dao.ResponseUtils; import eu.dnetlib.openaire.dsm.dao.VocabularyClient; import eu.dnetlib.openaire.dsm.dao.utils.DsmMappingUtils; -import eu.dnetlib.openaire.dsm.domain.AggregationHistoryResponseV1; -import eu.dnetlib.openaire.dsm.domain.AggregationHistoryResponseV2; -import eu.dnetlib.openaire.dsm.domain.AggregationInfoV1; import eu.dnetlib.openaire.dsm.domain.ApiDetails; import eu.dnetlib.openaire.dsm.domain.ApiDetailsResponse; import eu.dnetlib.openaire.dsm.domain.DatasourceDetailResponse; -import eu.dnetlib.openaire.dsm.domain.DatasourceDetails; import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsUpdate; import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsWithApis; import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetResponse; @@ -51,13 +47,17 @@ import eu.dnetlib.openaire.dsm.domain.RegisteredDatasourceInfo; import eu.dnetlib.openaire.dsm.domain.RequestFilter; import eu.dnetlib.openaire.dsm.domain.RequestSort; import eu.dnetlib.openaire.dsm.domain.RequestSortOrder; -import eu.dnetlib.openaire.dsm.domain.SimpleDatasourceInfo; import eu.dnetlib.openaire.dsm.domain.db.ApiDbEntry; import eu.dnetlib.openaire.dsm.domain.db.DatasourceDbEntry; import eu.dnetlib.openaire.dsm.domain.db.IdentityDbEntry; import eu.dnetlib.openaire.exporter.exceptions.DsmException; import eu.dnetlib.openaire.exporter.exceptions.DsmForbiddenException; import eu.dnetlib.openaire.exporter.exceptions.DsmNotFoundException; +import eu.dnetlib.openaire.exporter.model.dsm.AggregationHistoryResponseV1; +import eu.dnetlib.openaire.exporter.model.dsm.AggregationHistoryResponseV2; +import eu.dnetlib.openaire.exporter.model.dsm.AggregationInfoV1; +import eu.dnetlib.openaire.exporter.model.dsm.DatasourceDetails; +import eu.dnetlib.openaire.exporter.model.dsm.SimpleDatasourceInfo; import eu.dnetlib.openaire.exporter.model.dsm.SimpleResponse; import eu.dnetlib.openaire.exporter.model.vocabularies.Country; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/MongoLoggerClient.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/MongoLoggerClient.java index 0a141057..59d773ce 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/MongoLoggerClient.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/MongoLoggerClient.java @@ -2,8 +2,8 @@ package eu.dnetlib.openaire.dsm.dao; import java.util.List; -import eu.dnetlib.openaire.dsm.domain.AggregationInfoV1; import eu.dnetlib.openaire.exporter.exceptions.DsmException; +import eu.dnetlib.openaire.exporter.model.dsm.AggregationInfoV1; public interface MongoLoggerClient { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/MongoLoggerClientImpl.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/MongoLoggerClientImpl.java index 48346f15..a176be01 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/MongoLoggerClientImpl.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/MongoLoggerClientImpl.java @@ -46,13 +46,13 @@ import eu.dnetlib.enabling.datasources.common.AggregationStage; import eu.dnetlib.miscutils.datetime.DateUtils; import eu.dnetlib.openaire.common.Utils; import eu.dnetlib.openaire.dsm.dao.utils.DsmMappingUtils; -import eu.dnetlib.openaire.dsm.domain.AggregationInfoV1; -import eu.dnetlib.openaire.dsm.domain.CollectionInfoV1; -import eu.dnetlib.openaire.dsm.domain.CollectionInfoV2; -import eu.dnetlib.openaire.dsm.domain.CollectionMode; -import eu.dnetlib.openaire.dsm.domain.TransformationInfoV1; -import eu.dnetlib.openaire.dsm.domain.TransformationInfoV2; import eu.dnetlib.openaire.exporter.exceptions.DsmException; +import eu.dnetlib.openaire.exporter.model.dsm.AggregationInfoV1; +import eu.dnetlib.openaire.exporter.model.dsm.CollectionInfoV1; +import eu.dnetlib.openaire.exporter.model.dsm.CollectionInfoV2; +import eu.dnetlib.openaire.exporter.model.dsm.CollectionMode; +import eu.dnetlib.openaire.exporter.model.dsm.TransformationInfoV1; +import eu.dnetlib.openaire.exporter.model.dsm.TransformationInfoV2; import eu.dnetlib.openaire.info.JdbcInfoDao; /** diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/ResponseUtils.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/ResponseUtils.java index 941ee574..fa849ea0 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/ResponseUtils.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/ResponseUtils.java @@ -8,11 +8,11 @@ import com.google.common.collect.Lists; import eu.dnetlib.openaire.dsm.domain.ApiDetails; import eu.dnetlib.openaire.dsm.domain.ApiDetailsResponse; import eu.dnetlib.openaire.dsm.domain.DatasourceDetailResponse; -import eu.dnetlib.openaire.dsm.domain.DatasourceDetails; -import eu.dnetlib.openaire.dsm.domain.DatasourceInfo; import eu.dnetlib.openaire.dsm.domain.DatasourceSearchResponse; import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetExtended; import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetResponse; +import eu.dnetlib.openaire.exporter.model.dsm.DatasourceDetails; +import eu.dnetlib.openaire.exporter.model.dsm.DatasourceInfo; import eu.dnetlib.openaire.exporter.model.dsm.Header; import eu.dnetlib.openaire.exporter.model.dsm.SimpleResponse; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/utils/DsmMappingUtils.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/utils/DsmMappingUtils.java index 7e6d80b2..3d3ee56d 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/utils/DsmMappingUtils.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/utils/DsmMappingUtils.java @@ -15,13 +15,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import eu.dnetlib.data.transform.xml.AbstractDNetXsltFunctions; import eu.dnetlib.openaire.dsm.domain.ApiDetails; -import eu.dnetlib.openaire.dsm.domain.DatasourceDetails; import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsUpdate; import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetExtended; -import eu.dnetlib.openaire.dsm.domain.OrganizationDetails; import eu.dnetlib.openaire.dsm.domain.db.ApiDbEntry; import eu.dnetlib.openaire.dsm.domain.db.DatasourceDbEntry; import eu.dnetlib.openaire.dsm.domain.db.OrganizationDbEntry; +import eu.dnetlib.openaire.exporter.model.dsm.DatasourceDetails; +import eu.dnetlib.openaire.exporter.model.dsm.OrganizationDetails; public class DsmMappingUtils { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailResponse.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailResponse.java index b011d889..1d55a20d 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailResponse.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailResponse.java @@ -4,6 +4,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonAutoDetect; +import eu.dnetlib.openaire.exporter.model.dsm.DatasourceDetails; import eu.dnetlib.openaire.exporter.model.dsm.Response; @JsonAutoDetect diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsUpdate.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsUpdate.java index 750813bb..eef03063 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsUpdate.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsUpdate.java @@ -8,6 +8,7 @@ import javax.validation.constraints.NotBlank; import com.fasterxml.jackson.annotation.JsonAutoDetect; +import eu.dnetlib.openaire.exporter.model.dsm.IdentitiesDetails; import io.swagger.v3.oas.annotations.media.Schema; /** diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsWithApis.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsWithApis.java index 8e0c3d09..bf41287b 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsWithApis.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsWithApis.java @@ -5,6 +5,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonAutoDetect; +import eu.dnetlib.openaire.exporter.model.dsm.DatasourceDetails; import io.swagger.v3.oas.annotations.media.Schema; /** diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSearchResponse.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSearchResponse.java index e8d3aacb..5c31dab1 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSearchResponse.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSearchResponse.java @@ -4,6 +4,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonAutoDetect; +import eu.dnetlib.openaire.exporter.model.dsm.DatasourceInfo; import eu.dnetlib.openaire.exporter.model.dsm.Response; @JsonAutoDetect diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetExtended.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetExtended.java index 819fe307..3454f8e3 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetExtended.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetExtended.java @@ -8,6 +8,7 @@ import javax.validation.constraints.NotBlank; import com.fasterxml.jackson.annotation.JsonAutoDetect; +import eu.dnetlib.openaire.exporter.model.dsm.OrganizationDetails; import io.swagger.v3.oas.annotations.media.Schema; @JsonAutoDetect diff --git a/apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/dsm/DatasourceApiControllerTest.java b/apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/dsm/DatasourceApiControllerTest.java index 80cfe152..b5ede79a 100644 --- a/apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/dsm/DatasourceApiControllerTest.java +++ b/apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/dsm/DatasourceApiControllerTest.java @@ -21,8 +21,8 @@ import org.springframework.test.web.servlet.MockMvc; import eu.dnetlib.enabling.datasources.common.DsmException; import eu.dnetlib.openaire.dsm.dao.utils.DsmMappingUtils; -import eu.dnetlib.openaire.dsm.domain.DatasourceDetails; import eu.dnetlib.openaire.dsm.domain.db.DatasourceDbEntry; +import eu.dnetlib.openaire.exporter.model.dsm.DatasourceDetails; import eu.dnetlib.openaire.exporter.model.vocabularies.Country; @SpringBootTest diff --git a/libs/dnet-exporter-model/TODO.txt b/libs/dnet-exporter-model/TODO.txt index c5253ee8..aa4feea2 100644 --- a/libs/dnet-exporter-model/TODO.txt +++ b/libs/dnet-exporter-model/TODO.txt @@ -1,15 +1,7 @@ - -DsmApiControllerV2 - SimpleDatasourceInfo - AggregationHistoryResponseV2 - DsmApiController - DatasourceDetailResponse - AggregationHistoryResponseV1 DatasourceSnippetResponse RegisteredDatasourceInfo ApiDetailsResponse - DatasourceDetails DatasourceDetailsWithApis DatasourceDetailsUpdate ApiDetails diff --git a/libs/dnet-exporter-model/pom.xml b/libs/dnet-exporter-model/pom.xml index dc5e670b..970daafb 100644 --- a/libs/dnet-exporter-model/pom.xml +++ b/libs/dnet-exporter-model/pom.xml @@ -18,18 +18,23 @@ - - org.mockito - mockito-junit-jupiter - test - - org.springdoc springdoc-openapi-common 1.6.10 + + jakarta.persistence + jakarta.persistence-api + + + + org.mockito + mockito-junit-jupiter + test + + org.springframework.boot spring-boot-starter-test diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationHistoryResponseV1.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationHistoryResponseV1.java similarity index 85% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationHistoryResponseV1.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationHistoryResponseV1.java index 6ab84899..84efaa3c 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationHistoryResponseV1.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationHistoryResponseV1.java @@ -1,11 +1,9 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.openaire.exporter.model.dsm; import java.util.List; import com.fasterxml.jackson.annotation.JsonAutoDetect; -import eu.dnetlib.openaire.exporter.model.dsm.Response; - @JsonAutoDetect @Deprecated public class AggregationHistoryResponseV1 extends Response { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationHistoryResponseV2.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationHistoryResponseV2.java similarity index 77% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationHistoryResponseV2.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationHistoryResponseV2.java index b13e35a4..1a7779d1 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationHistoryResponseV2.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationHistoryResponseV2.java @@ -1,12 +1,9 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.openaire.exporter.model.dsm; import java.util.List; import com.fasterxml.jackson.annotation.JsonAutoDetect; -import eu.dnetlib.enabling.datasources.common.AggregationInfo; -import eu.dnetlib.openaire.exporter.model.dsm.Response; - @JsonAutoDetect public class AggregationHistoryResponseV2 extends Response { diff --git a/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationInfo.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationInfo.java new file mode 100644 index 00000000..a2d1b7b5 --- /dev/null +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationInfo.java @@ -0,0 +1,56 @@ +package eu.dnetlib.openaire.exporter.model.dsm; + +public abstract class AggregationInfo { + + private int numberOfRecords; + + private String date; + + private AggregationStage aggregationStage; + + private boolean indexedVersion = false; + + private boolean completedSuccessfully = true; + + public AggregationInfo() {} + + public int getNumberOfRecords() { + return numberOfRecords; + } + + public void setNumberOfRecords(final int numberOfRecords) { + this.numberOfRecords = numberOfRecords; + } + + public String getDate() { + return date; + } + + public void setDate(final String date) { + this.date = date; + } + + public AggregationStage getAggregationStage() { + return aggregationStage; + } + + public void setAggregationStage(final AggregationStage aggregationStage) { + this.aggregationStage = aggregationStage; + } + + public boolean isIndexedVersion() { + return indexedVersion; + } + + public void setIndexedVersion(final boolean indexedVersion) { + this.indexedVersion = indexedVersion; + } + + public boolean isCompletedSuccessfully() { + return completedSuccessfully; + } + + public void setCompletedSuccessfully(final boolean completedSuccessfully) { + this.completedSuccessfully = completedSuccessfully; + } +} diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationInfoV1.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationInfoV1.java similarity index 68% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationInfoV1.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationInfoV1.java index d33ec120..3d70cae7 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationInfoV1.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationInfoV1.java @@ -1,9 +1,7 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.openaire.exporter.model.dsm; import com.fasterxml.jackson.annotation.JsonIgnore; -import eu.dnetlib.enabling.datasources.common.AggregationInfo; - public class AggregationInfoV1 extends AggregationInfo { @Override diff --git a/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationStage.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationStage.java new file mode 100644 index 00000000..e2a79bf7 --- /dev/null +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/AggregationStage.java @@ -0,0 +1,25 @@ +package eu.dnetlib.openaire.exporter.model.dsm; + +public enum AggregationStage { + + COLLECT, + TRANSFORM; + + public static AggregationStage parse(final String s) { + switch (s) { + case "collect": + case "collection": + case "COLLECT": + case "COLLECTION": + return AggregationStage.COLLECT; + case "transform": + case "transformation": + case "TRANSFORM": + case "TRANSFORMATION": + case "transformDatasets": + case "transformPublications": + return AggregationStage.TRANSFORM; + } + throw new IllegalArgumentException("invalid AggregationStage: " + s); + } +} diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionInfoV1.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/CollectionInfoV1.java similarity index 89% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionInfoV1.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/CollectionInfoV1.java index 34a8961d..6c15c896 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionInfoV1.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/CollectionInfoV1.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.openaire.exporter.model.dsm; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionInfoV2.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/CollectionInfoV2.java similarity index 72% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionInfoV2.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/CollectionInfoV2.java index b1cba57d..a9edb7a1 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionInfoV2.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/CollectionInfoV2.java @@ -1,10 +1,7 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.openaire.exporter.model.dsm; import com.fasterxml.jackson.annotation.JsonAutoDetect; -import eu.dnetlib.enabling.datasources.common.AggregationInfo; -import io.swagger.v3.oas.annotations.media.Schema; - /** * Created by claudio on 29/11/2016. */ diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionMode.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/CollectionMode.java similarity index 78% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionMode.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/CollectionMode.java index 5d8702d7..a2d972d9 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionMode.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/CollectionMode.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.openaire.exporter.model.dsm; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetails.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/DatasourceDetails.java similarity index 99% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetails.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/DatasourceDetails.java index 0d27e3bc..b9b31cdf 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetails.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/DatasourceDetails.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.openaire.exporter.model.dsm; import java.sql.Date; import java.util.Set; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceIgnoredProperties.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/DatasourceIgnoredProperties.java similarity index 98% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceIgnoredProperties.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/DatasourceIgnoredProperties.java index f00a734c..498d9144 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceIgnoredProperties.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/DatasourceIgnoredProperties.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.openaire.exporter.model.dsm; import java.sql.Date; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceInfo.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/DatasourceInfo.java similarity index 96% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceInfo.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/DatasourceInfo.java index 07399122..4b2a40ea 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceInfo.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/DatasourceInfo.java @@ -1,10 +1,9 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.openaire.exporter.model.dsm; import java.util.List; import com.fasterxml.jackson.annotation.JsonAutoDetect; -import eu.dnetlib.enabling.datasources.common.AggregationInfo; import io.swagger.v3.oas.annotations.media.Schema; @JsonAutoDetect diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/IdentitiesDetails.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/IdentitiesDetails.java similarity index 90% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/IdentitiesDetails.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/IdentitiesDetails.java index 48cba1e9..7d1ccd33 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/IdentitiesDetails.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/IdentitiesDetails.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.openaire.exporter.model.dsm; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationDetails.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/OrganizationDetails.java similarity index 96% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationDetails.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/OrganizationDetails.java index 1abc52d4..0b7c92d2 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationDetails.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/OrganizationDetails.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.openaire.exporter.model.dsm; import javax.validation.constraints.NotBlank; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationIgnoredProperties.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/OrganizationIgnoredProperties.java similarity index 96% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationIgnoredProperties.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/OrganizationIgnoredProperties.java index 3212fb66..256c0de2 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationIgnoredProperties.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/OrganizationIgnoredProperties.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.openaire.exporter.model.dsm; import java.util.Date; import java.util.Set; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/SimpleDatasourceInfo.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/SimpleDatasourceInfo.java similarity index 98% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/SimpleDatasourceInfo.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/SimpleDatasourceInfo.java index 997f3894..9c9fc799 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/SimpleDatasourceInfo.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/SimpleDatasourceInfo.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.openaire.exporter.model.dsm; import java.util.LinkedHashMap; import java.util.Map; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/TransformationInfoV1.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/TransformationInfoV1.java similarity index 80% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/TransformationInfoV1.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/TransformationInfoV1.java index d119964d..4990daec 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/TransformationInfoV1.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/TransformationInfoV1.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.openaire.exporter.model.dsm; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/TransformationInfoV2.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/TransformationInfoV2.java similarity index 63% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/TransformationInfoV2.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/TransformationInfoV2.java index 2d5a6fa4..df74986c 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/domain/TransformationInfoV2.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/TransformationInfoV2.java @@ -1,9 +1,7 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.openaire.exporter.model.dsm; import com.fasterxml.jackson.annotation.JsonAutoDetect; -import eu.dnetlib.enabling.datasources.common.AggregationInfo; - /** * Created by claudio on 29/11/2016. */