[incubator-kie-issues#1748] DMNCompilerImpl class code refactoring and Test cases #6267

ChinchuAjith · 2025-02-28T04:48:37Z

This PR is to refactor the methods to adhere to clean code principles and also added test cases to increase the coverage.

gitgabrio

Good job @ChinchuAjith
There are only minor details to fix, IMO. Thanks! 👍

kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/DMNCompilerImpl.java

kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/DMNCompilerImplTest.java

…mpl#resolvePMMLImportType

yesamer · 2025-03-07T11:33:38Z

@ChinchuAjith Can you please describe the changes you applied in the first message? Thanks!

ChinchuAjith · 2025-03-10T09:21:31Z

@ChinchuAjith Can you please describe the changes you applied in the first message? Thanks!

@yesamer added description for the PR

gitgabrio

Just a couple of minor details, then would be fine for me

kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/DMNCompilerImplTest.java

…o DMNImportsUtil.

bncriju

Thanks @ChinchuAjith for the PR. Have commented few minor review comments.

bncriju · 2025-03-12T15:19:22Z

kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/DMNImportsUtilTest.java

+        DMNImportsUtil.resolvePMMLImportType(model, input, relativeResource, dmnCompilerConfig);
+        assertThat(model.getPmmlImportInfo()).hasSize(1).containsOnlyKeys("test_tree");
+    }
+


It might be beneficial to include edge cases, such as:

An empty DMN file or one with invalid syntax.

A case where the import model is valid but contains errors or discrepancies in the expected structure.

kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/DMNCompilerImpl.java

bncriju · 2025-03-12T15:21:04Z

kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/assembler/DMNAssemblerService.java

-import org.kie.dmn.core.compiler.ImportDMNResolverUtil;
-import org.kie.dmn.core.compiler.ImportDMNResolverUtil.ImportType;
-import org.kie.dmn.core.compiler.RuntimeTypeCheckOption;
+import org.kie.dmn.core.compiler.*;


Instead of asterisk and importing everything, import what exactly is required

kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/DMNCompilerImpl.java

kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/DMNImportsUtil.java

bncriju · 2025-03-12T15:21:30Z

kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/DMNImportsUtil.java

+    static void checkLocatedDMNModel(Import i, DMNModel located, DMNModelImpl model, List<DMNModel> toMerge) {
+        if (located != null) {
+            String iAlias = Optional.ofNullable(i.getName()).orElse(located.getName());
+            // incubator-kie-issues#852: The idea is to not treat the anonymous models as import, but to "merge" them


The comment regarding the incubator-kie-issues#852 is valuable but could be made clearer with a bit more context of the same

kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/DMNImportsUtil.java

kie-ci3 · 2025-03-19T14:37:35Z

PR job #11 was: UNSTABLE
Possible explanation: This should be test failures

Reproducer

build-chain build full_downstream -f 'https://raw.githubusercontent.com/${AUTHOR:apache}/incubator-kie-kogito-pipelines/${BRANCH:main}/.ci/buildchain-config-pr-cdb.yaml' -o 'bc' -p apache/incubator-kie-drools -u #6267 --skipParallelCheckout

NOTE: To install the build-chain tool, please refer to https://github.com/kiegroup/github-action-build-chain#local-execution

Please look here: https://ci-builds.apache.org/job/KIE/job/drools/job/main/job/pullrequest_jobs/job/drools-pr/job/PR-6267/11/display/redirect

Test results:

PASSED: 23364
FAILED: 1

Those are the test failures:

org.kie.dmn.core.compiler.DMNCompilerImplTest.compileWithInvalidModel

Expecting actual not to be null

kie-ci3 · 2025-03-19T16:03:06Z

PR job #12 was: UNSTABLE
Possible explanation: This should be test failures

Reproducer

build-chain build full_downstream -f 'https://raw.githubusercontent.com/${AUTHOR:apache}/incubator-kie-kogito-pipelines/${BRANCH:main}/.ci/buildchain-config-pr-cdb.yaml' -o 'bc' -p apache/incubator-kie-drools -u #6267 --skipParallelCheckout

NOTE: To install the build-chain tool, please refer to https://github.com/kiegroup/github-action-build-chain#local-execution

Please look here: https://ci-builds.apache.org/job/KIE/job/drools/job/main/job/pullrequest_jobs/job/drools-pr/job/PR-6267/12/display/redirect

Test results:

PASSED: 23364
FAILED: 1

Those are the test failures:

org.kie.dmn.core.compiler.DMNCompilerImplTest.compileWithInvalidModel

Expecting actual not to be null

kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/DMNCompilerImpl.java

kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/DMNImportsUtil.java

gitgabrio

Thank @ChinchuAjith
Great stuf!! 👍

yesamer

Nice refactoring @ChinchuAjith , well done!

porcelli · 2025-03-24T11:52:34Z

@gitgabrio iirc, jenkins hasn't being used for PR checks for awhile

…d Test cases (apache#6267) * TestCases for DMNCompilerImpl class * TestCases for DMNCompilerImpl class * TestCases for DMNCompilerImpl class - changes in assertions * TestCases for DMNCompilerImpl class - changes in assertions * Changing Testcase names * Refactoring Compile method * Refactoring Compile method * Refactoring Compile method * Refactoring Compile method-Incorporating review comments, code cleanup * Test cases for refactored method * Review Comments fix * Review Comments fix:replace if/else with switch in DMNCompilerImpl class * [incubator-kie-issues#1748] Refactoring and unit testing DMNCompilerImpl#resolvePMMLImportType * Review Comments fix * Moving static classes to the Util class and Renaming the util class to DMNImportsUtil. * Adding javaDoc * Added test case for invalidDMN and mocked the static methods * Added test case for invalidDMN and mocked the static methods * [incubator-kie-issues#1748] Minor refactoring unit test * Correcting dmn file name * Adding Javadoc for newly created Methods * Updating Javadoc for newly created Methods --------- Co-authored-by: Gabriele-Cardosi <[email protected]>

ChinchuAjith added 14 commits February 19, 2025 11:30

TestCases for DMNCompilerImpl class

6fbd51c

Merge branch 'apache:main' into incubator-kie-issues#1748

3e7d044

TestCases for DMNCompilerImpl class

c952e19

Merge branch 'apache:main' into incubator-kie-issues#1748

85ae9a7

TestCases for DMNCompilerImpl class - changes in assertions

3bc52b9

TestCases for DMNCompilerImpl class - changes in assertions

e9f25ca

Changing Testcase names

91ecdbd

Refactoring Compile method

9eee2d8

Refactoring Compile method

d540ece

Refactoring Compile method

459a605

Merge branch 'apache:main' into incubator-kie-issues#1748

86e64da

Refactoring Compile method-Incorporating review comments, code cleanup

5f830ac

Test cases for refactored method

6c28863

Merge branch 'apache:main' into incubator-kie-issues#1748

6dfae4e

ChinchuAjith marked this pull request as draft February 28, 2025 04:50

gitgabrio requested changes Mar 4, 2025

View reviewed changes

ChinchuAjith added 4 commits March 6, 2025 16:47

Merge branch 'apache:main' into incubator-kie-issues#1748

84a703e

Merge branch 'apache:main' into incubator-kie-issues#1748

cc0d641

Review Comments fix

45658fe

Review Comments fix:replace if/else with switch in DMNCompilerImpl class

bce987f

ChinchuAjith requested a review from gitgabrio March 7, 2025 06:43

[incubator-kie-issues#1748] Refactoring and unit testing DMNCompilerI…

753815b

…mpl#resolvePMMLImportType

gitgabrio requested review from baldimir and yesamer March 7, 2025 09:07

gitgabrio marked this pull request as ready for review March 7, 2025 09:08

gitgabrio requested changes Mar 10, 2025

View reviewed changes

kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/DMNCompilerImplTest.java Outdated Show resolved Hide resolved

kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/DMNCompilerImplTest.java Outdated Show resolved Hide resolved

ChinchuAjith added 2 commits March 10, 2025 21:21

Merge branch 'apache:main' into incubator-kie-issues#1748

aaa595d

Review Comments fix

94a6153

ChinchuAjith requested a review from gitgabrio March 10, 2025 15:56

Moving static classes to the Util class and Renaming the util class t…

3759b02

…o DMNImportsUtil.

baldimir approved these changes Mar 12, 2025

View reviewed changes

bncriju reviewed Mar 12, 2025

View reviewed changes

Adding javaDoc

5c0c65d

bncriju approved these changes Mar 14, 2025

View reviewed changes

yesamer changed the title ~~DMNCompilerImpl class code refactoring and Test cases~~ [incubator-kie-issues#1748] DMNCompilerImpl class code refactoring and Test cases Mar 18, 2025

yesamer added the DMN label Mar 18, 2025

ChinchuAjith added 3 commits March 19, 2025 18:02

Added test case for invalidDMN and mocked the static methods

6b02484

Merge branch 'apache:main' into incubator-kie-issues#1748

3a5e728

Added test case for invalidDMN and mocked the static methods

eba3409

[incubator-kie-issues#1748] Minor refactoring unit test

66009fe

ChinchuAjith added 2 commits March 20, 2025 19:31

Correcting dmn file name

93a8a55

Adding Javadoc for newly created Methods

13b4ec7

gitgabrio requested changes Mar 21, 2025

View reviewed changes

Updating Javadoc for newly created Methods

4bb0ec0

ChinchuAjith requested a review from gitgabrio March 21, 2025 10:45

gitgabrio approved these changes Mar 21, 2025

View reviewed changes

yesamer approved these changes Mar 24, 2025

View reviewed changes

gitgabrio merged commit 9da33cd into apache:main Mar 24, 2025
9 of 10 checks passed

ChinchuAjith deleted the incubator-kie-issues#1748 branch July 2, 2025 09:51

[incubator-kie-issues#1748] DMNCompilerImpl class code refactoring and Test cases #6267

[incubator-kie-issues#1748] DMNCompilerImpl class code refactoring and Test cases #6267

Conversation

ChinchuAjith commented Feb 28, 2025 • edited by yesamer Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gitgabrio left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

yesamer commented Mar 7, 2025

Uh oh!

ChinchuAjith commented Mar 10, 2025

Uh oh!

gitgabrio left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bncriju left a comment

Choose a reason for hiding this comment

Uh oh!

bncriju Mar 12, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

bncriju Mar 12, 2025

Choose a reason for hiding this comment

Uh oh!

ChinchuAjith Mar 13, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bncriju Mar 12, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kie-ci3 commented Mar 19, 2025

Uh oh!

kie-ci3 commented Mar 19, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gitgabrio left a comment

Choose a reason for hiding this comment

Uh oh!

yesamer left a comment

Choose a reason for hiding this comment

Uh oh!

porcelli commented Mar 24, 2025

Uh oh!

Uh oh!

Uh oh!

ChinchuAjith commented Feb 28, 2025 •

edited by yesamer

Loading