Fix for meta generation (finos#832)

* Fix * Fix
REGnosys · Sep 10, 2024 · 7b89343 · 7b89343
1 parent 64c4d0e
commit 7b89343
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 9 deletions.
diff --git a/...a-lang/src/main/java/com/regnosys/rosetta/generator/java/function/FunctionGenerator.xtend b/...a-lang/src/main/java/com/regnosys/rosetta/generator/java/function/FunctionGenerator.xtend
@@ -591,7 +591,7 @@ class FunctionGenerator {
 	}
 
 	private def StringConcatenationClient inputsAsParameters(List<RAttribute> inputs, JavaScope scope) {
-		'''«FOR input : inputs SEPARATOR ', '»«input.toMetaJavaType» «scope.getIdentifierOrThrow(input)»«ENDFOR»'''
+		'''«FOR input : inputs SEPARATOR ', '»«input.toJavaType» «scope.getIdentifierOrThrow(input)»«ENDFOR»'''
 	}
 
 	private def JavaReferenceType shortcutJavaType(RShortcut feature) {

diff --git a/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/types/JavaTypeTranslator.java b/rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/types/JavaTypeTranslator.java
@@ -249,7 +249,7 @@ public JavaReferenceType operationToJavaType(ROperation op) {
 			List<RAttribute> segments = op.getPathTail();
 			attr = segments.get(segments.size() - 1);
 		}
-		return toMetaJavaType(attr);
+		return toJavaType(attr);
 	}
 	public JavaClass<?> operationToReferenceWithMetaType(ROperation op) {
 		RAttribute attr;

diff --git a/...ng/src/test/java/com/regnosys/rosetta/generator/java/function/FunctionGeneratorTest.xtend b/...ng/src/test/java/com/regnosys/rosetta/generator/java/function/FunctionGeneratorTest.xtend
@@ -42,6 +42,32 @@ class FunctionGeneratorTest {
 	@Inject extension ModelHelper
 	@Inject extension ValidationTestHelper
 
+	@Test
+	def void assignToMultiMetaFeature() {
+		val code = '''
+		type A:
+		    a string (0..*)
+		    	[metadata reference]
+		
+		func Test:
+			output:
+				result A (1..1)
+			
+			add result -> a:
+				"Hello"
+		'''.generateCode
+
+		val classes = code.compileToClasses
+		val a = classes.createInstanceUsingBuilder("A", #{
+    		"a" -> #[classes.createInstanceUsingBuilder(new RootPackage("com.rosetta.model.metafields"), "ReferenceWithMetaString", #{
+    			"value" -> "Hello"
+    		})]
+        })
+
+        val testOnlyExists = classes.createFunc("Test")
+        assertEquals(a, testOnlyExists.invokeFunc(a.class, #[]))
+	}
+
 	@Test
 	def void onlyExistsOnAbsentParent() {
 		val code = '''

diff --git a/.../test/java/com/regnosys/rosetta/generator/java/object/ConfigurableTypeTabulatorTest.xtend b/.../test/java/com/regnosys/rosetta/generator/java/object/ConfigurableTypeTabulatorTest.xtend
@@ -140,14 +140,12 @@ class ConfigurableTypeTabulatorTest {
 		val model2 = '''
 			namespace model2
 			
-			    metaType scheme string
+			type Root:
+				engineSpecification EngineSpecification (1..1)
 			
-				type Root:
-				   engineSpecification EngineSpecification (1..1)
-				
-				type EngineSpecification:
-				   fuel string (1..*)
-				   [metadata scheme]
+			type EngineSpecification:
+				fuel string (1..*)
+				[metadata scheme]
 		'''
 
 		val model2Code = model2.generateCodeForModel(Model2FileConfigProvider)