Review Comments fix

apache · Mar 7, 2025 · 45658fe · 45658fe
1 parent cc0d641
commit 45658fe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/DMNCompilerImpl.java b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/DMNCompilerImpl.java
@@ -41,10 +41,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
 import javax.xml.namespace.QName;
-
-import org.codehaus.plexus.util.CollectionUtils;
 import org.drools.io.FileSystemResource;
 import org.kie.api.io.Resource;
 import org.kie.dmn.api.core.DMNCompiler;

diff --git a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/DMNCompilerImplTest.java b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/DMNCompilerImplTest.java
@@ -1,5 +1,4 @@
-
- /* Licensed to the Apache Software Foundation (ASF) under one
+/* Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  The ASF licenses this file
@@ -33,6 +32,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.xml.namespace.QName;
 import java.util.*;
 import java.util.List;
 
@@ -121,6 +121,7 @@ void compileWithUnknownTypeModelImports() {
         assertThat(model).isNotNull();
         assertThat(model.getName()).isNotNull().isEqualTo(modelName);
         assertThat(model.getMessages()).isNotEmpty();
+        assertThat(model.getMessages().size()).isEqualTo(1);
         assertThat(model.getMessages().get(0).getText()).isEqualTo("DMN: Import type unknown: 'UNKNOWN'. (Invalid FEEL syntax on the referenced expression) ");
 
     }
@@ -161,12 +162,13 @@ void compileImportingModelWithoutImportedModel()  {
         assertThat(model).isNotNull();
         assertThat(model.getName()).isNotNull().isEqualTo(modelName);
         assertThat(model.getMessages()).isNotEmpty();
+        assertThat(model.getMessages().size()).isEqualTo(5);
         assertThat(model.getMessages().get(0).getMessageType()).isEqualTo(DMNMessageType.IMPORT_NOT_FOUND);
 
     }
 
     @Test
-    void resolveDMNImportType() {
+    void resolveDMNImportType()  {
         List<DMNModel> toMerge = new ArrayList<>();
         List<DMNModel> dmnModels = new ArrayList<>();
         Resource resource = new ClassPathResource( "valid_models/DMNv1_5/Imported_Model_Unamed.dmn",
@@ -188,7 +190,9 @@ void resolveDMNImportType() {
         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");
+        assertThat(model.getImportAliasesForNS().entrySet().stream().findFirst())
+                .isPresent().get().extracting(Map.Entry::getValue)
+                .extracting(QName::getLocalPart).isNotNull().isEqualTo("Imported Model");
 
     }
 
@@ -209,7 +213,7 @@ void checkLocatedDMNModel() {
         DMNCompilerImpl.checkLocatedDMNModel(input, located, model, toMerge);
         assertThat(importingModel).isNotNull();
         assertThat(importingModel.getNamespace()).isNotNull().isEqualTo(nameSpace);
-        assertThat(toMerge.isEmpty()).isTrue();
+        assertThat(toMerge).isEmpty();
     }
 
     @Test
@@ -228,7 +232,8 @@ void checkLocatedDMNModelWithAliasNull() {
         DMNModel located = new DMNModelImpl(emptyNamedModel.getDefinitions(), resource);
         DMNCompilerImpl.checkLocatedDMNModel(input, located, model, toMerge);
         assertThat(emptyNamedModel).isNotNull();
-        assertThat(toMerge.isEmpty()).isFalse();
+        assertThat(toMerge).isNotEmpty();
+        assertThat(toMerge.size()).isEqualTo(1);
         assertThat(toMerge.get(0).getNamespace()).isNotNull().isEqualTo(namespace);
 
     }