Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Story/3511/with meta address and location #911

Merged
merged 2 commits into from
Jan 30, 2025
Merged

Story/3511/with meta address and location #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15cd36e
implement setting address and location
davidalk Jan 29, 2025
a8e612b
add test for setting location on object
davidalk Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 102 additions & 8 deletions ...src/test/java/com/regnosys/rosetta/generator/java/function/FunctionGeneratorMetaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,105 @@ public class FunctionGeneratorMetaTest {
@Inject
CodeGeneratorTestHelper generatorTestHelper;

//TODO:canSetMetaLocationOnFunctionBasicOutput
@Test
void canSetMetaLocationOnFunctionObjectOutput() {
var model = """
metaType location string

type Foo:
field string (1..1)

func MyFunc:
output:
result Foo (1..1)
[metadata location]
set result -> field: "someValue"
set result -> location: "someAddress"
""";

var code = generatorTestHelper.generateCode(model);

var classes = generatorTestHelper.compileToClasses(code);
var myFunc = functionGeneratorHelper.createFunc(classes, "MyFunc");

var result = functionGeneratorHelper.invokeFunc(myFunc, FieldWithMeta.class);

var expected = generatorTestHelper.createInstanceUsingBuilder(classes, new RosettaJavaPackages.RootPackage("com.rosetta.test.model.metafields"), "FieldWithMetaFoo", Map.of(
"value", generatorTestHelper.createInstanceUsingBuilder(classes, new RosettaJavaPackages.RootPackage("com.rosetta.test.model"), "Foo", Map.of(
"field", "someValue"
)),
"meta", MetaFields.builder().setLocation("someAddress")
));

assertEquals(expected, result);
}

@Test
void canSetMetaLocationOnFunctionBasicOutput() {
var model = """
metaType location string

func MyFunc:
output:
result string (1..1)
[metadata location]
set result: "someValue"
set result -> location: "someAddress"
""";

var code = generatorTestHelper.generateCode(model);

var classes = generatorTestHelper.compileToClasses(code);
var myFunc = functionGeneratorHelper.createFunc(classes, "MyFunc");

var result = functionGeneratorHelper.invokeFunc(myFunc, FieldWithMeta.class);

var expected = generatorTestHelper.createInstanceUsingBuilder(classes, new RosettaJavaPackages.RootPackage("com.rosetta.model.metafields"), "FieldWithMetaString", Map.of(
"value", "someValue",
"meta", MetaFields.builder().setLocation("someAddress")
));

assertEquals(expected, result);
}

@Test
void canSetMetaAddressOnFunctionObjectOutput() {
var model = """
metaType address string

type Foo:
field string (1..1)

func MyFunc:
output:
result Foo (1..1)
[metadata address]
set result -> field: "someValue"
set result -> address: "someLocation"
""";

var code = generatorTestHelper.generateCode(model);

generatorTestHelper.writeClasses(code, "canSetMetaAddressOnFunctionObjectOutput");

var classes = generatorTestHelper.compileToClasses(code);

var myFunc = functionGeneratorHelper.createFunc(classes, "MyFunc");

var result = functionGeneratorHelper.invokeFunc(myFunc, FieldWithMeta.class);

var expected = generatorTestHelper.createInstanceUsingBuilder(classes, new RosettaJavaPackages.RootPackage("com.rosetta.test.model.metafields"), "ReferenceWithMetaFoo", Map.of(
"value", generatorTestHelper.createInstanceUsingBuilder(classes, new RosettaJavaPackages.RootPackage("com.rosetta.test.model"), "Foo", Map.of(
"field", "someValue"
)),
"reference", Reference.builder().setReference("someLocation")
));

assertEquals(expected, result);
}

@Test
void canSetMetaAddressOnFunctionBasicOutput() {
void canSetAddressOnFunctionBasicOutput() {
var model = """
metaType address string

Expand All @@ -45,7 +139,7 @@ result string (1..1)
""";

var code = generatorTestHelper.generateCode(model);

var classes = generatorTestHelper.compileToClasses(code);


Expand All @@ -63,7 +157,7 @@ result string (1..1)


@Test
void canSetExternalIdOnFunctionObjectOutput() {
void canSetExternalIdOnFunctionBasicOutput() {
var model = """
metaType id string

Expand Down Expand Up @@ -139,7 +233,7 @@ result Foo (1..1)
""";

var code = generatorTestHelper.generateCode(model);

var classes = generatorTestHelper.compileToClasses(code);
var myFunc = functionGeneratorHelper.createFunc(classes, "MyFunc");

Expand All @@ -154,7 +248,7 @@ result Foo (1..1)

@Disabled //TODO: implement setting nested meta
@Test
void canSetMetaOnFunctionObjectOutputAndNestedMetaField() {
void canSetMetaOnFunctionObjectOutputAndNestedBasicMetaField() {
var model = """
type Foo:
a string (1..1)
Expand Down Expand Up @@ -192,7 +286,7 @@ result Foo (1..1)
}

@Test
void canSetMetaSchemeOnFunctionObjectOutput() {
void canSetSchemeOnFunctionObjectOutput() {
var model = """
type Foo:
a string (1..1)
Expand Down Expand Up @@ -225,7 +319,7 @@ result Foo (1..1)
}

@Test
void canSetMetaSchemeOnFunctionBasicOutput() {
void canSetSchemeOnFunctionBasicOutput() {
var model = """
func MyFunc:
output:
Expand Down
12 changes: 7 additions & 5 deletions ...a-lang/src/main/java/com/regnosys/rosetta/generator/java/function/FunctionGenerator.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ class FunctionGenerator {
expr = JavaExpression.from(
'''
«oldExpr»
«generateMetaWrapperCreator(prop, outputExpressionType)».«IF op.ROperationType == ROperationType.ADD»add«ELSE»set«ENDIF»«seg.toPojoPropertyNames.toFirstUpper»(«it»)''',
«generateMetaWrapperCreator(seg, prop, outputExpressionType)».«IF op.ROperationType == ROperationType.ADD»add«ELSE»set«ENDIF»«seg.toPojoPropertyNames.toFirstUpper»(«it»)''',
JavaPrimitiveType.VOID
)
} else {
Expand All @@ -503,10 +503,12 @@ class FunctionGenerator {
}
}

private def StringConcatenationClient generateMetaWrapperCreator(JavaPojoProperty prop, RJavaWithMetaValue outputExpressionType) {
private def StringConcatenationClient generateMetaWrapperCreator(RFeature seg, JavaPojoProperty prop, RJavaWithMetaValue outputExpressionType) {
switch (outputExpressionType) {
RJavaFieldWithMeta: '''.«prop.getOrCreateName»()'''
RJavaReferenceWithMeta: '''«IF prop.name === "reference"».«prop.getOrCreateName»()«ENDIF»'''
RJavaFieldWithMeta: '''«IF seg instanceof RMetaAttribute».getOrCreateMeta()«ELSE».«prop.getOrCreateName»()«ENDIF»'''
RJavaReferenceWithMeta case seg instanceof RMetaAttribute && seg.name == "address": '''.«prop.getOrCreateName»()'''
RJavaReferenceWithMeta case !(seg instanceof RMetaAttribute): '''.getOrCreateValue()'''
default: ''''''
}
}

Expand All @@ -515,7 +517,7 @@ class FunctionGenerator {
if (seg instanceof RMetaAttribute && outputExpressionType.itemType instanceof RJavaFieldWithMeta) {
(outputExpressionType as JavaPojoInterface).findProperty("meta")
} else if (seg instanceof RMetaAttribute && outputExpressionType.itemType instanceof RJavaReferenceWithMeta) {
(outputExpressionType as JavaPojoInterface).findProperty(toPojoPropertyNames(seg))
(outputExpressionType as JavaPojoInterface).findProperty("reference")
} else if (outputExpressionType.itemType instanceof RJavaWithMetaValue) {
(outputExpressionType as JavaPojoInterface).findProperty("value")
} else {
Expand Down