apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmApiController.java

@@ -26,21 +26,21 @@ 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.ApiDetails;
-import eu.dnetlib.openaire.dsm.domain.ApiDetailsResponse;
 import eu.dnetlib.openaire.dsm.domain.DatasourceDetailResponse;
 import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsUpdate;
 import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsWithApis;
 import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetResponse;
 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.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.ApiDetails;
+import eu.dnetlib.openaire.exporter.model.dsm.ApiDetailsResponse;
 import eu.dnetlib.openaire.exporter.model.dsm.DatasourceDetails;
+import eu.dnetlib.openaire.exporter.model.dsm.RequestFilter;
 import eu.dnetlib.openaire.exporter.model.dsm.SimpleResponse;
 import eu.dnetlib.openaire.exporter.model.vocabularies.Country;
 import io.swagger.v3.oas.annotations.Operation;

apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/DsmCore.java

@@ -29,7 +29,6 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Component;
 
-import eu.dnetlib.enabling.datasources.common.AggregationInfo;
 import eu.dnetlib.openaire.common.ISClient;
 import eu.dnetlib.openaire.community.CommunityClient;
 import eu.dnetlib.openaire.dsm.dao.DatasourceDao;
@@ -37,14 +36,11 @@ 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.ApiDetails;
-import eu.dnetlib.openaire.dsm.domain.ApiDetailsResponse;
 import eu.dnetlib.openaire.dsm.domain.DatasourceDetailResponse;
 import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsUpdate;
 import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsWithApis;
 import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetResponse;
 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.db.ApiDbEntry;
@@ -55,8 +51,12 @@ 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.AggregationInfo;
 import eu.dnetlib.openaire.exporter.model.dsm.AggregationInfoV1;
+import eu.dnetlib.openaire.exporter.model.dsm.ApiDetails;
+import eu.dnetlib.openaire.exporter.model.dsm.ApiDetailsResponse;
 import eu.dnetlib.openaire.exporter.model.dsm.DatasourceDetails;
+import eu.dnetlib.openaire.exporter.model.dsm.RequestFilter;
 import eu.dnetlib.openaire.exporter.model.dsm.SimpleDatasourceInfo;
 import eu.dnetlib.openaire.exporter.model.dsm.SimpleResponse;
 import eu.dnetlib.openaire.exporter.model.vocabularies.Country;

apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/DatasourceDao.java

@@ -5,10 +5,10 @@ import java.util.List;
 import org.springframework.data.domain.Page;
 
 import eu.dnetlib.enabling.datasources.common.Api;
-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.exporter.exceptions.DsmException;
+import eu.dnetlib.openaire.exporter.model.dsm.RequestFilter;
 import eu.dnetlib.openaire.exporter.model.vocabularies.Country;
 
 public interface DatasourceDao<DS extends Datasource<?, ?, ?>, API extends Api<?>> extends DatasourceManagerCommon<DS, API> {

apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/DatasourceDaoImpl.java

@@ -30,7 +30,6 @@ import org.springframework.transaction.annotation.Transactional;
 import com.google.common.collect.Lists;
 
 import eu.dnetlib.DnetOpenaireExporterProperties;
-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.db.ApiDbEntry;
@@ -40,6 +39,7 @@ import eu.dnetlib.openaire.dsm.domain.db.DatasourceDbEntry;
 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.RequestFilter;
 import eu.dnetlib.openaire.exporter.model.vocabularies.Country;
 import eu.dnetlib.openaire.exporter.model.vocabularies.Vocabulary;
 

apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/DatasourceSpecs.java

@@ -16,13 +16,13 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.data.jpa.domain.Specification;
 
-import eu.dnetlib.openaire.dsm.domain.FilterName;
-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.db.DatasourceApiDbEntry;
 import eu.dnetlib.openaire.dsm.domain.db.DatasourceDbEntry;
 import eu.dnetlib.openaire.exporter.exceptions.DsmRuntimeException;
+import eu.dnetlib.openaire.exporter.model.dsm.FilterName;
+import eu.dnetlib.openaire.exporter.model.dsm.RequestFilter;
 
 public class DatasourceSpecs {
 

apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/ResponseUtils.java

@@ -5,12 +5,12 @@ import java.util.Queue;
 
 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.DatasourceSearchResponse;
 import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetExtended;
 import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetResponse;
+import eu.dnetlib.openaire.exporter.model.dsm.ApiDetails;
+import eu.dnetlib.openaire.exporter.model.dsm.ApiDetailsResponse;
 import eu.dnetlib.openaire.exporter.model.dsm.DatasourceDetails;
 import eu.dnetlib.openaire.exporter.model.dsm.DatasourceInfo;
 import eu.dnetlib.openaire.exporter.model.dsm.Header;

apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/dsm/dao/utils/DsmMappingUtils.java

@@ -14,12 +14,12 @@ import org.springframework.beans.BeanWrapperImpl;
 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.DatasourceDetailsUpdate;
 import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetExtended;
 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.ApiDetails;
 import eu.dnetlib.openaire.exporter.model.dsm.DatasourceDetails;
 import eu.dnetlib.openaire.exporter.model.dsm.OrganizationDetails;
 

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.ApiDetails;
 import eu.dnetlib.openaire.exporter.model.dsm.DatasourceDetails;
 import io.swagger.v3.oas.annotations.media.Schema;
 

apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/dsm/dao/utils/DsmMappingUtilsTest.java

@@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import eu.dnetlib.openaire.dsm.domain.ApiDetails;
 import eu.dnetlib.openaire.dsm.domain.db.ApiDbEntry;
+import eu.dnetlib.openaire.exporter.model.dsm.ApiDetails;
 
 class DsmMappingUtilsTest {
 

libs/dnet-exporter-model/TODO.txt

@@ -1,8 +1,6 @@
 DsmApiController
 	DatasourceSnippetResponse
 	RegisteredDatasourceInfo
-	ApiDetailsResponse
 	DatasourceDetailsWithApis
 	DatasourceDetailsUpdate
-	ApiDetails
+
-	RequestFilter

libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/ApiDetails.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;

libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/ApiDetailsResponse.java

@@ -1,13 +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;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-
 @JsonAutoDetect
 public class ApiDetailsResponse extends Response {
 

libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/ApiIgnoredProperties.java

@@ -1,4 +1,4 @@
-package eu.dnetlib.openaire.dsm.domain;
+package eu.dnetlib.openaire.exporter.model.dsm;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/ApiParamDetails.java

@@ -1,4 +1,4 @@
-package eu.dnetlib.openaire.dsm.domain;
+package eu.dnetlib.openaire.exporter.model.dsm;
 
 public class ApiParamDetails {
 

libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/FilterName.java

@@ -1,4 +1,4 @@
-package eu.dnetlib.openaire.dsm.domain;
+package eu.dnetlib.openaire.exporter.model.dsm;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 

libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/FilterType.java

@@ -1,4 +1,4 @@
-package eu.dnetlib.openaire.dsm.domain;
+package eu.dnetlib.openaire.exporter.model.dsm;
 
 public enum FilterType {
 	exact,

libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/dsm/RequestFilter.java

@@ -1,4 +1,4 @@
-package eu.dnetlib.openaire.dsm.domain;
+package eu.dnetlib.openaire.exporter.model.dsm;
 
 import java.util.HashMap;