Fixed sdmx codelists with inconsistent values

vpinna80 · Jan 16, 2024 · 9c944d6 · 9c944d6
1 parent 209ba82
commit 9c944d6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...s/vtl-sdmxenv/src/main/java/it/bancaditalia/oss/vtl/impl/environment/SDMXEnvironment.java b/...s/vtl-sdmxenv/src/main/java/it/bancaditalia/oss/vtl/impl/environment/SDMXEnvironment.java
@@ -95,6 +95,7 @@
 import it.bancaditalia.oss.vtl.impl.types.config.VTLPropertyImpl.Flags;
 import it.bancaditalia.oss.vtl.impl.types.data.DateValue;
 import it.bancaditalia.oss.vtl.impl.types.data.DoubleValue;
+import it.bancaditalia.oss.vtl.impl.types.data.NullValue;
 import it.bancaditalia.oss.vtl.impl.types.data.StringValue;
 import it.bancaditalia.oss.vtl.impl.types.data.TimePeriodValue;
 import it.bancaditalia.oss.vtl.impl.types.data.date.MonthPeriodHolder;
@@ -330,7 +331,9 @@ public synchronized DataPoint next()
 			}
 
 			DataStructureComponent<Measure, ?, ?> measure = structure.getMeasures().iterator().next();
-			builder.add(measure, DoubleValue.of(parseDouble(obs.getMeasureValue(measure.getName()))));
+			builder.add(measure, obs.getMeasureValue(measure.getName()) != null 
+					? DoubleValue.of(parseDouble(obs.getMeasureValue(measure.getName())))
+					: NullValue.instanceFrom(measure));
 			TemporalAccessor holder = parser.getValue().queryFrom(parser.getKey().parse(obs.getDimensionValue()));
 			ScalarValue<?, ?, ?, ?> value;
 			if (holder instanceof PeriodHolder)

diff --git a/...abase/src/main/java/it/bancaditalia/oss/vtl/impl/meta/subsets/AbstractStringCodeList.java b/...abase/src/main/java/it/bancaditalia/oss/vtl/impl/meta/subsets/AbstractStringCodeList.java
@@ -22,6 +22,10 @@
 import static it.bancaditalia.oss.vtl.impl.types.domain.Domains.STRINGDS;
 
 import java.io.Serializable;
+import java.util.TreeSet;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import it.bancaditalia.oss.vtl.exceptions.VTLCastException;
 import it.bancaditalia.oss.vtl.impl.meta.subsets.AbstractStringCodeList.StringCodeItemImpl;
@@ -37,6 +41,7 @@
 public abstract class AbstractStringCodeList implements StringEnumeratedDomainSubset<AbstractStringCodeList, StringCodeItemImpl, String>, Serializable
 {
 	private static final long serialVersionUID = 1L;
+	private static final Logger LOGGER = LoggerFactory.getLogger(AbstractStringCodeList.class);
 
 	public class StringCodeItemImpl extends StringValue<StringCodeItemImpl, AbstractStringCodeList> implements StringCodeItem<StringCodeItemImpl, String, AbstractStringCodeList>
 	{
@@ -117,6 +122,8 @@ public StringCodeItemImpl cast(ScalarValue<?, ?, ?, ?> value)
 			StringCodeItemImpl item = new StringCodeItemImpl((String) value.get());
 			if (getCodeItems().contains(item))
 				return item;
+
+			LOGGER.warn("Code {} was not found on codelist {}:{}", value.get(), name, new TreeSet<>(getCodeItems()));
 		}
 
 		throw new VTLCastException(this, value);