Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 9f4f42a0 by Tony Chemit at 2023-01-24T13:15:11+01:00 Avdth - Remove comment in AvdthDataImportResult (move it to test) - - - - - c1e15bcd by Tony Chemit at 2023-01-24T13:15:15+01:00 Avdth test - show export Result if not empty + improve code - - - - - 4 changed files: - core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/AvdthDataImportResult.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectWriter.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthDataBuilderTestSupport.java - core/persistence/test/src/test/resources/log4j2.xml Changes: ===================================== core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/AvdthDataImportResult.java ===================================== @@ -87,10 +87,6 @@ public class AvdthDataImportResult implements ObserveDto { this.notReadResult = notReadResult; this.exportResult = exportResult; this.sqlResultPath = sqlResultPath; - // Used for debugging... -// if (!exportResult.isEmpty()) { -// System.out.println(exportResult.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.joining("\n"))); -// } } public Path getMessageFile() { ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectWriter.java ===================================== @@ -192,9 +192,7 @@ public class FloatingObjectWriter extends DataWriter<FloatingObject, FloatingObj super.toResult(resultBuilder); toResult(resultBuilder, FloatingObjectPart.class, getReader().getFloatingObjectPartCount()); toResult(resultBuilder, TransmittingBuoy.class, getReader().getTransmittingBuoyCount()); -// getReader().getBadVesselActivityCodes().forEach((k,v)-> { -// resultBuilder.put(String.format("Bad Vessel activity used to build FAD from ACTIVITY.C_OPERA %s used but ObServe not allow fad.", k), v.getValue()); -// }); + getReader().getBadVesselActivityCodes().forEach((k,v)-> resultBuilder.put(String.format("Bad Vessel activity used to build FAD from ACTIVITE.C_OPERA %s used but this vessel activity does not allow fad in ObServe.", k), v.getValue())); } } ===================================== core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthDataBuilderTestSupport.java ===================================== @@ -26,19 +26,21 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import fr.ird.observe.dto.ObserveUtil; import fr.ird.observe.dto.ProgressionModel; -import fr.ird.observe.services.service.data.ps.AvdthDataImportConfiguration; -import fr.ird.observe.services.service.data.ps.AvdthDataImportResult; -import fr.ird.observe.services.service.data.ps.MissingReferentialException; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.persistence.avdth.AvdthFixtures; import fr.ird.observe.persistence.test.PersistenceTestSupportWrite; +import fr.ird.observe.services.service.data.ps.AvdthDataImportConfiguration; +import fr.ird.observe.services.service.data.ps.AvdthDataImportResult; +import fr.ird.observe.services.service.data.ps.MissingReferentialException; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.IgnoreTestClassRule; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import io.ultreia.java4all.util.SortedProperties; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Assume; @@ -56,6 +58,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * Created on 24/05/2021. @@ -65,7 +68,7 @@ import java.util.stream.Collectors; */ @RunWith(Parameterized.class) public abstract class AvdthDataBuilderTestSupport extends PersistenceTestSupportWrite { - + private static final Logger log = LogManager.getLogger(AvdthDataBuilderTestSupport.class); @ClassRule public static final IgnoreTestClassRule IGNORE2 = new IgnoreTestClassRule("Persistence Avdth", "persistence.avdth.test.skip"); @@ -95,8 +98,8 @@ public abstract class AvdthDataBuilderTestSupport extends PersistenceTestSupport } public static List<String> allDatabases(Path path) { - try { - List<String> collect = Files.find(path, 1, (p, b) -> p.toFile().getName().endsWith(".mdb")).map(p -> p.toFile().getName()).sorted().collect(Collectors.toList()); + try (Stream<Path> pathStream = Files.find(path, 1, (p, b) -> p.toFile().getName().endsWith(".mdb"))) { + List<String> collect = pathStream.map(p -> p.toFile().getName()).sorted().collect(Collectors.toList()); Collections.reverse(collect); return collect; } catch (IOException e) { @@ -142,8 +145,12 @@ public abstract class AvdthDataBuilderTestSupport extends PersistenceTestSupport try { result = ImportEngine.run(configuration, localTestMethodResource.getTopiaApplicationContext()); String resultAsGson = gson.toJson(result); - log.info(String.format("Import result:\n%s", resultAsGson)); - log.info(String.format("Import messages:\n%s", result.getMessageFile())); + log.debug(String.format("Import result:\n%s", resultAsGson)); + // Used for debugging... + Map<String, Integer> exportResult = result.getExportResult(); + if (!exportResult.isEmpty()) { + log.info(String.format("Export result:\n%s", exportResult.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.joining("\n")))); + } } finally { ObserveUtil.cleanMemory(); } ===================================== core/persistence/test/src/test/resources/log4j2.xml ===================================== @@ -46,6 +46,9 @@ <Logger name="org.nuiton.topia.persistence.security.SecurityScriptHelper" level="info" additivity="false"> <AppenderRef ref="console"/> </Logger> + <Logger name="fr.ird.observe.persistence.avdth.data.AvdthDataBuilderTestSupport" level="info" additivity="false"> + <AppenderRef ref="console"/> + </Logger> <Logger name="fr.ird.observe.persistence.test" level="info" additivity="false"> <AppenderRef ref="console"/> </Logger> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3b5c1e35a8bb8b9d36518dc13... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3b5c1e35a8bb8b9d36518dc13... You're receiving this email because of your account on gitlab.com.