From fa5b0ef7c5c8edfd74ca170ce5184df04d0e5f15 Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Thu, 15 Jun 2023 11:37:01 +0200 Subject: [PATCH] moved some classes --- .../openaire/community/CommunityMappingUtils.java | 13 ++++++------- .../openaire/community/db/CommunityService.java | 2 +- .../openaire/community/db/enums/CommunityType.java | 6 ------ .../openaire/community/db/model/DbCommunity.java | 10 +++++----- .../CommunityClaimTypeConverter.java | 4 +++- .../CommunityMembershipTypeConverter.java | 4 +++- .../community/db/{ => utils}/ConvertionUtils.java | 2 +- .../community/CommunityApiControllerTest.java | 4 ++-- .../model/community}/CommunityClaimType.java | 2 +- .../exporter/model/community/CommunityDetails.java | 14 +++++++------- .../model/community}/CommunityMembershipType.java | 2 +- .../exporter/model/community/CommunityType.java | 6 ++++++ 12 files changed, 36 insertions(+), 33 deletions(-) delete mode 100644 apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityType.java rename apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/{enums => utils}/CommunityClaimTypeConverter.java (83%) rename apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/{enums => utils}/CommunityMembershipTypeConverter.java (83%) rename apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/{ => utils}/ConvertionUtils.java (98%) rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community}/CommunityClaimType.java (90%) rename {apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums => libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community}/CommunityMembershipType.java (90%) create mode 100644 libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityType.java diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityMappingUtils.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityMappingUtils.java index 291e011d..81e389c5 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityMappingUtils.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityMappingUtils.java @@ -33,7 +33,6 @@ import static eu.dnetlib.openaire.community.CommunityConstants.PIPE_SEPARATOR; import static eu.dnetlib.openaire.community.CommunityConstants.PROJECTS_ID_SUFFIX; import static eu.dnetlib.openaire.community.CommunityConstants.ZENODOCOMMUNITY_ID_SUFFIX; -import java.text.ParseException; import java.util.Arrays; import java.util.Base64; import java.util.List; @@ -100,7 +99,7 @@ public class CommunityMappingUtils { public static CommunityDetails asCommunityProfile(final Context c) { final CommunityDetails p = new CommunityDetails(asCommunitySummary(c)); - p.setLastUpdateDate(c.getLastUpdateDate()); + // p.setLastUpdateDate(c.getLastUpdateDate()); final Map> params = c.getParams(); if (params.containsKey(CPROFILE_SUBJECT)) { p.setSubjects(splitValues(asValues(params.get(CPROFILE_SUBJECT)), CSV_DELIMITER)); @@ -117,11 +116,11 @@ public class CommunityMappingUtils { } if (params.containsKey(CPROFILE_CREATIONDATE)) { - try { - p.setCreationDate(org.apache.commons.lang3.time.DateUtils.parseDate(asCsv(params.get(CPROFILE_CREATIONDATE)), pattern)); - } catch (final ParseException e) { - log.debug("Exception on date format: " + e.getMessage()); - } + // try { + // p.setCreationDate(org.apache.commons.lang3.time.DateUtils.parseDate(asCsv(params.get(CPROFILE_CREATIONDATE)), pattern)); + // } catch (final ParseException e) { + // log.debug("Exception on date format: " + e.getMessage()); + // } } return p; 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/db/CommunityService.java index b57909ab..35d717d5 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/db/CommunityService.java @@ -27,6 +27,7 @@ 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.DbSupportOrgRepository; +import eu.dnetlib.openaire.community.db.utils.ConvertionUtils; import eu.dnetlib.openaire.exporter.exceptions.CommunityException; import eu.dnetlib.openaire.exporter.exceptions.ResourceNotFoundException; import eu.dnetlib.openaire.exporter.model.community.CommunityContentprovider; @@ -55,7 +56,6 @@ public class CommunityService { // 9) i campi officialName e selectioncriteria mancano nel nuovo modello delle datasource, si aggiungono? // 10) i campi name, logoUrl e websiteUrl mancano nel nuovo modello delle organization, // esistono solo in quello delle support_org, occorre rivedere le api e i mapping - // 11) Move enums in dnet-exporter-model @Autowired private DbCommunityRepository dbCommunityRepository; diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityType.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityType.java deleted file mode 100644 index 9c59b8d1..00000000 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityType.java +++ /dev/null @@ -1,6 +0,0 @@ -package eu.dnetlib.openaire.community.db.enums; - -public enum CommunityType { - community, - ri -} 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/db/model/DbCommunity.java index b0781601..cdac8146 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/db/model/DbCommunity.java @@ -21,12 +21,12 @@ 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.enums.CommunityClaimType; -import eu.dnetlib.openaire.community.db.enums.CommunityClaimTypeConverter; -import eu.dnetlib.openaire.community.db.enums.CommunityMembershipType; -import eu.dnetlib.openaire.community.db.enums.CommunityMembershipTypeConverter; -import eu.dnetlib.openaire.community.db.enums.CommunityType; +import eu.dnetlib.openaire.community.db.utils.CommunityClaimTypeConverter; +import eu.dnetlib.openaire.community.db.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; +import eu.dnetlib.openaire.exporter.model.community.CommunityType; @Entity @Table(name = "communities") diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityClaimTypeConverter.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/CommunityClaimTypeConverter.java similarity index 83% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityClaimTypeConverter.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/CommunityClaimTypeConverter.java index bacda019..09e6afdc 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityClaimTypeConverter.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/CommunityClaimTypeConverter.java @@ -1,9 +1,11 @@ -package eu.dnetlib.openaire.community.db.enums; +package eu.dnetlib.openaire.community.db.utils; import javax.persistence.AttributeConverter; import org.apache.commons.lang3.StringUtils; +import eu.dnetlib.openaire.exporter.model.community.CommunityClaimType; + public class CommunityClaimTypeConverter implements AttributeConverter { @Override diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityMembershipTypeConverter.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/CommunityMembershipTypeConverter.java similarity index 83% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityMembershipTypeConverter.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/CommunityMembershipTypeConverter.java index bafd7ab4..0430a2c3 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityMembershipTypeConverter.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/CommunityMembershipTypeConverter.java @@ -1,9 +1,11 @@ -package eu.dnetlib.openaire.community.db.enums; +package eu.dnetlib.openaire.community.db.utils; import javax.persistence.AttributeConverter; import org.apache.commons.lang3.StringUtils; +import eu.dnetlib.openaire.exporter.model.community.CommunityMembershipType; + public class CommunityMembershipTypeConverter implements AttributeConverter { @Override diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/ConvertionUtils.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/ConvertionUtils.java similarity index 98% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/ConvertionUtils.java rename to apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/ConvertionUtils.java index bf3d2d30..33c924af 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/ConvertionUtils.java +++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/utils/ConvertionUtils.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db; +package eu.dnetlib.openaire.community.db.utils; import static eu.dnetlib.openaire.community.CommunityConstants.PIPE_SEPARATOR; diff --git a/apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/community/CommunityApiControllerTest.java b/apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/community/CommunityApiControllerTest.java index 94d9ee7f..4f1ffe2a 100644 --- a/apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/community/CommunityApiControllerTest.java +++ b/apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/community/CommunityApiControllerTest.java @@ -8,7 +8,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import java.nio.charset.Charset; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; import org.junit.jupiter.api.Test; @@ -46,7 +46,7 @@ public class CommunityApiControllerTest { final CommunitySummary cs = new CommunitySummary(); cs.setDescription("the description"); cs.setId("id1"); - cs.setLastUpdateDate(new Date()); + cs.setLastUpdateDate(LocalDateTime.now()); cs.setName("X"); cs.setShortName("x"); final List csList = singletonList(cs); diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityClaimType.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityClaimType.java similarity index 90% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityClaimType.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityClaimType.java index 077342ce..0e5a5d57 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityClaimType.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityClaimType.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.enums; +package eu.dnetlib.openaire.exporter.model.community; public enum CommunityClaimType { diff --git a/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityDetails.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityDetails.java index de23e80e..f26a76f9 100644 --- a/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityDetails.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityDetails.java @@ -1,6 +1,6 @@ package eu.dnetlib.openaire.exporter.model.community; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; import com.fasterxml.jackson.annotation.JsonAutoDetect; @@ -12,10 +12,10 @@ import io.swagger.v3.oas.annotations.media.Schema; public class CommunityDetails extends CommunitySummary { @Schema(description = "date of creation for this community") - private Date creationDate; + private LocalDateTime creationDate; @Schema(description = "date of the last update for this communityu") - private Date lastUpdateDate; + private LocalDateTime lastUpdateDate; @Schema(description = "list of subjects (keywords) that characterise this community") private List subjects; @@ -36,12 +36,12 @@ public class CommunityDetails extends CommunitySummary { } @Override - public Date getCreationDate() { + public LocalDateTime getCreationDate() { return creationDate; } @Override - public void setCreationDate(final Date creationDate) { + public void setCreationDate(final LocalDateTime creationDate) { this.creationDate = creationDate; } @@ -54,12 +54,12 @@ public class CommunityDetails extends CommunitySummary { } @Override - public Date getLastUpdateDate() { + public LocalDateTime getLastUpdateDate() { return lastUpdateDate; } @Override - public void setLastUpdateDate(final Date lastUpdateDate) { + public void setLastUpdateDate(final LocalDateTime lastUpdateDate) { this.lastUpdateDate = lastUpdateDate; } diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityMembershipType.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityMembershipType.java similarity index 90% rename from apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityMembershipType.java rename to libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityMembershipType.java index 8f4371fd..aead6cd6 100644 --- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/db/enums/CommunityMembershipType.java +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityMembershipType.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.community.db.enums; +package eu.dnetlib.openaire.exporter.model.community; public enum CommunityMembershipType { diff --git a/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityType.java b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityType.java new file mode 100644 index 00000000..1e2ce254 --- /dev/null +++ b/libs/dnet-exporter-model/src/main/java/eu/dnetlib/openaire/exporter/model/community/CommunityType.java @@ -0,0 +1,6 @@ +package eu.dnetlib.openaire.exporter.model.community; + +public enum CommunityType { + community, + ri +}