From 71a48639be869355c001da6a11a2a213922155dc Mon Sep 17 00:00:00 2001
From: TCHERNIATINSKY <philippe.tcherniatinsky@inrae.fr>
Date: Mon, 2 May 2022 16:04:45 +0200
Subject: [PATCH 1/2] =?UTF-8?q?Correction=20de=20l'objet=20binaryFiledatas?=
=?UTF-8?q?et=20dans=20la=20m=C3=A9thode=20publish?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../fr/inra/oresing/checker/ReferenceLineChecker.java | 8 +++++---
src/test/resources/data/monsore/refdatas/sites.csv | 3 ++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/fr/inra/oresing/checker/ReferenceLineChecker.java b/src/main/java/fr/inra/oresing/checker/ReferenceLineChecker.java
index 0daaefac4..457158f3a 100644
--- a/src/main/java/fr/inra/oresing/checker/ReferenceLineChecker.java
+++ b/src/main/java/fr/inra/oresing/checker/ReferenceLineChecker.java
@@ -7,7 +7,9 @@ import fr.inra.oresing.persistence.SqlPrimitiveType;
import fr.inra.oresing.rest.validationcheckresults.ReferenceValidationCheckResult;
import fr.inra.oresing.transformer.LineTransformer;
+import java.util.HashSet;
import java.util.UUID;
+import java.util.stream.Collectors;
public class ReferenceLineChecker implements CheckerOnOneVariableComponentLineChecker<ReferenceLineCheckerConfiguration> {
@@ -47,8 +49,8 @@ public class ReferenceLineChecker implements CheckerOnOneVariableComponentLineCh
validationCheckResult = ReferenceValidationCheckResult.success(target, rawValue, valueAsLtree, referenceValues.get(valueAsLtree));
} else {
validationCheckResult = ReferenceValidationCheckResult.error(target, rawValue, getTarget().getInternationalizedKey("invalidReference"), ImmutableMap.of(
- "target", target,
- "referenceValues", referenceValues,
+ "target", target.toHumanReadableString(),
+ "referenceValues", referenceValues==null?new HashSet<>():referenceValues.keySet().stream().map(Ltree::getSql).collect(Collectors.toSet()),
"refType", reference,
"value", rawValue));
}
@@ -73,4 +75,4 @@ public class ReferenceLineChecker implements CheckerOnOneVariableComponentLineCh
public SqlPrimitiveType getSqlType() {
return SqlPrimitiveType.LTREE;
}
-}
+}
\ No newline at end of file
diff --git a/src/test/resources/data/monsore/refdatas/sites.csv b/src/test/resources/data/monsore/refdatas/sites.csv
index 590aac16b..bf552fa48 100644
--- a/src/test/resources/data/monsore/refdatas/sites.csv
+++ b/src/test/resources/data/monsore/refdatas/sites.csv
@@ -7,4 +7,5 @@ plateforme;b;B;B;;;oir__p1
bassin_versant;nivelle;Nivelle;Nivelle;Bassin versant de Nivelle;Watershed Nivelle;
bassin_versant;scarff;Scarff;Scarff;Bassin versant de Scarff;Watershed Scarff;
plateforme;p1;P1;P1;;;nivelle
-plateforme;p1;P1;P1;;;scarff
\ No newline at end of file
+plateforme;p1;P1;P1;;;scarff
+tutu;p1;P1;P1;;;scarff
\ No newline at end of file
--
GitLab
From 17dfdd7b5ff06bef5d85e23516bb1a49ceb70947 Mon Sep 17 00:00:00 2001
From: TCHERNIATINSKY <philippe.tcherniatinsky@inrae.fr>
Date: Mon, 2 May 2022 17:21:33 +0200
Subject: [PATCH 2/2] Avec une ligne de test en trop
---
src/test/resources/data/monsore/refdatas/sites.csv | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/test/resources/data/monsore/refdatas/sites.csv b/src/test/resources/data/monsore/refdatas/sites.csv
index bf552fa48..590aac16b 100644
--- a/src/test/resources/data/monsore/refdatas/sites.csv
+++ b/src/test/resources/data/monsore/refdatas/sites.csv
@@ -7,5 +7,4 @@ plateforme;b;B;B;;;oir__p1
bassin_versant;nivelle;Nivelle;Nivelle;Bassin versant de Nivelle;Watershed Nivelle;
bassin_versant;scarff;Scarff;Scarff;Bassin versant de Scarff;Watershed Scarff;
plateforme;p1;P1;P1;;;nivelle
-plateforme;p1;P1;P1;;;scarff
-tutu;p1;P1;P1;;;scarff
\ No newline at end of file
+plateforme;p1;P1;P1;;;scarff
\ No newline at end of file
--
GitLab