exporter-model-classes #14
|
@ -26,11 +26,9 @@ import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import eu.dnetlib.openaire.common.AbstractExporterController;
|
import eu.dnetlib.openaire.common.AbstractExporterController;
|
||||||
import eu.dnetlib.openaire.common.OperationManager;
|
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.ApiDetails;
|
||||||
import eu.dnetlib.openaire.dsm.domain.ApiDetailsResponse;
|
import eu.dnetlib.openaire.dsm.domain.ApiDetailsResponse;
|
||||||
import eu.dnetlib.openaire.dsm.domain.DatasourceDetailResponse;
|
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.DatasourceDetailsUpdate;
|
||||||
import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsWithApis;
|
import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsWithApis;
|
||||||
import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetResponse;
|
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.DsmException;
|
||||||
import eu.dnetlib.openaire.exporter.exceptions.DsmForbiddenException;
|
import eu.dnetlib.openaire.exporter.exceptions.DsmForbiddenException;
|
||||||
import eu.dnetlib.openaire.exporter.exceptions.DsmNotFoundException;
|
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.dsm.SimpleResponse;
|
||||||
import eu.dnetlib.openaire.exporter.model.vocabularies.Country;
|
import eu.dnetlib.openaire.exporter.model.vocabularies.Country;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
|
|
|
@ -17,9 +17,9 @@ import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import eu.dnetlib.openaire.common.AbstractExporterController;
|
import eu.dnetlib.openaire.common.AbstractExporterController;
|
||||||
import eu.dnetlib.openaire.dsm.dao.ResponseUtils;
|
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.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 eu.dnetlib.openaire.exporter.model.dsm.SimpleResponse;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||||
|
|
|
@ -37,13 +37,9 @@ import eu.dnetlib.openaire.dsm.dao.MongoLoggerClient;
|
||||||
import eu.dnetlib.openaire.dsm.dao.ResponseUtils;
|
import eu.dnetlib.openaire.dsm.dao.ResponseUtils;
|
||||||
import eu.dnetlib.openaire.dsm.dao.VocabularyClient;
|
import eu.dnetlib.openaire.dsm.dao.VocabularyClient;
|
||||||
import eu.dnetlib.openaire.dsm.dao.utils.DsmMappingUtils;
|
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.ApiDetails;
|
||||||
import eu.dnetlib.openaire.dsm.domain.ApiDetailsResponse;
|
import eu.dnetlib.openaire.dsm.domain.ApiDetailsResponse;
|
||||||
import eu.dnetlib.openaire.dsm.domain.DatasourceDetailResponse;
|
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.DatasourceDetailsUpdate;
|
||||||
import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsWithApis;
|
import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsWithApis;
|
||||||
import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetResponse;
|
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.RequestFilter;
|
||||||
import eu.dnetlib.openaire.dsm.domain.RequestSort;
|
import eu.dnetlib.openaire.dsm.domain.RequestSort;
|
||||||
import eu.dnetlib.openaire.dsm.domain.RequestSortOrder;
|
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.ApiDbEntry;
|
||||||
import eu.dnetlib.openaire.dsm.domain.db.DatasourceDbEntry;
|
import eu.dnetlib.openaire.dsm.domain.db.DatasourceDbEntry;
|
||||||
import eu.dnetlib.openaire.dsm.domain.db.IdentityDbEntry;
|
import eu.dnetlib.openaire.dsm.domain.db.IdentityDbEntry;
|
||||||
import eu.dnetlib.openaire.exporter.exceptions.DsmException;
|
import eu.dnetlib.openaire.exporter.exceptions.DsmException;
|
||||||
import eu.dnetlib.openaire.exporter.exceptions.DsmForbiddenException;
|
import eu.dnetlib.openaire.exporter.exceptions.DsmForbiddenException;
|
||||||
import eu.dnetlib.openaire.exporter.exceptions.DsmNotFoundException;
|
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.dsm.SimpleResponse;
|
||||||
import eu.dnetlib.openaire.exporter.model.vocabularies.Country;
|
import eu.dnetlib.openaire.exporter.model.vocabularies.Country;
|
||||||
|
|
||||||
|
|
|
@ -2,8 +2,8 @@ package eu.dnetlib.openaire.dsm.dao;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import eu.dnetlib.openaire.dsm.domain.AggregationInfoV1;
|
|
||||||
import eu.dnetlib.openaire.exporter.exceptions.DsmException;
|
import eu.dnetlib.openaire.exporter.exceptions.DsmException;
|
||||||
|
import eu.dnetlib.openaire.exporter.model.dsm.AggregationInfoV1;
|
||||||
|
|
||||||
public interface MongoLoggerClient {
|
public interface MongoLoggerClient {
|
||||||
|
|
||||||
|
|
|
@ -46,13 +46,13 @@ import eu.dnetlib.enabling.datasources.common.AggregationStage;
|
||||||
import eu.dnetlib.miscutils.datetime.DateUtils;
|
import eu.dnetlib.miscutils.datetime.DateUtils;
|
||||||
import eu.dnetlib.openaire.common.Utils;
|
import eu.dnetlib.openaire.common.Utils;
|
||||||
import eu.dnetlib.openaire.dsm.dao.utils.DsmMappingUtils;
|
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.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;
|
import eu.dnetlib.openaire.info.JdbcInfoDao;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -8,11 +8,11 @@ import com.google.common.collect.Lists;
|
||||||
import eu.dnetlib.openaire.dsm.domain.ApiDetails;
|
import eu.dnetlib.openaire.dsm.domain.ApiDetails;
|
||||||
import eu.dnetlib.openaire.dsm.domain.ApiDetailsResponse;
|
import eu.dnetlib.openaire.dsm.domain.ApiDetailsResponse;
|
||||||
import eu.dnetlib.openaire.dsm.domain.DatasourceDetailResponse;
|
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.DatasourceSearchResponse;
|
||||||
import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetExtended;
|
import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetExtended;
|
||||||
import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetResponse;
|
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.Header;
|
||||||
import eu.dnetlib.openaire.exporter.model.dsm.SimpleResponse;
|
import eu.dnetlib.openaire.exporter.model.dsm.SimpleResponse;
|
||||||
|
|
||||||
|
|
|
@ -15,13 +15,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
|
||||||
import eu.dnetlib.data.transform.xml.AbstractDNetXsltFunctions;
|
import eu.dnetlib.data.transform.xml.AbstractDNetXsltFunctions;
|
||||||
import eu.dnetlib.openaire.dsm.domain.ApiDetails;
|
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.DatasourceDetailsUpdate;
|
||||||
import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetExtended;
|
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.ApiDbEntry;
|
||||||
import eu.dnetlib.openaire.dsm.domain.db.DatasourceDbEntry;
|
import eu.dnetlib.openaire.dsm.domain.db.DatasourceDbEntry;
|
||||||
import eu.dnetlib.openaire.dsm.domain.db.OrganizationDbEntry;
|
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 {
|
public class DsmMappingUtils {
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@ import java.util.List;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
|
|
||||||
|
import eu.dnetlib.openaire.exporter.model.dsm.DatasourceDetails;
|
||||||
import eu.dnetlib.openaire.exporter.model.dsm.Response;
|
import eu.dnetlib.openaire.exporter.model.dsm.Response;
|
||||||
|
|
||||||
@JsonAutoDetect
|
@JsonAutoDetect
|
||||||
|
|
|
@ -8,6 +8,7 @@ import javax.validation.constraints.NotBlank;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
|
|
||||||
|
import eu.dnetlib.openaire.exporter.model.dsm.IdentitiesDetails;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -5,6 +5,7 @@ import java.util.List;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
|
|
||||||
|
import eu.dnetlib.openaire.exporter.model.dsm.DatasourceDetails;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -4,6 +4,7 @@ import java.util.List;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
|
|
||||||
|
import eu.dnetlib.openaire.exporter.model.dsm.DatasourceInfo;
|
||||||
import eu.dnetlib.openaire.exporter.model.dsm.Response;
|
import eu.dnetlib.openaire.exporter.model.dsm.Response;
|
||||||
|
|
||||||
@JsonAutoDetect
|
@JsonAutoDetect
|
||||||
|
|
|
@ -8,6 +8,7 @@ import javax.validation.constraints.NotBlank;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
|
|
||||||
|
import eu.dnetlib.openaire.exporter.model.dsm.OrganizationDetails;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
|
||||||
@JsonAutoDetect
|
@JsonAutoDetect
|
||||||
|
|
|
@ -21,8 +21,8 @@ import org.springframework.test.web.servlet.MockMvc;
|
||||||
|
|
||||||
import eu.dnetlib.enabling.datasources.common.DsmException;
|
import eu.dnetlib.enabling.datasources.common.DsmException;
|
||||||
import eu.dnetlib.openaire.dsm.dao.utils.DsmMappingUtils;
|
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.dsm.domain.db.DatasourceDbEntry;
|
||||||
|
import eu.dnetlib.openaire.exporter.model.dsm.DatasourceDetails;
|
||||||
import eu.dnetlib.openaire.exporter.model.vocabularies.Country;
|
import eu.dnetlib.openaire.exporter.model.vocabularies.Country;
|
||||||
|
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
|
|
|
@ -1,15 +1,7 @@
|
||||||
|
|
||||||
DsmApiControllerV2
|
|
||||||
SimpleDatasourceInfo
|
|
||||||
AggregationHistoryResponseV2
|
|
||||||
|
|
||||||
DsmApiController
|
DsmApiController
|
||||||
DatasourceDetailResponse
|
|
||||||
AggregationHistoryResponseV1
|
|
||||||
DatasourceSnippetResponse
|
DatasourceSnippetResponse
|
||||||
RegisteredDatasourceInfo
|
RegisteredDatasourceInfo
|
||||||
ApiDetailsResponse
|
ApiDetailsResponse
|
||||||
DatasourceDetails
|
|
||||||
DatasourceDetailsWithApis
|
DatasourceDetailsWithApis
|
||||||
DatasourceDetailsUpdate
|
DatasourceDetailsUpdate
|
||||||
ApiDetails
|
ApiDetails
|
||||||
|
|
|
@ -18,18 +18,23 @@
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.mockito</groupId>
|
|
||||||
<artifactId>mockito-junit-jupiter</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springdoc</groupId>
|
<groupId>org.springdoc</groupId>
|
||||||
<artifactId>springdoc-openapi-common</artifactId>
|
<artifactId>springdoc-openapi-common</artifactId>
|
||||||
<version>1.6.10</version>
|
<version>1.6.10</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>jakarta.persistence</groupId>
|
||||||
|
<artifactId>jakarta.persistence-api</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.mockito</groupId>
|
||||||
|
<artifactId>mockito-junit-jupiter</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
<artifactId>spring-boot-starter-test</artifactId>
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
package eu.dnetlib.openaire.dsm.domain;
|
package eu.dnetlib.openaire.exporter.model.dsm;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
|
|
||||||
import eu.dnetlib.openaire.exporter.model.dsm.Response;
|
|
||||||
|
|
||||||
@JsonAutoDetect
|
@JsonAutoDetect
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public class AggregationHistoryResponseV1 extends Response {
|
public class AggregationHistoryResponseV1 extends Response {
|
|
@ -1,12 +1,9 @@
|
||||||
package eu.dnetlib.openaire.dsm.domain;
|
package eu.dnetlib.openaire.exporter.model.dsm;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
|
|
||||||
import eu.dnetlib.enabling.datasources.common.AggregationInfo;
|
|
||||||
import eu.dnetlib.openaire.exporter.model.dsm.Response;
|
|
||||||
|
|
||||||
@JsonAutoDetect
|
@JsonAutoDetect
|
||||||
public class AggregationHistoryResponseV2 extends Response {
|
public class AggregationHistoryResponseV2 extends Response {
|
||||||
|
|
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,9 +1,7 @@
|
||||||
package eu.dnetlib.openaire.dsm.domain;
|
package eu.dnetlib.openaire.exporter.model.dsm;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
|
||||||
import eu.dnetlib.enabling.datasources.common.AggregationInfo;
|
|
||||||
|
|
||||||
public class AggregationInfoV1 extends AggregationInfo {
|
public class AggregationInfoV1 extends AggregationInfo {
|
||||||
|
|
||||||
@Override
|
@Override
|
|
@ -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);
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
package eu.dnetlib.openaire.dsm.domain;
|
package eu.dnetlib.openaire.exporter.model.dsm;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
|
|
|
@ -1,10 +1,7 @@
|
||||||
package eu.dnetlib.openaire.dsm.domain;
|
package eu.dnetlib.openaire.exporter.model.dsm;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
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.
|
* Created by claudio on 29/11/2016.
|
||||||
*/
|
*/
|
|
@ -1,4 +1,4 @@
|
||||||
package eu.dnetlib.openaire.dsm.domain;
|
package eu.dnetlib.openaire.exporter.model.dsm;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package eu.dnetlib.openaire.dsm.domain;
|
package eu.dnetlib.openaire.exporter.model.dsm;
|
||||||
|
|
||||||
import java.sql.Date;
|
import java.sql.Date;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
|
@ -1,4 +1,4 @@
|
||||||
package eu.dnetlib.openaire.dsm.domain;
|
package eu.dnetlib.openaire.exporter.model.dsm;
|
||||||
|
|
||||||
import java.sql.Date;
|
import java.sql.Date;
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
package eu.dnetlib.openaire.dsm.domain;
|
package eu.dnetlib.openaire.exporter.model.dsm;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
|
|
||||||
import eu.dnetlib.enabling.datasources.common.AggregationInfo;
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
|
||||||
@JsonAutoDetect
|
@JsonAutoDetect
|
|
@ -1,4 +1,4 @@
|
||||||
package eu.dnetlib.openaire.dsm.domain;
|
package eu.dnetlib.openaire.exporter.model.dsm;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package eu.dnetlib.openaire.dsm.domain;
|
package eu.dnetlib.openaire.exporter.model.dsm;
|
||||||
|
|
||||||
import javax.validation.constraints.NotBlank;
|
import javax.validation.constraints.NotBlank;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package eu.dnetlib.openaire.dsm.domain;
|
package eu.dnetlib.openaire.exporter.model.dsm;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
|
@ -1,4 +1,4 @@
|
||||||
package eu.dnetlib.openaire.dsm.domain;
|
package eu.dnetlib.openaire.exporter.model.dsm;
|
||||||
|
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
|
@ -1,4 +1,4 @@
|
||||||
package eu.dnetlib.openaire.dsm.domain;
|
package eu.dnetlib.openaire.exporter.model.dsm;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
package eu.dnetlib.openaire.dsm.domain;
|
package eu.dnetlib.openaire.exporter.model.dsm;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
import com.fasterxml.jackson.annotation.JsonAutoDetect;
|
||||||
|
|
||||||
import eu.dnetlib.enabling.datasources.common.AggregationInfo;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by claudio on 29/11/2016.
|
* Created by claudio on 29/11/2016.
|
||||||
*/
|
*/
|
Loading…
Reference in New Issue