From 3ac6b0243682a8aba10184cdec69ab9d42e14132 Mon Sep 17 00:00:00 2001 From: Octavian Patrascoiu Date: Fri, 13 Sep 2024 16:58:13 +0100 Subject: [PATCH] [#662] XML dialects: Set default dialects in Maven Mojos to the ones based on java.time API. --- .../type/JavaTimeKotlinNativeTypeFactory.java | 5 +-- .../type/KotlinNativeTypeFactoryTest.java | 6 ++-- .../java/com/gs/dmn/maven/DMNToJavaMojo.java | 2 +- .../com/gs/dmn/maven/DMNToKotlinMojo.java | 2 +- .../com/gs/dmn/maven/TCKToJavaJUnitMojo.java | 2 +- .../gs/dmn/maven/TCKToKotlinJUnitMojo.java | 2 +- .../gs/dmn/maven/TestLabToJavaJUnitMojo.java | 2 +- .../dmn/maven/TestLabToKotlinJUnitMojo.java | 2 +- .../com/gs/dmn/maven/DMNToJavaMojoTest.java | 4 +-- .../com/gs/dmn/maven/DMNToKotlinMojoTest.java | 4 +-- .../com/gs/dmn/maven/DMNToPythonMojoTest.java | 4 +-- .../gs/dmn/maven/TCKToJavaJUnitMojoTest.java | 4 +-- .../dmn/maven/TCKToKotlinJUnitMojoTest.java | 4 +-- .../dmn/maven/TCKToPythonJUnitMojoTest.java | 4 +-- .../dmn/maven/TestLabToJavaJUnitMojoTest.java | 4 +-- .../maven/TestLabToKotlinJUnitMojoTest.java | 4 +-- .../DateTimeProtoHandwrittenTest.java | 11 ++++--- .../tck/AbstractHandwrittenDecisionTest.java | 7 ++++ .../HandwrittenMonthlyPaymentTest.java | 17 ++++------ .../HandwrittenDecisionTest.java | 17 +++++----- .../PostorderTraceListenerTest.java | 11 +++---- .../TreeTraceListenerTest.java | 15 ++++----- ...ittenDecisionTableWithAnnotationsTest.java | 2 +- .../AbstractTest0004Lending.java | 2 +- .../kotlin/dmn/AffordabilityCalculation.kt | 8 ++--- .../proto3/kotlin/dmn/ApplicationRiskScore.kt | 16 +++++----- .../kotlin/dmn/ApplicationRiskScoreModel.kt | 32 +++++++++---------- .../ApplicationRiskScoreModelRuleOutput.kt | 2 +- .../dmn/CreditContingencyFactorTable.kt | 10 +++--- .../CreditContingencyFactorTableRuleOutput.kt | 2 +- .../proto3/kotlin/dmn/DMNMetadata.json | 10 +++--- .../expected/proto3/kotlin/dmn/Eligibility.kt | 2 +- .../proto3/kotlin/dmn/EligibilityRules.kt | 12 +++---- .../kotlin/dmn/InstallmentCalculation.kt | 12 +++---- .../kotlin/dmn/PostBureauAffordability.kt | 4 +-- .../kotlin/dmn/PostBureauRiskCategory.kt | 4 +-- .../kotlin/dmn/PostBureauRiskCategoryTable.kt | 30 ++++++++--------- .../kotlin/dmn/PreBureauAffordability.kt | 4 +-- .../kotlin/dmn/PreBureauRiskCategory.kt | 2 +- .../kotlin/dmn/PreBureauRiskCategoryTable.kt | 20 ++++++------ .../kotlin/dmn/RequiredMonthlyInstallment.kt | 16 +++++----- .../expected/proto3/kotlin/dmn/Routing.kt | 2 +- .../proto3/kotlin/dmn/RoutingRules.kt | 14 ++++---- .../proto3/kotlin/dmn/type/Monthly.kt | 12 +++---- .../proto3/kotlin/dmn/type/MonthlyImpl.kt | 8 ++--- .../proto3/kotlin/dmn/type/TApplicantData.kt | 4 +-- .../kotlin/dmn/type/TApplicantDataImpl.kt | 4 +-- .../proto3/kotlin/dmn/type/TBureauData.kt | 4 +-- .../proto3/kotlin/dmn/type/TBureauDataImpl.kt | 4 +-- .../kotlin/dmn/type/TRequestedProduct.kt | 12 +++---- .../kotlin/dmn/type/TRequestedProductImpl.kt | 8 ++--- .../expected/kotlin/dmn/ApprovalStatus.kt | 12 +++---- .../expected/kotlin/dmn/DMNMetadata.json | 4 +-- .../expected/kotlin/dmn/ApprovalStatus.kt | 12 +++---- .../expected/kotlin/dmn/DMNMetadata.json | 4 +-- .../expected/kotlin/dmn/ApprovalStatus.kt | 12 +++---- .../expected/kotlin/dmn/DMNMetadata.json | 4 +-- .../expected/kotlin/dmn/ApprovalStatus.kt | 8 ++--- .../expected/kotlin/dmn/DMNMetadata.json | 4 +-- .../expected/kotlin/dmn/DMNMetadata.json | 2 +- .../translator/expected/kotlin/dmn/Payment.kt | 10 +++--- .../expected/kotlin/dmn/type/TLoan.kt | 12 +++---- .../expected/kotlin/dmn/type/TLoanImpl.kt | 8 ++--- .../expected/kotlin/dmn/DMNMetadata.json | 8 ++--- .../expected/kotlin/dmn/MonthlyPayment.kt | 10 +++--- .../translator/expected/kotlin/dmn/PMT.kt | 10 +++--- .../expected/kotlin/dmn/type/TLoan.kt | 12 +++---- .../expected/kotlin/dmn/type/TLoanImpl.kt | 8 ++--- .../expected/kotlin/dmn/Approval.kt | 14 ++++---- .../expected/kotlin/dmn/DMNMetadata.json | 4 +-- .../kotlin/dmn/AffordabilityCalculation.kt | 8 ++--- .../kotlin/dmn/ApplicationRiskScore.kt | 10 +++--- .../kotlin/dmn/ApplicationRiskScoreModel.kt | 32 +++++++++---------- .../ApplicationRiskScoreModelRuleOutput.kt | 2 +- .../dmn/CreditContingencyFactorTable.kt | 10 +++--- .../CreditContingencyFactorTableRuleOutput.kt | 2 +- .../expected/kotlin/dmn/DMNMetadata.json | 10 +++--- .../expected/kotlin/dmn/Eligibility.kt | 2 +- .../expected/kotlin/dmn/EligibilityRules.kt | 12 +++---- .../kotlin/dmn/InstallmentCalculation.kt | 12 +++---- .../kotlin/dmn/PostBureauAffordability.kt | 4 +-- .../kotlin/dmn/PostBureauRiskCategory.kt | 4 +-- .../kotlin/dmn/PostBureauRiskCategoryTable.kt | 30 ++++++++--------- .../kotlin/dmn/PreBureauAffordability.kt | 4 +-- .../kotlin/dmn/PreBureauRiskCategory.kt | 2 +- .../kotlin/dmn/PreBureauRiskCategoryTable.kt | 20 ++++++------ .../kotlin/dmn/RequiredMonthlyInstallment.kt | 10 +++--- .../translator/expected/kotlin/dmn/Routing.kt | 2 +- .../expected/kotlin/dmn/RoutingRules.kt | 14 ++++---- .../expected/kotlin/dmn/type/Monthly.kt | 12 +++---- .../expected/kotlin/dmn/type/MonthlyImpl.kt | 8 ++--- .../kotlin/dmn/type/TApplicantData.kt | 4 +-- .../kotlin/dmn/type/TApplicantDataImpl.kt | 4 +-- .../expected/kotlin/dmn/type/TBureauData.kt | 4 +-- .../kotlin/dmn/type/TBureauDataImpl.kt | 4 +-- .../kotlin/dmn/type/TRequestedProduct.kt | 12 +++---- .../kotlin/dmn/type/TRequestedProductImpl.kt | 8 ++--- .../expected/kotlin/dmn/DMNMetadata.json | 8 ++--- .../expected/kotlin/dmn/MonthlyPayment.kt | 10 +++--- .../translator/expected/kotlin/dmn/PMT.kt | 10 +++--- .../expected/kotlin/dmn/type/TLoan.kt | 12 +++---- .../expected/kotlin/dmn/type/TLoanImpl.kt | 8 ++--- .../translator/expected/kotlin/dmn/Join.kt | 2 +- .../expected/kotlin/dmn/type/TDeptTable.kt | 4 +-- .../kotlin/dmn/type/TDeptTableImpl.kt | 4 +-- .../kotlin/dmn/type/TEmployeeTable.kt | 4 +-- .../kotlin/dmn/type/TEmployeeTableImpl.kt | 4 +-- .../expected/kotlin/dmn/DMNMetadata.json | 6 ++-- .../translator/expected/kotlin/dmn/Sort1.kt | 12 +++---- .../translator/expected/kotlin/dmn/Sort2.kt | 2 +- .../expected/kotlin/dmn/type/TRow.kt | 16 +++++----- .../expected/kotlin/dmn/type/TRowImpl.kt | 10 +++--- .../expected/kotlin/dmn/DMNMetadata.json | 8 ++--- .../expected/kotlin/dmn/Equity36Mo.kt | 10 +++--- .../expected/kotlin/dmn/FinancialMetrics.kt | 18 +++++------ .../expected/kotlin/dmn/MonthlyPayment.kt | 10 +++--- .../expected/kotlin/dmn/RankedProducts.kt | 12 +++---- .../expected/kotlin/dmn/type/TLoanProduct.kt | 12 +++---- .../kotlin/dmn/type/TLoanProductImpl.kt | 8 ++--- .../expected/kotlin/dmn/type/TMetric.kt | 28 ++++++++-------- .../expected/kotlin/dmn/type/TMetricImpl.kt | 16 +++++----- .../expected/kotlin/dmn/EveryGtTen1.kt | 2 +- .../expected/kotlin/dmn/EveryGtTen2.kt | 2 +- .../expected/kotlin/dmn/EveryGtTen3.kt | 2 +- .../translator/expected/kotlin/dmn/GtTen.kt | 4 +-- .../expected/kotlin/dmn/SomeGtTen1.kt | 2 +- .../expected/kotlin/dmn/SomeGtTen2.kt | 2 +- .../expected/kotlin/dmn/type/TItemPrice.kt | 4 +-- .../kotlin/dmn/type/TItemPriceImpl.kt | 4 +-- .../expected/kotlin/dmn/DMNMetadata.json | 8 ++--- .../expected/kotlin/dmn/PriceGt10.kt | 4 +-- .../expected/kotlin/dmn/PriceInRange.kt | 10 +++--- .../translator/expected/kotlin/dmn/type/TA.kt | 4 +-- .../expected/kotlin/dmn/type/TAImpl.kt | 4 +-- .../expected/kotlin/dmn/BaseVacationDays.kt | 10 +++--- .../expected/kotlin/dmn/DMNMetadata.json | 30 ++++++++--------- .../expected/kotlin/dmn/ExtraDaysCase1.kt | 14 ++++---- .../kotlin/dmn/ExtraDaysCase1RuleOutput.kt | 2 +- .../expected/kotlin/dmn/ExtraDaysCase2.kt | 14 ++++---- .../kotlin/dmn/ExtraDaysCase2RuleOutput.kt | 2 +- .../expected/kotlin/dmn/ExtraDaysCase3.kt | 14 ++++---- .../kotlin/dmn/ExtraDaysCase3RuleOutput.kt | 2 +- .../expected/kotlin/dmn/TotalVacationDays.kt | 18 +++++------ .../expected/kotlin/dmn/Circumference.kt | 10 +++--- .../expected/kotlin/dmn/DMNMetadata.json | 18 +++++------ .../dmn/FnInvocationComplexParameters.kt | 10 +++--- .../kotlin/dmn/FnInvocationNamedParameters.kt | 12 +++---- .../dmn/FnInvocationPositionalParameters.kt | 10 +++--- .../expected/kotlin/dmn/FnLibrary.kt | 8 ++--- .../type/TFnInvocationComplexParamsResult.kt | 12 +++---- .../TFnInvocationComplexParamsResultImpl.kt | 8 ++--- .../dmn/type/TFnInvocationNamedResult.kt | 16 +++++----- .../dmn/type/TFnInvocationNamedResultImpl.kt | 10 +++--- .../dmn/type/TFnInvocationPositionalResult.kt | 12 +++---- .../type/TFnInvocationPositionalResultImpl.kt | 8 ++--- .../expected/kotlin/dmn/DMNMetadata.json | 8 ++--- .../translator/expected/kotlin/dmn/FACT.kt | 10 +++--- .../translator/expected/kotlin/dmn/Main.kt | 10 +++--- 158 files changed, 679 insertions(+), 674 deletions(-) diff --git a/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/JavaTimeKotlinNativeTypeFactory.java b/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/JavaTimeKotlinNativeTypeFactory.java index c94bfb630..6935c7cd3 100644 --- a/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/JavaTimeKotlinNativeTypeFactory.java +++ b/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/JavaTimeKotlinNativeTypeFactory.java @@ -31,6 +31,7 @@ public class JavaTimeKotlinNativeTypeFactory extends KotlinTypeFactory { private static final Map FEEL_TYPE_TO_JAVA_TYPE = new LinkedHashMap<>(); public static final String KOTLIN_ANY = "kotlin.Any"; + public static final String KOTLIN_NUMBER = "kotlin.Number"; static { FEEL_TYPE_TO_JAVA_TYPE.put(ENUMERATION.getName(), String.class.getName()); @@ -41,7 +42,7 @@ public class JavaTimeKotlinNativeTypeFactory extends KotlinTypeFactory { FEEL_TYPE_TO_JAVA_TYPE.put(DATE.getName(), java.time.LocalDate.class.getName()); FEEL_TYPE_TO_JAVA_TYPE.put(STRING.getName(), String.class.getSimpleName()); FEEL_TYPE_TO_JAVA_TYPE.put(BOOLEAN.getName(), Boolean.class.getSimpleName()); - FEEL_TYPE_TO_JAVA_TYPE.put(NUMBER.getName(), java.lang.Number.class.getName()); + FEEL_TYPE_TO_JAVA_TYPE.put(NUMBER.getName(), KOTLIN_NUMBER); FEEL_TYPE_TO_JAVA_TYPE.put(ANY.getName(), KOTLIN_ANY); FEEL_TYPE_TO_JAVA_TYPE.put(NULL.getName(), KOTLIN_ANY); } @@ -56,7 +57,7 @@ public class JavaTimeKotlinNativeTypeFactory extends KotlinTypeFactory { FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.put(DATE.getName(), java.time.LocalDate.class.getName()); FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.put(STRING.getName(), String.class.getName()); FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.put(BOOLEAN.getName(), Boolean.class.getName()); - FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.put(NUMBER.getName(), java.lang.Number.class.getName()); + FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.put(NUMBER.getName(), KOTLIN_NUMBER); FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.put(ANY.getName(), KOTLIN_ANY); FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.put(NULL.getName(), KOTLIN_ANY); } diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/type/KotlinNativeTypeFactoryTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/type/KotlinNativeTypeFactoryTest.java index 36baf26ed..4419f581b 100644 --- a/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/type/KotlinNativeTypeFactoryTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/type/KotlinNativeTypeFactoryTest.java @@ -21,13 +21,13 @@ class KotlinNativeTypeFactoryTest { @Test public void testToNativeType() { - assertEquals("java.lang.Number", typeFactory.toNativeType("number")); + assertEquals("kotlin.Number", typeFactory.toNativeType("number")); assertEquals("String", typeFactory.toNativeType("string")); } @Test public void testToQualifiedNativeType() { - assertEquals("java.lang.Number", typeFactory.toQualifiedNativeType("number")); + assertEquals("kotlin.Number", typeFactory.toQualifiedNativeType("number")); } @Test @@ -47,7 +47,7 @@ public void testClassOf() { @Test public void testGetNativeNumberType() { - assertEquals("java.lang.Number", typeFactory.getNativeNumberType()); + assertEquals("kotlin.Number", typeFactory.getNativeNumberType()); } @Test diff --git a/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/DMNToJavaMojo.java b/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/DMNToJavaMojo.java index 2b57c1bb6..68bb07395 100644 --- a/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/DMNToJavaMojo.java +++ b/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/DMNToJavaMojo.java @@ -21,7 +21,7 @@ @SuppressWarnings("CanBeFinal") @Mojo(name = "dmn-to-java", defaultPhase = LifecyclePhase.GENERATE_SOURCES, configurator = "dmn-mojo-configurator") public class DMNToJavaMojo extends AbstractDMNToNativeMojo { - @Parameter(required = true, defaultValue = "com.gs.dmn.dialect.StandardDMNDialectDefinition") + @Parameter(required = true, defaultValue = "com.gs.dmn.dialect.JavaTimeDMNDialectDefinition") public String dmnDialect; @Parameter(required = true, defaultValue = "com.gs.dmn.transformation.template.TreeTemplateProvider") diff --git a/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/DMNToKotlinMojo.java b/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/DMNToKotlinMojo.java index 32eca725f..2d26bd96c 100644 --- a/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/DMNToKotlinMojo.java +++ b/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/DMNToKotlinMojo.java @@ -21,7 +21,7 @@ @SuppressWarnings("CanBeFinal") @Mojo(name = "dmn-to-kotlin", defaultPhase = LifecyclePhase.GENERATE_SOURCES, configurator = "dmn-mojo-configurator") public class DMNToKotlinMojo extends AbstractDMNToNativeMojo { - @Parameter(required = true, defaultValue = "com.gs.dmn.dialect.KotlinStandardDMNDialectDefinition") + @Parameter(required = true, defaultValue = "com.gs.dmn.dialect.JavaTimeKotlinStandardDMNDialectDefinition") public String dmnDialect; @Parameter(required = true, defaultValue = "com.gs.dmn.transformation.template.KotlinTreeTemplateProvider") diff --git a/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TCKToJavaJUnitMojo.java b/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TCKToJavaJUnitMojo.java index dc9547c82..6162c3c80 100644 --- a/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TCKToJavaJUnitMojo.java +++ b/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TCKToJavaJUnitMojo.java @@ -33,7 +33,7 @@ @SuppressWarnings("CanBeFinal") @Mojo(name = "tck-to-java", defaultPhase = LifecyclePhase.GENERATE_TEST_SOURCES, configurator = "dmn-mojo-configurator") public class TCKToJavaJUnitMojo extends AbstractTestToJunitMojo { - @Parameter(required = true, defaultValue = "com.gs.dmn.dialect.StandardDMNDialectDefinition") + @Parameter(required = true, defaultValue = "com.gs.dmn.dialect.JavaTimeDMNDialectDefinition") public String dmnDialect; @Parameter(required = true, defaultValue = "com.gs.dmn.transformation.template.TreeTemplateProvider") diff --git a/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TCKToKotlinJUnitMojo.java b/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TCKToKotlinJUnitMojo.java index 1b35955eb..1bfd1f0b2 100644 --- a/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TCKToKotlinJUnitMojo.java +++ b/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TCKToKotlinJUnitMojo.java @@ -33,7 +33,7 @@ @SuppressWarnings("CanBeFinal") @Mojo(name = "tck-to-kotlin", defaultPhase = LifecyclePhase.GENERATE_TEST_SOURCES, configurator = "dmn-mojo-configurator") public class TCKToKotlinJUnitMojo extends AbstractTestToJunitMojo { - @Parameter(required = true, defaultValue = "com.gs.dmn.dialect.KotlinStandardDMNDialectDefinition") + @Parameter(required = true, defaultValue = "com.gs.dmn.dialect.JavaTimeKotlinStandardDMNDialectDefinition") public String dmnDialect; @Parameter(required = true, defaultValue = "com.gs.dmn.transformation.template.KotlinTreeTemplateProvider") diff --git a/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TestLabToJavaJUnitMojo.java b/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TestLabToJavaJUnitMojo.java index 7bd4b6ce6..0dc23dc75 100644 --- a/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TestLabToJavaJUnitMojo.java +++ b/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TestLabToJavaJUnitMojo.java @@ -33,7 +33,7 @@ @SuppressWarnings("CanBeFinal") @Mojo(name = "testlab-to-java", defaultPhase = LifecyclePhase.GENERATE_TEST_SOURCES, configurator = "dmn-mojo-configurator") public class TestLabToJavaJUnitMojo extends AbstractTestToJunitMojo { - @Parameter(required = true, defaultValue = "com.gs.dmn.signavio.dialect.SignavioDMNDialectDefinition") + @Parameter(required = true, defaultValue = "com.gs.dmn.signavio.dialect.JavaTimeSignavioDMNDialectDefinition") public String dmnDialect; @Parameter(required = true, defaultValue = "com.gs.dmn.signavio.transformation.template.SignavioTreeTemplateProvider") diff --git a/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TestLabToKotlinJUnitMojo.java b/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TestLabToKotlinJUnitMojo.java index 894b9d240..b383743ce 100644 --- a/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TestLabToKotlinJUnitMojo.java +++ b/dmn-maven-plugin/src/main/java/com/gs/dmn/maven/TestLabToKotlinJUnitMojo.java @@ -33,7 +33,7 @@ @SuppressWarnings("CanBeFinal") @Mojo(name = "testlab-to-kotlin", defaultPhase = LifecyclePhase.GENERATE_TEST_SOURCES, configurator = "dmn-mojo-configurator") public class TestLabToKotlinJUnitMojo extends AbstractTestToJunitMojo { - @Parameter(required = true, defaultValue = "com.gs.dmn.signavio.dialect.KotlinSignavioDMNDialectDefinition") + @Parameter(required = true, defaultValue = "com.gs.dmn.signavio.dialect.JavaTimeKotlinSignavioDMNDialectDefinition") public String dmnDialect; @Parameter(required = true, defaultValue = "com.gs.dmn.signavio.transformation.template.KotlinSignavioTreeTemplateProvider") diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToJavaMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToJavaMojoTest.java index 5fdc79645..189970a52 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToJavaMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToJavaMojoTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.maven; -import com.gs.dmn.dialect.StandardDMNDialectDefinition; +import com.gs.dmn.dialect.JavaTimeDMNDialectDefinition; import com.gs.dmn.maven.configuration.components.DMNTransformerComponent; import com.gs.dmn.transformation.ToQuotedNameTransformer; import com.gs.dmn.transformation.lazy.NopLazyEvaluationDetector; @@ -31,7 +31,7 @@ public void testExecute() throws Exception { String input = this.getClass().getClassLoader().getResource("input/0004-lending.dmn").getFile(); mojo.project = project; - mojo.dmnDialect = StandardDMNDialectDefinition.class.getName(); + mojo.dmnDialect = JavaTimeDMNDialectDefinition.class.getName(); mojo.dmnValidators = new String[] {NopDMNValidator.class.getName()}; mojo.dmnTransformers = new DMNTransformerComponent[] { new DMNTransformerComponent(ToQuotedNameTransformer.class.getName()) }; mojo.lazyEvaluationDetectors = new String[] {NopLazyEvaluationDetector.class.getName()}; diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToKotlinMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToKotlinMojoTest.java index 474078ec3..b3b1bfa82 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToKotlinMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToKotlinMojoTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.maven; -import com.gs.dmn.dialect.StandardDMNDialectDefinition; +import com.gs.dmn.dialect.JavaTimeKotlinStandardDMNDialectDefinition; import com.gs.dmn.maven.configuration.components.DMNTransformerComponent; import com.gs.dmn.transformation.ToQuotedNameTransformer; import com.gs.dmn.transformation.lazy.NopLazyEvaluationDetector; @@ -31,7 +31,7 @@ public void testExecute() throws Exception { String input = this.getClass().getClassLoader().getResource("input/0004-lending.dmn").getFile(); mojo.project = project; - mojo.dmnDialect = StandardDMNDialectDefinition.class.getName(); + mojo.dmnDialect = JavaTimeKotlinStandardDMNDialectDefinition.class.getName(); mojo.dmnValidators = new String[] {NopDMNValidator.class.getName()}; mojo.dmnTransformers = new DMNTransformerComponent[] { new DMNTransformerComponent(ToQuotedNameTransformer.class.getName()) }; mojo.lazyEvaluationDetectors = new String[] {NopLazyEvaluationDetector.class.getName()}; diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToPythonMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToPythonMojoTest.java index 5c607f84a..c0ca3a35b 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToPythonMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToPythonMojoTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.maven; -import com.gs.dmn.dialect.StandardDMNDialectDefinition; +import com.gs.dmn.dialect.JavaTimePythonStandardDMNDialectDefinition; import com.gs.dmn.maven.configuration.components.DMNTransformerComponent; import com.gs.dmn.transformation.ToQuotedNameTransformer; import com.gs.dmn.transformation.lazy.NopLazyEvaluationDetector; @@ -31,7 +31,7 @@ public void testExecute() throws Exception { String input = this.getClass().getClassLoader().getResource("input/0004-lending.dmn").getFile(); mojo.project = project; - mojo.dmnDialect = StandardDMNDialectDefinition.class.getName(); + mojo.dmnDialect = JavaTimePythonStandardDMNDialectDefinition.class.getName(); mojo.dmnValidators = new String[] {NopDMNValidator.class.getName()}; mojo.dmnTransformers = new DMNTransformerComponent[] { new DMNTransformerComponent(ToQuotedNameTransformer.class.getName()) }; mojo.lazyEvaluationDetectors = new String[] {NopLazyEvaluationDetector.class.getName()}; diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToJavaJUnitMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToJavaJUnitMojoTest.java index 9eb509714..77230472b 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToJavaJUnitMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToJavaJUnitMojoTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.maven; -import com.gs.dmn.dialect.StandardDMNDialectDefinition; +import com.gs.dmn.dialect.JavaTimeDMNDialectDefinition; import com.gs.dmn.maven.configuration.components.DMNTransformerComponent; import com.gs.dmn.tck.ast.TestCases; import com.gs.dmn.transformation.ToQuotedNameTransformer; @@ -32,7 +32,7 @@ public void testExecute() throws Exception { String inputModel = this.getClass().getClassLoader().getResource("input/0004-lending.dmn").getFile(); String inputTest = this.getClass().getClassLoader().getResource("input/0004-lending-test-01.xml").getFile(); mojo.project = project; - mojo.dmnDialect = StandardDMNDialectDefinition.class.getName(); + mojo.dmnDialect = JavaTimeDMNDialectDefinition.class.getName(); mojo.dmnValidators = new String[] {NopDMNValidator.class.getName()}; mojo.dmnTransformers = new DMNTransformerComponent[] { new DMNTransformerComponent(ToQuotedNameTransformer.class.getName()) }; mojo.templateProvider = TreeTemplateProvider.class.getName(); diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToKotlinJUnitMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToKotlinJUnitMojoTest.java index 8d41db01f..f417e56e2 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToKotlinJUnitMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToKotlinJUnitMojoTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.maven; -import com.gs.dmn.dialect.StandardDMNDialectDefinition; +import com.gs.dmn.dialect.JavaTimeKotlinStandardDMNDialectDefinition; import com.gs.dmn.maven.configuration.components.DMNTransformerComponent; import com.gs.dmn.tck.ast.TestCases; import com.gs.dmn.transformation.ToQuotedNameTransformer; @@ -32,7 +32,7 @@ public void testExecute() throws Exception { String inputModel = this.getClass().getClassLoader().getResource("input/0004-lending.dmn").getFile(); String inputTest = this.getClass().getClassLoader().getResource("input/0004-lending-test-01.xml").getFile(); mojo.project = project; - mojo.dmnDialect = StandardDMNDialectDefinition.class.getName(); + mojo.dmnDialect = JavaTimeKotlinStandardDMNDialectDefinition.class.getName(); mojo.dmnValidators = new String[] {NopDMNValidator.class.getName()}; mojo.dmnTransformers = new DMNTransformerComponent[] { new DMNTransformerComponent(ToQuotedNameTransformer.class.getName()) }; mojo.templateProvider = TreeTemplateProvider.class.getName(); diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToPythonJUnitMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToPythonJUnitMojoTest.java index 991b4f186..5ac732761 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToPythonJUnitMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToPythonJUnitMojoTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.maven; -import com.gs.dmn.dialect.StandardDMNDialectDefinition; +import com.gs.dmn.dialect.JavaTimePythonStandardDMNDialectDefinition; import com.gs.dmn.maven.configuration.components.DMNTransformerComponent; import com.gs.dmn.tck.ast.TestCases; import com.gs.dmn.transformation.ToQuotedNameTransformer; @@ -32,7 +32,7 @@ public void testExecute() throws Exception { String inputModel = this.getClass().getClassLoader().getResource("input/0004-lending.dmn").getFile(); String inputTest = this.getClass().getClassLoader().getResource("input/0004-lending-test-01.xml").getFile(); mojo.project = project; - mojo.dmnDialect = StandardDMNDialectDefinition.class.getName(); + mojo.dmnDialect = JavaTimePythonStandardDMNDialectDefinition.class.getName(); mojo.dmnValidators = new String[] {NopDMNValidator.class.getName()}; mojo.dmnTransformers = new DMNTransformerComponent[] { new DMNTransformerComponent(ToQuotedNameTransformer.class.getName()) }; mojo.templateProvider = TreeTemplateProvider.class.getName(); diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToJavaJUnitMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToJavaJUnitMojoTest.java index 0753153b5..c916e0ae9 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToJavaJUnitMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToJavaJUnitMojoTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.maven; import com.gs.dmn.maven.configuration.components.DMNTransformerComponent; -import com.gs.dmn.signavio.dialect.SignavioDMNDialectDefinition; +import com.gs.dmn.signavio.dialect.JavaTimeSignavioDMNDialectDefinition; import com.gs.dmn.signavio.testlab.TestLab; import com.gs.dmn.signavio.transformation.template.SignavioTreeTemplateProvider; import com.gs.dmn.transformation.NopDMNTransformer; @@ -31,7 +31,7 @@ public void testExecute() throws Exception { String inputModel = this.getClass().getClassLoader().getResource("input/NPEValidation2.dmn").getFile(); String inputTest = this.getClass().getClassLoader().getResource("input/NPEValidation2.json").getFile(); mojo.project = project; - mojo.dmnDialect = SignavioDMNDialectDefinition.class.getName(); + mojo.dmnDialect = JavaTimeSignavioDMNDialectDefinition.class.getName(); mojo.dmnTransformers = new DMNTransformerComponent[] { new DMNTransformerComponent(NopDMNTransformer.class.getName()) }; mojo.templateProvider = SignavioTreeTemplateProvider.class.getName(); mojo.inputModelFileDirectory = new File(inputModel); diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToKotlinJUnitMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToKotlinJUnitMojoTest.java index ac6d66b7c..67e8e252e 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToKotlinJUnitMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToKotlinJUnitMojoTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.maven; import com.gs.dmn.maven.configuration.components.DMNTransformerComponent; -import com.gs.dmn.signavio.dialect.SignavioDMNDialectDefinition; +import com.gs.dmn.signavio.dialect.JavaTimeKotlinSignavioDMNDialectDefinition; import com.gs.dmn.signavio.testlab.TestLab; import com.gs.dmn.signavio.transformation.template.SignavioTreeTemplateProvider; import com.gs.dmn.transformation.NopDMNTransformer; @@ -31,7 +31,7 @@ public void testExecute() throws Exception { String inputModel = this.getClass().getClassLoader().getResource("input/NPEValidation2.dmn").getFile(); String inputTest = this.getClass().getClassLoader().getResource("input/NPEValidation2.json").getFile(); mojo.project = project; - mojo.dmnDialect = SignavioDMNDialectDefinition.class.getName(); + mojo.dmnDialect = JavaTimeKotlinSignavioDMNDialectDefinition.class.getName(); mojo.dmnTransformers = new DMNTransformerComponent[] { new DMNTransformerComponent(NopDMNTransformer.class.getName()) }; mojo.templateProvider = SignavioTreeTemplateProvider.class.getName(); mojo.inputModelFileDirectory = new File(inputModel); diff --git a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/proto/date_time_proto/DateTimeProtoHandwrittenTest.java b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/proto/date_time_proto/DateTimeProtoHandwrittenTest.java index e1ce25fe3..fd3d09564 100644 --- a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/proto/date_time_proto/DateTimeProtoHandwrittenTest.java +++ b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/proto/date_time_proto/DateTimeProtoHandwrittenTest.java @@ -2,7 +2,10 @@ import org.junit.jupiter.api.Test; -public class DateTimeProtoHandwrittenTest extends com.gs.dmn.runtime.DefaultDMNBaseDecision { +import java.time.LocalDate; +import java.time.temporal.TemporalAccessor; + +public class DateTimeProtoHandwrittenTest extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision { private final Date dateDecision = new Date(); private final Time timeDecision = new Time(); private final DateTime dateTimeDecision = new DateTime(); @@ -11,7 +14,7 @@ public class DateTimeProtoHandwrittenTest extends com.gs.dmn.runtime.DefaultDMNB public void testCase1() { com.gs.dmn.runtime.ExecutionContext context_ = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data - javax.xml.datatype.XMLGregorianCalendar inputDate = date("2020-09-10"); + LocalDate inputDate = date("2020-09-10"); // Check Date checkValues(date("2020-09-10"), dateDecision.apply(inputDate, context_)); @@ -28,7 +31,7 @@ public void testCase1() { public void testCase2() { com.gs.dmn.runtime.ExecutionContext context_ = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data - javax.xml.datatype.XMLGregorianCalendar inputTime = time("12:10:10"); + TemporalAccessor inputTime = time("12:10:10"); // Check Time checkValues(time("12:10:10"), timeDecision.apply(inputTime, context_)); @@ -45,7 +48,7 @@ public void testCase2() { public void testCase3() { com.gs.dmn.runtime.ExecutionContext context_ = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data - javax.xml.datatype.XMLGregorianCalendar inputDateTime = dateAndTime("2020-09-19T12:10:10"); + TemporalAccessor inputDateTime = dateAndTime("2020-09-19T12:10:10"); // Check DateTime checkValues(dateAndTime("2020-09-19T12:10:10"), dateTimeDecision.apply(inputDateTime, context_)); diff --git a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/AbstractHandwrittenDecisionTest.java b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/AbstractHandwrittenDecisionTest.java index d8f69201a..a2fa3f1bc 100644 --- a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/AbstractHandwrittenDecisionTest.java +++ b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/AbstractHandwrittenDecisionTest.java @@ -17,6 +17,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.math.BigDecimal; +import java.math.RoundingMode; + import static org.junit.jupiter.api.Assertions.assertTrue; public abstract class AbstractHandwrittenDecisionTest { @@ -36,4 +39,8 @@ public void testPerformance() { public void setUp() { this.context = ExecutionContextBuilder.executionContext().build(); } + + protected String round(Number number, int scale) { + return new BigDecimal(number.toString()).setScale(scale, RoundingMode.FLOOR).toPlainString(); + } } diff --git a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java index e7b3af6b6..857079472 100644 --- a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java +++ b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java @@ -16,9 +16,6 @@ import com.gs.dmn.generated.tck.cl2_0009_invocation_arithmetic.type.TLoanImpl; import org.junit.jupiter.api.Test; -import java.math.BigDecimal; -import java.math.RoundingMode; - import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenMonthlyPaymentTest extends AbstractHandwrittenDecisionTest { @@ -30,9 +27,9 @@ public void testApply1() { loan.setAmount(decision.number("600000")); loan.setRate(decision.number("0.0375")); loan.setTerm(decision.number("360")); - BigDecimal fee = decision.number("100"); - BigDecimal output = applyDecision(loan, fee); - assertEquals("2878.69", output.setScale(2, RoundingMode.FLOOR).toPlainString()); + Number fee = decision.number("100"); + Number output = applyDecision(loan, fee); + assertEquals("2878.69", round(output, 2)); } @Test @@ -41,9 +38,9 @@ public void testApply2() { loan.setAmount(decision.number("30000")); loan.setRate(decision.number("0.0475")); loan.setTerm(decision.number("60")); - BigDecimal fee = decision.number("100"); - BigDecimal output = applyDecision(loan, fee); - assertEquals("662.70", output.setScale(2, RoundingMode.FLOOR).toPlainString()); + Number fee = decision.number("100"); + Number output = applyDecision(loan, fee); + assertEquals("662.70", round(output, 2)); } @Override @@ -51,7 +48,7 @@ protected void applyDecision() { applyDecision(null, null); } - private BigDecimal applyDecision(TLoanImpl loan, BigDecimal fee) { + private Number applyDecision(TLoanImpl loan, Number fee) { return decision.apply(loan, fee, context); } } \ No newline at end of file diff --git a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java index 97cdf4509..e0846e7d6 100644 --- a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java +++ b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java @@ -16,7 +16,6 @@ import com.gs.dmn.runtime.ExecutionContext; import org.junit.jupiter.api.Test; -import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; @@ -29,13 +28,13 @@ public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { public void applyCompiler() { com.gs.dmn.runtime.ExecutionContext context = new com.gs.dmn.runtime.ExecutionContext(); - assertEquals("27", applyDecision("16", "1", context).toPlainString()); - assertEquals("22", applyDecision("25", "5", context).toPlainString()); - assertEquals("24", applyDecision("25", "20", context).toPlainString()); - assertEquals("30", applyDecision("44", "30", context).toPlainString()); - assertEquals("24", applyDecision("50", "20", context).toPlainString()); - assertEquals("30", applyDecision("50", "30", context).toPlainString()); - assertEquals("30", applyDecision("60", "20", context).toPlainString()); + assertEquals("27", applyDecision("16", "1", context).toString()); + assertEquals("22", applyDecision("25", "5", context).toString()); + assertEquals("24", applyDecision("25", "20", context).toString()); + assertEquals("30", applyDecision("44", "30", context).toString()); + assertEquals("24", applyDecision("50", "20", context).toString()); + assertEquals("30", applyDecision("50", "30", context).toString()); + assertEquals("30", applyDecision("60", "20", context).toString()); } @Override @@ -45,7 +44,7 @@ protected void applyDecision() { applyDecision(null, null, context); } - private BigDecimal applyDecision(String age, String yearsOfService, ExecutionContext context) { + private Number applyDecision(String age, String yearsOfService, ExecutionContext context) { Map result = new LinkedHashMap<>(); result.put("Age", age); result.put("Years of Service", yearsOfService); diff --git a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java index dc4ee0d25..95be8074b 100644 --- a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java +++ b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java @@ -19,7 +19,6 @@ import org.junit.jupiter.api.Test; import java.io.File; -import java.math.BigDecimal; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; @@ -38,8 +37,8 @@ public void testListener() throws Exception { String expectedResult = "27"; String age = "16"; String yearsOfService = "1"; - BigDecimal actualResult = applyDecision(age, yearsOfService, context); - assertEquals(expectedResult, actualResult.toPlainString()); + Number actualResult = applyDecision(age, yearsOfService, context); + assertEquals(expectedResult, actualResult.toString()); List elementTraces = listener.postorderNodes(); File actualOutputFile = writeNodes(elementTraces); @@ -55,8 +54,8 @@ public void testListenerWithFilter() throws Exception { String expectedResult = "27"; String age = "16"; String yearsOfService = "1"; - BigDecimal actualResult = applyDecision(age, yearsOfService, context); - assertEquals(expectedResult, actualResult.toPlainString()); + Number actualResult = applyDecision(age, yearsOfService, context); + assertEquals(expectedResult, actualResult.toString()); List elementTraces = listener.postorderNodes(); File actualOutputFile = writeNodes(elementTraces); @@ -68,7 +67,7 @@ private String getExpectedPath() { return "traces/cl3_0020_vacation_days"; } - private BigDecimal applyDecision(String age, String yearsOfService, ExecutionContext context) { + private Number applyDecision(String age, String yearsOfService, ExecutionContext context) { Map result = new LinkedHashMap<>(); result.put("Age", age); result.put("Years of Service", yearsOfService); diff --git a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java index 0ec33447d..985bc2c7c 100644 --- a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java +++ b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java @@ -19,7 +19,6 @@ import org.junit.jupiter.api.Test; import java.io.File; -import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -37,8 +36,8 @@ public void testTree() throws Exception { String expectedResult = "27"; String age = "16"; String yearsOfService = "1"; - BigDecimal actualResult = applyDecision(age, yearsOfService, context); - assertEquals(expectedResult, actualResult.toPlainString()); + Number actualResult = applyDecision(age, yearsOfService, context); + assertEquals(expectedResult, actualResult.toString()); DRGElementNode root = listener.getRoot(); File actualOutputFile = writeNodes(root); @@ -54,8 +53,8 @@ public void testPreorder() throws Exception { String expectedResult = "27"; String age = "16"; String yearsOfService = "1"; - BigDecimal actualResult = applyDecision(age, yearsOfService, context); - assertEquals(expectedResult, actualResult.toPlainString()); + Number actualResult = applyDecision(age, yearsOfService, context); + assertEquals(expectedResult, actualResult.toString()); List nodes = listener.preorderNodes(); File actualOutputFile = writeNodes(nodes); @@ -71,8 +70,8 @@ public void testPostorder() throws Exception { String expectedResult = "27"; String age = "16"; String yearsOfService = "1"; - BigDecimal actualResult = applyDecision(age, yearsOfService, context); - assertEquals(expectedResult, actualResult.toPlainString()); + Number actualResult = applyDecision(age, yearsOfService, context); + assertEquals(expectedResult, actualResult.toString()); List nodes = listener.postorderNodes(); File actualOutputFile = writeNodes(nodes); @@ -80,7 +79,7 @@ public void testPostorder() throws Exception { checkTrace(expectedOutputFile, actualOutputFile); } - private BigDecimal applyDecision(String age, String yearsOfService, ExecutionContext context) { + private Number applyDecision(String age, String yearsOfService, ExecutionContext context) { Map result = new LinkedHashMap<>(); result.put("Age", age); result.put("Years of Service", yearsOfService); diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/other/decision_table_with_annotations/HandWrittenDecisionTableWithAnnotationsTest.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/other/decision_table_with_annotations/HandWrittenDecisionTableWithAnnotationsTest.java index b3f9f8e2f..fa813afbf 100644 --- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/other/decision_table_with_annotations/HandWrittenDecisionTableWithAnnotationsTest.java +++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/other/decision_table_with_annotations/HandWrittenDecisionTableWithAnnotationsTest.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @javax.annotation.Generated(value = {"junit.ftl", "decision-table-with-annotations.dmn"}) -public class HandWrittenDecisionTableWithAnnotationsTest extends com.gs.dmn.runtime.DefaultDMNBaseDecision { +public class HandWrittenDecisionTableWithAnnotationsTest extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision { @org.junit.jupiter.api.Test public void testCase001() { com.gs.dmn.runtime.ExecutionContext context_ = new com.gs.dmn.runtime.ExecutionContext(); diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0004_lending_singleton/AbstractTest0004Lending.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0004_lending_singleton/AbstractTest0004Lending.java index ba56a8eca..71ff2f210 100644 --- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0004_lending_singleton/AbstractTest0004Lending.java +++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0004_lending_singleton/AbstractTest0004Lending.java @@ -4,7 +4,7 @@ import com.gs.dmn.generated.tck.cl3_0004_lending_singleton.type.TBureauData; import com.gs.dmn.generated.tck.cl3_0004_lending_singleton.type.TRequestedProduct; -public abstract class AbstractTest0004Lending extends com.gs.dmn.runtime.DefaultDMNBaseDecision { +public abstract class AbstractTest0004Lending extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision { public void execute() { long count = 1000000000L; for (int i = 0; i< count; i++) { diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/AffordabilityCalculation.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/AffordabilityCalculation.kt index 78b0756cb..9b358d8d5 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/AffordabilityCalculation.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/AffordabilityCalculation.kt @@ -24,7 +24,7 @@ class AffordabilityCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(monthlyIncome: java.lang.Number?, monthlyRepayments: java.lang.Number?, monthlyExpenses: java.lang.Number?, riskCategory: String?, requiredMonthlyInstallment: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? { + fun apply(monthlyIncome: kotlin.Number?, monthlyRepayments: kotlin.Number?, monthlyExpenses: kotlin.Number?, riskCategory: String?, requiredMonthlyInstallment: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? { try { // Start BKM 'AffordabilityCalculation' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -53,13 +53,13 @@ class AffordabilityCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(monthlyIncome: java.lang.Number?, monthlyRepayments: java.lang.Number?, monthlyExpenses: java.lang.Number?, riskCategory: String?, requiredMonthlyInstallment: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? { + private inline fun evaluate(monthlyIncome: kotlin.Number?, monthlyRepayments: kotlin.Number?, monthlyExpenses: kotlin.Number?, riskCategory: String?, requiredMonthlyInstallment: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - val disposableIncome: java.lang.Number? = numericSubtract(monthlyIncome, numericAdd(monthlyExpenses, monthlyRepayments)) as java.lang.Number? - val creditContingencyFactor: java.lang.Number? = CreditContingencyFactorTable.instance().apply(riskCategory, context_) as java.lang.Number? + val disposableIncome: kotlin.Number? = numericSubtract(monthlyIncome, numericAdd(monthlyExpenses, monthlyRepayments)) as kotlin.Number? + val creditContingencyFactor: kotlin.Number? = CreditContingencyFactorTable.instance().apply(riskCategory, context_) as kotlin.Number? val affordability: Boolean? = (if (booleanEqual(numericGreaterThan(numericMultiply(disposableIncome, creditContingencyFactor), requiredMonthlyInstallment), true)) true else false) as Boolean? return affordability } diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScore.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScore.kt index de4454712..6e71ea3ff 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScore.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScore.kt @@ -13,7 +13,7 @@ import java.util.stream.Collectors rulesCount = -1 ) class ApplicationRiskScore() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference() {}) }), context_) } catch (e: Exception) { @@ -22,7 +22,7 @@ class ApplicationRiskScore() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(applicantData: type.TApplicantData?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(applicantData: type.TApplicantData?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start decision 'ApplicationRiskScore' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -36,7 +36,7 @@ class ApplicationRiskScore() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { if (cache_.contains("ApplicationRiskScore")) { // Retrieve value from cache - var output_:java.lang.Number? = cache_.lookup("ApplicationRiskScore") as java.lang.Number? + var output_:kotlin.Number? = cache_.lookup("ApplicationRiskScore") as kotlin.Number? // End decision 'ApplicationRiskScore' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreArguments_, output_, (System.currentTimeMillis() - applicationRiskScoreStartTime_)) @@ -44,7 +44,7 @@ class ApplicationRiskScore() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { return output_ } else { // Evaluate decision 'ApplicationRiskScore' - val output_: java.lang.Number? = evaluate(applicantData, context_) + val output_: kotlin.Number? = evaluate(applicantData, context_) cache_.bind("ApplicationRiskScore", output_) // End decision 'ApplicationRiskScore' @@ -63,7 +63,7 @@ class ApplicationRiskScore() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { val applicantData: type.TApplicantData? = type.TApplicantData.toTApplicantData(applicationRiskScoreRequest_.getApplicantData()) // Invoke apply method - val output_: java.lang.Number? = apply(applicantData, context_) + val output_: kotlin.Number? = apply(applicantData, context_) // Convert output to Response Message val builder_: proto.ApplicationRiskScoreResponse.Builder = proto.ApplicationRiskScoreResponse.newBuilder() @@ -72,12 +72,12 @@ class ApplicationRiskScore() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { return builder_.build() } - private inline fun evaluate(applicantData: type.TApplicantData?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(applicantData: type.TApplicantData?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return ApplicationRiskScoreModel.instance().apply(applicantData?.let({ it.age as java.lang.Number? }), applicantData?.let({ it.maritalStatus as String? }), applicantData?.let({ it.employmentStatus as String? }), context_) as java.lang.Number? + return ApplicationRiskScoreModel.instance().apply(applicantData?.let({ it.age as kotlin.Number? }), applicantData?.let({ it.maritalStatus as String? }), applicantData?.let({ it.employmentStatus as String? }), context_) as kotlin.Number? } companion object { @@ -103,7 +103,7 @@ class ApplicationRiskScore() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @JvmStatic - fun responseToOutput(applicationRiskScoreResponse_: proto.ApplicationRiskScoreResponse): java.lang.Number? { + fun responseToOutput(applicationRiskScoreResponse_: proto.ApplicationRiskScoreResponse): kotlin.Number? { // Extract and convert output return java.math.BigDecimal.valueOf(applicationRiskScoreResponse_.getApplicationRiskScore()) } diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScoreModel.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScoreModel.kt index 1dbcf83a1..587c5a81b 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScoreModel.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScoreModel.kt @@ -15,7 +15,7 @@ import java.util.stream.Collectors class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { private constructor() {} - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("Age")?.let({ number(it) }), input_.get("MaritalStatus"), input_.get("EmploymentStatus"), context_) } catch (e: Exception) { @@ -24,7 +24,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start BKM 'ApplicationRiskScoreModel' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -39,7 +39,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreModelArguments_) // Evaluate BKM 'ApplicationRiskScoreModel' - val output_: java.lang.Number? = evaluate(age, maritalStatus, employmentStatus, context_) + val output_: kotlin.Number? = evaluate(age, maritalStatus, employmentStatus, context_) // End BKM 'ApplicationRiskScoreModel' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreModelArguments_, output_, (System.currentTimeMillis() - applicationRiskScoreModelStartTime_)) @@ -51,7 +51,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -71,7 +71,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { ruleOutputList_.add(rule10(age, maritalStatus, employmentStatus, context_)) // Return results based on hit policy - var output_: java.lang.Number? + var output_: kotlin.Number? if (ruleOutputList_.noMatchedRules()) { // Default value output_ = null @@ -84,7 +84,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -117,7 +117,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") @@ -150,7 +150,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "") - private fun rule2(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule2(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(2, "") @@ -183,7 +183,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "") - private fun rule3(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule3(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(3, "") @@ -216,7 +216,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "") - private fun rule4(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule4(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(4, "") @@ -249,7 +249,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 5, annotation = "") - private fun rule5(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule5(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(5, "") @@ -282,7 +282,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 6, annotation = "") - private fun rule6(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule6(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(6, "") @@ -315,7 +315,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 7, annotation = "") - private fun rule7(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule7(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(7, "") @@ -348,7 +348,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 8, annotation = "") - private fun rule8(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule8(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(8, "") @@ -381,7 +381,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 9, annotation = "") - private fun rule9(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule9(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(9, "") @@ -414,7 +414,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 10, annotation = "") - private fun rule10(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule10(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(10, "") diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScoreModelRuleOutput.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScoreModelRuleOutput.kt index 84ff37703..28aec9bf8 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScoreModelRuleOutput.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScoreModelRuleOutput.kt @@ -2,7 +2,7 @@ @javax.annotation.Generated(value = ["decisionTableRuleOutput.ftl", "ApplicationRiskScoreModel"]) class ApplicationRiskScoreModelRuleOutput(matched: Boolean) : com.gs.dmn.runtime.RuleOutput(matched) { @com.fasterxml.jackson.annotation.JsonProperty("ApplicationRiskScoreModel") - var applicationRiskScoreModel: java.lang.Number? = null + var applicationRiskScoreModel: kotlin.Number? = null override fun equals(o: Any?): Boolean { if (this === o) return true diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/CreditContingencyFactorTable.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/CreditContingencyFactorTable.kt index 263fb06d7..79b9381e5 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/CreditContingencyFactorTable.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/CreditContingencyFactorTable.kt @@ -15,7 +15,7 @@ import java.util.stream.Collectors class CreditContingencyFactorTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { private constructor() {} - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("RiskCategory"), context_) } catch (e: Exception) { @@ -24,7 +24,7 @@ class CreditContingencyFactorTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision } } - fun apply(riskCategory: String?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(riskCategory: String?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start BKM 'CreditContingencyFactorTable' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -37,7 +37,7 @@ class CreditContingencyFactorTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision eventListener_.startDRGElement(DRG_ELEMENT_METADATA, creditContingencyFactorTableArguments_) // Evaluate BKM 'CreditContingencyFactorTable' - val output_: java.lang.Number? = evaluate(riskCategory, context_) + val output_: kotlin.Number? = evaluate(riskCategory, context_) // End BKM 'CreditContingencyFactorTable' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, creditContingencyFactorTableArguments_, output_, (System.currentTimeMillis() - creditContingencyFactorTableStartTime_)) @@ -49,7 +49,7 @@ class CreditContingencyFactorTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision } } - private inline fun evaluate(riskCategory: String?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(riskCategory: String?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -61,7 +61,7 @@ class CreditContingencyFactorTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision ruleOutputList_.add(rule2(riskCategory, context_)) // Return results based on hit policy - var output_: java.lang.Number? + var output_: kotlin.Number? if (ruleOutputList_.noMatchedRules()) { // Default value output_ = null diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/CreditContingencyFactorTableRuleOutput.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/CreditContingencyFactorTableRuleOutput.kt index d6b066391..6044e1fe9 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/CreditContingencyFactorTableRuleOutput.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/CreditContingencyFactorTableRuleOutput.kt @@ -2,7 +2,7 @@ @javax.annotation.Generated(value = ["decisionTableRuleOutput.ftl", "CreditContingencyFactorTable"]) class CreditContingencyFactorTableRuleOutput(matched: Boolean) : com.gs.dmn.runtime.RuleOutput(matched) { @com.fasterxml.jackson.annotation.JsonProperty("CreditContingencyFactorTable") - var creditContingencyFactorTable: java.lang.Number? = null + var creditContingencyFactorTable: kotlin.Number? = null override fun equals(o: Any?): Boolean { if (this === o) return true diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/DMNMetadata.json index 5dc69727b..22b975240 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/DMNMetadata.json @@ -270,7 +270,7 @@ }, { "@kind" : "bkm", "id" : "b_ApplicationRiskScoreModel", - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "applicationRiskScoreModel", "javaTypeName" : "ApplicationRiskScoreModel", "knowledgeReferences" : [ ], @@ -288,7 +288,7 @@ }, { "@kind" : "bkm", "id" : "b_CreditContingencyFactorTable", - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "creditContingencyFactorTable", "javaTypeName" : "CreditContingencyFactorTable", "knowledgeReferences" : [ ], @@ -306,7 +306,7 @@ }, { "@kind" : "bkm", "id" : "b_InstallmentCalculation", - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "installmentCalculation", "javaTypeName" : "InstallmentCalculation", "knowledgeReferences" : [ ], @@ -401,7 +401,7 @@ "informationReferences" : [ { "reference" : "i_ApplicantData" } ], - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "applicationRiskScore", "javaTypeName" : "ApplicationRiskScore", "knowledgeReferences" : [ { @@ -712,7 +712,7 @@ "informationReferences" : [ { "reference" : "i_RequestedProduct" } ], - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "requiredMonthlyInstallment", "javaTypeName" : "RequiredMonthlyInstallment", "knowledgeReferences" : [ { diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Eligibility.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Eligibility.kt index 3119ec62b..b51cdccd1 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Eligibility.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Eligibility.kt @@ -72,7 +72,7 @@ class Eligibility(val preBureauAffordability : PreBureauAffordability = PreBurea val preBureauAffordability: Boolean? = this@Eligibility.preBureauAffordability.apply(applicantData, requestedProduct, context_) val preBureauRiskCategory: String? = this@Eligibility.preBureauRiskCategory.apply(applicantData, context_) - return EligibilityRules.instance().apply(preBureauRiskCategory, preBureauAffordability, applicantData?.let({ it.age as java.lang.Number? }), context_) as String? + return EligibilityRules.instance().apply(preBureauRiskCategory, preBureauAffordability, applicantData?.let({ it.age as kotlin.Number? }), context_) as String? } companion object { diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/EligibilityRules.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/EligibilityRules.kt index e8d339708..b5d6470ff 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/EligibilityRules.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/EligibilityRules.kt @@ -24,7 +24,7 @@ class EligibilityRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + fun apply(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { try { // Start BKM 'EligibilityRules' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -51,7 +51,7 @@ class EligibilityRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + private inline fun evaluate(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -77,7 +77,7 @@ class EligibilityRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -111,7 +111,7 @@ class EligibilityRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") @@ -145,7 +145,7 @@ class EligibilityRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "") - private fun rule2(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule2(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(2, "") @@ -179,7 +179,7 @@ class EligibilityRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "") - private fun rule3(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule3(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(3, "") diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/InstallmentCalculation.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/InstallmentCalculation.kt index 3a15fb981..90ff3c17d 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/InstallmentCalculation.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/InstallmentCalculation.kt @@ -15,7 +15,7 @@ import java.util.stream.Collectors class InstallmentCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { private constructor() {} - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("ProductType"), input_.get("Rate")?.let({ number(it) }), input_.get("Term")?.let({ number(it) }), input_.get("Amount")?.let({ number(it) }), context_) } catch (e: Exception) { @@ -24,7 +24,7 @@ class InstallmentCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(productType: String?, rate: java.lang.Number?, term: java.lang.Number?, amount: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(productType: String?, rate: kotlin.Number?, term: kotlin.Number?, amount: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start BKM 'InstallmentCalculation' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -40,7 +40,7 @@ class InstallmentCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, installmentCalculationArguments_) // Evaluate BKM 'InstallmentCalculation' - val output_: java.lang.Number? = evaluate(productType, rate, term, amount, context_) + val output_: kotlin.Number? = evaluate(productType, rate, term, amount, context_) // End BKM 'InstallmentCalculation' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, installmentCalculationArguments_, output_, (System.currentTimeMillis() - installmentCalculationStartTime_)) @@ -52,13 +52,13 @@ class InstallmentCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(productType: String?, rate: java.lang.Number?, term: java.lang.Number?, amount: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(productType: String?, rate: kotlin.Number?, term: kotlin.Number?, amount: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - val monthlyFee: java.lang.Number? = (if (booleanEqual(stringEqual(productType, "STANDARD LOAN"), true)) number("20.00") else (if (booleanEqual(stringEqual(productType, "SPECIAL LOAN"), true)) number("25.00") else null)) as java.lang.Number? - val monthlyRepayment: java.lang.Number? = numericDivide(numericDivide(numericMultiply(amount, rate), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(rate, number("12"))), numericUnaryMinus(term)))) as java.lang.Number? + val monthlyFee: kotlin.Number? = (if (booleanEqual(stringEqual(productType, "STANDARD LOAN"), true)) number("20.00") else (if (booleanEqual(stringEqual(productType, "SPECIAL LOAN"), true)) number("25.00") else null)) as kotlin.Number? + val monthlyRepayment: kotlin.Number? = numericDivide(numericDivide(numericMultiply(amount, rate), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(rate, number("12"))), numericUnaryMinus(term)))) as kotlin.Number? return numericAdd(monthlyRepayment, monthlyFee) } diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauAffordability.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauAffordability.kt index 75b44d906..d68fc3974 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauAffordability.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauAffordability.kt @@ -72,9 +72,9 @@ class PostBureauAffordability(val postBureauRiskCategory : PostBureauRiskCategor var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() // Apply child decisions val postBureauRiskCategory: String? = this@PostBureauAffordability.postBureauRiskCategory.apply(applicantData, bureauData, context_) - val requiredMonthlyInstallment: java.lang.Number? = this@PostBureauAffordability.requiredMonthlyInstallment.apply(requestedProduct, context_) + val requiredMonthlyInstallment: kotlin.Number? = this@PostBureauAffordability.requiredMonthlyInstallment.apply(requestedProduct, context_) - return AffordabilityCalculation.instance().apply(applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.income as java.lang.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.repayments as java.lang.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.expenses as java.lang.Number? }), postBureauRiskCategory, requiredMonthlyInstallment, context_) as Boolean? + return AffordabilityCalculation.instance().apply(applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.income as kotlin.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.repayments as kotlin.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.expenses as kotlin.Number? }), postBureauRiskCategory, requiredMonthlyInstallment, context_) as Boolean? } companion object { diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategory.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategory.kt index 8d3b60260..edf510743 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategory.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategory.kt @@ -80,9 +80,9 @@ class PostBureauRiskCategory(val applicationRiskScore : ApplicationRiskScore = A var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() // Apply child decisions - val applicationRiskScore: java.lang.Number? = this@PostBureauRiskCategory.applicationRiskScore.apply(applicantData, context_) + val applicationRiskScore: kotlin.Number? = this@PostBureauRiskCategory.applicationRiskScore.apply(applicantData, context_) - return PostBureauRiskCategoryTable.instance().apply(applicantData?.let({ it.existingCustomer as Boolean? }), applicationRiskScore, bureauData?.let({ it.creditScore as java.lang.Number? }), context_) as String? + return PostBureauRiskCategoryTable.instance().apply(applicantData?.let({ it.existingCustomer as Boolean? }), applicationRiskScore, bureauData?.let({ it.creditScore as kotlin.Number? }), context_) as String? } companion object { diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategoryTable.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategoryTable.kt index 6b3b07f56..baa0ecdcc 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategoryTable.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategoryTable.kt @@ -24,7 +24,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + fun apply(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { try { // Start BKM 'Post-bureauRiskCategoryTable' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -51,7 +51,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + private inline fun evaluate(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -86,7 +86,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -119,7 +119,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") @@ -152,7 +152,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "") - private fun rule2(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule2(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(2, "") @@ -185,7 +185,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "") - private fun rule3(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule3(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(3, "") @@ -218,7 +218,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "") - private fun rule4(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule4(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(4, "") @@ -251,7 +251,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 5, annotation = "") - private fun rule5(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule5(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(5, "") @@ -284,7 +284,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 6, annotation = "") - private fun rule6(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule6(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(6, "") @@ -317,7 +317,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 7, annotation = "") - private fun rule7(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule7(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(7, "") @@ -350,7 +350,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 8, annotation = "") - private fun rule8(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule8(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(8, "") @@ -383,7 +383,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 9, annotation = "") - private fun rule9(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule9(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(9, "") @@ -416,7 +416,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 10, annotation = "") - private fun rule10(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule10(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(10, "") @@ -449,7 +449,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 11, annotation = "") - private fun rule11(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule11(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(11, "") @@ -482,7 +482,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 12, annotation = "") - private fun rule12(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule12(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(12, "") diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauAffordability.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauAffordability.kt index a7b01bd0b..a5d3158a3 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauAffordability.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauAffordability.kt @@ -70,9 +70,9 @@ class PreBureauAffordability(val preBureauRiskCategory : PreBureauRiskCategory = var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() // Apply child decisions val preBureauRiskCategory: String? = this@PreBureauAffordability.preBureauRiskCategory.apply(applicantData, context_) - val requiredMonthlyInstallment: java.lang.Number? = this@PreBureauAffordability.requiredMonthlyInstallment.apply(requestedProduct, context_) + val requiredMonthlyInstallment: kotlin.Number? = this@PreBureauAffordability.requiredMonthlyInstallment.apply(requestedProduct, context_) - return AffordabilityCalculation.instance().apply(applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.income as java.lang.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.repayments as java.lang.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.expenses as java.lang.Number? }), preBureauRiskCategory, requiredMonthlyInstallment, context_) as Boolean? + return AffordabilityCalculation.instance().apply(applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.income as kotlin.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.repayments as kotlin.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.expenses as kotlin.Number? }), preBureauRiskCategory, requiredMonthlyInstallment, context_) as Boolean? } companion object { diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategory.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategory.kt index b9508b425..25f886da1 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategory.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategory.kt @@ -78,7 +78,7 @@ class PreBureauRiskCategory(val applicationRiskScore : ApplicationRiskScore = Ap var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() // Apply child decisions - val applicationRiskScore: java.lang.Number? = this@PreBureauRiskCategory.applicationRiskScore.apply(applicantData, context_) + val applicationRiskScore: kotlin.Number? = this@PreBureauRiskCategory.applicationRiskScore.apply(applicantData, context_) return PreBureauRiskCategoryTable.instance().apply(applicantData?.let({ it.existingCustomer as Boolean? }), applicationRiskScore, context_) as String? } diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategoryTable.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategoryTable.kt index 2879cf155..979c75e7a 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategoryTable.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategoryTable.kt @@ -24,7 +24,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + fun apply(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { try { // Start BKM 'Pre-bureauRiskCategoryTable' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -50,7 +50,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + private inline fun evaluate(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -80,7 +80,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -112,7 +112,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") @@ -144,7 +144,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "") - private fun rule2(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule2(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(2, "") @@ -176,7 +176,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "") - private fun rule3(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule3(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(3, "") @@ -208,7 +208,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "") - private fun rule4(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule4(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(4, "") @@ -240,7 +240,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 5, annotation = "") - private fun rule5(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule5(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(5, "") @@ -272,7 +272,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 6, annotation = "") - private fun rule6(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule6(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(6, "") @@ -304,7 +304,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 7, annotation = "") - private fun rule7(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule7(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(7, "") diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RequiredMonthlyInstallment.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RequiredMonthlyInstallment.kt index bd06793ad..8b2ec1adc 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RequiredMonthlyInstallment.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RequiredMonthlyInstallment.kt @@ -13,7 +13,7 @@ import java.util.stream.Collectors rulesCount = -1 ) class RequiredMonthlyInstallment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("RequestedProduct")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference() {}) }), context_) } catch (e: Exception) { @@ -22,7 +22,7 @@ class RequiredMonthlyInstallment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision( } } - fun apply(requestedProduct: type.TRequestedProduct?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(requestedProduct: type.TRequestedProduct?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start decision 'RequiredMonthlyInstallment' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -36,7 +36,7 @@ class RequiredMonthlyInstallment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision( if (cache_.contains("RequiredMonthlyInstallment")) { // Retrieve value from cache - var output_:java.lang.Number? = cache_.lookup("RequiredMonthlyInstallment") as java.lang.Number? + var output_:kotlin.Number? = cache_.lookup("RequiredMonthlyInstallment") as kotlin.Number? // End decision 'RequiredMonthlyInstallment' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, requiredMonthlyInstallmentArguments_, output_, (System.currentTimeMillis() - requiredMonthlyInstallmentStartTime_)) @@ -44,7 +44,7 @@ class RequiredMonthlyInstallment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision( return output_ } else { // Evaluate decision 'RequiredMonthlyInstallment' - val output_: java.lang.Number? = evaluate(requestedProduct, context_) + val output_: kotlin.Number? = evaluate(requestedProduct, context_) cache_.bind("RequiredMonthlyInstallment", output_) // End decision 'RequiredMonthlyInstallment' @@ -63,7 +63,7 @@ class RequiredMonthlyInstallment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision( val requestedProduct: type.TRequestedProduct? = type.TRequestedProduct.toTRequestedProduct(requiredMonthlyInstallmentRequest_.getRequestedProduct()) // Invoke apply method - val output_: java.lang.Number? = apply(requestedProduct, context_) + val output_: kotlin.Number? = apply(requestedProduct, context_) // Convert output to Response Message val builder_: proto.RequiredMonthlyInstallmentResponse.Builder = proto.RequiredMonthlyInstallmentResponse.newBuilder() @@ -72,12 +72,12 @@ class RequiredMonthlyInstallment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision( return builder_.build() } - private inline fun evaluate(requestedProduct: type.TRequestedProduct?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(requestedProduct: type.TRequestedProduct?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return InstallmentCalculation.instance().apply(requestedProduct?.let({ it.productType as String? }), requestedProduct?.let({ it.rate as java.lang.Number? }), requestedProduct?.let({ it.term as java.lang.Number? }), requestedProduct?.let({ it.amount as java.lang.Number? }), context_) as java.lang.Number? + return InstallmentCalculation.instance().apply(requestedProduct?.let({ it.productType as String? }), requestedProduct?.let({ it.rate as kotlin.Number? }), requestedProduct?.let({ it.term as kotlin.Number? }), requestedProduct?.let({ it.amount as kotlin.Number? }), context_) as kotlin.Number? } companion object { @@ -103,7 +103,7 @@ class RequiredMonthlyInstallment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision( } @JvmStatic - fun responseToOutput(requiredMonthlyInstallmentResponse_: proto.RequiredMonthlyInstallmentResponse): java.lang.Number? { + fun responseToOutput(requiredMonthlyInstallmentResponse_: proto.RequiredMonthlyInstallmentResponse): kotlin.Number? { // Extract and convert output return java.math.BigDecimal.valueOf(requiredMonthlyInstallmentResponse_.getRequiredMonthlyInstallment()) } diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Routing.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Routing.kt index 28cc98b69..6e034d4a7 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Routing.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Routing.kt @@ -74,7 +74,7 @@ class Routing(val postBureauAffordability : PostBureauAffordability = PostBureau val postBureauAffordability: Boolean? = this@Routing.postBureauAffordability.apply(applicantData, bureauData, requestedProduct, context_) val postBureauRiskCategory: String? = this@Routing.postBureauRiskCategory.apply(applicantData, bureauData, context_) - return RoutingRules.instance().apply(postBureauRiskCategory, postBureauAffordability, bureauData?.let({ it.bankrupt as Boolean? }), bureauData?.let({ it.creditScore as java.lang.Number? }), context_) as String? + return RoutingRules.instance().apply(postBureauRiskCategory, postBureauAffordability, bureauData?.let({ it.bankrupt as Boolean? }), bureauData?.let({ it.creditScore as kotlin.Number? }), context_) as String? } companion object { diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RoutingRules.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RoutingRules.kt index 5e9f038bf..3a49495bd 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RoutingRules.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RoutingRules.kt @@ -24,7 +24,7 @@ class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + fun apply(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { try { // Start BKM 'RoutingRules' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -52,7 +52,7 @@ class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + private inline fun evaluate(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -79,7 +79,7 @@ class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -114,7 +114,7 @@ class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") @@ -149,7 +149,7 @@ class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "") - private fun rule2(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule2(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(2, "") @@ -184,7 +184,7 @@ class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "") - private fun rule3(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule3(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(3, "") @@ -219,7 +219,7 @@ class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "") - private fun rule4(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule4(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(4, "") diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/Monthly.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/Monthly.kt index 99e8d7ed6..152dd5d64 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/Monthly.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/Monthly.kt @@ -7,13 +7,13 @@ import java.util.* @com.fasterxml.jackson.databind.annotation.JsonDeserialize(`as` = type.MonthlyImpl::class) interface Monthly : com.gs.dmn.runtime.DMNType { @get:com.fasterxml.jackson.annotation.JsonGetter("Income") - val income: java.lang.Number? + val income: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("Expenses") - val expenses: java.lang.Number? + val expenses: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("Repayments") - val repayments: java.lang.Number? + val repayments: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -61,9 +61,9 @@ interface Monthly : com.gs.dmn.runtime.DMNType { return other } else if (other is com.gs.dmn.runtime.Context) { var result_ = MonthlyImpl() - result_.income = other.get("Income") as java.lang.Number? - result_.expenses = other.get("Expenses") as java.lang.Number? - result_.repayments = other.get("Repayments") as java.lang.Number? + result_.income = other.get("Income") as kotlin.Number? + result_.expenses = other.get("Expenses") as kotlin.Number? + result_.repayments = other.get("Repayments") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toMonthly(other.toContext()) diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/MonthlyImpl.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/MonthlyImpl.kt index f1e5f0d9c..0115a0a5b 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/MonthlyImpl.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/MonthlyImpl.kt @@ -7,20 +7,20 @@ import java.util.* class MonthlyImpl : Monthly { @get:com.fasterxml.jackson.annotation.JsonGetter("Income") @set:com.fasterxml.jackson.annotation.JsonGetter("Income") - override var income: java.lang.Number? = null + override var income: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("Expenses") @set:com.fasterxml.jackson.annotation.JsonGetter("Expenses") - override var expenses: java.lang.Number? = null + override var expenses: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("Repayments") @set:com.fasterxml.jackson.annotation.JsonGetter("Repayments") - override var repayments: java.lang.Number? = null + override var repayments: kotlin.Number? = null constructor() { } - constructor (expenses: java.lang.Number?, income: java.lang.Number?, repayments: java.lang.Number?) { + constructor (expenses: kotlin.Number?, income: kotlin.Number?, repayments: kotlin.Number?) { this.expenses = expenses this.income = income this.repayments = repayments diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TApplicantData.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TApplicantData.kt index eefef7566..436bc324f 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TApplicantData.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TApplicantData.kt @@ -10,7 +10,7 @@ interface TApplicantData : com.gs.dmn.runtime.DMNType { val monthly: type.Monthly? @get:com.fasterxml.jackson.annotation.JsonGetter("Age") - val age: java.lang.Number? + val age: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("ExistingCustomer") val existingCustomer: Boolean? @@ -76,7 +76,7 @@ interface TApplicantData : com.gs.dmn.runtime.DMNType { } else if (other is com.gs.dmn.runtime.Context) { var result_ = TApplicantDataImpl() result_.monthly = other.get("Monthly") as type.Monthly? - result_.age = other.get("Age") as java.lang.Number? + result_.age = other.get("Age") as kotlin.Number? result_.existingCustomer = other.get("ExistingCustomer") as Boolean? result_.maritalStatus = other.get("MaritalStatus") as String? result_.employmentStatus = other.get("EmploymentStatus") as String? diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TApplicantDataImpl.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TApplicantDataImpl.kt index 7ea99be44..b20dd39f7 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TApplicantDataImpl.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TApplicantDataImpl.kt @@ -11,7 +11,7 @@ class TApplicantDataImpl : TApplicantData { @get:com.fasterxml.jackson.annotation.JsonGetter("Age") @set:com.fasterxml.jackson.annotation.JsonGetter("Age") - override var age: java.lang.Number? = null + override var age: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("ExistingCustomer") @set:com.fasterxml.jackson.annotation.JsonGetter("ExistingCustomer") @@ -28,7 +28,7 @@ class TApplicantDataImpl : TApplicantData { constructor() { } - constructor (age: java.lang.Number?, employmentStatus: String?, existingCustomer: Boolean?, maritalStatus: String?, monthly: type.Monthly?) { + constructor (age: kotlin.Number?, employmentStatus: String?, existingCustomer: Boolean?, maritalStatus: String?, monthly: type.Monthly?) { this.age = age this.employmentStatus = employmentStatus this.existingCustomer = existingCustomer diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TBureauData.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TBureauData.kt index f9152c777..86becefdd 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TBureauData.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TBureauData.kt @@ -7,7 +7,7 @@ import java.util.* @com.fasterxml.jackson.databind.annotation.JsonDeserialize(`as` = type.TBureauDataImpl::class) interface TBureauData : com.gs.dmn.runtime.DMNType { @get:com.fasterxml.jackson.annotation.JsonGetter("CreditScore") - val creditScore: java.lang.Number? + val creditScore: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("Bankrupt") val bankrupt: Boolean? @@ -54,7 +54,7 @@ interface TBureauData : com.gs.dmn.runtime.DMNType { return other } else if (other is com.gs.dmn.runtime.Context) { var result_ = TBureauDataImpl() - result_.creditScore = other.get("CreditScore") as java.lang.Number? + result_.creditScore = other.get("CreditScore") as kotlin.Number? result_.bankrupt = other.get("Bankrupt") as Boolean? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TBureauDataImpl.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TBureauDataImpl.kt index 355d3b585..15d5eb30e 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TBureauDataImpl.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TBureauDataImpl.kt @@ -7,7 +7,7 @@ import java.util.* class TBureauDataImpl : TBureauData { @get:com.fasterxml.jackson.annotation.JsonGetter("CreditScore") @set:com.fasterxml.jackson.annotation.JsonGetter("CreditScore") - override var creditScore: java.lang.Number? = null + override var creditScore: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("Bankrupt") @set:com.fasterxml.jackson.annotation.JsonGetter("Bankrupt") @@ -16,7 +16,7 @@ class TBureauDataImpl : TBureauData { constructor() { } - constructor (bankrupt: Boolean?, creditScore: java.lang.Number?) { + constructor (bankrupt: Boolean?, creditScore: kotlin.Number?) { this.bankrupt = bankrupt this.creditScore = creditScore } diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TRequestedProduct.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TRequestedProduct.kt index ce7bfe9a6..71b7c6853 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TRequestedProduct.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TRequestedProduct.kt @@ -10,13 +10,13 @@ interface TRequestedProduct : com.gs.dmn.runtime.DMNType { val productType: String? @get:com.fasterxml.jackson.annotation.JsonGetter("Amount") - val amount: java.lang.Number? + val amount: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("Rate") - val rate: java.lang.Number? + val rate: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("Term") - val term: java.lang.Number? + val term: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -69,9 +69,9 @@ interface TRequestedProduct : com.gs.dmn.runtime.DMNType { } else if (other is com.gs.dmn.runtime.Context) { var result_ = TRequestedProductImpl() result_.productType = other.get("ProductType") as String? - result_.amount = other.get("Amount") as java.lang.Number? - result_.rate = other.get("Rate") as java.lang.Number? - result_.term = other.get("Term") as java.lang.Number? + result_.amount = other.get("Amount") as kotlin.Number? + result_.rate = other.get("Rate") as kotlin.Number? + result_.term = other.get("Term") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toTRequestedProduct(other.toContext()) diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TRequestedProductImpl.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TRequestedProductImpl.kt index a1eaf5dfb..800edaa2e 100644 --- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TRequestedProductImpl.kt +++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/type/TRequestedProductImpl.kt @@ -11,20 +11,20 @@ class TRequestedProductImpl : TRequestedProduct { @get:com.fasterxml.jackson.annotation.JsonGetter("Amount") @set:com.fasterxml.jackson.annotation.JsonGetter("Amount") - override var amount: java.lang.Number? = null + override var amount: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("Rate") @set:com.fasterxml.jackson.annotation.JsonGetter("Rate") - override var rate: java.lang.Number? = null + override var rate: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("Term") @set:com.fasterxml.jackson.annotation.JsonGetter("Term") - override var term: java.lang.Number? = null + override var term: kotlin.Number? = null constructor() { } - constructor (amount: java.lang.Number?, productType: String?, rate: java.lang.Number?, term: java.lang.Number?) { + constructor (amount: kotlin.Number?, productType: String?, rate: kotlin.Number?, term: kotlin.Number?) { this.amount = amount this.productType = productType this.rate = rate diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/ApprovalStatus.kt b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/ApprovalStatus.kt index 081f92d14..5989091b2 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/ApprovalStatus.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/ApprovalStatus.kt @@ -22,7 +22,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + fun apply(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { try { // Start decision 'Approval Status' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -49,7 +49,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + private inline fun evaluate(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -75,7 +75,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -108,7 +108,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") @@ -141,7 +141,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "") - private fun rule2(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule2(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(2, "") @@ -174,7 +174,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "") - private fun rule3(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule3(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(3, "") diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/DMNMetadata.json index a75063036..5b8a07086 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/DMNMetadata.json @@ -9,7 +9,7 @@ "@kind" : "inputData", "id" : "_41effb45-b3c4-46ac-b1da-122b3e428a98", "javaParameterName" : "age", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Age", "namespace" : "http://www.trisotech.com/definitions/_edbd2d8e-a5a8-4660-9bb9-adaa792d900c", "typeRef" : { @@ -60,7 +60,7 @@ "@kind" : "inputData", "id" : "_41effb45-b3c4-46ac-b1da-122b3e428a98", "javaParameterName" : "age", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Age", "namespace" : "http://www.trisotech.com/definitions/_edbd2d8e-a5a8-4660-9bb9-adaa792d900c", "typeRef" : { diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/ApprovalStatus.kt b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/ApprovalStatus.kt index 0c2ff8324..add1e17d6 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/ApprovalStatus.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/ApprovalStatus.kt @@ -22,7 +22,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + fun apply(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { try { // Start decision 'Approval Status' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -49,7 +49,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + private inline fun evaluate(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -75,7 +75,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -108,7 +108,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") @@ -141,7 +141,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "") - private fun rule2(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule2(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(2, "") @@ -174,7 +174,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "") - private fun rule3(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule3(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(3, "") diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/DMNMetadata.json index 786df4e7c..f6efab991 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/DMNMetadata.json @@ -9,7 +9,7 @@ "@kind" : "inputData", "id" : "_41effb45-b3c4-46ac-b1da-122b3e428a98", "javaParameterName" : "age", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Age", "namespace" : "http://www.trisotech.com/definitions/_6cb03678-38e5-4ee3-826b-d6622c738563", "typeRef" : { @@ -60,7 +60,7 @@ "@kind" : "inputData", "id" : "_41effb45-b3c4-46ac-b1da-122b3e428a98", "javaParameterName" : "age", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Age", "namespace" : "http://www.trisotech.com/definitions/_6cb03678-38e5-4ee3-826b-d6622c738563", "typeRef" : { diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/ApprovalStatus.kt b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/ApprovalStatus.kt index 742d3553e..9734a748e 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/ApprovalStatus.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/ApprovalStatus.kt @@ -22,7 +22,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + fun apply(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { try { // Start decision 'Approval Status' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -49,7 +49,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + private inline fun evaluate(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -75,7 +75,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -109,7 +109,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") @@ -143,7 +143,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "") - private fun rule2(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule2(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(2, "") @@ -177,7 +177,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "") - private fun rule3(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule3(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(3, "") diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/DMNMetadata.json index 43bf77004..81b2e6b06 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/DMNMetadata.json @@ -9,7 +9,7 @@ "@kind" : "inputData", "id" : "_41effb45-b3c4-46ac-b1da-122b3e428a98", "javaParameterName" : "age", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Age", "namespace" : "http://www.trisotech.com/definitions/_791b8e95-b7a7-40e7-9dd1-5ff12364f340", "typeRef" : { @@ -60,7 +60,7 @@ "@kind" : "inputData", "id" : "_41effb45-b3c4-46ac-b1da-122b3e428a98", "javaParameterName" : "age", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Age", "namespace" : "http://www.trisotech.com/definitions/_791b8e95-b7a7-40e7-9dd1-5ff12364f340", "typeRef" : { diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/ApprovalStatus.kt b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/ApprovalStatus.kt index 736a52b32..6d070f28e 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/ApprovalStatus.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/ApprovalStatus.kt @@ -22,7 +22,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + fun apply(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { try { // Start decision 'Approval Status' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -49,7 +49,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + private inline fun evaluate(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): String? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -73,7 +73,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -107,7 +107,7 @@ class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/DMNMetadata.json index a2c865df9..642af075b 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/DMNMetadata.json @@ -9,7 +9,7 @@ "@kind" : "inputData", "id" : "_41effb45-b3c4-46ac-b1da-122b3e428a98", "javaParameterName" : "age", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Age", "namespace" : "http://www.trisotech.com/definitions/_501f6033-f4bc-4823-99aa-edaf29ac2e0b", "typeRef" : { @@ -60,7 +60,7 @@ "@kind" : "inputData", "id" : "_41effb45-b3c4-46ac-b1da-122b3e428a98", "javaParameterName" : "age", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Age", "namespace" : "http://www.trisotech.com/definitions/_501f6033-f4bc-4823-99aa-edaf29ac2e0b", "typeRef" : { diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/DMNMetadata.json index 083ead803..c786e3c0c 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/DMNMetadata.json @@ -59,7 +59,7 @@ "informationReferences" : [ { "reference" : "_1f4ae444-2e4e-4d26-b1f7-87a645c3f50a" } ], - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "payment", "javaTypeName" : "Payment", "knowledgeReferences" : [ ], diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/Payment.kt b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/Payment.kt index ebf2c46d5..0dcc2cbe4 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/Payment.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/Payment.kt @@ -13,7 +13,7 @@ import java.util.stream.Collectors rulesCount = -1 ) class Payment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("loan")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference() {}) }), context_) } catch (e: Exception) { @@ -22,7 +22,7 @@ class Payment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(loan: type.TLoan?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(loan: type.TLoan?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start decision 'payment' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -35,7 +35,7 @@ class Payment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, paymentArguments_) // Evaluate decision 'payment' - val output_: java.lang.Number? = evaluate(loan, context_) + val output_: kotlin.Number? = evaluate(loan, context_) // End decision 'payment' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, paymentArguments_, output_, (System.currentTimeMillis() - paymentStartTime_)) @@ -47,12 +47,12 @@ class Payment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(loan: type.TLoan?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(loan: type.TLoan?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return numericDivide(numericDivide(numericMultiply(loan?.let({ it.principal as java.lang.Number? }), loan?.let({ it.rate as java.lang.Number? })), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(loan?.let({ it.rate as java.lang.Number? }), number("12"))), numericUnaryMinus(loan?.let({ it.termMonths as java.lang.Number? }))))) as java.lang.Number? + return numericDivide(numericDivide(numericMultiply(loan?.let({ it.principal as kotlin.Number? }), loan?.let({ it.rate as kotlin.Number? })), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(loan?.let({ it.rate as kotlin.Number? }), number("12"))), numericUnaryMinus(loan?.let({ it.termMonths as kotlin.Number? }))))) as kotlin.Number? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/type/TLoan.kt b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/type/TLoan.kt index b82f3fbe4..b769b403c 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/type/TLoan.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/type/TLoan.kt @@ -7,13 +7,13 @@ import java.util.* @com.fasterxml.jackson.databind.annotation.JsonDeserialize(`as` = type.TLoanImpl::class) interface TLoan : com.gs.dmn.runtime.DMNType { @get:com.fasterxml.jackson.annotation.JsonGetter("principal") - val principal: java.lang.Number? + val principal: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("rate") - val rate: java.lang.Number? + val rate: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("termMonths") - val termMonths: java.lang.Number? + val termMonths: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -61,9 +61,9 @@ interface TLoan : com.gs.dmn.runtime.DMNType { return other } else if (other is com.gs.dmn.runtime.Context) { var result_ = TLoanImpl() - result_.principal = other.get("principal") as java.lang.Number? - result_.rate = other.get("rate") as java.lang.Number? - result_.termMonths = other.get("termMonths") as java.lang.Number? + result_.principal = other.get("principal") as kotlin.Number? + result_.rate = other.get("rate") as kotlin.Number? + result_.termMonths = other.get("termMonths") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toTLoan(other.toContext()) diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/type/TLoanImpl.kt b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/type/TLoanImpl.kt index 50c405394..9c27f3f89 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/type/TLoanImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/type/TLoanImpl.kt @@ -7,20 +7,20 @@ import java.util.* class TLoanImpl : TLoan { @get:com.fasterxml.jackson.annotation.JsonGetter("principal") @set:com.fasterxml.jackson.annotation.JsonGetter("principal") - override var principal: java.lang.Number? = null + override var principal: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("rate") @set:com.fasterxml.jackson.annotation.JsonGetter("rate") - override var rate: java.lang.Number? = null + override var rate: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("termMonths") @set:com.fasterxml.jackson.annotation.JsonGetter("termMonths") - override var termMonths: java.lang.Number? = null + override var termMonths: kotlin.Number? = null constructor() { } - constructor (principal: java.lang.Number?, rate: java.lang.Number?, termMonths: java.lang.Number?) { + constructor (principal: kotlin.Number?, rate: kotlin.Number?, termMonths: kotlin.Number?) { this.principal = principal this.rate = rate this.termMonths = termMonths diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/DMNMetadata.json index 1e7f4330e..7bfa0daff 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/DMNMetadata.json @@ -57,7 +57,7 @@ "@kind" : "inputData", "id" : "i_fee", "javaParameterName" : "fee", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "fee", "namespace" : "http://www.trisotech.com/definitions/_cb28c255-91cd-4c01-ac7b-1a9cb1ecdb11", "typeRef" : { @@ -67,7 +67,7 @@ }, { "@kind" : "bkm", "id" : "b_PMT", - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "pMT", "javaTypeName" : "PMT", "knowledgeReferences" : [ ], @@ -81,7 +81,7 @@ }, { "reference" : "i_fee" } ], - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "monthlyPayment", "javaTypeName" : "MonthlyPayment", "knowledgeReferences" : [ { @@ -108,7 +108,7 @@ "@kind" : "inputData", "id" : "i_fee", "javaParameterName" : "fee", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "fee", "namespace" : "http://www.trisotech.com/definitions/_cb28c255-91cd-4c01-ac7b-1a9cb1ecdb11", "typeRef" : { diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/MonthlyPayment.kt b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/MonthlyPayment.kt index 16cbd7d8f..72c3cd940 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/MonthlyPayment.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/MonthlyPayment.kt @@ -13,7 +13,7 @@ import java.util.stream.Collectors rulesCount = -1 ) class MonthlyPayment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("Loan")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference() {}) }), input_.get("fee")?.let({ number(it) }), context_) } catch (e: Exception) { @@ -22,7 +22,7 @@ class MonthlyPayment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(loan: type.TLoan?, fee: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(loan: type.TLoan?, fee: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start decision 'MonthlyPayment' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -36,7 +36,7 @@ class MonthlyPayment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, monthlyPaymentArguments_) // Evaluate decision 'MonthlyPayment' - val output_: java.lang.Number? = evaluate(loan, fee, context_) + val output_: kotlin.Number? = evaluate(loan, fee, context_) // End decision 'MonthlyPayment' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, monthlyPaymentArguments_, output_, (System.currentTimeMillis() - monthlyPaymentStartTime_)) @@ -48,12 +48,12 @@ class MonthlyPayment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(loan: type.TLoan?, fee: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(loan: type.TLoan?, fee: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return numericAdd(PMT.instance()?.apply(loan?.let({ it.amount as java.lang.Number? }), loan?.let({ it.rate as java.lang.Number? }), loan?.let({ it.term as java.lang.Number? }), context_), fee) as java.lang.Number? + return numericAdd(PMT.instance()?.apply(loan?.let({ it.amount as kotlin.Number? }), loan?.let({ it.rate as kotlin.Number? }), loan?.let({ it.term as kotlin.Number? }), context_), fee) as kotlin.Number? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/PMT.kt b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/PMT.kt index 8d76d4d14..490095817 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/PMT.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/PMT.kt @@ -15,7 +15,7 @@ import java.util.stream.Collectors class PMT : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { private constructor() {} - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("p")?.let({ number(it) }), input_.get("r")?.let({ number(it) }), input_.get("n")?.let({ number(it) }), context_) } catch (e: Exception) { @@ -24,7 +24,7 @@ class PMT : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(p: java.lang.Number?, r: java.lang.Number?, n: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(p: kotlin.Number?, r: kotlin.Number?, n: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start BKM 'PMT' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -39,7 +39,7 @@ class PMT : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, pMTArguments_) // Evaluate BKM 'PMT' - val output_: java.lang.Number? = evaluate(p, r, n, context_) + val output_: kotlin.Number? = evaluate(p, r, n, context_) // End BKM 'PMT' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, pMTArguments_, output_, (System.currentTimeMillis() - pMTStartTime_)) @@ -51,12 +51,12 @@ class PMT : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(p: java.lang.Number?, r: java.lang.Number?, n: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(p: kotlin.Number?, r: kotlin.Number?, n: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return numericDivide(numericDivide(numericMultiply(p, r), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(r, number("12"))), numericUnaryMinus(n)))) as java.lang.Number? + return numericDivide(numericDivide(numericMultiply(p, r), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(r, number("12"))), numericUnaryMinus(n)))) as kotlin.Number? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/type/TLoan.kt b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/type/TLoan.kt index 3bc1d28a4..662bc6299 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/type/TLoan.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/type/TLoan.kt @@ -7,13 +7,13 @@ import java.util.* @com.fasterxml.jackson.databind.annotation.JsonDeserialize(`as` = type.TLoanImpl::class) interface TLoan : com.gs.dmn.runtime.DMNType { @get:com.fasterxml.jackson.annotation.JsonGetter("amount") - val amount: java.lang.Number? + val amount: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("rate") - val rate: java.lang.Number? + val rate: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("term") - val term: java.lang.Number? + val term: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -61,9 +61,9 @@ interface TLoan : com.gs.dmn.runtime.DMNType { return other } else if (other is com.gs.dmn.runtime.Context) { var result_ = TLoanImpl() - result_.amount = other.get("amount") as java.lang.Number? - result_.rate = other.get("rate") as java.lang.Number? - result_.term = other.get("term") as java.lang.Number? + result_.amount = other.get("amount") as kotlin.Number? + result_.rate = other.get("rate") as kotlin.Number? + result_.term = other.get("term") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toTLoan(other.toContext()) diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/type/TLoanImpl.kt b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/type/TLoanImpl.kt index 328bc9e0e..d00db8a07 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/type/TLoanImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/type/TLoanImpl.kt @@ -7,20 +7,20 @@ import java.util.* class TLoanImpl : TLoan { @get:com.fasterxml.jackson.annotation.JsonGetter("amount") @set:com.fasterxml.jackson.annotation.JsonGetter("amount") - override var amount: java.lang.Number? = null + override var amount: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("rate") @set:com.fasterxml.jackson.annotation.JsonGetter("rate") - override var rate: java.lang.Number? = null + override var rate: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("term") @set:com.fasterxml.jackson.annotation.JsonGetter("term") - override var term: java.lang.Number? = null + override var term: kotlin.Number? = null constructor() { } - constructor (amount: java.lang.Number?, rate: java.lang.Number?, term: java.lang.Number?) { + constructor (amount: kotlin.Number?, rate: kotlin.Number?, term: kotlin.Number?) { this.amount = amount this.rate = rate this.term = term diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/Approval.kt b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/Approval.kt index b63fd2c9f..912386443 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/Approval.kt +++ b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/Approval.kt @@ -22,7 +22,7 @@ class Approval() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): type.TApproval? { + fun apply(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): type.TApproval? { try { // Start decision 'Approval' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -49,7 +49,7 @@ class Approval() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): type.TApproval? { + private inline fun evaluate(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): type.TApproval? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -76,7 +76,7 @@ class Approval() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -110,7 +110,7 @@ class Approval() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") @@ -144,7 +144,7 @@ class Approval() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "") - private fun rule2(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule2(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(2, "") @@ -178,7 +178,7 @@ class Approval() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "") - private fun rule3(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule3(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(3, "") @@ -212,7 +212,7 @@ class Approval() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "") - private fun rule4(age: java.lang.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule4(age: kotlin.Number?, riskCategory: String?, isAffordable: Boolean?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(4, "") diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/DMNMetadata.json index 074b3cfb3..a63a472dc 100644 --- a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/DMNMetadata.json @@ -36,7 +36,7 @@ "@kind" : "inputData", "id" : "_41effb45-b3c4-46ac-b1da-122b3e428a98", "javaParameterName" : "age", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Age", "namespace" : "http://www.trisotech.com/definitions/_a3ebbd98-af09-42f3-9099-4ae2204a1f54", "typeRef" : { @@ -87,7 +87,7 @@ "@kind" : "inputData", "id" : "_41effb45-b3c4-46ac-b1da-122b3e428a98", "javaParameterName" : "age", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Age", "namespace" : "http://www.trisotech.com/definitions/_a3ebbd98-af09-42f3-9099-4ae2204a1f54", "typeRef" : { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/AffordabilityCalculation.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/AffordabilityCalculation.kt index 78b0756cb..9b358d8d5 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/AffordabilityCalculation.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/AffordabilityCalculation.kt @@ -24,7 +24,7 @@ class AffordabilityCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(monthlyIncome: java.lang.Number?, monthlyRepayments: java.lang.Number?, monthlyExpenses: java.lang.Number?, riskCategory: String?, requiredMonthlyInstallment: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? { + fun apply(monthlyIncome: kotlin.Number?, monthlyRepayments: kotlin.Number?, monthlyExpenses: kotlin.Number?, riskCategory: String?, requiredMonthlyInstallment: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? { try { // Start BKM 'AffordabilityCalculation' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -53,13 +53,13 @@ class AffordabilityCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(monthlyIncome: java.lang.Number?, monthlyRepayments: java.lang.Number?, monthlyExpenses: java.lang.Number?, riskCategory: String?, requiredMonthlyInstallment: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? { + private inline fun evaluate(monthlyIncome: kotlin.Number?, monthlyRepayments: kotlin.Number?, monthlyExpenses: kotlin.Number?, riskCategory: String?, requiredMonthlyInstallment: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - val disposableIncome: java.lang.Number? = numericSubtract(monthlyIncome, numericAdd(monthlyExpenses, monthlyRepayments)) as java.lang.Number? - val creditContingencyFactor: java.lang.Number? = CreditContingencyFactorTable.instance().apply(riskCategory, context_) as java.lang.Number? + val disposableIncome: kotlin.Number? = numericSubtract(monthlyIncome, numericAdd(monthlyExpenses, monthlyRepayments)) as kotlin.Number? + val creditContingencyFactor: kotlin.Number? = CreditContingencyFactorTable.instance().apply(riskCategory, context_) as kotlin.Number? val affordability: Boolean? = (if (booleanEqual(numericGreaterThan(numericMultiply(disposableIncome, creditContingencyFactor), requiredMonthlyInstallment), true)) true else false) as Boolean? return affordability } diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScore.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScore.kt index bac13cc36..d5aa526d1 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScore.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScore.kt @@ -13,7 +13,7 @@ import java.util.stream.Collectors rulesCount = -1 ) class ApplicationRiskScore() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference() {}) }), context_) } catch (e: Exception) { @@ -22,7 +22,7 @@ class ApplicationRiskScore() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(applicantData: type.TApplicantData?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(applicantData: type.TApplicantData?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start decision 'ApplicationRiskScore' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -35,7 +35,7 @@ class ApplicationRiskScore() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreArguments_) // Evaluate decision 'ApplicationRiskScore' - val output_: java.lang.Number? = evaluate(applicantData, context_) + val output_: kotlin.Number? = evaluate(applicantData, context_) // End decision 'ApplicationRiskScore' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreArguments_, output_, (System.currentTimeMillis() - applicationRiskScoreStartTime_)) @@ -47,12 +47,12 @@ class ApplicationRiskScore() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(applicantData: type.TApplicantData?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(applicantData: type.TApplicantData?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return ApplicationRiskScoreModel.instance().apply(applicantData?.let({ it.age as java.lang.Number? }), applicantData?.let({ it.maritalStatus as String? }), applicantData?.let({ it.employmentStatus as String? }), context_) as java.lang.Number? + return ApplicationRiskScoreModel.instance().apply(applicantData?.let({ it.age as kotlin.Number? }), applicantData?.let({ it.maritalStatus as String? }), applicantData?.let({ it.employmentStatus as String? }), context_) as kotlin.Number? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScoreModel.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScoreModel.kt index 1dbcf83a1..587c5a81b 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScoreModel.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScoreModel.kt @@ -15,7 +15,7 @@ import java.util.stream.Collectors class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { private constructor() {} - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("Age")?.let({ number(it) }), input_.get("MaritalStatus"), input_.get("EmploymentStatus"), context_) } catch (e: Exception) { @@ -24,7 +24,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start BKM 'ApplicationRiskScoreModel' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -39,7 +39,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreModelArguments_) // Evaluate BKM 'ApplicationRiskScoreModel' - val output_: java.lang.Number? = evaluate(age, maritalStatus, employmentStatus, context_) + val output_: kotlin.Number? = evaluate(age, maritalStatus, employmentStatus, context_) // End BKM 'ApplicationRiskScoreModel' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreModelArguments_, output_, (System.currentTimeMillis() - applicationRiskScoreModelStartTime_)) @@ -51,7 +51,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -71,7 +71,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { ruleOutputList_.add(rule10(age, maritalStatus, employmentStatus, context_)) // Return results based on hit policy - var output_: java.lang.Number? + var output_: kotlin.Number? if (ruleOutputList_.noMatchedRules()) { // Default value output_ = null @@ -84,7 +84,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -117,7 +117,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") @@ -150,7 +150,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "") - private fun rule2(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule2(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(2, "") @@ -183,7 +183,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "") - private fun rule3(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule3(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(3, "") @@ -216,7 +216,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "") - private fun rule4(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule4(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(4, "") @@ -249,7 +249,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 5, annotation = "") - private fun rule5(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule5(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(5, "") @@ -282,7 +282,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 6, annotation = "") - private fun rule6(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule6(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(6, "") @@ -315,7 +315,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 7, annotation = "") - private fun rule7(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule7(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(7, "") @@ -348,7 +348,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 8, annotation = "") - private fun rule8(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule8(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(8, "") @@ -381,7 +381,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 9, annotation = "") - private fun rule9(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule9(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(9, "") @@ -414,7 +414,7 @@ class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 10, annotation = "") - private fun rule10(age: java.lang.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule10(age: kotlin.Number?, maritalStatus: String?, employmentStatus: String?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(10, "") diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScoreModelRuleOutput.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScoreModelRuleOutput.kt index 84ff37703..28aec9bf8 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScoreModelRuleOutput.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScoreModelRuleOutput.kt @@ -2,7 +2,7 @@ @javax.annotation.Generated(value = ["decisionTableRuleOutput.ftl", "ApplicationRiskScoreModel"]) class ApplicationRiskScoreModelRuleOutput(matched: Boolean) : com.gs.dmn.runtime.RuleOutput(matched) { @com.fasterxml.jackson.annotation.JsonProperty("ApplicationRiskScoreModel") - var applicationRiskScoreModel: java.lang.Number? = null + var applicationRiskScoreModel: kotlin.Number? = null override fun equals(o: Any?): Boolean { if (this === o) return true diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/CreditContingencyFactorTable.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/CreditContingencyFactorTable.kt index 263fb06d7..79b9381e5 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/CreditContingencyFactorTable.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/CreditContingencyFactorTable.kt @@ -15,7 +15,7 @@ import java.util.stream.Collectors class CreditContingencyFactorTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { private constructor() {} - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("RiskCategory"), context_) } catch (e: Exception) { @@ -24,7 +24,7 @@ class CreditContingencyFactorTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision } } - fun apply(riskCategory: String?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(riskCategory: String?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start BKM 'CreditContingencyFactorTable' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -37,7 +37,7 @@ class CreditContingencyFactorTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision eventListener_.startDRGElement(DRG_ELEMENT_METADATA, creditContingencyFactorTableArguments_) // Evaluate BKM 'CreditContingencyFactorTable' - val output_: java.lang.Number? = evaluate(riskCategory, context_) + val output_: kotlin.Number? = evaluate(riskCategory, context_) // End BKM 'CreditContingencyFactorTable' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, creditContingencyFactorTableArguments_, output_, (System.currentTimeMillis() - creditContingencyFactorTableStartTime_)) @@ -49,7 +49,7 @@ class CreditContingencyFactorTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision } } - private inline fun evaluate(riskCategory: String?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(riskCategory: String?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -61,7 +61,7 @@ class CreditContingencyFactorTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision ruleOutputList_.add(rule2(riskCategory, context_)) // Return results based on hit policy - var output_: java.lang.Number? + var output_: kotlin.Number? if (ruleOutputList_.noMatchedRules()) { // Default value output_ = null diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/CreditContingencyFactorTableRuleOutput.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/CreditContingencyFactorTableRuleOutput.kt index d6b066391..6044e1fe9 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/CreditContingencyFactorTableRuleOutput.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/CreditContingencyFactorTableRuleOutput.kt @@ -2,7 +2,7 @@ @javax.annotation.Generated(value = ["decisionTableRuleOutput.ftl", "CreditContingencyFactorTable"]) class CreditContingencyFactorTableRuleOutput(matched: Boolean) : com.gs.dmn.runtime.RuleOutput(matched) { @com.fasterxml.jackson.annotation.JsonProperty("CreditContingencyFactorTable") - var creditContingencyFactorTable: java.lang.Number? = null + var creditContingencyFactorTable: kotlin.Number? = null override fun equals(o: Any?): Boolean { if (this === o) return true diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/DMNMetadata.json index 5dc69727b..22b975240 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/DMNMetadata.json @@ -270,7 +270,7 @@ }, { "@kind" : "bkm", "id" : "b_ApplicationRiskScoreModel", - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "applicationRiskScoreModel", "javaTypeName" : "ApplicationRiskScoreModel", "knowledgeReferences" : [ ], @@ -288,7 +288,7 @@ }, { "@kind" : "bkm", "id" : "b_CreditContingencyFactorTable", - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "creditContingencyFactorTable", "javaTypeName" : "CreditContingencyFactorTable", "knowledgeReferences" : [ ], @@ -306,7 +306,7 @@ }, { "@kind" : "bkm", "id" : "b_InstallmentCalculation", - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "installmentCalculation", "javaTypeName" : "InstallmentCalculation", "knowledgeReferences" : [ ], @@ -401,7 +401,7 @@ "informationReferences" : [ { "reference" : "i_ApplicantData" } ], - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "applicationRiskScore", "javaTypeName" : "ApplicationRiskScore", "knowledgeReferences" : [ { @@ -712,7 +712,7 @@ "informationReferences" : [ { "reference" : "i_RequestedProduct" } ], - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "requiredMonthlyInstallment", "javaTypeName" : "RequiredMonthlyInstallment", "knowledgeReferences" : [ { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Eligibility.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Eligibility.kt index 7c51b2dd2..71d1f20ee 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Eligibility.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Eligibility.kt @@ -57,7 +57,7 @@ class Eligibility(val preBureauAffordability : PreBureauAffordability = PreBurea val preBureauAffordability: Boolean? = this@Eligibility.preBureauAffordability.apply(applicantData, requestedProduct, context_) val preBureauRiskCategory: String? = this@Eligibility.preBureauRiskCategory.apply(applicantData, context_) - return EligibilityRules.instance().apply(preBureauRiskCategory, preBureauAffordability, applicantData?.let({ it.age as java.lang.Number? }), context_) as String? + return EligibilityRules.instance().apply(preBureauRiskCategory, preBureauAffordability, applicantData?.let({ it.age as kotlin.Number? }), context_) as String? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/EligibilityRules.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/EligibilityRules.kt index e8d339708..b5d6470ff 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/EligibilityRules.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/EligibilityRules.kt @@ -24,7 +24,7 @@ class EligibilityRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + fun apply(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { try { // Start BKM 'EligibilityRules' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -51,7 +51,7 @@ class EligibilityRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + private inline fun evaluate(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -77,7 +77,7 @@ class EligibilityRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -111,7 +111,7 @@ class EligibilityRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") @@ -145,7 +145,7 @@ class EligibilityRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "") - private fun rule2(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule2(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(2, "") @@ -179,7 +179,7 @@ class EligibilityRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "") - private fun rule3(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule3(preBureauRiskCategory: String?, preBureauAffordability: Boolean?, age: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(3, "") diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/InstallmentCalculation.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/InstallmentCalculation.kt index 3a15fb981..90ff3c17d 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/InstallmentCalculation.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/InstallmentCalculation.kt @@ -15,7 +15,7 @@ import java.util.stream.Collectors class InstallmentCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { private constructor() {} - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("ProductType"), input_.get("Rate")?.let({ number(it) }), input_.get("Term")?.let({ number(it) }), input_.get("Amount")?.let({ number(it) }), context_) } catch (e: Exception) { @@ -24,7 +24,7 @@ class InstallmentCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(productType: String?, rate: java.lang.Number?, term: java.lang.Number?, amount: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(productType: String?, rate: kotlin.Number?, term: kotlin.Number?, amount: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start BKM 'InstallmentCalculation' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -40,7 +40,7 @@ class InstallmentCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, installmentCalculationArguments_) // Evaluate BKM 'InstallmentCalculation' - val output_: java.lang.Number? = evaluate(productType, rate, term, amount, context_) + val output_: kotlin.Number? = evaluate(productType, rate, term, amount, context_) // End BKM 'InstallmentCalculation' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, installmentCalculationArguments_, output_, (System.currentTimeMillis() - installmentCalculationStartTime_)) @@ -52,13 +52,13 @@ class InstallmentCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(productType: String?, rate: java.lang.Number?, term: java.lang.Number?, amount: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(productType: String?, rate: kotlin.Number?, term: kotlin.Number?, amount: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - val monthlyFee: java.lang.Number? = (if (booleanEqual(stringEqual(productType, "STANDARD LOAN"), true)) number("20.00") else (if (booleanEqual(stringEqual(productType, "SPECIAL LOAN"), true)) number("25.00") else null)) as java.lang.Number? - val monthlyRepayment: java.lang.Number? = numericDivide(numericDivide(numericMultiply(amount, rate), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(rate, number("12"))), numericUnaryMinus(term)))) as java.lang.Number? + val monthlyFee: kotlin.Number? = (if (booleanEqual(stringEqual(productType, "STANDARD LOAN"), true)) number("20.00") else (if (booleanEqual(stringEqual(productType, "SPECIAL LOAN"), true)) number("25.00") else null)) as kotlin.Number? + val monthlyRepayment: kotlin.Number? = numericDivide(numericDivide(numericMultiply(amount, rate), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(rate, number("12"))), numericUnaryMinus(term)))) as kotlin.Number? return numericAdd(monthlyRepayment, monthlyFee) } diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauAffordability.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauAffordability.kt index 236eb6780..ca291b372 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauAffordability.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauAffordability.kt @@ -56,9 +56,9 @@ class PostBureauAffordability(val postBureauRiskCategory : PostBureauRiskCategor var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() // Apply child decisions val postBureauRiskCategory: String? = this@PostBureauAffordability.postBureauRiskCategory.apply(applicantData, bureauData, context_) - val requiredMonthlyInstallment: java.lang.Number? = this@PostBureauAffordability.requiredMonthlyInstallment.apply(requestedProduct, context_) + val requiredMonthlyInstallment: kotlin.Number? = this@PostBureauAffordability.requiredMonthlyInstallment.apply(requestedProduct, context_) - return AffordabilityCalculation.instance().apply(applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.income as java.lang.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.repayments as java.lang.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.expenses as java.lang.Number? }), postBureauRiskCategory, requiredMonthlyInstallment, context_) as Boolean? + return AffordabilityCalculation.instance().apply(applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.income as kotlin.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.repayments as kotlin.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.expenses as kotlin.Number? }), postBureauRiskCategory, requiredMonthlyInstallment, context_) as Boolean? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategory.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategory.kt index 8847f752b..a6b8120bb 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategory.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategory.kt @@ -54,9 +54,9 @@ class PostBureauRiskCategory(val applicationRiskScore : ApplicationRiskScore = A var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() // Apply child decisions - val applicationRiskScore: java.lang.Number? = this@PostBureauRiskCategory.applicationRiskScore.apply(applicantData, context_) + val applicationRiskScore: kotlin.Number? = this@PostBureauRiskCategory.applicationRiskScore.apply(applicantData, context_) - return PostBureauRiskCategoryTable.instance().apply(applicantData?.let({ it.existingCustomer as Boolean? }), applicationRiskScore, bureauData?.let({ it.creditScore as java.lang.Number? }), context_) as String? + return PostBureauRiskCategoryTable.instance().apply(applicantData?.let({ it.existingCustomer as Boolean? }), applicationRiskScore, bureauData?.let({ it.creditScore as kotlin.Number? }), context_) as String? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategoryTable.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategoryTable.kt index 6b3b07f56..baa0ecdcc 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategoryTable.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategoryTable.kt @@ -24,7 +24,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + fun apply(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { try { // Start BKM 'Post-bureauRiskCategoryTable' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -51,7 +51,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + private inline fun evaluate(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -86,7 +86,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -119,7 +119,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") @@ -152,7 +152,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "") - private fun rule2(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule2(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(2, "") @@ -185,7 +185,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "") - private fun rule3(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule3(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(3, "") @@ -218,7 +218,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "") - private fun rule4(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule4(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(4, "") @@ -251,7 +251,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 5, annotation = "") - private fun rule5(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule5(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(5, "") @@ -284,7 +284,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 6, annotation = "") - private fun rule6(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule6(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(6, "") @@ -317,7 +317,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 7, annotation = "") - private fun rule7(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule7(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(7, "") @@ -350,7 +350,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 8, annotation = "") - private fun rule8(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule8(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(8, "") @@ -383,7 +383,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 9, annotation = "") - private fun rule9(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule9(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(9, "") @@ -416,7 +416,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 10, annotation = "") - private fun rule10(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule10(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(10, "") @@ -449,7 +449,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 11, annotation = "") - private fun rule11(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule11(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(11, "") @@ -482,7 +482,7 @@ class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 12, annotation = "") - private fun rule12(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule12(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(12, "") diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauAffordability.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauAffordability.kt index 676cea07f..a1615d82b 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauAffordability.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauAffordability.kt @@ -55,9 +55,9 @@ class PreBureauAffordability(val preBureauRiskCategory : PreBureauRiskCategory = var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() // Apply child decisions val preBureauRiskCategory: String? = this@PreBureauAffordability.preBureauRiskCategory.apply(applicantData, context_) - val requiredMonthlyInstallment: java.lang.Number? = this@PreBureauAffordability.requiredMonthlyInstallment.apply(requestedProduct, context_) + val requiredMonthlyInstallment: kotlin.Number? = this@PreBureauAffordability.requiredMonthlyInstallment.apply(requestedProduct, context_) - return AffordabilityCalculation.instance().apply(applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.income as java.lang.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.repayments as java.lang.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.expenses as java.lang.Number? }), preBureauRiskCategory, requiredMonthlyInstallment, context_) as Boolean? + return AffordabilityCalculation.instance().apply(applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.income as kotlin.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.repayments as kotlin.Number? }), applicantData?.let({ it.monthly as type.Monthly? })?.let({ it.expenses as kotlin.Number? }), preBureauRiskCategory, requiredMonthlyInstallment, context_) as Boolean? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategory.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategory.kt index bd8145f16..92b6c0746 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategory.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategory.kt @@ -53,7 +53,7 @@ class PreBureauRiskCategory(val applicationRiskScore : ApplicationRiskScore = Ap var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() // Apply child decisions - val applicationRiskScore: java.lang.Number? = this@PreBureauRiskCategory.applicationRiskScore.apply(applicantData, context_) + val applicationRiskScore: kotlin.Number? = this@PreBureauRiskCategory.applicationRiskScore.apply(applicantData, context_) return PreBureauRiskCategoryTable.instance().apply(applicantData?.let({ it.existingCustomer as Boolean? }), applicationRiskScore, context_) as String? } diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategoryTable.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategoryTable.kt index 2879cf155..979c75e7a 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategoryTable.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategoryTable.kt @@ -24,7 +24,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + fun apply(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { try { // Start BKM 'Pre-bureauRiskCategoryTable' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -50,7 +50,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + private inline fun evaluate(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -80,7 +80,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -112,7 +112,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") @@ -144,7 +144,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "") - private fun rule2(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule2(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(2, "") @@ -176,7 +176,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "") - private fun rule3(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule3(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(3, "") @@ -208,7 +208,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "") - private fun rule4(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule4(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(4, "") @@ -240,7 +240,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 5, annotation = "") - private fun rule5(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule5(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(5, "") @@ -272,7 +272,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 6, annotation = "") - private fun rule6(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule6(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(6, "") @@ -304,7 +304,7 @@ class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 7, annotation = "") - private fun rule7(existingCustomer: Boolean?, applicationRiskScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule7(existingCustomer: Boolean?, applicationRiskScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(7, "") diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RequiredMonthlyInstallment.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RequiredMonthlyInstallment.kt index 16a3aa7cb..e5f9552ea 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RequiredMonthlyInstallment.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RequiredMonthlyInstallment.kt @@ -13,7 +13,7 @@ import java.util.stream.Collectors rulesCount = -1 ) class RequiredMonthlyInstallment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("RequestedProduct")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference() {}) }), context_) } catch (e: Exception) { @@ -22,7 +22,7 @@ class RequiredMonthlyInstallment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision( } } - fun apply(requestedProduct: type.TRequestedProduct?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(requestedProduct: type.TRequestedProduct?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start decision 'RequiredMonthlyInstallment' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -35,7 +35,7 @@ class RequiredMonthlyInstallment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision( eventListener_.startDRGElement(DRG_ELEMENT_METADATA, requiredMonthlyInstallmentArguments_) // Evaluate decision 'RequiredMonthlyInstallment' - val output_: java.lang.Number? = evaluate(requestedProduct, context_) + val output_: kotlin.Number? = evaluate(requestedProduct, context_) // End decision 'RequiredMonthlyInstallment' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, requiredMonthlyInstallmentArguments_, output_, (System.currentTimeMillis() - requiredMonthlyInstallmentStartTime_)) @@ -47,12 +47,12 @@ class RequiredMonthlyInstallment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision( } } - private inline fun evaluate(requestedProduct: type.TRequestedProduct?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(requestedProduct: type.TRequestedProduct?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return InstallmentCalculation.instance().apply(requestedProduct?.let({ it.productType as String? }), requestedProduct?.let({ it.rate as java.lang.Number? }), requestedProduct?.let({ it.term as java.lang.Number? }), requestedProduct?.let({ it.amount as java.lang.Number? }), context_) as java.lang.Number? + return InstallmentCalculation.instance().apply(requestedProduct?.let({ it.productType as String? }), requestedProduct?.let({ it.rate as kotlin.Number? }), requestedProduct?.let({ it.term as kotlin.Number? }), requestedProduct?.let({ it.amount as kotlin.Number? }), context_) as kotlin.Number? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Routing.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Routing.kt index 80dc16801..2292e65eb 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Routing.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Routing.kt @@ -58,7 +58,7 @@ class Routing(val postBureauAffordability : PostBureauAffordability = PostBureau val postBureauAffordability: Boolean? = this@Routing.postBureauAffordability.apply(applicantData, bureauData, requestedProduct, context_) val postBureauRiskCategory: String? = this@Routing.postBureauRiskCategory.apply(applicantData, bureauData, context_) - return RoutingRules.instance().apply(postBureauRiskCategory, postBureauAffordability, bureauData?.let({ it.bankrupt as Boolean? }), bureauData?.let({ it.creditScore as java.lang.Number? }), context_) as String? + return RoutingRules.instance().apply(postBureauRiskCategory, postBureauAffordability, bureauData?.let({ it.bankrupt as Boolean? }), bureauData?.let({ it.creditScore as kotlin.Number? }), context_) as String? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RoutingRules.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RoutingRules.kt index 5e9f038bf..3a49495bd 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RoutingRules.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RoutingRules.kt @@ -24,7 +24,7 @@ class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + fun apply(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { try { // Start BKM 'RoutingRules' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -52,7 +52,7 @@ class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + private inline fun evaluate(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): String? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -79,7 +79,7 @@ class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -114,7 +114,7 @@ class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") @@ -149,7 +149,7 @@ class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "") - private fun rule2(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule2(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(2, "") @@ -184,7 +184,7 @@ class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "") - private fun rule3(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule3(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(3, "") @@ -219,7 +219,7 @@ class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "") - private fun rule4(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule4(postBureauRiskCategory: String?, postBureauAffordability: Boolean?, bankrupt: Boolean?, creditScore: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(4, "") diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/Monthly.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/Monthly.kt index 5b1caf484..8f90e5a60 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/Monthly.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/Monthly.kt @@ -7,13 +7,13 @@ import java.util.* @com.fasterxml.jackson.databind.annotation.JsonDeserialize(`as` = type.MonthlyImpl::class) interface Monthly : com.gs.dmn.runtime.DMNType { @get:com.fasterxml.jackson.annotation.JsonGetter("Income") - val income: java.lang.Number? + val income: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("Expenses") - val expenses: java.lang.Number? + val expenses: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("Repayments") - val repayments: java.lang.Number? + val repayments: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -61,9 +61,9 @@ interface Monthly : com.gs.dmn.runtime.DMNType { return other } else if (other is com.gs.dmn.runtime.Context) { var result_ = MonthlyImpl() - result_.income = other.get("Income") as java.lang.Number? - result_.expenses = other.get("Expenses") as java.lang.Number? - result_.repayments = other.get("Repayments") as java.lang.Number? + result_.income = other.get("Income") as kotlin.Number? + result_.expenses = other.get("Expenses") as kotlin.Number? + result_.repayments = other.get("Repayments") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toMonthly(other.toContext()) diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/MonthlyImpl.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/MonthlyImpl.kt index f1e5f0d9c..0115a0a5b 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/MonthlyImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/MonthlyImpl.kt @@ -7,20 +7,20 @@ import java.util.* class MonthlyImpl : Monthly { @get:com.fasterxml.jackson.annotation.JsonGetter("Income") @set:com.fasterxml.jackson.annotation.JsonGetter("Income") - override var income: java.lang.Number? = null + override var income: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("Expenses") @set:com.fasterxml.jackson.annotation.JsonGetter("Expenses") - override var expenses: java.lang.Number? = null + override var expenses: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("Repayments") @set:com.fasterxml.jackson.annotation.JsonGetter("Repayments") - override var repayments: java.lang.Number? = null + override var repayments: kotlin.Number? = null constructor() { } - constructor (expenses: java.lang.Number?, income: java.lang.Number?, repayments: java.lang.Number?) { + constructor (expenses: kotlin.Number?, income: kotlin.Number?, repayments: kotlin.Number?) { this.expenses = expenses this.income = income this.repayments = repayments diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TApplicantData.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TApplicantData.kt index df9d2a106..116b1b7f2 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TApplicantData.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TApplicantData.kt @@ -10,7 +10,7 @@ interface TApplicantData : com.gs.dmn.runtime.DMNType { val monthly: type.Monthly? @get:com.fasterxml.jackson.annotation.JsonGetter("Age") - val age: java.lang.Number? + val age: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("ExistingCustomer") val existingCustomer: Boolean? @@ -76,7 +76,7 @@ interface TApplicantData : com.gs.dmn.runtime.DMNType { } else if (other is com.gs.dmn.runtime.Context) { var result_ = TApplicantDataImpl() result_.monthly = other.get("Monthly") as type.Monthly? - result_.age = other.get("Age") as java.lang.Number? + result_.age = other.get("Age") as kotlin.Number? result_.existingCustomer = other.get("ExistingCustomer") as Boolean? result_.maritalStatus = other.get("MaritalStatus") as String? result_.employmentStatus = other.get("EmploymentStatus") as String? diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TApplicantDataImpl.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TApplicantDataImpl.kt index 7ea99be44..b20dd39f7 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TApplicantDataImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TApplicantDataImpl.kt @@ -11,7 +11,7 @@ class TApplicantDataImpl : TApplicantData { @get:com.fasterxml.jackson.annotation.JsonGetter("Age") @set:com.fasterxml.jackson.annotation.JsonGetter("Age") - override var age: java.lang.Number? = null + override var age: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("ExistingCustomer") @set:com.fasterxml.jackson.annotation.JsonGetter("ExistingCustomer") @@ -28,7 +28,7 @@ class TApplicantDataImpl : TApplicantData { constructor() { } - constructor (age: java.lang.Number?, employmentStatus: String?, existingCustomer: Boolean?, maritalStatus: String?, monthly: type.Monthly?) { + constructor (age: kotlin.Number?, employmentStatus: String?, existingCustomer: Boolean?, maritalStatus: String?, monthly: type.Monthly?) { this.age = age this.employmentStatus = employmentStatus this.existingCustomer = existingCustomer diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TBureauData.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TBureauData.kt index e09c7553d..c936f1930 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TBureauData.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TBureauData.kt @@ -7,7 +7,7 @@ import java.util.* @com.fasterxml.jackson.databind.annotation.JsonDeserialize(`as` = type.TBureauDataImpl::class) interface TBureauData : com.gs.dmn.runtime.DMNType { @get:com.fasterxml.jackson.annotation.JsonGetter("CreditScore") - val creditScore: java.lang.Number? + val creditScore: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("Bankrupt") val bankrupt: Boolean? @@ -54,7 +54,7 @@ interface TBureauData : com.gs.dmn.runtime.DMNType { return other } else if (other is com.gs.dmn.runtime.Context) { var result_ = TBureauDataImpl() - result_.creditScore = other.get("CreditScore") as java.lang.Number? + result_.creditScore = other.get("CreditScore") as kotlin.Number? result_.bankrupt = other.get("Bankrupt") as Boolean? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TBureauDataImpl.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TBureauDataImpl.kt index 355d3b585..15d5eb30e 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TBureauDataImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TBureauDataImpl.kt @@ -7,7 +7,7 @@ import java.util.* class TBureauDataImpl : TBureauData { @get:com.fasterxml.jackson.annotation.JsonGetter("CreditScore") @set:com.fasterxml.jackson.annotation.JsonGetter("CreditScore") - override var creditScore: java.lang.Number? = null + override var creditScore: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("Bankrupt") @set:com.fasterxml.jackson.annotation.JsonGetter("Bankrupt") @@ -16,7 +16,7 @@ class TBureauDataImpl : TBureauData { constructor() { } - constructor (bankrupt: Boolean?, creditScore: java.lang.Number?) { + constructor (bankrupt: Boolean?, creditScore: kotlin.Number?) { this.bankrupt = bankrupt this.creditScore = creditScore } diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TRequestedProduct.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TRequestedProduct.kt index 5442883ae..425b366d4 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TRequestedProduct.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TRequestedProduct.kt @@ -10,13 +10,13 @@ interface TRequestedProduct : com.gs.dmn.runtime.DMNType { val productType: String? @get:com.fasterxml.jackson.annotation.JsonGetter("Amount") - val amount: java.lang.Number? + val amount: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("Rate") - val rate: java.lang.Number? + val rate: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("Term") - val term: java.lang.Number? + val term: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -69,9 +69,9 @@ interface TRequestedProduct : com.gs.dmn.runtime.DMNType { } else if (other is com.gs.dmn.runtime.Context) { var result_ = TRequestedProductImpl() result_.productType = other.get("ProductType") as String? - result_.amount = other.get("Amount") as java.lang.Number? - result_.rate = other.get("Rate") as java.lang.Number? - result_.term = other.get("Term") as java.lang.Number? + result_.amount = other.get("Amount") as kotlin.Number? + result_.rate = other.get("Rate") as kotlin.Number? + result_.term = other.get("Term") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toTRequestedProduct(other.toContext()) diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TRequestedProductImpl.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TRequestedProductImpl.kt index a1eaf5dfb..800edaa2e 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TRequestedProductImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/type/TRequestedProductImpl.kt @@ -11,20 +11,20 @@ class TRequestedProductImpl : TRequestedProduct { @get:com.fasterxml.jackson.annotation.JsonGetter("Amount") @set:com.fasterxml.jackson.annotation.JsonGetter("Amount") - override var amount: java.lang.Number? = null + override var amount: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("Rate") @set:com.fasterxml.jackson.annotation.JsonGetter("Rate") - override var rate: java.lang.Number? = null + override var rate: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("Term") @set:com.fasterxml.jackson.annotation.JsonGetter("Term") - override var term: java.lang.Number? = null + override var term: kotlin.Number? = null constructor() { } - constructor (amount: java.lang.Number?, productType: String?, rate: java.lang.Number?, term: java.lang.Number?) { + constructor (amount: kotlin.Number?, productType: String?, rate: kotlin.Number?, term: kotlin.Number?) { this.amount = amount this.productType = productType this.rate = rate diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/DMNMetadata.json index 1e7f4330e..7bfa0daff 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/DMNMetadata.json @@ -57,7 +57,7 @@ "@kind" : "inputData", "id" : "i_fee", "javaParameterName" : "fee", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "fee", "namespace" : "http://www.trisotech.com/definitions/_cb28c255-91cd-4c01-ac7b-1a9cb1ecdb11", "typeRef" : { @@ -67,7 +67,7 @@ }, { "@kind" : "bkm", "id" : "b_PMT", - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "pMT", "javaTypeName" : "PMT", "knowledgeReferences" : [ ], @@ -81,7 +81,7 @@ }, { "reference" : "i_fee" } ], - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "monthlyPayment", "javaTypeName" : "MonthlyPayment", "knowledgeReferences" : [ { @@ -108,7 +108,7 @@ "@kind" : "inputData", "id" : "i_fee", "javaParameterName" : "fee", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "fee", "namespace" : "http://www.trisotech.com/definitions/_cb28c255-91cd-4c01-ac7b-1a9cb1ecdb11", "typeRef" : { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/MonthlyPayment.kt b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/MonthlyPayment.kt index 16cbd7d8f..72c3cd940 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/MonthlyPayment.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/MonthlyPayment.kt @@ -13,7 +13,7 @@ import java.util.stream.Collectors rulesCount = -1 ) class MonthlyPayment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("Loan")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference() {}) }), input_.get("fee")?.let({ number(it) }), context_) } catch (e: Exception) { @@ -22,7 +22,7 @@ class MonthlyPayment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(loan: type.TLoan?, fee: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(loan: type.TLoan?, fee: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start decision 'MonthlyPayment' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -36,7 +36,7 @@ class MonthlyPayment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, monthlyPaymentArguments_) // Evaluate decision 'MonthlyPayment' - val output_: java.lang.Number? = evaluate(loan, fee, context_) + val output_: kotlin.Number? = evaluate(loan, fee, context_) // End decision 'MonthlyPayment' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, monthlyPaymentArguments_, output_, (System.currentTimeMillis() - monthlyPaymentStartTime_)) @@ -48,12 +48,12 @@ class MonthlyPayment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(loan: type.TLoan?, fee: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(loan: type.TLoan?, fee: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return numericAdd(PMT.instance()?.apply(loan?.let({ it.amount as java.lang.Number? }), loan?.let({ it.rate as java.lang.Number? }), loan?.let({ it.term as java.lang.Number? }), context_), fee) as java.lang.Number? + return numericAdd(PMT.instance()?.apply(loan?.let({ it.amount as kotlin.Number? }), loan?.let({ it.rate as kotlin.Number? }), loan?.let({ it.term as kotlin.Number? }), context_), fee) as kotlin.Number? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/PMT.kt b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/PMT.kt index 8d76d4d14..490095817 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/PMT.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/PMT.kt @@ -15,7 +15,7 @@ import java.util.stream.Collectors class PMT : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { private constructor() {} - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("p")?.let({ number(it) }), input_.get("r")?.let({ number(it) }), input_.get("n")?.let({ number(it) }), context_) } catch (e: Exception) { @@ -24,7 +24,7 @@ class PMT : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(p: java.lang.Number?, r: java.lang.Number?, n: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(p: kotlin.Number?, r: kotlin.Number?, n: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start BKM 'PMT' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -39,7 +39,7 @@ class PMT : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, pMTArguments_) // Evaluate BKM 'PMT' - val output_: java.lang.Number? = evaluate(p, r, n, context_) + val output_: kotlin.Number? = evaluate(p, r, n, context_) // End BKM 'PMT' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, pMTArguments_, output_, (System.currentTimeMillis() - pMTStartTime_)) @@ -51,12 +51,12 @@ class PMT : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(p: java.lang.Number?, r: java.lang.Number?, n: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(p: kotlin.Number?, r: kotlin.Number?, n: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return numericDivide(numericDivide(numericMultiply(p, r), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(r, number("12"))), numericUnaryMinus(n)))) as java.lang.Number? + return numericDivide(numericDivide(numericMultiply(p, r), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(r, number("12"))), numericUnaryMinus(n)))) as kotlin.Number? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/type/TLoan.kt b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/type/TLoan.kt index 3bc1d28a4..662bc6299 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/type/TLoan.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/type/TLoan.kt @@ -7,13 +7,13 @@ import java.util.* @com.fasterxml.jackson.databind.annotation.JsonDeserialize(`as` = type.TLoanImpl::class) interface TLoan : com.gs.dmn.runtime.DMNType { @get:com.fasterxml.jackson.annotation.JsonGetter("amount") - val amount: java.lang.Number? + val amount: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("rate") - val rate: java.lang.Number? + val rate: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("term") - val term: java.lang.Number? + val term: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -61,9 +61,9 @@ interface TLoan : com.gs.dmn.runtime.DMNType { return other } else if (other is com.gs.dmn.runtime.Context) { var result_ = TLoanImpl() - result_.amount = other.get("amount") as java.lang.Number? - result_.rate = other.get("rate") as java.lang.Number? - result_.term = other.get("term") as java.lang.Number? + result_.amount = other.get("amount") as kotlin.Number? + result_.rate = other.get("rate") as kotlin.Number? + result_.term = other.get("term") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toTLoan(other.toContext()) diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/type/TLoanImpl.kt b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/type/TLoanImpl.kt index 328bc9e0e..d00db8a07 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/type/TLoanImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/type/TLoanImpl.kt @@ -7,20 +7,20 @@ import java.util.* class TLoanImpl : TLoan { @get:com.fasterxml.jackson.annotation.JsonGetter("amount") @set:com.fasterxml.jackson.annotation.JsonGetter("amount") - override var amount: java.lang.Number? = null + override var amount: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("rate") @set:com.fasterxml.jackson.annotation.JsonGetter("rate") - override var rate: java.lang.Number? = null + override var rate: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("term") @set:com.fasterxml.jackson.annotation.JsonGetter("term") - override var term: java.lang.Number? = null + override var term: kotlin.Number? = null constructor() { } - constructor (amount: java.lang.Number?, rate: java.lang.Number?, term: java.lang.Number?) { + constructor (amount: kotlin.Number?, rate: kotlin.Number?, term: kotlin.Number?) { this.amount = amount this.rate = rate this.term = term diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/Join.kt b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/Join.kt index 58ecf4de0..dbda42b67 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/Join.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/Join.kt @@ -54,7 +54,7 @@ class Join() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return (elementAt(deptTable?.filter({ item -> numericEqual(item?.let({ it.number as java.lang.Number? }), (elementAt(employeeTable?.filter({ item_1_ -> stringEqual(item_1_?.let({ it.name as String? }), lastName) })?.map({ x -> x?.let({ it.deptNum as java.lang.Number? }) }), number("1")) as java.lang.Number?)) })?.map({ x -> x?.let({ it.manager as String? }) }), number("1")) as String?) as String? + return (elementAt(deptTable?.filter({ item -> numericEqual(item?.let({ it.number as kotlin.Number? }), (elementAt(employeeTable?.filter({ item_1_ -> stringEqual(item_1_?.let({ it.name as String? }), lastName) })?.map({ x -> x?.let({ it.deptNum as kotlin.Number? }) }), number("1")) as kotlin.Number?)) })?.map({ x -> x?.let({ it.manager as String? }) }), number("1")) as String?) as String? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TDeptTable.kt b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TDeptTable.kt index 4bc92570e..9a6335ad3 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TDeptTable.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TDeptTable.kt @@ -7,7 +7,7 @@ import java.util.* @com.fasterxml.jackson.databind.annotation.JsonDeserialize(`as` = type.TDeptTableImpl::class) interface TDeptTable : com.gs.dmn.runtime.DMNType { @get:com.fasterxml.jackson.annotation.JsonGetter("number") - val number: java.lang.Number? + val number: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("name") val name: String? @@ -61,7 +61,7 @@ interface TDeptTable : com.gs.dmn.runtime.DMNType { return other } else if (other is com.gs.dmn.runtime.Context) { var result_ = TDeptTableImpl() - result_.number = other.get("number") as java.lang.Number? + result_.number = other.get("number") as kotlin.Number? result_.name = other.get("name") as String? result_.manager = other.get("manager") as String? return result_ diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TDeptTableImpl.kt b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TDeptTableImpl.kt index 0e6e81e93..7facfc494 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TDeptTableImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TDeptTableImpl.kt @@ -7,7 +7,7 @@ import java.util.* class TDeptTableImpl : TDeptTable { @get:com.fasterxml.jackson.annotation.JsonGetter("number") @set:com.fasterxml.jackson.annotation.JsonGetter("number") - override var number: java.lang.Number? = null + override var number: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("name") @set:com.fasterxml.jackson.annotation.JsonGetter("name") @@ -20,7 +20,7 @@ class TDeptTableImpl : TDeptTable { constructor() { } - constructor (manager: String?, name: String?, number: java.lang.Number?) { + constructor (manager: String?, name: String?, number: kotlin.Number?) { this.manager = manager this.name = name this.number = number diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TEmployeeTable.kt b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TEmployeeTable.kt index a207526e1..95fd89d79 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TEmployeeTable.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TEmployeeTable.kt @@ -13,7 +13,7 @@ interface TEmployeeTable : com.gs.dmn.runtime.DMNType { val name: String? @get:com.fasterxml.jackson.annotation.JsonGetter("deptNum") - val deptNum: java.lang.Number? + val deptNum: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -63,7 +63,7 @@ interface TEmployeeTable : com.gs.dmn.runtime.DMNType { var result_ = TEmployeeTableImpl() result_.id = other.get("id") as String? result_.name = other.get("name") as String? - result_.deptNum = other.get("deptNum") as java.lang.Number? + result_.deptNum = other.get("deptNum") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toTEmployeeTable(other.toContext()) diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TEmployeeTableImpl.kt b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TEmployeeTableImpl.kt index f942d08be..41a1294b8 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TEmployeeTableImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/type/TEmployeeTableImpl.kt @@ -15,12 +15,12 @@ class TEmployeeTableImpl : TEmployeeTable { @get:com.fasterxml.jackson.annotation.JsonGetter("deptNum") @set:com.fasterxml.jackson.annotation.JsonGetter("deptNum") - override var deptNum: java.lang.Number? = null + override var deptNum: kotlin.Number? = null constructor() { } - constructor (deptNum: java.lang.Number?, id: String?, name: String?) { + constructor (deptNum: kotlin.Number?, id: String?, name: String?) { this.deptNum = deptNum this.id = id this.name = name diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/DMNMetadata.json index 9c1996922..8c29b1cfb 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/DMNMetadata.json @@ -86,7 +86,7 @@ "@kind" : "inputData", "id" : "_d8747cda-26be-46c8-98ee-78f64efbf730", "javaParameterName" : "listA", - "javaTypeName" : "List?", + "javaTypeName" : "List?", "name" : "listA", "namespace" : "http://www.trisotech.com/definitions/_ac1acfdd-6baa-4f30-9cac-5d23957b4217", "typeRef" : { @@ -121,7 +121,7 @@ "informationReferences" : [ { "reference" : "_d8747cda-26be-46c8-98ee-78f64efbf730" } ], - "javaOutputTypeName" : "List?", + "javaOutputTypeName" : "List?", "javaParameterName" : "sort1", "javaTypeName" : "Sort1", "knowledgeReferences" : [ ], @@ -133,7 +133,7 @@ "@kind" : "inputData", "id" : "_d8747cda-26be-46c8-98ee-78f64efbf730", "javaParameterName" : "listA", - "javaTypeName" : "List?", + "javaTypeName" : "List?", "name" : "listA", "namespace" : "http://www.trisotech.com/definitions/_ac1acfdd-6baa-4f30-9cac-5d23957b4217", "typeRef" : { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort1.kt b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort1.kt index edd887363..c0f0d6c5a 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort1.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort1.kt @@ -13,16 +13,16 @@ import java.util.stream.Collectors rulesCount = -1 ) class Sort1() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): List? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): List? { try { - return apply(input_.get("listA")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference?>() {}) }), context_) + return apply(input_.get("listA")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference?>() {}) }), context_) } catch (e: Exception) { logError("Cannot apply decision 'Sort1'", e) return null } } - fun apply(listA: List?, context_: com.gs.dmn.runtime.ExecutionContext): List? { + fun apply(listA: List?, context_: com.gs.dmn.runtime.ExecutionContext): List? { try { // Start decision 'sort1' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -35,7 +35,7 @@ class Sort1() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, sort1Arguments_) // Evaluate decision 'sort1' - val output_: List? = evaluate(listA, context_) + val output_: List? = evaluate(listA, context_) // End decision 'sort1' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, sort1Arguments_, output_, (System.currentTimeMillis() - sort1StartTime_)) @@ -47,12 +47,12 @@ class Sort1() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(listA: List?, context_: com.gs.dmn.runtime.ExecutionContext): List? { + private inline fun evaluate(listA: List?, context_: com.gs.dmn.runtime.ExecutionContext): List? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return sort(listA, com.gs.dmn.runtime.LambdaExpression { args_ -> val x: java.lang.Number? = args_[0] as java.lang.Number?; val y: java.lang.Number? = args_[1] as java.lang.Number?; numericGreaterThan(x, y) }) as List? + return sort(listA, com.gs.dmn.runtime.LambdaExpression { args_ -> val x: kotlin.Number? = args_[0] as kotlin.Number?; val y: kotlin.Number? = args_[1] as kotlin.Number?; numericGreaterThan(x, y) }) as List? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort2.kt b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort2.kt index 5be1b58b8..21524a5b8 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort2.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort2.kt @@ -52,7 +52,7 @@ class Sort2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return sort(tableB, com.gs.dmn.runtime.LambdaExpression { args_ -> val x: type.TRow? = args_[0] as type.TRow?; val y: type.TRow? = args_[1] as type.TRow?; numericLessThan(x?.let({ it.col2 as java.lang.Number? }), y?.let({ it.col2 as java.lang.Number? })) })?.map({ x -> type.TRow.toTRow(x) }) as List? + return sort(tableB, com.gs.dmn.runtime.LambdaExpression { args_ -> val x: type.TRow? = args_[0] as type.TRow?; val y: type.TRow? = args_[1] as type.TRow?; numericLessThan(x?.let({ it.col2 as kotlin.Number? }), y?.let({ it.col2 as kotlin.Number? })) })?.map({ x -> type.TRow.toTRow(x) }) as List? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/type/TRow.kt b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/type/TRow.kt index 94b2ba704..23ced93b9 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/type/TRow.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/type/TRow.kt @@ -7,16 +7,16 @@ import java.util.* @com.fasterxml.jackson.databind.annotation.JsonDeserialize(`as` = type.TRowImpl::class) interface TRow : com.gs.dmn.runtime.DMNType { @get:com.fasterxml.jackson.annotation.JsonGetter("col1") - val col1: java.lang.Number? + val col1: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("col2") - val col2: java.lang.Number? + val col2: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("col3") - val col3: java.lang.Number? + val col3: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("col4") - val col4: java.lang.Number? + val col4: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -68,10 +68,10 @@ interface TRow : com.gs.dmn.runtime.DMNType { return other } else if (other is com.gs.dmn.runtime.Context) { var result_ = TRowImpl() - result_.col1 = other.get("col1") as java.lang.Number? - result_.col2 = other.get("col2") as java.lang.Number? - result_.col3 = other.get("col3") as java.lang.Number? - result_.col4 = other.get("col4") as java.lang.Number? + result_.col1 = other.get("col1") as kotlin.Number? + result_.col2 = other.get("col2") as kotlin.Number? + result_.col3 = other.get("col3") as kotlin.Number? + result_.col4 = other.get("col4") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toTRow(other.toContext()) diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/type/TRowImpl.kt b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/type/TRowImpl.kt index 423851b60..cbd3542dd 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/type/TRowImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/type/TRowImpl.kt @@ -7,24 +7,24 @@ import java.util.* class TRowImpl : TRow { @get:com.fasterxml.jackson.annotation.JsonGetter("col1") @set:com.fasterxml.jackson.annotation.JsonGetter("col1") - override var col1: java.lang.Number? = null + override var col1: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("col2") @set:com.fasterxml.jackson.annotation.JsonGetter("col2") - override var col2: java.lang.Number? = null + override var col2: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("col3") @set:com.fasterxml.jackson.annotation.JsonGetter("col3") - override var col3: java.lang.Number? = null + override var col3: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("col4") @set:com.fasterxml.jackson.annotation.JsonGetter("col4") - override var col4: java.lang.Number? = null + override var col4: kotlin.Number? = null constructor() { } - constructor (col1: java.lang.Number?, col2: java.lang.Number?, col3: java.lang.Number?, col4: java.lang.Number?) { + constructor (col1: kotlin.Number?, col2: kotlin.Number?, col3: kotlin.Number?, col4: kotlin.Number?) { this.col1 = col1 this.col2 = col2 this.col3 = col3 diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/DMNMetadata.json index 211531515..db47fd907 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/DMNMetadata.json @@ -220,7 +220,7 @@ "@kind" : "inputData", "id" : "_67c50a4c-3002-4d0a-9acf-4c76cb0364fa", "javaParameterName" : "requestedAmt", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "RequestedAmt", "namespace" : "http://www.trisotech.com/definitions/_56c7d4a5-e6db-4bba-ac5f-dc082a16f719", "typeRef" : { @@ -247,7 +247,7 @@ }, { "@kind" : "bkm", "id" : "_daec318a-135b-4d54-9e7f-85af3aa662f7", - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "equity36Mo", "javaTypeName" : "Equity36Mo", "knowledgeReferences" : [ ], @@ -256,7 +256,7 @@ }, { "@kind" : "bkm", "id" : "_8702e1b6-213b-4f75-bf56-99ac3835cde7", - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "monthlyPayment", "javaTypeName" : "MonthlyPayment", "knowledgeReferences" : [ ], @@ -303,7 +303,7 @@ "@kind" : "inputData", "id" : "_67c50a4c-3002-4d0a-9acf-4c76cb0364fa", "javaParameterName" : "requestedAmt", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "RequestedAmt", "namespace" : "http://www.trisotech.com/definitions/_56c7d4a5-e6db-4bba-ac5f-dc082a16f719", "typeRef" : { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/Equity36Mo.kt b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/Equity36Mo.kt index 7524d1a27..a11a806d3 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/Equity36Mo.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/Equity36Mo.kt @@ -15,7 +15,7 @@ import java.util.stream.Collectors class Equity36Mo : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { private constructor() {} - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("p")?.let({ number(it) }), input_.get("r")?.let({ number(it) }), input_.get("n")?.let({ number(it) }), input_.get("pmt")?.let({ number(it) }), context_) } catch (e: Exception) { @@ -24,7 +24,7 @@ class Equity36Mo : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(p: java.lang.Number?, r: java.lang.Number?, n: java.lang.Number?, pmt: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(p: kotlin.Number?, r: kotlin.Number?, n: kotlin.Number?, pmt: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start BKM 'equity36Mo' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -40,7 +40,7 @@ class Equity36Mo : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, equity36MoArguments_) // Evaluate BKM 'equity36Mo' - val output_: java.lang.Number? = evaluate(p, r, n, pmt, context_) + val output_: kotlin.Number? = evaluate(p, r, n, pmt, context_) // End BKM 'equity36Mo' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, equity36MoArguments_, output_, (System.currentTimeMillis() - equity36MoStartTime_)) @@ -52,12 +52,12 @@ class Equity36Mo : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(p: java.lang.Number?, r: java.lang.Number?, n: java.lang.Number?, pmt: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(p: kotlin.Number?, r: kotlin.Number?, n: kotlin.Number?, pmt: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return numericSubtract(numericMultiply(p, numericExponentiation(numericAdd(number("1"), numericDivide(r, number("12"))), n)), numericDivide(numericMultiply(pmt, numericAdd(numericUnaryMinus(number("1")), numericExponentiation(numericAdd(number("1"), numericDivide(r, number("12"))), n))), r)) as java.lang.Number? + return numericSubtract(numericMultiply(p, numericExponentiation(numericAdd(number("1"), numericDivide(r, number("12"))), n)), numericDivide(numericMultiply(pmt, numericAdd(numericUnaryMinus(number("1")), numericExponentiation(numericAdd(number("1"), numericDivide(r, number("12"))), n))), r)) as kotlin.Number? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/FinancialMetrics.kt b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/FinancialMetrics.kt index e1354ccbe..64bfc4d8b 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/FinancialMetrics.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/FinancialMetrics.kt @@ -24,7 +24,7 @@ class FinancialMetrics : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(product: type.TLoanProduct?, requestedAmt: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TMetric? { + fun apply(product: type.TLoanProduct?, requestedAmt: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TMetric? { try { // Start BKM 'FinancialMetrics' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -50,19 +50,19 @@ class FinancialMetrics : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(product: type.TLoanProduct?, requestedAmt: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TMetric? { + private inline fun evaluate(product: type.TLoanProduct?, requestedAmt: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TMetric? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() val lenderName: String? = product?.let({ it.lenderName as String? }) as String? - val rate: java.lang.Number? = product?.let({ it.rate as java.lang.Number? }) as java.lang.Number? - val points: java.lang.Number? = product?.let({ it.points as java.lang.Number? }) as java.lang.Number? - val fee: java.lang.Number? = product?.let({ it.fee as java.lang.Number? }) as java.lang.Number? - val loanAmt: java.lang.Number? = numericAdd(numericMultiply(requestedAmt, numericAdd(number("1"), numericDivide(points, number("100")))), fee) as java.lang.Number? - val downPmtAmt: java.lang.Number? = numericMultiply(number("0.2"), loanAmt) as java.lang.Number? - val paymentAmt: java.lang.Number? = MonthlyPayment.instance()?.apply(loanAmt, rate, number("360"), context_) as java.lang.Number? - val equity36moPct: java.lang.Number? = numericSubtract(number("1"), numericMultiply(numericDivide(Equity36Mo.instance()?.apply(loanAmt, rate, number("36"), paymentAmt, context_), requestedAmt), number("0.8"))) as java.lang.Number? + val rate: kotlin.Number? = product?.let({ it.rate as kotlin.Number? }) as kotlin.Number? + val points: kotlin.Number? = product?.let({ it.points as kotlin.Number? }) as kotlin.Number? + val fee: kotlin.Number? = product?.let({ it.fee as kotlin.Number? }) as kotlin.Number? + val loanAmt: kotlin.Number? = numericAdd(numericMultiply(requestedAmt, numericAdd(number("1"), numericDivide(points, number("100")))), fee) as kotlin.Number? + val downPmtAmt: kotlin.Number? = numericMultiply(number("0.2"), loanAmt) as kotlin.Number? + val paymentAmt: kotlin.Number? = MonthlyPayment.instance()?.apply(loanAmt, rate, number("360"), context_) as kotlin.Number? + val equity36moPct: kotlin.Number? = numericSubtract(number("1"), numericMultiply(numericDivide(Equity36Mo.instance()?.apply(loanAmt, rate, number("36"), paymentAmt, context_), requestedAmt), number("0.8"))) as kotlin.Number? val financialMetrics: type.TMetricImpl? = type.TMetricImpl() as type.TMetricImpl? financialMetrics?.lenderName = lenderName financialMetrics?.rate = rate diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/MonthlyPayment.kt b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/MonthlyPayment.kt index f5804626f..756006039 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/MonthlyPayment.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/MonthlyPayment.kt @@ -15,7 +15,7 @@ import java.util.stream.Collectors class MonthlyPayment : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { private constructor() {} - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("p")?.let({ number(it) }), input_.get("r")?.let({ number(it) }), input_.get("n")?.let({ number(it) }), context_) } catch (e: Exception) { @@ -24,7 +24,7 @@ class MonthlyPayment : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(p: java.lang.Number?, r: java.lang.Number?, n: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(p: kotlin.Number?, r: kotlin.Number?, n: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start BKM 'monthlyPayment' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -39,7 +39,7 @@ class MonthlyPayment : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, monthlyPaymentArguments_) // Evaluate BKM 'monthlyPayment' - val output_: java.lang.Number? = evaluate(p, r, n, context_) + val output_: kotlin.Number? = evaluate(p, r, n, context_) // End BKM 'monthlyPayment' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, monthlyPaymentArguments_, output_, (System.currentTimeMillis() - monthlyPaymentStartTime_)) @@ -51,12 +51,12 @@ class MonthlyPayment : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(p: java.lang.Number?, r: java.lang.Number?, n: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(p: kotlin.Number?, r: kotlin.Number?, n: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return numericDivide(numericDivide(numericMultiply(p, r), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(r, number("12"))), numericUnaryMinus(n)))) as java.lang.Number? + return numericDivide(numericDivide(numericMultiply(p, r), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(r, number("12"))), numericUnaryMinus(n)))) as kotlin.Number? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/RankedProducts.kt b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/RankedProducts.kt index 4efa0bc6b..b5ee3c08d 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/RankedProducts.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/RankedProducts.kt @@ -22,7 +22,7 @@ class RankedProducts(val bankrates : Bankrates = Bankrates()) : com.gs.dmn.runti } } - fun apply(requestedAmt: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TRankedProducts? { + fun apply(requestedAmt: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TRankedProducts? { try { // Start decision 'RankedProducts' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -47,7 +47,7 @@ class RankedProducts(val bankrates : Bankrates = Bankrates()) : com.gs.dmn.runti } } - private inline fun evaluate(requestedAmt: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TRankedProducts? { + private inline fun evaluate(requestedAmt: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TRankedProducts? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -56,10 +56,10 @@ class RankedProducts(val bankrates : Bankrates = Bankrates()) : com.gs.dmn.runti val bankrates: List? = this@RankedProducts.bankrates.apply(context_) val metricsTable: List? = bankrates?.stream()?.map({ i -> FinancialMetrics.instance()?.apply(i, requestedAmt, context_) })?.collect(Collectors.toList()) as List? - val rankByRate: List? = sort(metricsTable, com.gs.dmn.runtime.LambdaExpression { args_ -> val x: type.TMetric? = args_[0] as type.TMetric?; val y: type.TMetric? = args_[1] as type.TMetric?; numericLessThan(x?.let({ it.rate as java.lang.Number? }), y?.let({ it.rate as java.lang.Number? })) }) as List? - val rankByDownPmt: List? = sort(metricsTable, com.gs.dmn.runtime.LambdaExpression { args_ -> val x: type.TMetric? = args_[0] as type.TMetric?; val y: type.TMetric? = args_[1] as type.TMetric?; numericLessThan(x?.let({ it.downPmtAmt as java.lang.Number? }), y?.let({ it.downPmtAmt as java.lang.Number? })) }) as List? - val rankByMonthlyPmt: List? = sort(metricsTable, com.gs.dmn.runtime.LambdaExpression { args_ -> val x: type.TMetric? = args_[0] as type.TMetric?; val y: type.TMetric? = args_[1] as type.TMetric?; numericLessThan(x?.let({ it.paymentAmt as java.lang.Number? }), y?.let({ it.paymentAmt as java.lang.Number? })) }) as List? - val rankByEquityPct: List? = sort(metricsTable, com.gs.dmn.runtime.LambdaExpression { args_ -> val x: type.TMetric? = args_[0] as type.TMetric?; val y: type.TMetric? = args_[1] as type.TMetric?; numericGreaterThan(x?.let({ it.equity36moPct as java.lang.Number? }), y?.let({ it.equity36moPct as java.lang.Number? })) }) as List? + val rankByRate: List? = sort(metricsTable, com.gs.dmn.runtime.LambdaExpression { args_ -> val x: type.TMetric? = args_[0] as type.TMetric?; val y: type.TMetric? = args_[1] as type.TMetric?; numericLessThan(x?.let({ it.rate as kotlin.Number? }), y?.let({ it.rate as kotlin.Number? })) }) as List? + val rankByDownPmt: List? = sort(metricsTable, com.gs.dmn.runtime.LambdaExpression { args_ -> val x: type.TMetric? = args_[0] as type.TMetric?; val y: type.TMetric? = args_[1] as type.TMetric?; numericLessThan(x?.let({ it.downPmtAmt as kotlin.Number? }), y?.let({ it.downPmtAmt as kotlin.Number? })) }) as List? + val rankByMonthlyPmt: List? = sort(metricsTable, com.gs.dmn.runtime.LambdaExpression { args_ -> val x: type.TMetric? = args_[0] as type.TMetric?; val y: type.TMetric? = args_[1] as type.TMetric?; numericLessThan(x?.let({ it.paymentAmt as kotlin.Number? }), y?.let({ it.paymentAmt as kotlin.Number? })) }) as List? + val rankByEquityPct: List? = sort(metricsTable, com.gs.dmn.runtime.LambdaExpression { args_ -> val x: type.TMetric? = args_[0] as type.TMetric?; val y: type.TMetric? = args_[1] as type.TMetric?; numericGreaterThan(x?.let({ it.equity36moPct as kotlin.Number? }), y?.let({ it.equity36moPct as kotlin.Number? })) }) as List? val rankedProducts: type.TRankedProductsImpl? = type.TRankedProductsImpl() as type.TRankedProductsImpl? rankedProducts?.metricsTable = metricsTable rankedProducts?.rankByRate = rankByRate diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TLoanProduct.kt b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TLoanProduct.kt index dd157449b..57c104bb8 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TLoanProduct.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TLoanProduct.kt @@ -10,13 +10,13 @@ interface TLoanProduct : com.gs.dmn.runtime.DMNType { val lenderName: String? @get:com.fasterxml.jackson.annotation.JsonGetter("rate") - val rate: java.lang.Number? + val rate: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("points") - val points: java.lang.Number? + val points: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("fee") - val fee: java.lang.Number? + val fee: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -69,9 +69,9 @@ interface TLoanProduct : com.gs.dmn.runtime.DMNType { } else if (other is com.gs.dmn.runtime.Context) { var result_ = TLoanProductImpl() result_.lenderName = other.get("lenderName") as String? - result_.rate = other.get("rate") as java.lang.Number? - result_.points = other.get("points") as java.lang.Number? - result_.fee = other.get("fee") as java.lang.Number? + result_.rate = other.get("rate") as kotlin.Number? + result_.points = other.get("points") as kotlin.Number? + result_.fee = other.get("fee") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toTLoanProduct(other.toContext()) diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TLoanProductImpl.kt b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TLoanProductImpl.kt index ccc078fee..c1d159df9 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TLoanProductImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TLoanProductImpl.kt @@ -11,20 +11,20 @@ class TLoanProductImpl : TLoanProduct { @get:com.fasterxml.jackson.annotation.JsonGetter("rate") @set:com.fasterxml.jackson.annotation.JsonGetter("rate") - override var rate: java.lang.Number? = null + override var rate: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("points") @set:com.fasterxml.jackson.annotation.JsonGetter("points") - override var points: java.lang.Number? = null + override var points: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("fee") @set:com.fasterxml.jackson.annotation.JsonGetter("fee") - override var fee: java.lang.Number? = null + override var fee: kotlin.Number? = null constructor() { } - constructor (fee: java.lang.Number?, lenderName: String?, points: java.lang.Number?, rate: java.lang.Number?) { + constructor (fee: kotlin.Number?, lenderName: String?, points: kotlin.Number?, rate: kotlin.Number?) { this.fee = fee this.lenderName = lenderName this.points = points diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TMetric.kt b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TMetric.kt index d9a33c6c7..40d76708e 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TMetric.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TMetric.kt @@ -10,25 +10,25 @@ interface TMetric : com.gs.dmn.runtime.DMNType { val lenderName: String? @get:com.fasterxml.jackson.annotation.JsonGetter("rate") - val rate: java.lang.Number? + val rate: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("points") - val points: java.lang.Number? + val points: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("fee") - val fee: java.lang.Number? + val fee: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("loanAmt") - val loanAmt: java.lang.Number? + val loanAmt: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("downPmtAmt") - val downPmtAmt: java.lang.Number? + val downPmtAmt: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("paymentAmt") - val paymentAmt: java.lang.Number? + val paymentAmt: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("equity36moPct") - val equity36moPct: java.lang.Number? + val equity36moPct: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -97,13 +97,13 @@ interface TMetric : com.gs.dmn.runtime.DMNType { } else if (other is com.gs.dmn.runtime.Context) { var result_ = TMetricImpl() result_.lenderName = other.get("lenderName") as String? - result_.rate = other.get("rate") as java.lang.Number? - result_.points = other.get("points") as java.lang.Number? - result_.fee = other.get("fee") as java.lang.Number? - result_.loanAmt = other.get("loanAmt") as java.lang.Number? - result_.downPmtAmt = other.get("downPmtAmt") as java.lang.Number? - result_.paymentAmt = other.get("paymentAmt") as java.lang.Number? - result_.equity36moPct = other.get("equity36moPct") as java.lang.Number? + result_.rate = other.get("rate") as kotlin.Number? + result_.points = other.get("points") as kotlin.Number? + result_.fee = other.get("fee") as kotlin.Number? + result_.loanAmt = other.get("loanAmt") as kotlin.Number? + result_.downPmtAmt = other.get("downPmtAmt") as kotlin.Number? + result_.paymentAmt = other.get("paymentAmt") as kotlin.Number? + result_.equity36moPct = other.get("equity36moPct") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toTMetric(other.toContext()) diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TMetricImpl.kt b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TMetricImpl.kt index 3fcdb7e6f..261358338 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TMetricImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/type/TMetricImpl.kt @@ -11,36 +11,36 @@ class TMetricImpl : TMetric { @get:com.fasterxml.jackson.annotation.JsonGetter("rate") @set:com.fasterxml.jackson.annotation.JsonGetter("rate") - override var rate: java.lang.Number? = null + override var rate: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("points") @set:com.fasterxml.jackson.annotation.JsonGetter("points") - override var points: java.lang.Number? = null + override var points: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("fee") @set:com.fasterxml.jackson.annotation.JsonGetter("fee") - override var fee: java.lang.Number? = null + override var fee: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("loanAmt") @set:com.fasterxml.jackson.annotation.JsonGetter("loanAmt") - override var loanAmt: java.lang.Number? = null + override var loanAmt: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("downPmtAmt") @set:com.fasterxml.jackson.annotation.JsonGetter("downPmtAmt") - override var downPmtAmt: java.lang.Number? = null + override var downPmtAmt: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("paymentAmt") @set:com.fasterxml.jackson.annotation.JsonGetter("paymentAmt") - override var paymentAmt: java.lang.Number? = null + override var paymentAmt: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("equity36moPct") @set:com.fasterxml.jackson.annotation.JsonGetter("equity36moPct") - override var equity36moPct: java.lang.Number? = null + override var equity36moPct: kotlin.Number? = null constructor() { } - constructor (downPmtAmt: java.lang.Number?, equity36moPct: java.lang.Number?, fee: java.lang.Number?, lenderName: String?, loanAmt: java.lang.Number?, paymentAmt: java.lang.Number?, points: java.lang.Number?, rate: java.lang.Number?) { + constructor (downPmtAmt: kotlin.Number?, equity36moPct: kotlin.Number?, fee: kotlin.Number?, lenderName: String?, loanAmt: kotlin.Number?, paymentAmt: kotlin.Number?, points: kotlin.Number?, rate: kotlin.Number?) { this.downPmtAmt = downPmtAmt this.equity36moPct = equity36moPct this.fee = fee diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen1.kt b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen1.kt index 9ef45cb3b..17a4aef45 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen1.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen1.kt @@ -54,7 +54,7 @@ class EveryGtTen1(val priceTable1 : PriceTable1 = PriceTable1()) : com.gs.dmn.ru // Apply child decisions val priceTable1: List? = this@EveryGtTen1.priceTable1.apply(context_) - return booleanAnd(priceTable1?.stream()?.map({ i -> numericGreaterThan(i?.let({ it.price as java.lang.Number? }), number("10")) })?.collect(Collectors.toList())?.toList()) as Boolean? + return booleanAnd(priceTable1?.stream()?.map({ i -> numericGreaterThan(i?.let({ it.price as kotlin.Number? }), number("10")) })?.collect(Collectors.toList())?.toList()) as Boolean? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen2.kt b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen2.kt index 4c2e1cbb0..d52dc49c5 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen2.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen2.kt @@ -52,7 +52,7 @@ class EveryGtTen2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return booleanAnd(priceTable2?.stream()?.map({ i -> numericGreaterThan(i?.let({ it.price as java.lang.Number? }), number("10")) })?.collect(Collectors.toList())?.toList()) as Boolean? + return booleanAnd(priceTable2?.stream()?.map({ i -> numericGreaterThan(i?.let({ it.price as kotlin.Number? }), number("10")) })?.collect(Collectors.toList())?.toList()) as Boolean? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen3.kt b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen3.kt index eb3a77fc0..6963dfae7 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen3.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen3.kt @@ -54,7 +54,7 @@ class EveryGtTen3(val priceTable1 : PriceTable1 = PriceTable1()) : com.gs.dmn.ru // Apply child decisions val priceTable1: List? = this@EveryGtTen3.priceTable1.apply(context_) - return booleanAnd(priceTable1?.stream()?.map({ i -> booleanEqual(GtTen.instance()?.apply(i?.let({ it.price as java.lang.Number? }), context_), true) })?.collect(Collectors.toList())?.toList()) as Boolean? + return booleanAnd(priceTable1?.stream()?.map({ i -> booleanEqual(GtTen.instance()?.apply(i?.let({ it.price as kotlin.Number? }), context_), true) })?.collect(Collectors.toList())?.toList()) as Boolean? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/GtTen.kt b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/GtTen.kt index 29b3449a0..1b7aa95d2 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/GtTen.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/GtTen.kt @@ -24,7 +24,7 @@ class GtTen : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(theNumber: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? { + fun apply(theNumber: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? { try { // Start BKM 'gtTen' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -49,7 +49,7 @@ class GtTen : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(theNumber: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? { + private inline fun evaluate(theNumber: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen1.kt b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen1.kt index 3278df435..37a18b4ee 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen1.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen1.kt @@ -54,7 +54,7 @@ class SomeGtTen1(val priceTable1 : PriceTable1 = PriceTable1()) : com.gs.dmn.run // Apply child decisions val priceTable1: List? = this@SomeGtTen1.priceTable1.apply(context_) - return booleanOr(priceTable1?.stream()?.map({ i -> numericGreaterThan(i?.let({ it.price as java.lang.Number? }), number("10")) })?.collect(Collectors.toList())?.toList()) as Boolean? + return booleanOr(priceTable1?.stream()?.map({ i -> numericGreaterThan(i?.let({ it.price as kotlin.Number? }), number("10")) })?.collect(Collectors.toList())?.toList()) as Boolean? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen2.kt b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen2.kt index 20846500f..c03aa1f5f 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen2.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen2.kt @@ -52,7 +52,7 @@ class SomeGtTen2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return booleanOr(priceTable2?.stream()?.map({ i -> numericGreaterThan(i?.let({ it.price as java.lang.Number? }), number("10")) })?.collect(Collectors.toList())?.toList()) as Boolean? + return booleanOr(priceTable2?.stream()?.map({ i -> numericGreaterThan(i?.let({ it.price as kotlin.Number? }), number("10")) })?.collect(Collectors.toList())?.toList()) as Boolean? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/type/TItemPrice.kt b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/type/TItemPrice.kt index d66d17c4a..62e2315d9 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/type/TItemPrice.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/type/TItemPrice.kt @@ -10,7 +10,7 @@ interface TItemPrice : com.gs.dmn.runtime.DMNType { val itemName: String? @get:com.fasterxml.jackson.annotation.JsonGetter("price") - val price: java.lang.Number? + val price: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -55,7 +55,7 @@ interface TItemPrice : com.gs.dmn.runtime.DMNType { } else if (other is com.gs.dmn.runtime.Context) { var result_ = TItemPriceImpl() result_.itemName = other.get("itemName") as String? - result_.price = other.get("price") as java.lang.Number? + result_.price = other.get("price") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toTItemPrice(other.toContext()) diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/type/TItemPriceImpl.kt b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/type/TItemPriceImpl.kt index 033b0f9d5..b5ad57d34 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/type/TItemPriceImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/type/TItemPriceImpl.kt @@ -11,12 +11,12 @@ class TItemPriceImpl : TItemPrice { @get:com.fasterxml.jackson.annotation.JsonGetter("price") @set:com.fasterxml.jackson.annotation.JsonGetter("price") - override var price: java.lang.Number? = null + override var price: kotlin.Number? = null constructor() { } - constructor (itemName: String?, price: java.lang.Number?) { + constructor (itemName: String?, price: kotlin.Number?) { this.itemName = itemName this.price = price } diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/DMNMetadata.json index 3e5b83c5d..a2ad0bcf5 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/DMNMetadata.json @@ -78,7 +78,7 @@ "@kind" : "inputData", "id" : "_3b175722-5f96-49e4-a50d-0bf9588c901c", "javaParameterName" : "numB", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "numB", "namespace" : "http://www.trisotech.com/definitions/_92a0c25f-707e-4fc8-ae2d-2ab51ebe6bb6", "typeRef" : { @@ -89,7 +89,7 @@ "@kind" : "inputData", "id" : "_25cdd674-9b3f-47b1-bace-1d4e3ce50d5d", "javaParameterName" : "numC", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "numC", "namespace" : "http://www.trisotech.com/definitions/_92a0c25f-707e-4fc8-ae2d-2ab51ebe6bb6", "typeRef" : { @@ -232,7 +232,7 @@ "@kind" : "inputData", "id" : "_3b175722-5f96-49e4-a50d-0bf9588c901c", "javaParameterName" : "numB", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "numB", "namespace" : "http://www.trisotech.com/definitions/_92a0c25f-707e-4fc8-ae2d-2ab51ebe6bb6", "typeRef" : { @@ -243,7 +243,7 @@ "@kind" : "inputData", "id" : "_25cdd674-9b3f-47b1-bace-1d4e3ce50d5d", "javaParameterName" : "numC", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "numC", "namespace" : "http://www.trisotech.com/definitions/_92a0c25f-707e-4fc8-ae2d-2ab51ebe6bb6", "typeRef" : { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceGt10.kt b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceGt10.kt index d3be1f9c9..4b5d91668 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceGt10.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceGt10.kt @@ -85,7 +85,7 @@ class PriceGt10() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { // Apply rule var output_: PriceGt10RuleOutput = PriceGt10RuleOutput(false) if (ruleMatches(eventListener_, drgRuleMetadata, - numericGreaterThan(structA?.let({ it.price as java.lang.Number? }), number("10")) + numericGreaterThan(structA?.let({ it.price as kotlin.Number? }), number("10")) )) { // Rule match eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata) @@ -116,7 +116,7 @@ class PriceGt10() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { // Apply rule var output_: PriceGt10RuleOutput = PriceGt10RuleOutput(false) if (ruleMatches(eventListener_, drgRuleMetadata, - numericLessEqualThan(structA?.let({ it.price as java.lang.Number? }), number("10")) + numericLessEqualThan(structA?.let({ it.price as kotlin.Number? }), number("10")) )) { // Rule match eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata) diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceInRange.kt b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceInRange.kt index d03bc20c3..965968e9d 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceInRange.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceInRange.kt @@ -22,7 +22,7 @@ class PriceInRange() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(numB: java.lang.Number?, numC: java.lang.Number?, structA: type.TA?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + fun apply(numB: kotlin.Number?, numC: kotlin.Number?, structA: type.TA?, context_: com.gs.dmn.runtime.ExecutionContext): String? { try { // Start decision 'priceInRange' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -49,7 +49,7 @@ class PriceInRange() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(numB: java.lang.Number?, numC: java.lang.Number?, structA: type.TA?, context_: com.gs.dmn.runtime.ExecutionContext): String? { + private inline fun evaluate(numB: kotlin.Number?, numC: kotlin.Number?, structA: type.TA?, context_: com.gs.dmn.runtime.ExecutionContext): String? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -73,7 +73,7 @@ class PriceInRange() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(numB: java.lang.Number?, numC: java.lang.Number?, structA: type.TA?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(numB: kotlin.Number?, numC: kotlin.Number?, structA: type.TA?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -87,7 +87,7 @@ class PriceInRange() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { // Apply rule var output_: PriceInRangeRuleOutput = PriceInRangeRuleOutput(false) if (ruleMatches(eventListener_, drgRuleMetadata, - booleanAnd(numericGreaterEqualThan(structA?.let({ it.price as java.lang.Number? }), numB), numericLessEqualThan(structA?.let({ it.price as java.lang.Number? }), numC)) + booleanAnd(numericGreaterEqualThan(structA?.let({ it.price as kotlin.Number? }), numB), numericLessEqualThan(structA?.let({ it.price as kotlin.Number? }), numC)) )) { // Rule match eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata) @@ -105,7 +105,7 @@ class PriceInRange() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(numB: java.lang.Number?, numC: java.lang.Number?, structA: type.TA?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(numB: kotlin.Number?, numC: kotlin.Number?, structA: type.TA?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/type/TA.kt b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/type/TA.kt index 215ca32c0..36c2628f8 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/type/TA.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/type/TA.kt @@ -10,7 +10,7 @@ interface TA : com.gs.dmn.runtime.DMNType { val name: String? @get:com.fasterxml.jackson.annotation.JsonGetter("price") - val price: java.lang.Number? + val price: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -55,7 +55,7 @@ interface TA : com.gs.dmn.runtime.DMNType { } else if (other is com.gs.dmn.runtime.Context) { var result_ = TAImpl() result_.name = other.get("name") as String? - result_.price = other.get("price") as java.lang.Number? + result_.price = other.get("price") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toTA(other.toContext()) diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/type/TAImpl.kt b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/type/TAImpl.kt index 1dc893d5a..c6ddaa033 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/type/TAImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/type/TAImpl.kt @@ -11,12 +11,12 @@ class TAImpl : TA { @get:com.fasterxml.jackson.annotation.JsonGetter("price") @set:com.fasterxml.jackson.annotation.JsonGetter("price") - override var price: java.lang.Number? = null + override var price: kotlin.Number? = null constructor() { } - constructor (name: String?, price: java.lang.Number?) { + constructor (name: String?, price: kotlin.Number?) { this.name = name this.price = price } diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/BaseVacationDays.kt b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/BaseVacationDays.kt index baa7272d5..c45d115cd 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/BaseVacationDays.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/BaseVacationDays.kt @@ -13,7 +13,7 @@ import java.util.stream.Collectors rulesCount = -1 ) class BaseVacationDays() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(context_) } catch (e: Exception) { @@ -22,7 +22,7 @@ class BaseVacationDays() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start decision 'Base Vacation Days' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -34,7 +34,7 @@ class BaseVacationDays() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, baseVacationDaysArguments_) // Evaluate decision 'Base Vacation Days' - val output_: java.lang.Number? = evaluate(context_) + val output_: kotlin.Number? = evaluate(context_) // End decision 'Base Vacation Days' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, baseVacationDaysArguments_, output_, (System.currentTimeMillis() - baseVacationDaysStartTime_)) @@ -46,12 +46,12 @@ class BaseVacationDays() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return number("22") as java.lang.Number? + return number("22") as kotlin.Number? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/DMNMetadata.json index a6895fcdb..1a566996f 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/DMNMetadata.json @@ -9,7 +9,7 @@ "@kind" : "inputData", "id" : "i_Age", "javaParameterName" : "age", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Age", "namespace" : "https://www.drools.org/kie-dmn", "typeRef" : { @@ -20,7 +20,7 @@ "@kind" : "inputData", "id" : "i_Years_of_Service", "javaParameterName" : "yearsOfService", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Years of Service", "namespace" : "https://www.drools.org/kie-dmn", "typeRef" : { @@ -31,7 +31,7 @@ "@kind" : "decision", "id" : "d_Base_Vacation_Days", "informationReferences" : [ ], - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "baseVacationDays", "javaTypeName" : "BaseVacationDays", "knowledgeReferences" : [ ], @@ -52,7 +52,7 @@ }, { "reference" : "i_Years_of_Service" } ], - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "extraDaysCase1", "javaTypeName" : "ExtraDaysCase1", "knowledgeReferences" : [ ], @@ -64,7 +64,7 @@ "@kind" : "inputData", "id" : "i_Age", "javaParameterName" : "age", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Age", "namespace" : "https://www.drools.org/kie-dmn", "typeRef" : { @@ -75,7 +75,7 @@ "@kind" : "inputData", "id" : "i_Years_of_Service", "javaParameterName" : "yearsOfService", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Years of Service", "namespace" : "https://www.drools.org/kie-dmn", "typeRef" : { @@ -95,7 +95,7 @@ }, { "reference" : "i_Years_of_Service" } ], - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "extraDaysCase2", "javaTypeName" : "ExtraDaysCase2", "knowledgeReferences" : [ ], @@ -107,7 +107,7 @@ "@kind" : "inputData", "id" : "i_Age", "javaParameterName" : "age", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Age", "namespace" : "https://www.drools.org/kie-dmn", "typeRef" : { @@ -118,7 +118,7 @@ "@kind" : "inputData", "id" : "i_Years_of_Service", "javaParameterName" : "yearsOfService", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Years of Service", "namespace" : "https://www.drools.org/kie-dmn", "typeRef" : { @@ -138,7 +138,7 @@ }, { "reference" : "i_Years_of_Service" } ], - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "extraDaysCase3", "javaTypeName" : "ExtraDaysCase3", "knowledgeReferences" : [ ], @@ -150,7 +150,7 @@ "@kind" : "inputData", "id" : "i_Age", "javaParameterName" : "age", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Age", "namespace" : "https://www.drools.org/kie-dmn", "typeRef" : { @@ -161,7 +161,7 @@ "@kind" : "inputData", "id" : "i_Years_of_Service", "javaParameterName" : "yearsOfService", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Years of Service", "namespace" : "https://www.drools.org/kie-dmn", "typeRef" : { @@ -185,7 +185,7 @@ }, { "reference" : "d_Extra_days_case_3" } ], - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "totalVacationDays", "javaTypeName" : "TotalVacationDays", "knowledgeReferences" : [ ], @@ -197,7 +197,7 @@ "@kind" : "inputData", "id" : "i_Age", "javaParameterName" : "age", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Age", "namespace" : "https://www.drools.org/kie-dmn", "typeRef" : { @@ -208,7 +208,7 @@ "@kind" : "inputData", "id" : "i_Years_of_Service", "javaParameterName" : "yearsOfService", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "Years of Service", "namespace" : "https://www.drools.org/kie-dmn", "typeRef" : { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase1.kt b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase1.kt index ef490b175..67342bc00 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase1.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase1.kt @@ -13,7 +13,7 @@ import java.util.stream.Collectors rulesCount = 2 ) class ExtraDaysCase1() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("Age")?.let({ number(it) }), input_.get("Years of Service")?.let({ number(it) }), context_) } catch (e: Exception) { @@ -22,7 +22,7 @@ class ExtraDaysCase1() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(age: java.lang.Number?, yearsOfService: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(age: kotlin.Number?, yearsOfService: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start decision 'Extra days case 1' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -36,7 +36,7 @@ class ExtraDaysCase1() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, extraDaysCase1Arguments_) // Evaluate decision 'Extra days case 1' - val output_: java.lang.Number? = evaluate(age, yearsOfService, context_) + val output_: kotlin.Number? = evaluate(age, yearsOfService, context_) // End decision 'Extra days case 1' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, extraDaysCase1Arguments_, output_, (System.currentTimeMillis() - extraDaysCase1StartTime_)) @@ -48,7 +48,7 @@ class ExtraDaysCase1() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(age: java.lang.Number?, yearsOfService: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(age: kotlin.Number?, yearsOfService: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -59,7 +59,7 @@ class ExtraDaysCase1() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { ruleOutputList_.add(rule1(age, yearsOfService, context_)) // Return results based on hit policy - var output_: java.lang.Number? + var output_: kotlin.Number? if (ruleOutputList_.noMatchedRules()) { // Default value output_ = number("0") @@ -72,7 +72,7 @@ class ExtraDaysCase1() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(age: java.lang.Number?, yearsOfService: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(age: kotlin.Number?, yearsOfService: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -104,7 +104,7 @@ class ExtraDaysCase1() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(age: java.lang.Number?, yearsOfService: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(age: kotlin.Number?, yearsOfService: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase1RuleOutput.kt b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase1RuleOutput.kt index 0e0e62aeb..43830ddb8 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase1RuleOutput.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase1RuleOutput.kt @@ -2,7 +2,7 @@ @javax.annotation.Generated(value = ["decisionTableRuleOutput.ftl", "Extra days case 1"]) class ExtraDaysCase1RuleOutput(matched: Boolean) : com.gs.dmn.runtime.RuleOutput(matched) { @com.fasterxml.jackson.annotation.JsonProperty("Extra days case 1") - var extraDaysCase1: java.lang.Number? = null + var extraDaysCase1: kotlin.Number? = null override fun equals(o: Any?): Boolean { if (this === o) return true diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase2.kt b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase2.kt index 1b4ff651d..57700fc22 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase2.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase2.kt @@ -13,7 +13,7 @@ import java.util.stream.Collectors rulesCount = 2 ) class ExtraDaysCase2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("Age")?.let({ number(it) }), input_.get("Years of Service")?.let({ number(it) }), context_) } catch (e: Exception) { @@ -22,7 +22,7 @@ class ExtraDaysCase2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(age: java.lang.Number?, yearsOfService: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(age: kotlin.Number?, yearsOfService: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start decision 'Extra days case 2' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -36,7 +36,7 @@ class ExtraDaysCase2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, extraDaysCase2Arguments_) // Evaluate decision 'Extra days case 2' - val output_: java.lang.Number? = evaluate(age, yearsOfService, context_) + val output_: kotlin.Number? = evaluate(age, yearsOfService, context_) // End decision 'Extra days case 2' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, extraDaysCase2Arguments_, output_, (System.currentTimeMillis() - extraDaysCase2StartTime_)) @@ -48,7 +48,7 @@ class ExtraDaysCase2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(age: java.lang.Number?, yearsOfService: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(age: kotlin.Number?, yearsOfService: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -59,7 +59,7 @@ class ExtraDaysCase2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { ruleOutputList_.add(rule1(age, yearsOfService, context_)) // Return results based on hit policy - var output_: java.lang.Number? + var output_: kotlin.Number? if (ruleOutputList_.noMatchedRules()) { // Default value output_ = number("0") @@ -72,7 +72,7 @@ class ExtraDaysCase2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(age: java.lang.Number?, yearsOfService: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(age: kotlin.Number?, yearsOfService: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -104,7 +104,7 @@ class ExtraDaysCase2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(age: java.lang.Number?, yearsOfService: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(age: kotlin.Number?, yearsOfService: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase2RuleOutput.kt b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase2RuleOutput.kt index 42434eedf..8fd1248ec 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase2RuleOutput.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase2RuleOutput.kt @@ -2,7 +2,7 @@ @javax.annotation.Generated(value = ["decisionTableRuleOutput.ftl", "Extra days case 2"]) class ExtraDaysCase2RuleOutput(matched: Boolean) : com.gs.dmn.runtime.RuleOutput(matched) { @com.fasterxml.jackson.annotation.JsonProperty("Extra days case 2") - var extraDaysCase2: java.lang.Number? = null + var extraDaysCase2: kotlin.Number? = null override fun equals(o: Any?): Boolean { if (this === o) return true diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase3.kt b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase3.kt index ac6914fd4..9bbe6d8ae 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase3.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase3.kt @@ -13,7 +13,7 @@ import java.util.stream.Collectors rulesCount = 2 ) class ExtraDaysCase3() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("Age")?.let({ number(it) }), input_.get("Years of Service")?.let({ number(it) }), context_) } catch (e: Exception) { @@ -22,7 +22,7 @@ class ExtraDaysCase3() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(age: java.lang.Number?, yearsOfService: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(age: kotlin.Number?, yearsOfService: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start decision 'Extra days case 3' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -36,7 +36,7 @@ class ExtraDaysCase3() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, extraDaysCase3Arguments_) // Evaluate decision 'Extra days case 3' - val output_: java.lang.Number? = evaluate(age, yearsOfService, context_) + val output_: kotlin.Number? = evaluate(age, yearsOfService, context_) // End decision 'Extra days case 3' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, extraDaysCase3Arguments_, output_, (System.currentTimeMillis() - extraDaysCase3StartTime_)) @@ -48,7 +48,7 @@ class ExtraDaysCase3() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(age: java.lang.Number?, yearsOfService: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(age: kotlin.Number?, yearsOfService: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -59,7 +59,7 @@ class ExtraDaysCase3() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { ruleOutputList_.add(rule1(age, yearsOfService, context_)) // Return results based on hit policy - var output_: java.lang.Number? + var output_: kotlin.Number? if (ruleOutputList_.noMatchedRules()) { // Default value output_ = number("0") @@ -72,7 +72,7 @@ class ExtraDaysCase3() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "") - private fun rule0(age: java.lang.Number?, yearsOfService: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule0(age: kotlin.Number?, yearsOfService: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "") @@ -104,7 +104,7 @@ class ExtraDaysCase3() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "") - private fun rule1(age: java.lang.Number?, yearsOfService: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { + private fun rule1(age: kotlin.Number?, yearsOfService: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput { // Rule metadata val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "") diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase3RuleOutput.kt b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase3RuleOutput.kt index c2e48b718..8f3cd629c 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase3RuleOutput.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase3RuleOutput.kt @@ -2,7 +2,7 @@ @javax.annotation.Generated(value = ["decisionTableRuleOutput.ftl", "Extra days case 3"]) class ExtraDaysCase3RuleOutput(matched: Boolean) : com.gs.dmn.runtime.RuleOutput(matched) { @com.fasterxml.jackson.annotation.JsonProperty("Extra days case 3") - var extraDaysCase3: java.lang.Number? = null + var extraDaysCase3: kotlin.Number? = null override fun equals(o: Any?): Boolean { if (this === o) return true diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/TotalVacationDays.kt b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/TotalVacationDays.kt index aa46cae88..58f0921cd 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/TotalVacationDays.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/TotalVacationDays.kt @@ -13,7 +13,7 @@ import java.util.stream.Collectors rulesCount = -1 ) class TotalVacationDays(val baseVacationDays : BaseVacationDays = BaseVacationDays(), val extraDaysCase1 : ExtraDaysCase1 = ExtraDaysCase1(), val extraDaysCase2 : ExtraDaysCase2 = ExtraDaysCase2(), val extraDaysCase3 : ExtraDaysCase3 = ExtraDaysCase3()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("Age")?.let({ number(it) }), input_.get("Years of Service")?.let({ number(it) }), context_) } catch (e: Exception) { @@ -22,7 +22,7 @@ class TotalVacationDays(val baseVacationDays : BaseVacationDays = BaseVacationDa } } - fun apply(age: java.lang.Number?, yearsOfService: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(age: kotlin.Number?, yearsOfService: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start decision 'Total Vacation Days' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -36,7 +36,7 @@ class TotalVacationDays(val baseVacationDays : BaseVacationDays = BaseVacationDa eventListener_.startDRGElement(DRG_ELEMENT_METADATA, totalVacationDaysArguments_) // Evaluate decision 'Total Vacation Days' - val output_: java.lang.Number? = evaluate(age, yearsOfService, context_) + val output_: kotlin.Number? = evaluate(age, yearsOfService, context_) // End decision 'Total Vacation Days' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, totalVacationDaysArguments_, output_, (System.currentTimeMillis() - totalVacationDaysStartTime_)) @@ -48,18 +48,18 @@ class TotalVacationDays(val baseVacationDays : BaseVacationDays = BaseVacationDa } } - private inline fun evaluate(age: java.lang.Number?, yearsOfService: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(age: kotlin.Number?, yearsOfService: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() // Apply child decisions - val baseVacationDays: java.lang.Number? = this@TotalVacationDays.baseVacationDays.apply(context_) - val extraDaysCase1: java.lang.Number? = this@TotalVacationDays.extraDaysCase1.apply(age, yearsOfService, context_) - val extraDaysCase2: java.lang.Number? = this@TotalVacationDays.extraDaysCase2.apply(age, yearsOfService, context_) - val extraDaysCase3: java.lang.Number? = this@TotalVacationDays.extraDaysCase3.apply(age, yearsOfService, context_) + val baseVacationDays: kotlin.Number? = this@TotalVacationDays.baseVacationDays.apply(context_) + val extraDaysCase1: kotlin.Number? = this@TotalVacationDays.extraDaysCase1.apply(age, yearsOfService, context_) + val extraDaysCase2: kotlin.Number? = this@TotalVacationDays.extraDaysCase2.apply(age, yearsOfService, context_) + val extraDaysCase3: kotlin.Number? = this@TotalVacationDays.extraDaysCase3.apply(age, yearsOfService, context_) - return numericAdd(numericAdd(baseVacationDays, max(extraDaysCase1, extraDaysCase3)), extraDaysCase2) as java.lang.Number? + return numericAdd(numericAdd(baseVacationDays, max(extraDaysCase1, extraDaysCase3)), extraDaysCase2) as kotlin.Number? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/Circumference.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/Circumference.kt index 8f120ada1..18e517d68 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/Circumference.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/Circumference.kt @@ -15,7 +15,7 @@ import java.util.stream.Collectors class Circumference : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { private constructor() {} - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("radius")?.let({ number(it) }), context_) } catch (e: Exception) { @@ -24,7 +24,7 @@ class Circumference : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(radius: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(radius: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start BKM 'Circumference' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -37,7 +37,7 @@ class Circumference : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, circumferenceArguments_) // Evaluate BKM 'Circumference' - val output_: java.lang.Number? = evaluate(radius, context_) + val output_: kotlin.Number? = evaluate(radius, context_) // End BKM 'Circumference' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, circumferenceArguments_, output_, (System.currentTimeMillis() - circumferenceStartTime_)) @@ -49,12 +49,12 @@ class Circumference : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(radius: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(radius: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return numericMultiply(numericMultiply(number("2"), number("3.141592")), radius) as java.lang.Number? + return numericMultiply(numericMultiply(number("2"), number("3.141592")), radius) as kotlin.Number? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/DMNMetadata.json index aebf32608..148fc5c27 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/DMNMetadata.json @@ -161,7 +161,7 @@ "@kind" : "inputData", "id" : "_48BAYH6PEeePe9Zmt-encA", "javaParameterName" : "inputA", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "inputA", "namespace" : "http://www.actico.com/spec/DMN/0.1.0/0031-user-defined-functions", "typeRef" : { @@ -172,7 +172,7 @@ "@kind" : "inputData", "id" : "_5eBhQH6PEeePe9Zmt-encA", "javaParameterName" : "inputB", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "inputB", "namespace" : "http://www.actico.com/spec/DMN/0.1.0/0031-user-defined-functions", "typeRef" : { @@ -182,7 +182,7 @@ }, { "@kind" : "bkm", "id" : "_8xmTAIDNEee-MeWXoLgrYg", - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "circumference", "javaTypeName" : "Circumference", "knowledgeReferences" : [ ], @@ -214,7 +214,7 @@ "@kind" : "inputData", "id" : "_48BAYH6PEeePe9Zmt-encA", "javaParameterName" : "inputA", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "inputA", "namespace" : "http://www.actico.com/spec/DMN/0.1.0/0031-user-defined-functions", "typeRef" : { @@ -225,7 +225,7 @@ "@kind" : "inputData", "id" : "_5eBhQH6PEeePe9Zmt-encA", "javaParameterName" : "inputB", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "inputB", "namespace" : "http://www.actico.com/spec/DMN/0.1.0/0031-user-defined-functions", "typeRef" : { @@ -259,7 +259,7 @@ "@kind" : "inputData", "id" : "_48BAYH6PEeePe9Zmt-encA", "javaParameterName" : "inputA", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "inputA", "namespace" : "http://www.actico.com/spec/DMN/0.1.0/0031-user-defined-functions", "typeRef" : { @@ -270,7 +270,7 @@ "@kind" : "inputData", "id" : "_5eBhQH6PEeePe9Zmt-encA", "javaParameterName" : "inputB", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "inputB", "namespace" : "http://www.actico.com/spec/DMN/0.1.0/0031-user-defined-functions", "typeRef" : { @@ -304,7 +304,7 @@ "@kind" : "inputData", "id" : "_48BAYH6PEeePe9Zmt-encA", "javaParameterName" : "inputA", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "inputA", "namespace" : "http://www.actico.com/spec/DMN/0.1.0/0031-user-defined-functions", "typeRef" : { @@ -315,7 +315,7 @@ "@kind" : "inputData", "id" : "_5eBhQH6PEeePe9Zmt-encA", "javaParameterName" : "inputB", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "inputB", "namespace" : "http://www.actico.com/spec/DMN/0.1.0/0031-user-defined-functions", "typeRef" : { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationComplexParameters.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationComplexParameters.kt index a079bd4bd..d8bb5f19b 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationComplexParameters.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationComplexParameters.kt @@ -22,7 +22,7 @@ class FnInvocationComplexParameters(val fnLibrary : FnLibrary = FnLibrary()) : c } } - fun apply(inputA: java.lang.Number?, inputB: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnInvocationComplexParamsResult? { + fun apply(inputA: kotlin.Number?, inputB: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnInvocationComplexParamsResult? { try { // Start decision 'fn invocation complex parameters' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -48,7 +48,7 @@ class FnInvocationComplexParameters(val fnLibrary : FnLibrary = FnLibrary()) : c } } - private inline fun evaluate(inputA: java.lang.Number?, inputB: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnInvocationComplexParamsResult? { + private inline fun evaluate(inputA: kotlin.Number?, inputB: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnInvocationComplexParamsResult? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -56,9 +56,9 @@ class FnInvocationComplexParameters(val fnLibrary : FnLibrary = FnLibrary()) : c // Apply child decisions val fnLibrary: type.TFnLibrary? = this@FnInvocationComplexParameters.fnLibrary.apply(context_) - val functionInvocationInParameter: java.lang.Number? = fnLibrary?.let({ it.multiplyFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(fnLibrary?.let({ it.sumFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputA, context_), fnLibrary?.let({ it.sumFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputB, inputB, context_), context_) as java.lang.Number? - val functionInvocationLiteralExpressionInParameter: java.lang.Number? = fnLibrary?.let({ it.multiplyFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(numericMultiply(inputA, inputA), (if (booleanEqual(booleanAnd(numericGreaterEqualThan(fnLibrary?.let({ it.subFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_), number("0")), numericLessEqualThan(fnLibrary?.let({ it.subFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_), number("10"))), true)) number("5") else number("10")), context_) as java.lang.Number? - val circumference: java.lang.Number? = Circumference.instance()?.apply(numericAdd(inputA, inputB), context_) as java.lang.Number? + val functionInvocationInParameter: kotlin.Number? = fnLibrary?.let({ it.multiplyFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(fnLibrary?.let({ it.sumFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputA, context_), fnLibrary?.let({ it.sumFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputB, inputB, context_), context_) as kotlin.Number? + val functionInvocationLiteralExpressionInParameter: kotlin.Number? = fnLibrary?.let({ it.multiplyFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(numericMultiply(inputA, inputA), (if (booleanEqual(booleanAnd(numericGreaterEqualThan(fnLibrary?.let({ it.subFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_), number("0")), numericLessEqualThan(fnLibrary?.let({ it.subFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_), number("10"))), true)) number("5") else number("10")), context_) as kotlin.Number? + val circumference: kotlin.Number? = Circumference.instance()?.apply(numericAdd(inputA, inputB), context_) as kotlin.Number? val fnInvocationComplexParameters: type.TFnInvocationComplexParamsResultImpl? = type.TFnInvocationComplexParamsResultImpl() as type.TFnInvocationComplexParamsResultImpl? fnInvocationComplexParameters?.functionInvocationInParameter = functionInvocationInParameter fnInvocationComplexParameters?.functionInvocationLiteralExpressionInParameter = functionInvocationLiteralExpressionInParameter diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationNamedParameters.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationNamedParameters.kt index 98ae1a760..64b66bb97 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationNamedParameters.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationNamedParameters.kt @@ -22,7 +22,7 @@ class FnInvocationNamedParameters(val fnLibrary : FnLibrary = FnLibrary()) : com } } - fun apply(inputA: java.lang.Number?, inputB: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnInvocationNamedResult? { + fun apply(inputA: kotlin.Number?, inputB: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnInvocationNamedResult? { try { // Start decision 'fn invocation named parameters' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -48,7 +48,7 @@ class FnInvocationNamedParameters(val fnLibrary : FnLibrary = FnLibrary()) : com } } - private inline fun evaluate(inputA: java.lang.Number?, inputB: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnInvocationNamedResult? { + private inline fun evaluate(inputA: kotlin.Number?, inputB: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnInvocationNamedResult? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -56,10 +56,10 @@ class FnInvocationNamedParameters(val fnLibrary : FnLibrary = FnLibrary()) : com // Apply child decisions val fnLibrary: type.TFnLibrary? = this@FnInvocationNamedParameters.fnLibrary.apply(context_) - val subResult: java.lang.Number? = fnLibrary?.let({ it.subFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_) as java.lang.Number? - val multiplicationResultNamed: java.lang.Number? = fnLibrary?.let({ it.multiplyFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_) as java.lang.Number? - val subResultMixed: java.lang.Number? = fnLibrary?.let({ it.subFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputB, inputA, context_) as java.lang.Number? - val divisionResultNamed: java.lang.Number? = fnLibrary?.let({ it.divideFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_) as java.lang.Number? + val subResult: kotlin.Number? = fnLibrary?.let({ it.subFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_) as kotlin.Number? + val multiplicationResultNamed: kotlin.Number? = fnLibrary?.let({ it.multiplyFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_) as kotlin.Number? + val subResultMixed: kotlin.Number? = fnLibrary?.let({ it.subFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputB, inputA, context_) as kotlin.Number? + val divisionResultNamed: kotlin.Number? = fnLibrary?.let({ it.divideFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_) as kotlin.Number? val fnInvocationNamedParameters: type.TFnInvocationNamedResultImpl? = type.TFnInvocationNamedResultImpl() as type.TFnInvocationNamedResultImpl? fnInvocationNamedParameters?.subResult = subResult fnInvocationNamedParameters?.multiplicationResultNamed = multiplicationResultNamed diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationPositionalParameters.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationPositionalParameters.kt index 210911cef..84cab9d43 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationPositionalParameters.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationPositionalParameters.kt @@ -22,7 +22,7 @@ class FnInvocationPositionalParameters(val fnLibrary : FnLibrary = FnLibrary()) } } - fun apply(inputA: java.lang.Number?, inputB: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnInvocationPositionalResult? { + fun apply(inputA: kotlin.Number?, inputB: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnInvocationPositionalResult? { try { // Start decision 'fn invocation positional parameters' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -48,7 +48,7 @@ class FnInvocationPositionalParameters(val fnLibrary : FnLibrary = FnLibrary()) } } - private inline fun evaluate(inputA: java.lang.Number?, inputB: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnInvocationPositionalResult? { + private inline fun evaluate(inputA: kotlin.Number?, inputB: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnInvocationPositionalResult? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() @@ -56,9 +56,9 @@ class FnInvocationPositionalParameters(val fnLibrary : FnLibrary = FnLibrary()) // Apply child decisions val fnLibrary: type.TFnLibrary? = this@FnInvocationPositionalParameters.fnLibrary.apply(context_) - val sumResult: java.lang.Number? = fnLibrary?.let({ it.sumFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_) as java.lang.Number? - val multiplicationResultPositional: java.lang.Number? = fnLibrary?.let({ it.multiplyFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_) as java.lang.Number? - val divisionResultPositional: java.lang.Number? = fnLibrary?.let({ it.divideFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_) as java.lang.Number? + val sumResult: kotlin.Number? = fnLibrary?.let({ it.sumFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_) as kotlin.Number? + val multiplicationResultPositional: kotlin.Number? = fnLibrary?.let({ it.multiplyFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_) as kotlin.Number? + val divisionResultPositional: kotlin.Number? = fnLibrary?.let({ it.divideFn as com.gs.dmn.runtime.LambdaExpression? })?.apply(inputA, inputB, context_) as kotlin.Number? val fnInvocationPositionalParameters: type.TFnInvocationPositionalResultImpl? = type.TFnInvocationPositionalResultImpl() as type.TFnInvocationPositionalResultImpl? fnInvocationPositionalParameters?.sumResult = sumResult fnInvocationPositionalParameters?.multiplicationResultPositional = multiplicationResultPositional diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnLibrary.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnLibrary.kt index 1c6527388..32add5ca5 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnLibrary.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnLibrary.kt @@ -51,10 +51,10 @@ class FnLibrary() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - val sumFn: com.gs.dmn.runtime.LambdaExpression? = com.gs.dmn.runtime.LambdaExpression { args_ -> val a: java.lang.Number? = args_[0] as java.lang.Number?; val b: java.lang.Number? = args_[1] as java.lang.Number?; numericAdd(a, b) } as com.gs.dmn.runtime.LambdaExpression? - val subFn: com.gs.dmn.runtime.LambdaExpression? = com.gs.dmn.runtime.LambdaExpression { args_ -> val a: java.lang.Number? = args_[0] as java.lang.Number?; val b: java.lang.Number? = args_[1] as java.lang.Number?; numericSubtract(a, b) } as com.gs.dmn.runtime.LambdaExpression? - val multiplyFn: com.gs.dmn.runtime.LambdaExpression? = com.gs.dmn.runtime.LambdaExpression { args_ -> val a: java.lang.Number? = args_[0] as java.lang.Number?; val b: java.lang.Number? = args_[1] as java.lang.Number?; numericMultiply(a, b) } as com.gs.dmn.runtime.LambdaExpression? - val divideFn: com.gs.dmn.runtime.LambdaExpression? = com.gs.dmn.runtime.LambdaExpression { args_ -> val a: java.lang.Number? = args_[0] as java.lang.Number?; val b: java.lang.Number? = args_[1] as java.lang.Number?; (if (booleanEqual(numericEqual(b, number("0")), true)) null else numericDivide(a, b)) } as com.gs.dmn.runtime.LambdaExpression? + val sumFn: com.gs.dmn.runtime.LambdaExpression? = com.gs.dmn.runtime.LambdaExpression { args_ -> val a: kotlin.Number? = args_[0] as kotlin.Number?; val b: kotlin.Number? = args_[1] as kotlin.Number?; numericAdd(a, b) } as com.gs.dmn.runtime.LambdaExpression? + val subFn: com.gs.dmn.runtime.LambdaExpression? = com.gs.dmn.runtime.LambdaExpression { args_ -> val a: kotlin.Number? = args_[0] as kotlin.Number?; val b: kotlin.Number? = args_[1] as kotlin.Number?; numericSubtract(a, b) } as com.gs.dmn.runtime.LambdaExpression? + val multiplyFn: com.gs.dmn.runtime.LambdaExpression? = com.gs.dmn.runtime.LambdaExpression { args_ -> val a: kotlin.Number? = args_[0] as kotlin.Number?; val b: kotlin.Number? = args_[1] as kotlin.Number?; numericMultiply(a, b) } as com.gs.dmn.runtime.LambdaExpression? + val divideFn: com.gs.dmn.runtime.LambdaExpression? = com.gs.dmn.runtime.LambdaExpression { args_ -> val a: kotlin.Number? = args_[0] as kotlin.Number?; val b: kotlin.Number? = args_[1] as kotlin.Number?; (if (booleanEqual(numericEqual(b, number("0")), true)) null else numericDivide(a, b)) } as com.gs.dmn.runtime.LambdaExpression? val fnLibrary: type.TFnLibraryImpl? = type.TFnLibraryImpl() as type.TFnLibraryImpl? fnLibrary?.sumFn = sumFn fnLibrary?.subFn = subFn diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationComplexParamsResult.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationComplexParamsResult.kt index 729a355f6..03f70131a 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationComplexParamsResult.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationComplexParamsResult.kt @@ -7,13 +7,13 @@ import java.util.* @com.fasterxml.jackson.databind.annotation.JsonDeserialize(`as` = type.TFnInvocationComplexParamsResultImpl::class) interface TFnInvocationComplexParamsResult : com.gs.dmn.runtime.DMNType { @get:com.fasterxml.jackson.annotation.JsonGetter("functionInvocationLiteralExpressionInParameter") - val functionInvocationLiteralExpressionInParameter: java.lang.Number? + val functionInvocationLiteralExpressionInParameter: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("functionInvocationInParameter") - val functionInvocationInParameter: java.lang.Number? + val functionInvocationInParameter: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("circumference") - val circumference: java.lang.Number? + val circumference: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -61,9 +61,9 @@ interface TFnInvocationComplexParamsResult : com.gs.dmn.runtime.DMNType { return other } else if (other is com.gs.dmn.runtime.Context) { var result_ = TFnInvocationComplexParamsResultImpl() - result_.functionInvocationLiteralExpressionInParameter = other.get("functionInvocationLiteralExpressionInParameter") as java.lang.Number? - result_.functionInvocationInParameter = other.get("functionInvocationInParameter") as java.lang.Number? - result_.circumference = other.get("circumference") as java.lang.Number? + result_.functionInvocationLiteralExpressionInParameter = other.get("functionInvocationLiteralExpressionInParameter") as kotlin.Number? + result_.functionInvocationInParameter = other.get("functionInvocationInParameter") as kotlin.Number? + result_.circumference = other.get("circumference") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toTFnInvocationComplexParamsResult(other.toContext()) diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationComplexParamsResultImpl.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationComplexParamsResultImpl.kt index 3fc438967..378145ddc 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationComplexParamsResultImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationComplexParamsResultImpl.kt @@ -7,20 +7,20 @@ import java.util.* class TFnInvocationComplexParamsResultImpl : TFnInvocationComplexParamsResult { @get:com.fasterxml.jackson.annotation.JsonGetter("functionInvocationLiteralExpressionInParameter") @set:com.fasterxml.jackson.annotation.JsonGetter("functionInvocationLiteralExpressionInParameter") - override var functionInvocationLiteralExpressionInParameter: java.lang.Number? = null + override var functionInvocationLiteralExpressionInParameter: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("functionInvocationInParameter") @set:com.fasterxml.jackson.annotation.JsonGetter("functionInvocationInParameter") - override var functionInvocationInParameter: java.lang.Number? = null + override var functionInvocationInParameter: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("circumference") @set:com.fasterxml.jackson.annotation.JsonGetter("circumference") - override var circumference: java.lang.Number? = null + override var circumference: kotlin.Number? = null constructor() { } - constructor (circumference: java.lang.Number?, functionInvocationInParameter: java.lang.Number?, functionInvocationLiteralExpressionInParameter: java.lang.Number?) { + constructor (circumference: kotlin.Number?, functionInvocationInParameter: kotlin.Number?, functionInvocationLiteralExpressionInParameter: kotlin.Number?) { this.circumference = circumference this.functionInvocationInParameter = functionInvocationInParameter this.functionInvocationLiteralExpressionInParameter = functionInvocationLiteralExpressionInParameter diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationNamedResult.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationNamedResult.kt index 8539398a0..94cba5738 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationNamedResult.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationNamedResult.kt @@ -7,16 +7,16 @@ import java.util.* @com.fasterxml.jackson.databind.annotation.JsonDeserialize(`as` = type.TFnInvocationNamedResultImpl::class) interface TFnInvocationNamedResult : com.gs.dmn.runtime.DMNType { @get:com.fasterxml.jackson.annotation.JsonGetter("subResult") - val subResult: java.lang.Number? + val subResult: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("subResultMixed") - val subResultMixed: java.lang.Number? + val subResultMixed: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("divisionResultNamed") - val divisionResultNamed: java.lang.Number? + val divisionResultNamed: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("multiplicationResultNamed") - val multiplicationResultNamed: java.lang.Number? + val multiplicationResultNamed: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -68,10 +68,10 @@ interface TFnInvocationNamedResult : com.gs.dmn.runtime.DMNType { return other } else if (other is com.gs.dmn.runtime.Context) { var result_ = TFnInvocationNamedResultImpl() - result_.subResult = other.get("subResult") as java.lang.Number? - result_.subResultMixed = other.get("subResultMixed") as java.lang.Number? - result_.divisionResultNamed = other.get("divisionResultNamed") as java.lang.Number? - result_.multiplicationResultNamed = other.get("multiplicationResultNamed") as java.lang.Number? + result_.subResult = other.get("subResult") as kotlin.Number? + result_.subResultMixed = other.get("subResultMixed") as kotlin.Number? + result_.divisionResultNamed = other.get("divisionResultNamed") as kotlin.Number? + result_.multiplicationResultNamed = other.get("multiplicationResultNamed") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toTFnInvocationNamedResult(other.toContext()) diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationNamedResultImpl.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationNamedResultImpl.kt index 437c29b6e..a2b92ba1d 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationNamedResultImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationNamedResultImpl.kt @@ -7,24 +7,24 @@ import java.util.* class TFnInvocationNamedResultImpl : TFnInvocationNamedResult { @get:com.fasterxml.jackson.annotation.JsonGetter("subResult") @set:com.fasterxml.jackson.annotation.JsonGetter("subResult") - override var subResult: java.lang.Number? = null + override var subResult: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("subResultMixed") @set:com.fasterxml.jackson.annotation.JsonGetter("subResultMixed") - override var subResultMixed: java.lang.Number? = null + override var subResultMixed: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("divisionResultNamed") @set:com.fasterxml.jackson.annotation.JsonGetter("divisionResultNamed") - override var divisionResultNamed: java.lang.Number? = null + override var divisionResultNamed: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("multiplicationResultNamed") @set:com.fasterxml.jackson.annotation.JsonGetter("multiplicationResultNamed") - override var multiplicationResultNamed: java.lang.Number? = null + override var multiplicationResultNamed: kotlin.Number? = null constructor() { } - constructor (divisionResultNamed: java.lang.Number?, multiplicationResultNamed: java.lang.Number?, subResult: java.lang.Number?, subResultMixed: java.lang.Number?) { + constructor (divisionResultNamed: kotlin.Number?, multiplicationResultNamed: kotlin.Number?, subResult: kotlin.Number?, subResultMixed: kotlin.Number?) { this.divisionResultNamed = divisionResultNamed this.multiplicationResultNamed = multiplicationResultNamed this.subResult = subResult diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationPositionalResult.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationPositionalResult.kt index 615c0f745..34539ac8c 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationPositionalResult.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationPositionalResult.kt @@ -7,13 +7,13 @@ import java.util.* @com.fasterxml.jackson.databind.annotation.JsonDeserialize(`as` = type.TFnInvocationPositionalResultImpl::class) interface TFnInvocationPositionalResult : com.gs.dmn.runtime.DMNType { @get:com.fasterxml.jackson.annotation.JsonGetter("sumResult") - val sumResult: java.lang.Number? + val sumResult: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("divisionResultPositional") - val divisionResultPositional: java.lang.Number? + val divisionResultPositional: kotlin.Number? @get:com.fasterxml.jackson.annotation.JsonGetter("multiplicationResultPositional") - val multiplicationResultPositional: java.lang.Number? + val multiplicationResultPositional: kotlin.Number? override fun toContext(): com.gs.dmn.runtime.Context { val context = com.gs.dmn.runtime.Context() @@ -61,9 +61,9 @@ interface TFnInvocationPositionalResult : com.gs.dmn.runtime.DMNType { return other } else if (other is com.gs.dmn.runtime.Context) { var result_ = TFnInvocationPositionalResultImpl() - result_.sumResult = other.get("sumResult") as java.lang.Number? - result_.divisionResultPositional = other.get("divisionResultPositional") as java.lang.Number? - result_.multiplicationResultPositional = other.get("multiplicationResultPositional") as java.lang.Number? + result_.sumResult = other.get("sumResult") as kotlin.Number? + result_.divisionResultPositional = other.get("divisionResultPositional") as kotlin.Number? + result_.multiplicationResultPositional = other.get("multiplicationResultPositional") as kotlin.Number? return result_ } else if (other is com.gs.dmn.runtime.DMNType) { return toTFnInvocationPositionalResult(other.toContext()) diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationPositionalResultImpl.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationPositionalResultImpl.kt index 00e5901fd..341e6c53e 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationPositionalResultImpl.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/type/TFnInvocationPositionalResultImpl.kt @@ -7,20 +7,20 @@ import java.util.* class TFnInvocationPositionalResultImpl : TFnInvocationPositionalResult { @get:com.fasterxml.jackson.annotation.JsonGetter("sumResult") @set:com.fasterxml.jackson.annotation.JsonGetter("sumResult") - override var sumResult: java.lang.Number? = null + override var sumResult: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("divisionResultPositional") @set:com.fasterxml.jackson.annotation.JsonGetter("divisionResultPositional") - override var divisionResultPositional: java.lang.Number? = null + override var divisionResultPositional: kotlin.Number? = null @get:com.fasterxml.jackson.annotation.JsonGetter("multiplicationResultPositional") @set:com.fasterxml.jackson.annotation.JsonGetter("multiplicationResultPositional") - override var multiplicationResultPositional: java.lang.Number? = null + override var multiplicationResultPositional: kotlin.Number? = null constructor() { } - constructor (divisionResultPositional: java.lang.Number?, multiplicationResultPositional: java.lang.Number?, sumResult: java.lang.Number?) { + constructor (divisionResultPositional: kotlin.Number?, multiplicationResultPositional: kotlin.Number?, sumResult: kotlin.Number?) { this.divisionResultPositional = divisionResultPositional this.multiplicationResultPositional = multiplicationResultPositional this.sumResult = sumResult diff --git a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/DMNMetadata.json index 052628ab0..afa5eca8c 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/DMNMetadata.json +++ b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/DMNMetadata.json @@ -9,7 +9,7 @@ "@kind" : "inputData", "id" : "i_n", "javaParameterName" : "n", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "n", "namespace" : "http://www.gs.com/spec/DMN/9001-recursive-function", "typeRef" : { @@ -19,7 +19,7 @@ }, { "@kind" : "bkm", "id" : "b_FACT", - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "fACT", "javaTypeName" : "FACT", "knowledgeReferences" : [ ], @@ -31,7 +31,7 @@ "informationReferences" : [ { "reference" : "i_n" } ], - "javaOutputTypeName" : "java.lang.Number?", + "javaOutputTypeName" : "kotlin.Number?", "javaParameterName" : "main", "javaTypeName" : "Main", "knowledgeReferences" : [ { @@ -47,7 +47,7 @@ "@kind" : "inputData", "id" : "i_n", "javaParameterName" : "n", - "javaTypeName" : "java.lang.Number?", + "javaTypeName" : "kotlin.Number?", "name" : "n", "namespace" : "http://www.gs.com/spec/DMN/9001-recursive-function", "typeRef" : { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/FACT.kt b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/FACT.kt index 7e2223c67..5a4b76b67 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/FACT.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/FACT.kt @@ -15,7 +15,7 @@ import java.util.stream.Collectors class FACT : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { private constructor() {} - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("n")?.let({ number(it) }), context_) } catch (e: Exception) { @@ -24,7 +24,7 @@ class FACT : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - fun apply(n: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(n: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start BKM 'FACT' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -37,7 +37,7 @@ class FACT : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, fACTArguments_) // Evaluate BKM 'FACT' - val output_: java.lang.Number? = evaluate(n, context_) + val output_: kotlin.Number? = evaluate(n, context_) // End BKM 'FACT' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, fACTArguments_, output_, (System.currentTimeMillis() - fACTStartTime_)) @@ -49,12 +49,12 @@ class FACT : com.gs.dmn.runtime.JavaTimeDMNBaseDecision { } } - private inline fun evaluate(n: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(n: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return (if (booleanEqual(numericLessThan(n, number("0")), true)) null else (if (booleanEqual(numericEqual(n, number("0")), true)) number("1") else numericMultiply(n, FACT.instance()?.apply(numericSubtract(n, number("1")), context_)))) as java.lang.Number? + return (if (booleanEqual(numericLessThan(n, number("0")), true)) null else (if (booleanEqual(numericEqual(n, number("0")), true)) number("1") else numericMultiply(n, FACT.instance()?.apply(numericSubtract(n, number("1")), context_)))) as kotlin.Number? } companion object { diff --git a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/Main.kt b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/Main.kt index a9ee292b5..9ebfb799e 100644 --- a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/Main.kt +++ b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/Main.kt @@ -13,7 +13,7 @@ import java.util.stream.Collectors rulesCount = -1 ) class Main() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { - override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + override fun applyMap(input_: MutableMap, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { return apply(input_.get("n")?.let({ number(it) }), context_) } catch (e: Exception) { @@ -22,7 +22,7 @@ class Main() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - fun apply(n: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + fun apply(n: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { try { // Start decision 'main' var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() @@ -35,7 +35,7 @@ class Main() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { eventListener_.startDRGElement(DRG_ELEMENT_METADATA, mainArguments_) // Evaluate decision 'main' - val output_: java.lang.Number? = evaluate(n, context_) + val output_: kotlin.Number? = evaluate(n, context_) // End decision 'main' eventListener_.endDRGElement(DRG_ELEMENT_METADATA, mainArguments_, output_, (System.currentTimeMillis() - mainStartTime_)) @@ -47,12 +47,12 @@ class Main() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() { } } - private inline fun evaluate(n: java.lang.Number?, context_: com.gs.dmn.runtime.ExecutionContext): java.lang.Number? { + private inline fun evaluate(n: kotlin.Number?, context_: com.gs.dmn.runtime.ExecutionContext): kotlin.Number? { var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations() var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener() var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor() var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache() - return FACT.instance()?.apply(n, context_) as java.lang.Number? + return FACT.instance()?.apply(n, context_) as kotlin.Number? } companion object {