This is an automated email from the ASF dual-hosted git repository.
yamer pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-drools.git
The following commit(s) were added to refs/heads/main by this push:
new c0c300c8ac [incubator-kie-issues#1627] Change log level from error to
debug inside ImportDMNResolverUtil (#6172)
c0c300c8ac is described below
commit c0c300c8ac91e6a2a7eff1d995778b63c844dbf1
Author: Yeser Amer <[email protected]>
AuthorDate: Thu Nov 28 14:16:54 2024 +0100
[incubator-kie-issues#1627] Change log level from error to debug inside
ImportDMNResolverUtil (#6172)
* change log level
* change log level
* change log level
---
.../java/org/kie/dmn/core/compiler/ImportDMNResolverUtil.java | 6 +++++-
.../org/kie/dmn/core/compiler/ImportDMNResolverUtilTest.java | 9 ++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git
a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/ImportDMNResolverUtil.java
b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/ImportDMNResolverUtil.java
index 8f44c67815..388a47c608 100644
---
a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/ImportDMNResolverUtil.java
+++
b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/ImportDMNResolverUtil.java
@@ -52,6 +52,10 @@ public class ImportDMNResolverUtil {
"Importing a DMN model with namespace={} name={}
locationURI={}, modelName={}",
importerDMNName, importerDMNNamespace, importNamespace,
importName, importLocationURI, importModelName);
+ if (dmns.isEmpty()) {
+ return Either.ofLeft("Impossible to resolve an import against an
empty DMN collection");
+ }
+
List<T> matchingDMNList = dmns.stream()
.filter(m ->
idExtractor.apply(m).getNamespaceURI().equals(importNamespace))
.toList();
@@ -64,7 +68,7 @@ public class ImportDMNResolverUtil {
importerDMNName, importerDMNNamespace,
importNamespace, importName, importLocationURI, importModelName);
return Either.ofRight(located);
} else {
- LOGGER.debug("DMN Model with name={} and namespace={} can't
import a DMN with namespace={}, name={}, modelName={}, " +
+ LOGGER.error("DMN Model with name={} and namespace={} can't
import a DMN with namespace={}, name={}, modelName={}, " +
"located within namespace only {} but does not
match for the actual modelName",
importerDMNName, importerDMNNamespace,
importNamespace, importName, importModelName, idExtractor.apply(located));
return Either.ofLeft(String.format(
diff --git
a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/ImportDMNResolverUtilTest.java
b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/ImportDMNResolverUtilTest.java
index 6368dee3cc..2b7554d1d8 100644
---
a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/ImportDMNResolverUtilTest.java
+++
b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/ImportDMNResolverUtilTest.java
@@ -19,6 +19,7 @@
package org.kie.dmn.core.compiler;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -156,7 +157,6 @@ class ImportDMNResolverUtilTest {
@Test
void locateInNSAliasedBadScenario() {
- // this is a BAD scenario are in namespace `nsA` there are 2 models
with the same name.
final Import i = makeImport("nsA", "aliased", "mA");
final List<QName> available = Arrays.asList(new QName("nsA", "mA"),
new QName("nsA", "mA"),
@@ -165,6 +165,13 @@ class ImportDMNResolverUtilTest {
assertThat(result.isLeft()).isTrue();
}
+ @Test
+ void emptyDMNCollection() {
+ final Import i = makeImport("nsA", "aliased", "mA");
+ final Either<String, QName> result =
ImportDMNResolverUtil.resolveImportDMN(i, Collections.emptyList(),
Function.identity());
+ assertThat(result.isLeft()).isTrue();
+ }
+
private Import makeImport(final String namespace, final String name, final
String modelName) {
final Import i = new TImport();
i.setNamespace(namespace);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
