diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityApiController.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityApiController.java index 7db0de6b..f4511ff2 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityApiController.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityApiController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import eu.dnetlib.openaire.community.db.CommunityService; +import eu.dnetlib.openaire.community.CommunityService; import eu.dnetlib.openaire.exporter.exceptions.CommunityException; import eu.dnetlib.openaire.exporter.exceptions.ResourceNotFoundException; import eu.dnetlib.openaire.exporter.model.community.CommunityContentprovider; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityService.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityService.java similarity index 93% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityService.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityService.java index 3af9e9cb..abc2af38 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/CommunityService.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityService.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db; +package eu.dnetlib.openaire.community; import java.util.Arrays; import java.util.LinkedHashSet; @@ -17,21 +17,21 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; -import eu.dnetlib.openaire.community.db.model.DbCommunity; -import eu.dnetlib.openaire.community.db.model.DbDatasource; -import eu.dnetlib.openaire.community.db.model.DbDatasourcePK; -import eu.dnetlib.openaire.community.db.model.DbOrganization; -import eu.dnetlib.openaire.community.db.model.DbProject; -import eu.dnetlib.openaire.community.db.model.DbProjectPK; -import eu.dnetlib.openaire.community.db.model.DbSubCommunity; -import eu.dnetlib.openaire.community.db.model.DbSupportOrg; -import eu.dnetlib.openaire.community.db.repository.DbCommunityRepository; -import eu.dnetlib.openaire.community.db.repository.DbDatasourceRepository; -import eu.dnetlib.openaire.community.db.repository.DbOrganizationRepository; -import eu.dnetlib.openaire.community.db.repository.DbProjectRepository; -import eu.dnetlib.openaire.community.db.repository.DbSubCommunityRepository; -import eu.dnetlib.openaire.community.db.repository.DbSupportOrgRepository; -import eu.dnetlib.openaire.community.db.utils.CommunityMappingUtils; +import eu.dnetlib.openaire.community.model.DbCommunity; +import eu.dnetlib.openaire.community.model.DbDatasource; +import eu.dnetlib.openaire.community.model.DbDatasourcePK; +import eu.dnetlib.openaire.community.model.DbOrganization; +import eu.dnetlib.openaire.community.model.DbProject; +import eu.dnetlib.openaire.community.model.DbProjectPK; +import eu.dnetlib.openaire.community.model.DbSubCommunity; +import eu.dnetlib.openaire.community.model.DbSupportOrg; +import eu.dnetlib.openaire.community.repository.DbCommunityRepository; +import eu.dnetlib.openaire.community.repository.DbDatasourceRepository; +import eu.dnetlib.openaire.community.repository.DbOrganizationRepository; +import eu.dnetlib.openaire.community.repository.DbProjectRepository; +import eu.dnetlib.openaire.community.repository.DbSubCommunityRepository; +import eu.dnetlib.openaire.community.repository.DbSupportOrgRepository; +import eu.dnetlib.openaire.community.utils.CommunityMappingUtils; import eu.dnetlib.openaire.exporter.exceptions.CommunityException; import eu.dnetlib.openaire.exporter.exceptions.ResourceNotFoundException; import eu.dnetlib.openaire.exporter.model.community.CommunityContentprovider; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/importer/CommunityImporterController.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/importer/CommunityImporterController.java index ea439627..a737b1ab 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/importer/CommunityImporterController.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/importer/CommunityImporterController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; import com.google.common.collect.Sets; import eu.dnetlib.openaire.common.ISClient; -import eu.dnetlib.openaire.community.db.model.DbOrganization; +import eu.dnetlib.openaire.community.model.DbOrganization; import eu.dnetlib.openaire.exporter.exceptions.CommunityException; import eu.dnetlib.openaire.exporter.model.context.Context; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/importer/CommunityImporterService.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/importer/CommunityImporterService.java index 777606ee..ffe38dc1 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/importer/CommunityImporterService.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/importer/CommunityImporterService.java @@ -25,9 +25,9 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; -import eu.dnetlib.openaire.community.db.CommunityService; -import eu.dnetlib.openaire.community.db.model.DbOrganization; -import eu.dnetlib.openaire.community.db.repository.DbOrganizationRepository; +import eu.dnetlib.openaire.community.CommunityService; +import eu.dnetlib.openaire.community.model.DbOrganization; +import eu.dnetlib.openaire.community.repository.DbOrganizationRepository; import eu.dnetlib.openaire.exporter.exceptions.CommunityException; import eu.dnetlib.openaire.exporter.model.community.CommunityClaimType; import eu.dnetlib.openaire.exporter.model.community.CommunityContentprovider; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbCommunity.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbCommunity.java similarity index 96% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbCommunity.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbCommunity.java index 5fe43395..68b7dafc 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbCommunity.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbCommunity.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.model; +package eu.dnetlib.openaire.community.model; import java.io.Serializable; import java.time.LocalDateTime; @@ -23,8 +23,8 @@ import com.vladmihalcea.hibernate.type.array.StringArrayType; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; import com.vladmihalcea.hibernate.type.json.JsonStringType; -import eu.dnetlib.openaire.community.db.utils.CommunityClaimTypeConverter; -import eu.dnetlib.openaire.community.db.utils.CommunityMembershipTypeConverter; +import eu.dnetlib.openaire.community.utils.CommunityClaimTypeConverter; +import eu.dnetlib.openaire.community.utils.CommunityMembershipTypeConverter; import eu.dnetlib.openaire.exporter.model.community.CommunityClaimType; import eu.dnetlib.openaire.exporter.model.community.CommunityMembershipType; import eu.dnetlib.openaire.exporter.model.community.CommunityStatus; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbDatasource.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbDatasource.java similarity index 97% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbDatasource.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbDatasource.java index a76ad833..3eaa6179 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbDatasource.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbDatasource.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.model; +package eu.dnetlib.openaire.community.model; import java.io.Serializable; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbDatasourcePK.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbDatasourcePK.java similarity index 95% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbDatasourcePK.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbDatasourcePK.java index 4e18288b..e02afaa7 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbDatasourcePK.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbDatasourcePK.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.model; +package eu.dnetlib.openaire.community.model; import java.io.Serializable; import java.util.Objects; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbOrganization.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbOrganization.java similarity index 95% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbOrganization.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbOrganization.java index 7ab5ff45..6ed99e92 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbOrganization.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbOrganization.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.model; +package eu.dnetlib.openaire.community.model; import java.io.Serializable; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbOrganizationPK.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbOrganizationPK.java similarity index 95% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbOrganizationPK.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbOrganizationPK.java index 2922fee4..bf91209d 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbOrganizationPK.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbOrganizationPK.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.model; +package eu.dnetlib.openaire.community.model; import java.io.Serializable; import java.util.Objects; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbProject.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbProject.java similarity index 97% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbProject.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbProject.java index 33fa1402..206457be 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbProject.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbProject.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.model; +package eu.dnetlib.openaire.community.model; import java.io.Serializable; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbProjectPK.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbProjectPK.java similarity index 96% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbProjectPK.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbProjectPK.java index 2dd424cf..558abcf9 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbProjectPK.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbProjectPK.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.model; +package eu.dnetlib.openaire.community.model; import java.io.Serializable; import java.util.Objects; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbSubCommunity.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbSubCommunity.java similarity index 97% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbSubCommunity.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbSubCommunity.java index 26924ff1..7d6b8954 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbSubCommunity.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbSubCommunity.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.model; +package eu.dnetlib.openaire.community.model; import java.io.Serializable; import java.util.LinkedHashMap; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbSupportOrg.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbSupportOrg.java similarity index 96% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbSupportOrg.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbSupportOrg.java index d037a94f..848b5c3a 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbSupportOrg.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbSupportOrg.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.model; +package eu.dnetlib.openaire.community.model; import java.io.Serializable; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbSupportOrgPK.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbSupportOrgPK.java similarity index 95% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbSupportOrgPK.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbSupportOrgPK.java index 63355dff..57e312dd 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/model/DbSupportOrgPK.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbSupportOrgPK.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.model; +package eu.dnetlib.openaire.community.model; import java.io.Serializable; import java.util.Objects; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbCommunityRepository.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbCommunityRepository.java similarity index 84% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbCommunityRepository.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbCommunityRepository.java index 0d1a888c..b60f0c56 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbCommunityRepository.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbCommunityRepository.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.repository; +package eu.dnetlib.openaire.community.repository; import java.util.List; @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import eu.dnetlib.openaire.community.db.model.DbCommunity; +import eu.dnetlib.openaire.community.model.DbCommunity; @ConditionalOnProperty(value = "openaire.exporter.enable.community", havingValue = "true") public interface DbCommunityRepository extends JpaRepository { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbDatasourceRepository.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbDatasourceRepository.java similarity index 70% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbDatasourceRepository.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbDatasourceRepository.java index cd6edeee..dc23cf31 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbDatasourceRepository.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbDatasourceRepository.java @@ -1,12 +1,12 @@ -package eu.dnetlib.openaire.community.db.repository; +package eu.dnetlib.openaire.community.repository; import java.util.List; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.JpaRepository; -import eu.dnetlib.openaire.community.db.model.DbDatasource; -import eu.dnetlib.openaire.community.db.model.DbDatasourcePK; +import eu.dnetlib.openaire.community.model.DbDatasource; +import eu.dnetlib.openaire.community.model.DbDatasourcePK; @ConditionalOnProperty(value = "openaire.exporter.enable.community", havingValue = "true") public interface DbDatasourceRepository extends JpaRepository { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbOrganizationRepository.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbOrganizationRepository.java similarity index 70% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbOrganizationRepository.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbOrganizationRepository.java index 79f1a734..1335108c 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbOrganizationRepository.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbOrganizationRepository.java @@ -1,12 +1,12 @@ -package eu.dnetlib.openaire.community.db.repository; +package eu.dnetlib.openaire.community.repository; import java.util.List; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.JpaRepository; -import eu.dnetlib.openaire.community.db.model.DbOrganization; -import eu.dnetlib.openaire.community.db.model.DbOrganizationPK; +import eu.dnetlib.openaire.community.model.DbOrganization; +import eu.dnetlib.openaire.community.model.DbOrganizationPK; @ConditionalOnProperty(value = "openaire.exporter.enable.community", havingValue = "true") public interface DbOrganizationRepository extends JpaRepository { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbProjectRepository.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbProjectRepository.java similarity index 74% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbProjectRepository.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbProjectRepository.java index 9b85d919..0c0e7214 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbProjectRepository.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbProjectRepository.java @@ -1,12 +1,12 @@ -package eu.dnetlib.openaire.community.db.repository; +package eu.dnetlib.openaire.community.repository; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.repository.JpaRepository; -import eu.dnetlib.openaire.community.db.model.DbProject; -import eu.dnetlib.openaire.community.db.model.DbProjectPK; +import eu.dnetlib.openaire.community.model.DbProject; +import eu.dnetlib.openaire.community.model.DbProjectPK; @ConditionalOnProperty(value = "openaire.exporter.enable.community", havingValue = "true") public interface DbProjectRepository extends JpaRepository { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbSubCommunityRepository.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbSubCommunityRepository.java similarity index 81% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbSubCommunityRepository.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbSubCommunityRepository.java index f2735f60..b81428e2 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbSubCommunityRepository.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbSubCommunityRepository.java @@ -1,11 +1,11 @@ -package eu.dnetlib.openaire.community.db.repository; +package eu.dnetlib.openaire.community.repository; import java.util.List; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.JpaRepository; -import eu.dnetlib.openaire.community.db.model.DbSubCommunity; +import eu.dnetlib.openaire.community.model.DbSubCommunity; @ConditionalOnProperty(value = "openaire.exporter.enable.community", havingValue = "true") public interface DbSubCommunityRepository extends JpaRepository { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbSupportOrgRepository.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbSupportOrgRepository.java similarity index 70% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbSupportOrgRepository.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbSupportOrgRepository.java index 04f07398..fb92f935 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/repository/DbSupportOrgRepository.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/repository/DbSupportOrgRepository.java @@ -1,12 +1,12 @@ -package eu.dnetlib.openaire.community.db.repository; +package eu.dnetlib.openaire.community.repository; import java.util.List; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.jpa.repository.JpaRepository; -import eu.dnetlib.openaire.community.db.model.DbSupportOrg; -import eu.dnetlib.openaire.community.db.model.DbSupportOrgPK; +import eu.dnetlib.openaire.community.model.DbSupportOrg; +import eu.dnetlib.openaire.community.model.DbSupportOrgPK; @ConditionalOnProperty(value = "openaire.exporter.enable.community", havingValue = "true") public interface DbSupportOrgRepository extends JpaRepository { diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/CommunityClaimTypeConverter.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/utils/CommunityClaimTypeConverter.java similarity index 93% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/CommunityClaimTypeConverter.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/utils/CommunityClaimTypeConverter.java index 09e6afdc..219325a8 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/CommunityClaimTypeConverter.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/utils/CommunityClaimTypeConverter.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.utils; +package eu.dnetlib.openaire.community.utils; import javax.persistence.AttributeConverter; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/CommunityMappingUtils.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/utils/CommunityMappingUtils.java similarity index 95% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/CommunityMappingUtils.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/utils/CommunityMappingUtils.java index 383e582a..b3bba7cc 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/CommunityMappingUtils.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/utils/CommunityMappingUtils.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.utils; +package eu.dnetlib.openaire.community.utils; import java.time.LocalDateTime; import java.util.Arrays; @@ -7,11 +7,11 @@ import java.util.List; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import eu.dnetlib.openaire.community.db.model.DbCommunity; -import eu.dnetlib.openaire.community.db.model.DbDatasource; -import eu.dnetlib.openaire.community.db.model.DbProject; -import eu.dnetlib.openaire.community.db.model.DbSubCommunity; -import eu.dnetlib.openaire.community.db.model.DbSupportOrg; +import eu.dnetlib.openaire.community.model.DbCommunity; +import eu.dnetlib.openaire.community.model.DbDatasource; +import eu.dnetlib.openaire.community.model.DbProject; +import eu.dnetlib.openaire.community.model.DbSubCommunity; +import eu.dnetlib.openaire.community.model.DbSupportOrg; import eu.dnetlib.openaire.exporter.model.community.CommunityContentprovider; import eu.dnetlib.openaire.exporter.model.community.CommunityDetails; import eu.dnetlib.openaire.exporter.model.community.CommunityOrganization; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/CommunityMembershipTypeConverter.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/utils/CommunityMembershipTypeConverter.java similarity index 93% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/CommunityMembershipTypeConverter.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/utils/CommunityMembershipTypeConverter.java index 0430a2c3..66ef5b55 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/CommunityMembershipTypeConverter.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/utils/CommunityMembershipTypeConverter.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.utils; +package eu.dnetlib.openaire.community.utils; import javax.persistence.AttributeConverter; diff --git a/apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/community/importer/CommunityImporterServiceTest.java b/apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/community/importer/CommunityImporterServiceTest.java index a5604e7a..20a5ecd0 100644 --- a/apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/community/importer/CommunityImporterServiceTest.java +++ b/apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/community/importer/CommunityImporterServiceTest.java @@ -12,9 +12,9 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import eu.dnetlib.openaire.community.db.CommunityService; -import eu.dnetlib.openaire.community.db.model.DbOrganization; -import eu.dnetlib.openaire.community.db.repository.DbOrganizationRepository; +import eu.dnetlib.openaire.community.CommunityService; +import eu.dnetlib.openaire.community.model.DbOrganization; +import eu.dnetlib.openaire.community.repository.DbOrganizationRepository; @ExtendWith(MockitoExtension.class) class CommunityImporterServiceTest {