Fix distinct return type to allow list operation chaining (finos#353)

dcarrascosa00 · Mar 4, 2022 · eee8677 · eee8677
1 parent 478affd
commit eee8677
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/...nosys.rosetta.lib/src/main/java/com/rosetta/model/lib/expression/ExpressionOperators.java b/...nosys.rosetta.lib/src/main/java/com/rosetta/model/lib/expression/ExpressionOperators.java
@@ -232,7 +232,7 @@ public static <T> ComparisonResult disjoint(Mapper<T> o1, Mapper<T> o2) {
 
 	// distinct
 
-	public static <T> Mapper<T> distinct(Mapper<T> o) {
+	public static <T> MapperC<T> distinct(Mapper<T> o) {
 		return MapperC.of(o.getMulti()
 				.stream()
 				.distinct()

diff --git a/....rosetta.tests/src/com/regnosys/rosetta/generator/java/expression/ListOperationTest.xtend b/....rosetta.tests/src/com/regnosys/rosetta/generator/java/expression/ListOperationTest.xtend
@@ -3605,6 +3605,29 @@ class ListOperationTest {
 		assertEquals(ImmutableList.of(1, 2, 3, 4), res);
 	}
 
+		@Test
+	def void shouldGenerateDistinctIntListSort() {
+		val model = '''
+			func FuncFoo: 
+				inputs:
+					numbers int (0..*)
+				output:
+					sortedNumbers int (0..*)
+			
+				set sortedNumbers:
+					numbers 
+						distinct
+						sort
+		'''
+		val code = model.generateCode
+		val classes = code.compileToClasses
+		val func = classes.createFunc("FuncFoo");
+
+		val res = func.invokeFunc(List, ImmutableList.of(4, 2, 2, 4, 3, 1, 1, 3))
+		assertEquals(4, res.size);
+		assertEquals(ImmutableList.of(1, 2, 3, 4), res);
+	}
+
 	@Test
 	def void shouldGenerateDateListSort() {
 		val model = '''