gitgabrio commented on code in PR #6267:
URL:
https://github.com/apache/incubator-kie-drools/pull/6267#discussion_r1979223507
##########
kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/DMNCompilerImpl.java:
##########
@@ -209,60 +210,82 @@ public DMNModel compile(Definitions dmndefs,
Collection<DMNModel> dmnModels, Res
}
DMNModelImpl model = new DMNModelImpl(dmndefs, resource);
model.setRuntimeTypeCheck(((DMNCompilerConfigurationImpl)
dmnCompilerConfig).getOption(RuntimeTypeCheckOption.class).isRuntimeTypeCheck());
+ DMNCompilerContext ctx = configureDMNCompiler(model.getFeelDialect(),
relativeResolver);
+ if (!dmndefs.getImport().isEmpty()) {
+ iterateImports(dmndefs, dmnModels, model, relativeResolver );
+ }
+ processItemDefinitions(ctx, model, dmndefs);
+ processDrgElements(ctx, model, dmndefs);
+ return model;
+ }
+
+ private DMNCompilerContext configureDMNCompiler(FEELDialect feeldialect,
Function<String, Reader> relativeResolver) {
+
DMNCompilerConfigurationImpl cc = (DMNCompilerConfigurationImpl)
dmnCompilerConfig;
List<FEELProfile> helperFEELProfiles = cc.getFeelProfiles();
- DMNFEELHelper feel = new DMNFEELHelper(cc.getRootClassLoader(),
helperFEELProfiles, model.getFeelDialect());
+ DMNFEELHelper feel = new DMNFEELHelper(cc.getRootClassLoader(),
helperFEELProfiles, feeldialect);
DMNCompilerContext ctx = new DMNCompilerContext(feel);
ctx.setRelativeResolver(relativeResolver);
+ return ctx;
+ }
+
+ private void iterateImports(Definitions dmndefs, Collection<DMNModel>
dmnModels, DMNModelImpl model, Function<String, Reader> relativeResolver ) {
Review Comment:
This method need to be tested, at least verify that elements are correctly
iterated over
##########
kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/DMNCompilerImpl.java:
##########
@@ -44,6 +44,7 @@
import javax.xml.namespace.QName;
+import org.codehaus.plexus.util.CollectionUtils;
Review Comment:
Pls remove this import
##########
kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/DMNCompilerImplTest.java:
##########
@@ -70,10 +84,168 @@ void getRootElement() {
InformationRequirement informationRequirement = new
TInformationRequirement();
elementReference.setParent(informationRequirement);
- assertThatExceptionOfType(RuntimeException.class).isThrownBy(() ->
DMNCompilerImpl.getRootElement(elementReference));
-
+ assertThatExceptionOfType(RuntimeException.class).isThrownBy(
+ () ->
DMNCompilerImpl.getRootElement(elementReference)).withMessageContaining
+ ("Failed to get Definitions parent for
org.kie.dmn.model.v1_5");
informationRequirement.setParent(parent);
retrieved = DMNCompilerImpl.getRootElement(elementReference);
assertThat(retrieved).isNotNull().isEqualTo(parent);
}
-}
\ No newline at end of file
+
+ @Test
+ void compile() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f27bb64b-6fc7-4e1f-9848-11ba35e0df44";;
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel importedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(importedModel).isNotNull();
+
assertThat(importedModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(importedModel.getMessages()).isEmpty();
+ }
+
+ @Test
+ void compileWithUnknownTypeModelImports() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f27bb64b-6fc7-4e1f-9848-11ba35e0df44";;
+ String modelName = "Imported Model";
+ String importType =
String.valueOf(ImportDMNResolverUtil.ImportType.UNKNOWN);
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel model = dMNCompiler.compile( resource, dmnModels);
+ assertThat(model).isNotNull();
+ Definitions dmnDefn = model.getDefinitions();
+ addImport(dmnDefn, importType, nameSpace, modelName);
+ dmnModels.add(model);
+ model = dMNCompiler.compile(dmnDefn, resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+ assertThat(model.getMessages()).isNotEmpty();
+ assertThat(model.getMessages().get(0).getText()).isEqualTo("DMN:
Import type unknown: 'UNKNOWN'. (Invalid FEEL syntax on the referenced
expression) ");
+
+ }
+
+ @Test
+ void compileWithImportingDmnModel() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel importedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(importedModel).isNotNull();
+ dmnModels.add(importedModel);
+
+ //imported model - Importing_Named_Model.dmn
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f79aa7a4-f9a3-410a-ac95-bea496edabgc";;
+ resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+
+ DMNModel importingModel = dMNCompiler.compile(resource, dmnModels);
+ assertThat(importingModel).isNotNull();
+
assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(importingModel.getMessages()).isEmpty();
+ }
+
+ @Test
+ void compileImportingModelWithoutImportedModel() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String modelName = "Importing named Model";
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+ DMNModel model = dMNCompiler.compile( resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+
+ Definitions dmnDefn = model.getDefinitions();
+ dmnModels.add(model);
+ model = dMNCompiler.compile(dmnDefn, resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+ assertThat(model.getMessages()).isNotEmpty();
+
assertThat(model.getMessages().get(0).getMessageType()).isEqualTo(DMNMessageType.IMPORT_NOT_FOUND);
+
+ }
+
+ @Test
+ void resolveDMNImportType() {
+ List<DMNModel> toMerge = new ArrayList<>();
+ List<DMNModel> dmnModels = new ArrayList<>();
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel importedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(importedModel).isNotNull();
+ dmnModels.add(importedModel);
+
+ //imported model - Importing_Named_Model.dmn
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f79aa7a4-f9a3-410a-ac95-bea496edabgc";;
+ resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+ DMNModel importingModel = dMNCompiler.compile(resource, dmnModels);
+ assertThat(importingModel).isNotNull();
+
assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(importingModel.getMessages()).isEmpty();
+
+ Import input = importingModel.getDefinitions().getImport().get(0);
+ DMNModelImpl model = new DMNModelImpl(importingModel.getDefinitions(),
resource);
+ DMNCompilerImpl.resolveDMNImportType(input, dmnModels, model, toMerge);
+ assertThat(model.getMessages()).isEmpty();
+
assertThat(model.getImportAliasesForNS().entrySet().stream().findFirst().get().getValue().getLocalPart()).isNotNull().isEqualTo("Imported
Model");
+
+ }
+
+ @Test
+ void checkLocatedDMNModel() {
+ List<DMNModel> toMerge = new ArrayList<>();
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f79aa7a4-f9a3-410a-ac95-bea496edabgc";;
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+ DMNModel importingModel = dMNCompiler.compile(resource, dmnModels);
+ assertThat(importingModel).isNotNull();
+
assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+
+ Import input = importingModel.getDefinitions().getImport().get(0);
+ DMNModelImpl model = new DMNModelImpl(importingModel.getDefinitions(),
resource);
+ DMNModel located = new DMNModelImpl(importingModel.getDefinitions(),
resource);
+ DMNCompilerImpl.checkLocatedDMNModel(input, located, model, toMerge);
+ assertThat(importingModel).isNotNull();
+
assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(toMerge.isEmpty()).isTrue();
Review Comment:
Pls replace with more idiomatic
` assertThat(toMerge).isEmpty();`
##########
kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/DMNCompilerImplTest.java:
##########
@@ -70,10 +84,168 @@ void getRootElement() {
InformationRequirement informationRequirement = new
TInformationRequirement();
elementReference.setParent(informationRequirement);
- assertThatExceptionOfType(RuntimeException.class).isThrownBy(() ->
DMNCompilerImpl.getRootElement(elementReference));
-
+ assertThatExceptionOfType(RuntimeException.class).isThrownBy(
+ () ->
DMNCompilerImpl.getRootElement(elementReference)).withMessageContaining
+ ("Failed to get Definitions parent for
org.kie.dmn.model.v1_5");
informationRequirement.setParent(parent);
retrieved = DMNCompilerImpl.getRootElement(elementReference);
assertThat(retrieved).isNotNull().isEqualTo(parent);
}
-}
\ No newline at end of file
+
+ @Test
+ void compile() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f27bb64b-6fc7-4e1f-9848-11ba35e0df44";;
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel importedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(importedModel).isNotNull();
+
assertThat(importedModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(importedModel.getMessages()).isEmpty();
+ }
+
+ @Test
+ void compileWithUnknownTypeModelImports() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f27bb64b-6fc7-4e1f-9848-11ba35e0df44";;
+ String modelName = "Imported Model";
+ String importType =
String.valueOf(ImportDMNResolverUtil.ImportType.UNKNOWN);
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel model = dMNCompiler.compile( resource, dmnModels);
+ assertThat(model).isNotNull();
+ Definitions dmnDefn = model.getDefinitions();
+ addImport(dmnDefn, importType, nameSpace, modelName);
+ dmnModels.add(model);
+ model = dMNCompiler.compile(dmnDefn, resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+ assertThat(model.getMessages()).isNotEmpty();
+ assertThat(model.getMessages().get(0).getText()).isEqualTo("DMN:
Import type unknown: 'UNKNOWN'. (Invalid FEEL syntax on the referenced
expression) ");
+
+ }
+
+ @Test
+ void compileWithImportingDmnModel() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel importedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(importedModel).isNotNull();
+ dmnModels.add(importedModel);
+
+ //imported model - Importing_Named_Model.dmn
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f79aa7a4-f9a3-410a-ac95-bea496edabgc";;
+ resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+
+ DMNModel importingModel = dMNCompiler.compile(resource, dmnModels);
+ assertThat(importingModel).isNotNull();
+
assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(importingModel.getMessages()).isEmpty();
+ }
+
+ @Test
+ void compileImportingModelWithoutImportedModel() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String modelName = "Importing named Model";
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+ DMNModel model = dMNCompiler.compile( resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+
+ Definitions dmnDefn = model.getDefinitions();
+ dmnModels.add(model);
+ model = dMNCompiler.compile(dmnDefn, resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+ assertThat(model.getMessages()).isNotEmpty();
+
assertThat(model.getMessages().get(0).getMessageType()).isEqualTo(DMNMessageType.IMPORT_NOT_FOUND);
+
+ }
+
+ @Test
+ void resolveDMNImportType() {
+ List<DMNModel> toMerge = new ArrayList<>();
+ List<DMNModel> dmnModels = new ArrayList<>();
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel importedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(importedModel).isNotNull();
+ dmnModels.add(importedModel);
+
+ //imported model - Importing_Named_Model.dmn
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f79aa7a4-f9a3-410a-ac95-bea496edabgc";;
+ resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+ DMNModel importingModel = dMNCompiler.compile(resource, dmnModels);
+ assertThat(importingModel).isNotNull();
+
assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(importingModel.getMessages()).isEmpty();
+
+ Import input = importingModel.getDefinitions().getImport().get(0);
+ DMNModelImpl model = new DMNModelImpl(importingModel.getDefinitions(),
resource);
+ DMNCompilerImpl.resolveDMNImportType(input, dmnModels, model, toMerge);
+ assertThat(model.getMessages()).isEmpty();
+
assertThat(model.getImportAliasesForNS().entrySet().stream().findFirst().get().getValue().getLocalPart()).isNotNull().isEqualTo("Imported
Model");
+
+ }
+
+ @Test
+ void checkLocatedDMNModel() {
+ List<DMNModel> toMerge = new ArrayList<>();
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f79aa7a4-f9a3-410a-ac95-bea496edabgc";;
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+ DMNModel importingModel = dMNCompiler.compile(resource, dmnModels);
+ assertThat(importingModel).isNotNull();
+
assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+
+ Import input = importingModel.getDefinitions().getImport().get(0);
+ DMNModelImpl model = new DMNModelImpl(importingModel.getDefinitions(),
resource);
+ DMNModel located = new DMNModelImpl(importingModel.getDefinitions(),
resource);
+ DMNCompilerImpl.checkLocatedDMNModel(input, located, model, toMerge);
+ assertThat(importingModel).isNotNull();
+
assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(toMerge.isEmpty()).isTrue();
+ }
+
+ @Test
+ void checkLocatedDMNModelWithAliasNull() {
+ String
namespace="http://www.trisotech.com/dmn/definitions/_f79aa7a4-f9a3-410a-ac95-bea496edabgc";;
+ List<DMNModel> toMerge = new ArrayList<>();
+ List<DMNModel> dmnModels = new ArrayList<>();
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_EmptyNamed_Model_Without_Href_Namespace.dmn",
+ this.getClass());
+ DMNModel emptyNamedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(emptyNamedModel).isNotNull();
+ dmnModels.add(emptyNamedModel);
+
+ Import input = emptyNamedModel.getDefinitions().getImport().get(0);
+ DMNModelImpl model = new
DMNModelImpl(emptyNamedModel.getDefinitions(), resource);
+ DMNModel located = new DMNModelImpl(emptyNamedModel.getDefinitions(),
resource);
+ DMNCompilerImpl.checkLocatedDMNModel(input, located, model, toMerge);
+ assertThat(emptyNamedModel).isNotNull();
+ assertThat(toMerge.isEmpty()).isFalse();
+
assertThat(toMerge.get(0).getNamespace()).isNotNull().isEqualTo(namespace);
Review Comment:
As in previous comment, assert the size of `toMerge`
##########
kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/DMNCompilerImplTest.java:
##########
@@ -1,5 +1,5 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
+
Review Comment:
Pls remove this empty line
##########
kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/DMNCompilerImplTest.java:
##########
@@ -70,10 +84,168 @@ void getRootElement() {
InformationRequirement informationRequirement = new
TInformationRequirement();
elementReference.setParent(informationRequirement);
- assertThatExceptionOfType(RuntimeException.class).isThrownBy(() ->
DMNCompilerImpl.getRootElement(elementReference));
-
+ assertThatExceptionOfType(RuntimeException.class).isThrownBy(
+ () ->
DMNCompilerImpl.getRootElement(elementReference)).withMessageContaining
+ ("Failed to get Definitions parent for
org.kie.dmn.model.v1_5");
informationRequirement.setParent(parent);
retrieved = DMNCompilerImpl.getRootElement(elementReference);
assertThat(retrieved).isNotNull().isEqualTo(parent);
}
-}
\ No newline at end of file
+
+ @Test
+ void compile() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f27bb64b-6fc7-4e1f-9848-11ba35e0df44";;
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel importedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(importedModel).isNotNull();
+
assertThat(importedModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(importedModel.getMessages()).isEmpty();
+ }
+
+ @Test
+ void compileWithUnknownTypeModelImports() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f27bb64b-6fc7-4e1f-9848-11ba35e0df44";;
+ String modelName = "Imported Model";
+ String importType =
String.valueOf(ImportDMNResolverUtil.ImportType.UNKNOWN);
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel model = dMNCompiler.compile( resource, dmnModels);
+ assertThat(model).isNotNull();
+ Definitions dmnDefn = model.getDefinitions();
+ addImport(dmnDefn, importType, nameSpace, modelName);
+ dmnModels.add(model);
+ model = dMNCompiler.compile(dmnDefn, resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+ assertThat(model.getMessages()).isNotEmpty();
Review Comment:
THis test is error prone. It rely on the assumption that there is only one
message, without checking it before. Please add assertion on
`model.getMessages()` size.
Please notice assertions on the same object could be chained
##########
kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/DMNCompilerImplTest.java:
##########
@@ -70,10 +84,168 @@ void getRootElement() {
InformationRequirement informationRequirement = new
TInformationRequirement();
elementReference.setParent(informationRequirement);
- assertThatExceptionOfType(RuntimeException.class).isThrownBy(() ->
DMNCompilerImpl.getRootElement(elementReference));
-
+ assertThatExceptionOfType(RuntimeException.class).isThrownBy(
+ () ->
DMNCompilerImpl.getRootElement(elementReference)).withMessageContaining
+ ("Failed to get Definitions parent for
org.kie.dmn.model.v1_5");
informationRequirement.setParent(parent);
retrieved = DMNCompilerImpl.getRootElement(elementReference);
assertThat(retrieved).isNotNull().isEqualTo(parent);
}
-}
\ No newline at end of file
+
+ @Test
+ void compile() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f27bb64b-6fc7-4e1f-9848-11ba35e0df44";;
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel importedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(importedModel).isNotNull();
+
assertThat(importedModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(importedModel.getMessages()).isEmpty();
+ }
+
+ @Test
+ void compileWithUnknownTypeModelImports() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f27bb64b-6fc7-4e1f-9848-11ba35e0df44";;
+ String modelName = "Imported Model";
+ String importType =
String.valueOf(ImportDMNResolverUtil.ImportType.UNKNOWN);
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel model = dMNCompiler.compile( resource, dmnModels);
+ assertThat(model).isNotNull();
+ Definitions dmnDefn = model.getDefinitions();
+ addImport(dmnDefn, importType, nameSpace, modelName);
+ dmnModels.add(model);
+ model = dMNCompiler.compile(dmnDefn, resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+ assertThat(model.getMessages()).isNotEmpty();
+ assertThat(model.getMessages().get(0).getText()).isEqualTo("DMN:
Import type unknown: 'UNKNOWN'. (Invalid FEEL syntax on the referenced
expression) ");
+
+ }
+
+ @Test
+ void compileWithImportingDmnModel() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel importedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(importedModel).isNotNull();
+ dmnModels.add(importedModel);
+
+ //imported model - Importing_Named_Model.dmn
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f79aa7a4-f9a3-410a-ac95-bea496edabgc";;
+ resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+
+ DMNModel importingModel = dMNCompiler.compile(resource, dmnModels);
+ assertThat(importingModel).isNotNull();
+
assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(importingModel.getMessages()).isEmpty();
+ }
+
+ @Test
+ void compileImportingModelWithoutImportedModel() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String modelName = "Importing named Model";
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+ DMNModel model = dMNCompiler.compile( resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+
+ Definitions dmnDefn = model.getDefinitions();
+ dmnModels.add(model);
+ model = dMNCompiler.compile(dmnDefn, resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+ assertThat(model.getMessages()).isNotEmpty();
Review Comment:
Same as previous comment
##########
kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/DMNCompilerImplTest.java:
##########
@@ -70,10 +84,168 @@ void getRootElement() {
InformationRequirement informationRequirement = new
TInformationRequirement();
elementReference.setParent(informationRequirement);
- assertThatExceptionOfType(RuntimeException.class).isThrownBy(() ->
DMNCompilerImpl.getRootElement(elementReference));
-
+ assertThatExceptionOfType(RuntimeException.class).isThrownBy(
+ () ->
DMNCompilerImpl.getRootElement(elementReference)).withMessageContaining
+ ("Failed to get Definitions parent for
org.kie.dmn.model.v1_5");
informationRequirement.setParent(parent);
retrieved = DMNCompilerImpl.getRootElement(elementReference);
assertThat(retrieved).isNotNull().isEqualTo(parent);
}
-}
\ No newline at end of file
+
+ @Test
+ void compile() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f27bb64b-6fc7-4e1f-9848-11ba35e0df44";;
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel importedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(importedModel).isNotNull();
+
assertThat(importedModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(importedModel.getMessages()).isEmpty();
+ }
+
+ @Test
+ void compileWithUnknownTypeModelImports() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f27bb64b-6fc7-4e1f-9848-11ba35e0df44";;
+ String modelName = "Imported Model";
+ String importType =
String.valueOf(ImportDMNResolverUtil.ImportType.UNKNOWN);
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel model = dMNCompiler.compile( resource, dmnModels);
+ assertThat(model).isNotNull();
+ Definitions dmnDefn = model.getDefinitions();
+ addImport(dmnDefn, importType, nameSpace, modelName);
+ dmnModels.add(model);
+ model = dMNCompiler.compile(dmnDefn, resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+ assertThat(model.getMessages()).isNotEmpty();
+ assertThat(model.getMessages().get(0).getText()).isEqualTo("DMN:
Import type unknown: 'UNKNOWN'. (Invalid FEEL syntax on the referenced
expression) ");
+
+ }
+
+ @Test
+ void compileWithImportingDmnModel() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel importedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(importedModel).isNotNull();
+ dmnModels.add(importedModel);
+
+ //imported model - Importing_Named_Model.dmn
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f79aa7a4-f9a3-410a-ac95-bea496edabgc";;
+ resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+
+ DMNModel importingModel = dMNCompiler.compile(resource, dmnModels);
+ assertThat(importingModel).isNotNull();
+
assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(importingModel.getMessages()).isEmpty();
+ }
+
+ @Test
+ void compileImportingModelWithoutImportedModel() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String modelName = "Importing named Model";
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+ DMNModel model = dMNCompiler.compile( resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+
+ Definitions dmnDefn = model.getDefinitions();
+ dmnModels.add(model);
+ model = dMNCompiler.compile(dmnDefn, resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+ assertThat(model.getMessages()).isNotEmpty();
+
assertThat(model.getMessages().get(0).getMessageType()).isEqualTo(DMNMessageType.IMPORT_NOT_FOUND);
+
+ }
+
+ @Test
+ void resolveDMNImportType() {
+ List<DMNModel> toMerge = new ArrayList<>();
+ List<DMNModel> dmnModels = new ArrayList<>();
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel importedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(importedModel).isNotNull();
+ dmnModels.add(importedModel);
+
+ //imported model - Importing_Named_Model.dmn
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f79aa7a4-f9a3-410a-ac95-bea496edabgc";;
+ resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+ DMNModel importingModel = dMNCompiler.compile(resource, dmnModels);
+ assertThat(importingModel).isNotNull();
+
assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(importingModel.getMessages()).isEmpty();
+
+ Import input = importingModel.getDefinitions().getImport().get(0);
+ DMNModelImpl model = new DMNModelImpl(importingModel.getDefinitions(),
resource);
+ DMNCompilerImpl.resolveDMNImportType(input, dmnModels, model, toMerge);
+ assertThat(model.getMessages()).isEmpty();
+
assertThat(model.getImportAliasesForNS().entrySet().stream().findFirst().get().getValue().getLocalPart()).isNotNull().isEqualTo("Imported
Model");
+
+ }
+
+ @Test
+ void checkLocatedDMNModel() {
+ List<DMNModel> toMerge = new ArrayList<>();
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f79aa7a4-f9a3-410a-ac95-bea496edabgc";;
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+ DMNModel importingModel = dMNCompiler.compile(resource, dmnModels);
+ assertThat(importingModel).isNotNull();
+
assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+
+ Import input = importingModel.getDefinitions().getImport().get(0);
+ DMNModelImpl model = new DMNModelImpl(importingModel.getDefinitions(),
resource);
+ DMNModel located = new DMNModelImpl(importingModel.getDefinitions(),
resource);
+ DMNCompilerImpl.checkLocatedDMNModel(input, located, model, toMerge);
+ assertThat(importingModel).isNotNull();
+
assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(toMerge.isEmpty()).isTrue();
+ }
+
+ @Test
+ void checkLocatedDMNModelWithAliasNull() {
+ String
namespace="http://www.trisotech.com/dmn/definitions/_f79aa7a4-f9a3-410a-ac95-bea496edabgc";;
+ List<DMNModel> toMerge = new ArrayList<>();
+ List<DMNModel> dmnModels = new ArrayList<>();
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_EmptyNamed_Model_Without_Href_Namespace.dmn",
+ this.getClass());
+ DMNModel emptyNamedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(emptyNamedModel).isNotNull();
+ dmnModels.add(emptyNamedModel);
+
+ Import input = emptyNamedModel.getDefinitions().getImport().get(0);
+ DMNModelImpl model = new
DMNModelImpl(emptyNamedModel.getDefinitions(), resource);
+ DMNModel located = new DMNModelImpl(emptyNamedModel.getDefinitions(),
resource);
+ DMNCompilerImpl.checkLocatedDMNModel(input, located, model, toMerge);
+ assertThat(emptyNamedModel).isNotNull();
+ assertThat(toMerge.isEmpty()).isFalse();
Review Comment:
Pls replace with more idiomatic
`assertThat(toMerge).isNotEmpty();`
##########
kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/DMNCompilerImplTest.java:
##########
@@ -70,10 +84,168 @@ void getRootElement() {
InformationRequirement informationRequirement = new
TInformationRequirement();
elementReference.setParent(informationRequirement);
- assertThatExceptionOfType(RuntimeException.class).isThrownBy(() ->
DMNCompilerImpl.getRootElement(elementReference));
-
+ assertThatExceptionOfType(RuntimeException.class).isThrownBy(
+ () ->
DMNCompilerImpl.getRootElement(elementReference)).withMessageContaining
+ ("Failed to get Definitions parent for
org.kie.dmn.model.v1_5");
informationRequirement.setParent(parent);
retrieved = DMNCompilerImpl.getRootElement(elementReference);
assertThat(retrieved).isNotNull().isEqualTo(parent);
}
-}
\ No newline at end of file
+
+ @Test
+ void compile() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f27bb64b-6fc7-4e1f-9848-11ba35e0df44";;
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel importedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(importedModel).isNotNull();
+
assertThat(importedModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(importedModel.getMessages()).isEmpty();
+ }
+
+ @Test
+ void compileWithUnknownTypeModelImports() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f27bb64b-6fc7-4e1f-9848-11ba35e0df44";;
+ String modelName = "Imported Model";
+ String importType =
String.valueOf(ImportDMNResolverUtil.ImportType.UNKNOWN);
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel model = dMNCompiler.compile( resource, dmnModels);
+ assertThat(model).isNotNull();
+ Definitions dmnDefn = model.getDefinitions();
+ addImport(dmnDefn, importType, nameSpace, modelName);
+ dmnModels.add(model);
+ model = dMNCompiler.compile(dmnDefn, resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+ assertThat(model.getMessages()).isNotEmpty();
+ assertThat(model.getMessages().get(0).getText()).isEqualTo("DMN:
Import type unknown: 'UNKNOWN'. (Invalid FEEL syntax on the referenced
expression) ");
+
+ }
+
+ @Test
+ void compileWithImportingDmnModel() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel importedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(importedModel).isNotNull();
+ dmnModels.add(importedModel);
+
+ //imported model - Importing_Named_Model.dmn
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f79aa7a4-f9a3-410a-ac95-bea496edabgc";;
+ resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+
+ DMNModel importingModel = dMNCompiler.compile(resource, dmnModels);
+ assertThat(importingModel).isNotNull();
+
assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(importingModel.getMessages()).isEmpty();
+ }
+
+ @Test
+ void compileImportingModelWithoutImportedModel() {
+ List<DMNModel> dmnModels = new ArrayList<>();
+ String modelName = "Importing named Model";
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+ DMNModel model = dMNCompiler.compile( resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+
+ Definitions dmnDefn = model.getDefinitions();
+ dmnModels.add(model);
+ model = dMNCompiler.compile(dmnDefn, resource, dmnModels);
+ assertThat(model).isNotNull();
+ assertThat(model.getName()).isNotNull().isEqualTo(modelName);
+ assertThat(model.getMessages()).isNotEmpty();
+
assertThat(model.getMessages().get(0).getMessageType()).isEqualTo(DMNMessageType.IMPORT_NOT_FOUND);
+
+ }
+
+ @Test
+ void resolveDMNImportType() {
+ List<DMNModel> toMerge = new ArrayList<>();
+ List<DMNModel> dmnModels = new ArrayList<>();
+ Resource resource = new ClassPathResource(
"valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
+ this.getClass());
+ DMNModel importedModel = dMNCompiler.compile( resource, dmnModels);
+ assertThat(importedModel).isNotNull();
+ dmnModels.add(importedModel);
+
+ //imported model - Importing_Named_Model.dmn
+ String nameSpace =
"http://www.trisotech.com/dmn/definitions/_f79aa7a4-f9a3-410a-ac95-bea496edabgc";;
+ resource = new ClassPathResource(
"valid_models/DMNv1_5/Importing_Named_Model.dmn",
+ this.getClass());
+ DMNModel importingModel = dMNCompiler.compile(resource, dmnModels);
+ assertThat(importingModel).isNotNull();
+
assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
+ assertThat(importingModel.getMessages()).isEmpty();
+
+ Import input = importingModel.getDefinitions().getImport().get(0);
+ DMNModelImpl model = new DMNModelImpl(importingModel.getDefinitions(),
resource);
+ DMNCompilerImpl.resolveDMNImportType(input, dmnModels, model, toMerge);
+ assertThat(model.getMessages()).isEmpty();
+
assertThat(model.getImportAliasesForNS().entrySet().stream().findFirst().get().getValue().getLocalPart()).isNotNull().isEqualTo("Imported
Model");
Review Comment:
Please add an assertion on the `get()` invocation, or throw an exception
##########
kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/DMNCompilerImpl.java:
##########
@@ -209,60 +210,82 @@ public DMNModel compile(Definitions dmndefs,
Collection<DMNModel> dmnModels, Res
}
DMNModelImpl model = new DMNModelImpl(dmndefs, resource);
model.setRuntimeTypeCheck(((DMNCompilerConfigurationImpl)
dmnCompilerConfig).getOption(RuntimeTypeCheckOption.class).isRuntimeTypeCheck());
+ DMNCompilerContext ctx = configureDMNCompiler(model.getFeelDialect(),
relativeResolver);
+ if (!dmndefs.getImport().isEmpty()) {
+ iterateImports(dmndefs, dmnModels, model, relativeResolver );
+ }
+ processItemDefinitions(ctx, model, dmndefs);
+ processDrgElements(ctx, model, dmndefs);
+ return model;
+ }
+
+ private DMNCompilerContext configureDMNCompiler(FEELDialect feeldialect,
Function<String, Reader> relativeResolver) {
+
DMNCompilerConfigurationImpl cc = (DMNCompilerConfigurationImpl)
dmnCompilerConfig;
List<FEELProfile> helperFEELProfiles = cc.getFeelProfiles();
- DMNFEELHelper feel = new DMNFEELHelper(cc.getRootClassLoader(),
helperFEELProfiles, model.getFeelDialect());
+ DMNFEELHelper feel = new DMNFEELHelper(cc.getRootClassLoader(),
helperFEELProfiles, feeldialect);
DMNCompilerContext ctx = new DMNCompilerContext(feel);
ctx.setRelativeResolver(relativeResolver);
+ return ctx;
+ }
+
+ private void iterateImports(Definitions dmndefs, Collection<DMNModel>
dmnModels, DMNModelImpl model, Function<String, Reader> relativeResolver ) {
List<DMNModel> toMerge = new ArrayList<>();
- if (!dmndefs.getImport().isEmpty()) {
- for (Import i : dmndefs.getImport()) {
- if (ImportDMNResolverUtil.whichImportType(i) ==
ImportType.DMN) {
- Either<String, DMNModel> resolvedResult =
ImportDMNResolverUtil.resolveImportDMN(i, dmnModels, (DMNModel m) -> new
QName(m.getNamespace(), m.getName()));
- DMNModel located = resolvedResult.cata(msg -> {
- MsgUtil.reportMessage(logger,
- DMNMessage.Severity.ERROR,
- i,
- model,
- null,
- null,
- Msg.IMPORT_NOT_FOUND_FOR_NODE,
- msg,
- i);
- return null;
- }, Function.identity());
- 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
- // with original one,
- // because otherwise we would have to deal with
clashing name aliases, or similar issues
- if (iAlias != null && !iAlias.isEmpty()) {
- model.setImportAliasForNS(iAlias,
located.getNamespace(), located.getName());
- importFromModel(model, located, iAlias);
- } else {
- toMerge.add(located);
- }
- }
- } else if (ImportDMNResolverUtil.whichImportType(i) ==
ImportType.PMML) {
- processPMMLImport(model, i, relativeResolver);
- model.setImportAliasForNS(i.getName(), i.getNamespace(),
i.getName());
- } else {
- MsgUtil.reportMessage(logger,
- DMNMessage.Severity.ERROR,
- null,
- model,
- null,
- null,
- Msg.IMPORT_TYPE_UNKNOWN,
- i.getImportType());
- }
+ for (Import i : dmndefs.getImport()) {
+ if (ImportDMNResolverUtil.whichImportType(i) == ImportType.DMN) {
Review Comment:
This `if/else` could be replaced by switch
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
