From c948ed63f37d2de093b9947ed9dd643f04211933 Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Thu, 14 Jul 2022 15:11:30 +0200 Subject: [PATCH] fixed a bug with _convert --- .../dsm/dao/utils/DsmMappingUtils.java | 12 +++++++++- .../dsm/dao/utils/DsmMappingUtilsTest.java | 24 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/dsm/dao/utils/DsmMappingUtilsTest.java 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 38e031eb..7e6d80b2 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 @@ -76,7 +76,17 @@ public class DsmMappingUtils { } public static ApiDbEntry asDbEntry(final ApiDetails d) { - final ApiDbEntry apiDbEntry = _convert(d, ApiDbEntry.class); + final ApiDbEntry apiDbEntry = new ApiDbEntry(); + + apiDbEntry.setId(d.getId()); + apiDbEntry.setBaseurl(d.getBaseurl()); + apiDbEntry.setProtocol(d.getProtocol()); + apiDbEntry.setDatasource(d.getDatasource()); + apiDbEntry.setContentdescription(d.getContentdescription()); + apiDbEntry.setCompatibility(d.getCompatibility()); + apiDbEntry.setCompatibilityOverride(d.getCompatibilityOverride()); + apiDbEntry.setRemovable(d.getRemovable()); + apiDbEntry.setMetadataIdentifierPath(d.getMetadataIdentifierPath()); // Need to complete the references among objects, because you know, referential integrity ... apiDbEntry.getApiParams().forEach(ap -> ap.getId().setApi(apiDbEntry)); diff --git a/apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/dsm/dao/utils/DsmMappingUtilsTest.java b/apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/dsm/dao/utils/DsmMappingUtilsTest.java new file mode 100644 index 00000000..eb11e14d --- /dev/null +++ b/apps/dnet-exporter-api/src/test/java/eu/dnetlib/openaire/dsm/dao/utils/DsmMappingUtilsTest.java @@ -0,0 +1,24 @@ +package eu.dnetlib.openaire.dsm.dao.utils; + +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; + +class DsmMappingUtilsTest { + + @BeforeEach + void setUp() throws Exception {} + + @Test + void testAsDetailsApiDbEntry() { + final ApiDetails api = new ApiDetails(); + api.setId("id:123"); + final ApiDbEntry dbEntry = DsmMappingUtils.asDbEntry(api); + assertEquals(api.getId(), dbEntry.getId()); + } + +}