DROOLS-1663 Kie DMN doesn't support IMPORT decisions between DMN files #1832
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,4 +22,8 @@ public interface DMNNode { | |
|
|
||
| String getName(); | ||
|
|
||
| String getModelNamespace(); | ||
|
|
||
| String getModelName(); | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package org.kie.dmn.core.assembler; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import javax.xml.namespace.QName; | ||
|
|
||
| import org.kie.api.io.ResourceWithConfiguration; | ||
| import org.kie.dmn.model.v1_1.Definitions; | ||
|
|
||
| public class DMNResource { | ||
|
|
||
| private final QName modelID; | ||
| private final ResourceWithConfiguration resAndConfig; | ||
| private final Definitions definitions; | ||
| private final List<QName> dependencies = new ArrayList<>(); | ||
|
|
||
| public DMNResource(QName modelID, ResourceWithConfiguration resAndConfig, Definitions definitions) { | ||
| this.modelID = modelID; | ||
| this.resAndConfig = resAndConfig; | ||
| this.definitions = definitions; | ||
| } | ||
|
|
||
| public QName getModelID() { | ||
| return modelID; | ||
| } | ||
|
|
||
| public ResourceWithConfiguration getResAndConfig() { | ||
| return resAndConfig; | ||
| } | ||
|
|
||
| public Definitions getDefinitions() { | ||
| return definitions; | ||
| } | ||
|
|
||
| public void addDependency(QName dep) { | ||
| this.dependencies.add(dep); | ||
| } | ||
|
|
||
| public void addDependencies(List<QName> deps) { | ||
| this.dependencies.addAll(deps); | ||
| } | ||
|
|
||
| public List<QName> getDependencies() { | ||
| return dependencies; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "DMNResource [modelID=" + modelID + ", resource=" + resAndConfig.getResource().getSourcePath() + "]"; | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| package org.kie.dmn.core.assembler; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| public class DMNResourceDependenciesSorter { | ||
|
|
||
| /** | ||
| * Return a new list of DMNResource sorted by dependencies (required dependencies comes first) | ||
| */ | ||
| public static List<DMNResource> sort(List<DMNResource> ins) { | ||
| // In a graph A -> B -> {C, D} | ||
| // showing that A requires B, and B requires C,D | ||
| // then a depth-first visit would satisfy required ordering, for example a valid depth first visit is also a valid sort here: C, D, B, A. | ||
| Collection<DMNResource> visited = new ArrayList<>(ins.size()); | ||
| List<DMNResource> dfv = new ArrayList<>(ins.size()); | ||
|
|
||
| for (DMNResource node : ins) { | ||
| if (!visited.contains(node)) { | ||
| dfVisit(node, ins, visited, dfv); | ||
| } | ||
| } | ||
|
|
||
| return dfv; | ||
| } | ||
|
|
||
| /** | ||
| * Performs a depth first visit, but keeping a separate reference of visited/visiting nodes, _also_ to avoid potential issues of circularities. | ||
| */ | ||
| private static void dfVisit(DMNResource node, List<DMNResource> allNodes, Collection<DMNResource> visited, List<DMNResource> dfv) { | ||
| if (visited.contains(node)) { | ||
| throw new RuntimeException("Circular dependency detected: " + visited + " , and again to: " + node); | ||
| } | ||
| visited.add(node); | ||
|
|
||
| List<DMNResource> neighbours = node.getDependencies().stream() | ||
| .flatMap(dep -> allNodes.stream().filter(r -> r.getModelID().equals(dep))) | ||
| .collect(Collectors.toList()); | ||
| for (DMNResource n : neighbours) { | ||
| if (!visited.contains(n)) { | ||
| dfVisit(n, allNodes, visited, dfv); | ||
| } | ||
| } | ||
|
|
||
| dfv.add(node); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Question: Will there be a possibility of an external import? I mean some external resource outside of the kjar or from URL. Asking because for this one file import is not resolved (and that is correct in current case).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not as far as I know. @etirelli ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This might be necessary in the future, but support is not implemented yet. For now, the imported model has to be reachable by the kie-container classloader.
I don't think we need to worry at the moment about "external" imports as that would have additional concerns, like authentication and authorization, that are not covered by the spec at the moment.