Fixed finos#844 (finos#851)

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/MetaFieldGenerator.xtend

@@ -84,38 +84,21 @@ class MetaFieldGenerator {
 			if (ctx.cancelIndicator.canceled) {
 				return
 			}
-			val refs = nsc.value.filter(Data).flatMap[buildRDataType.ownAttributes].filter [
-				metaAnnotations.exists[name == "reference" || name == "address"]
-			].toSet
+			val attributesWithMeta = nsc.value.filter(Data).flatMap[buildRDataType.ownAttributes].filter[!metaAnnotations.empty]
 
-			for (ref : refs) {
-				val targetModel = ref.RType.namespace
+			for (attr : attributesWithMeta) {
+				val targetModel = attr.RType.namespace
 				val targetPackage = new RootPackage(targetModel)
-				val metaJt = ref.toForcedMetaItemJavaType
+				val metaJt = attr.toForcedMetaItemJavaType
 
 				if (ctx.cancelIndicator.canceled) {
 					return
 				}
-				fsa.generateFile('''«metaJt.canonicalName.withForwardSlashes».java''',
-					referenceWithMeta(targetPackage, metaJt, ref.RType))
-			}
-
-
-
-			//find all the metaed types
-			val metas =  nsc.value.filter(Data).flatMap[buildRDataType.ownAttributes].filter[
-				!metaAnnotations.exists[name=="reference" || name=="address"]
-			].toSet
-
-			for (meta:metas) {
-				val targetModel = meta.RType.namespace
-				val targetPackage = new RootPackage(targetModel)
-				val metaJt = meta.toForcedMetaItemJavaType
-
-				if (ctx.cancelIndicator.canceled) {
-					return
+				if (attr.hasReferenceOrAddressMetadata) {
+					fsa.generateFile('''«metaJt.canonicalName.withForwardSlashes».java''', referenceWithMeta(targetPackage, metaJt, attr.RType))
+				} else {
+					fsa.generateFile('''«metaJt.canonicalName.withForwardSlashes».java''', fieldWithMeta(targetPackage, metaJt, attr.RType))
 				}
-				fsa.generateFile('''«metaJt.canonicalName.withForwardSlashes».java''', fieldWithMeta(targetPackage, metaJt, meta.RType))
 			}
 		}
 	}

rosetta-testing/src/test/java/com/regnosys/rosetta/issues/Issue844.xtend

@@ -0,0 +1,45 @@
+package com.regnosys.rosetta.issues
+
+import com.regnosys.rosetta.tests.RosettaInjectorProvider
+import com.regnosys.rosetta.tests.util.CodeGeneratorTestHelper
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.extensions.InjectionExtension
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.^extension.ExtendWith
+
+import javax.inject.Inject
+
+import static org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.BeforeAll
+import java.util.Map
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.TestInstance.Lifecycle
+
+// Regression test for https://github.com/finos/rune-dsl/issues/844
+@ExtendWith(InjectionExtension)
+@InjectWith(RosettaInjectorProvider)
+@TestInstance(Lifecycle.PER_CLASS)
+class Issue844 {
+
+	@Inject extension CodeGeneratorTestHelper
+
+	Map<String, String> code
+
+	@BeforeAll
+	def void setup() {
+		code = '''
+		type Foo:
+			foo Foo (0..1)
+		'''.generateCode
+	}
+
+	@Test
+	def void shouldNotGenerateFieldWithMeta() {
+		assertFalse(code.containsKey("com.rosetta.test.model.metafields.FieldWithMetaFoo"))
+	}
+
+	@Test
+	def void shouldNotGenerateReferenceWithMeta() {
+		assertFalse(code.containsKey("com.rosetta.test.model.metafields.ReferenceWithMetaFoo"))
+	}
+}