Fixed regression in aggr clause

vpinna80 · vpinna80 · commit 3dca74ce7f64 · 2024-05-13T15:52:42.000+02:00
diff --git a/vtl-transform/src/main/java/it/bancaditalia/oss/vtl/impl/transform/aggregation/AggregateTransformation.java b/vtl-transform/src/main/java/it/bancaditalia/oss/vtl/impl/transform/aggregation/AggregateTransformation.java
@@ -158,7 +158,7 @@ protected VTLValue evalOnDataset(MetadataRepository repo, DataSet dataset, VTLVa
 			else if (dp.size() == 1)
 			{
 				DataSetMetadata srcMeta = dataset.getMetadata();
-				builder = builder.add(getCompFor(srcMeta.getMeasures().iterator().next(), repo, srcMeta), dp.values().iterator().next());
+				builder = builder.add(getCompFor(srcMeta.getMeasures().iterator().next(), repo, (DataSetMetadata) metadata), dp.values().iterator().next());
 			}
 			else
 				throw new IllegalStateException();
diff --git a/vtl-types/src/main/java/it/bancaditalia/oss/vtl/impl/types/dataset/AbstractDataSet.java b/vtl-types/src/main/java/it/bancaditalia/oss/vtl/impl/types/dataset/AbstractDataSet.java
@@ -285,8 +285,7 @@ protected Stream<DataPoint> streamDataPoints()
 			{
 				createCache(keys, groupCollector);
 
-				return Utils.getStream(cache)
-						.map(splitting((k, v) -> finisher.apply(v, k)));
+				return Utils.getStream(cache).map(splitting((k, v) -> finisher.apply(v, k)));
 			}
 
 			private synchronized void createCache(Set<DataStructureComponent<Identifier, ?, ?>> keys,

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ protected VTLValue evalOnDataset(MetadataRepository repo, DataSet dataset, VTLVa`
`158`	`158`	`else if (dp.size() == 1)`
`159`	`159`	`{`
`160`	`160`	`DataSetMetadata srcMeta = dataset.getMetadata();`
`161`		`- builder = builder.add(getCompFor(srcMeta.getMeasures().iterator().next(), repo, srcMeta), dp.values().iterator().next());`
	`161`	`+ builder = builder.add(getCompFor(srcMeta.getMeasures().iterator().next(), repo, (DataSetMetadata) metadata), dp.values().iterator().next());`
`162`	`162`	`}`
`163`	`163`	`else`
`164`	`164`	`throw new IllegalStateException();`
Original file line number	Diff line number	Diff line change
`@@ -285,8 +285,7 @@ protected Stream<DataPoint> streamDataPoints()`
`285`	`285`	`{`
`286`	`286`	`createCache(keys, groupCollector);`
`287`	`287`
`288`		`- return Utils.getStream(cache)`
`289`		`- .map(splitting((k, v) -> finisher.apply(v, k)));`
	`288`	`+ return Utils.getStream(cache).map(splitting((k, v) -> finisher.apply(v, k)));`
`290`	`289`	`}`
`291`	`290`
`292`	`291`	`private synchronized void createCache(Set<DataStructureComponent<Identifier, ?, ?>> keys,`