Merge pull request #80 from rgdoliveira/sync_main

Sync main branch with Apache main branch
kiegroup · Oct 3, 2024 · 152dbc2 · 152dbc2
2 parents 80ceac5 + bfd675b
commit 152dbc2
Show file tree

Hide file tree

Showing 144 changed files with 1,808 additions and 1,240 deletions.
diff --git a/NOTICE b/NOTICE
@@ -14,6 +14,10 @@ This product also includes the following third-party components:
   Downloaded from: https://lunrjs.com/
   License: MIT
 
+* Saxon-HE
+  Downloaded from: https://www.saxonica.com/
+  License: Mozilla Public License 2.0
+
 * search-ui
   Downloaded from: https://gitlab.com/antora/antora-lunr-extension
   License: Mozilla Public License 2.0
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -66,7 +66,7 @@
     <version.com.github.victools>4.31.0</version.com.github.victools> <!-- victools should align with Jackson if possible -->
     <version.com.miglayout>3.7.4</version.com.miglayout>
     <version.domino-slf4j-logger>1.0.1</version.domino-slf4j-logger>
-    <version.com.google.protobuf>3.25.0</version.com.google.protobuf>
+    <version.com.google.protobuf>3.25.5</version.com.google.protobuf>
     <version.com.h2database>2.2.220</version.com.h2database>
     <version.com.networknt.json-schema-validator>1.0.86</version.com.networknt.json-schema-validator>
     <version.com.sun.xml.bind>4.0.4</version.com.sun.xml.bind>

diff --git a/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieBuilderImpl.java b/drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieBuilderImpl.java
@@ -298,6 +298,12 @@ private static void buildKieProject( BuildContext buildContext,
                 kieRepository.addKieModule( kDep );
             }
         }
+
+        clearBuilderCache();
+    }
+
+    private static void clearBuilderCache() {
+        DecisionTableFactory.clearCompilerCache();
     }
 
     private void addKBasesFilesToTrg() {

diff --git a/drools-decisiontables/pom.xml b/drools-decisiontables/pom.xml
@@ -87,8 +87,13 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
     <!-- Logging -->
@@ -101,11 +106,6 @@
       <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/drools-decisiontables/src/main/java/org/drools/decisiontable/DecisionTableProviderImpl.java b/drools-decisiontables/src/main/java/org/drools/decisiontable/DecisionTableProviderImpl.java
@@ -27,6 +27,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.drools.decisiontable.parser.xls.PropertiesSheetListener;
 import org.drools.drl.extensions.DecisionTableProvider;
@@ -42,16 +43,16 @@ public class DecisionTableProviderImpl
     implements
     DecisionTableProvider {
 
-    private static final transient Logger logger = LoggerFactory.getLogger( DecisionTableProviderImpl.class );
+    private static final Logger logger = LoggerFactory.getLogger( DecisionTableProviderImpl.class );
+
+    private Map<String, String> compiledDtablesCache = new ConcurrentHashMap<>();
 
     @Override
     public String loadFromResource(Resource resource,
                                    DecisionTableConfiguration configuration) {
 
         try {
             return compileResource( resource, configuration );
-        } catch (IOException e) {
-            throw new UncheckedIOException( e );
         } catch (Exception e) {
             throw new DecisionTableParseException(resource, e);
         }
@@ -78,29 +79,46 @@ public List<String> loadFromInputStreamWithTemplates(Resource resource,
         return drls;
     }
 
-    private String compileResource(Resource resource,
-                                   DecisionTableConfiguration configuration) throws IOException {
+    private String compileResource(Resource resource, DecisionTableConfiguration configuration) {
+        if (resource.getSourcePath() == null) {
+            return internalCompileResource(resource, configuration);
+        }
+        String resourceKey = resource.getSourcePath() + "?trimCell=" + configuration.isTrimCell() + "&worksheetName=" + configuration.getWorksheetName();
+        return compiledDtablesCache.computeIfAbsent(resourceKey, path -> internalCompileResource(resource, configuration));
+    }
+
+    private String internalCompileResource(Resource resource, DecisionTableConfiguration configuration) throws UncheckedIOException {
         SpreadsheetCompiler compiler = new SpreadsheetCompiler(configuration.isTrimCell());
 
         switch ( configuration.getInputType() ) {
             case XLS :
             case XLSX :
                 if ( StringUtils.isEmpty( configuration.getWorksheetName() ) ) {
-                    return compiler.compile( resource,
-                                             InputType.XLS );
+                    return compiler.compile( resource, InputType.XLS );
                 } else {
-                    return compiler.compile( resource.getInputStream(),
-                                             configuration.getWorksheetName() );
+                    try {
+                        return compiler.compile( resource.getInputStream(), configuration.getWorksheetName() );
+                    } catch (IOException e) {
+                        throw new UncheckedIOException(e);
+                    }
                 }
             case CSV : {
-                return compiler.compile( resource.getInputStream(),
-                                         InputType.CSV );
+                try {
+                    return compiler.compile( resource.getInputStream(), InputType.CSV );
+                } catch (IOException e) {
+                    throw new UncheckedIOException(e);
+                }
             }
         }
 
         return null;
     }
 
+    @Override
+    public void clearCompilerCache() {
+        compiledDtablesCache.clear();
+    }
+
     @Override
     public Map<String, List<String[]>> loadPropertiesFromFile(File file, DecisionTableConfiguration configuration) {
         switch (configuration.getInputType()) {

diff --git a/drools-decisiontables/src/test/java/org/drools/decisiontable/CalendarTimerResourcesTest.java b/drools-decisiontables/src/test/java/org/drools/decisiontable/CalendarTimerResourcesTest.java
@@ -21,9 +21,9 @@
 import java.util.Calendar;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.kie.api.KieServices;
 import org.kie.api.builder.KieBuilder;
 import org.kie.api.builder.KieFileSystem;
@@ -42,7 +42,7 @@ public class CalendarTimerResourcesTest {
 
     private SessionPseudoClock clock;
 
-    @Before
+    @BeforeEach
     public void init() {
 
         final KieServices ks = KieServices.Factory.get();
@@ -66,7 +66,7 @@ public void init() {
         clock = ksession.getSessionClock();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
 
         if (ksession != null) {

diff --git a/drools-decisiontables/src/test/java/org/drools/decisiontable/ColumnReplaceTest.java b/drools-decisiontables/src/test/java/org/drools/decisiontable/ColumnReplaceTest.java
@@ -21,7 +21,7 @@
 import org.drools.base.definitions.rule.impl.RuleImpl;
 import org.drools.kiesession.rulebase.InternalKnowledgeBase;
 import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.kie.api.io.ResourceType;
 import org.kie.internal.builder.DecisionTableConfiguration;
 import org.kie.internal.builder.DecisionTableInputType;

diff --git a/drools-decisiontables/src/test/java/org/drools/decisiontable/DecimalSeparatorTest.java b/drools-decisiontables/src/test/java/org/drools/decisiontable/DecimalSeparatorTest.java
@@ -20,8 +20,8 @@
 
 import java.util.Locale;
 
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.kie.api.KieServices;
 import org.kie.api.builder.KieBuilder;
 import org.kie.api.builder.KieFileSystem;
@@ -56,7 +56,7 @@ public void init() {
         ksession = ks.newKieContainer(ks.getRepository().getDefaultReleaseId()).newKieSession();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         if (ksession != null) {
             ksession.dispose();

diff --git a/drools-decisiontables/src/test/java/org/drools/decisiontable/DumpGeneratedDrlTest.java b/drools-decisiontables/src/test/java/org/drools/decisiontable/DumpGeneratedDrlTest.java
@@ -23,9 +23,9 @@
 
 import org.apache.commons.io.FileUtils;
 import org.drools.util.IoUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.kie.api.KieServices;
 import org.kie.api.builder.ReleaseId;
 import org.kie.api.io.Resource;
@@ -57,7 +57,7 @@ public class DumpGeneratedDrlTest {
     private File dumpDir;
     private String dumpDirPropOrigValue;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         dumpDir = new File("target/drools-dump-dir");
         // delete the dir before test to remove possible leftovers from previous runs
@@ -71,7 +71,7 @@ public void setUp() {
         System.setProperty(DumpDirOption.PROPERTY_NAME, dumpDir.getAbsolutePath());
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         if (dumpDirPropOrigValue != null) {
             System.setProperty(DumpDirOption.PROPERTY_NAME, dumpDirPropOrigValue);

diff --git a/drools-decisiontables/src/test/java/org/drools/decisiontable/EmptyHeaderTest.java b/drools-decisiontables/src/test/java/org/drools/decisiontable/EmptyHeaderTest.java
@@ -19,33 +19,36 @@
 package org.drools.decisiontable;
 
 import org.drools.template.parser.DecisionTableParseException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.kie.internal.builder.DecisionTableConfiguration;
 import org.kie.internal.builder.KnowledgeBuilder;
 import org.kie.internal.builder.KnowledgeBuilderFactory;
 
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.kie.api.io.ResourceType.DTABLE;
 import static org.kie.internal.builder.DecisionTableInputType.CSV;
 import static org.kie.internal.builder.DecisionTableInputType.XLS;
 import static org.kie.internal.io.ResourceFactory.newClassPathResource;
 
 public class EmptyHeaderTest {
 
-    @Test(expected = DecisionTableParseException.class)
+    @Test
     public void testEmptyConditionInXLS() {
         DecisionTableConfiguration dtconf = KnowledgeBuilderFactory.newDecisionTableConfiguration();
         dtconf.setInputType(XLS);
         KnowledgeBuilder kbuilder = KnowledgeBuilderFactory .newKnowledgeBuilder();
 
-        kbuilder.add(newClassPathResource("emptyCondition.drl.xls", getClass()), DTABLE, dtconf);
+        assertThatExceptionOfType((DecisionTableParseException.class)).isThrownBy(
+                () -> kbuilder.add(newClassPathResource("emptyCondition.drl.xls", getClass()), DTABLE, dtconf));
     }
 
-    @Test(expected = DecisionTableParseException.class)
+    @Test
     public void testEmptyActionInCSV() {
         DecisionTableConfiguration dtconf = KnowledgeBuilderFactory.newDecisionTableConfiguration();
         dtconf.setInputType(CSV);
         KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
 
-        kbuilder.add(newClassPathResource("emptyAction.drl.csv", getClass()), DTABLE, dtconf);
+        assertThatExceptionOfType((DecisionTableParseException.class)).isThrownBy(
+                () -> kbuilder.add(newClassPathResource("emptyAction.drl.csv", getClass()), DTABLE, dtconf));
     }
 }
diff --git a/...ecisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerTest.java b/...ecisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerTest.java
@@ -29,8 +29,8 @@
 import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
 import org.drools.template.parser.DataListener;
 import org.drools.template.parser.TemplateDataListener;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.kie.api.io.ResourceType;
 import org.kie.api.runtime.KieSession;
 import org.kie.internal.builder.KnowledgeBuilder;
@@ -49,7 +49,7 @@ public class ExternalSpreadsheetCompilerTest {
 
     private ExternalSpreadsheetCompiler converter;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         converter = new ExternalSpreadsheetCompiler();
     }

diff --git a/drools-decisiontables/src/test/java/org/drools/decisiontable/FixedPatternTest.java b/drools-decisiontables/src/test/java/org/drools/decisiontable/FixedPatternTest.java
@@ -23,8 +23,8 @@
 
 import org.drools.kiesession.rulebase.InternalKnowledgeBase;
 import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.kie.api.io.ResourceType;
 import org.kie.api.runtime.KieSession;
 import org.kie.internal.builder.DecisionTableConfiguration;
@@ -40,7 +40,7 @@ public class FixedPatternTest {
 
     private KieSession ksession;
 
-    @After
+    @AfterEach
     public void tearDown() {
         if (ksession != null) {
             ksession.dispose();

diff --git a/drools-decisiontables/src/test/java/org/drools/decisiontable/IgnoreNumericFormatTest.java b/drools-decisiontables/src/test/java/org/drools/decisiontable/IgnoreNumericFormatTest.java
@@ -23,8 +23,8 @@
 
 import org.drools.kiesession.rulebase.InternalKnowledgeBase;
 import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.kie.api.io.ResourceType;
 import org.kie.api.runtime.KieSession;
 import org.kie.internal.builder.DecisionTableConfiguration;
@@ -40,7 +40,7 @@ public class IgnoreNumericFormatTest {
 
     private KieSession ksession;
 
-    @After
+    @AfterEach
     public void tearDown() {
         if (ksession != null) {
             ksession.dispose();

diff --git a/drools-decisiontables/src/test/java/org/drools/decisiontable/LineBreakXLSTest.java b/drools-decisiontables/src/test/java/org/drools/decisiontable/LineBreakXLSTest.java
@@ -21,8 +21,8 @@
 import com.sample.FactData;
 import org.drools.kiesession.rulebase.InternalKnowledgeBase;
 import org.drools.kiesession.rulebase.KnowledgeBaseFactory;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.kie.api.io.ResourceType;
 import org.kie.api.runtime.KieSession;
 import org.kie.internal.builder.DecisionTableConfiguration;
@@ -38,7 +38,7 @@ public class LineBreakXLSTest {
 
     private KieSession ksession;
 
-    @After
+    @AfterEach
     public void tearDown() {
         if (ksession != null) {
             ksession.dispose();

diff --git a/drools-decisiontables/src/test/java/org/drools/decisiontable/LinkedWorkbookTest.java b/drools-decisiontables/src/test/java/org/drools/decisiontable/LinkedWorkbookTest.java
@@ -20,7 +20,7 @@
 
 import java.io.InputStream;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.kie.api.KieBase;
 import org.kie.api.io.ResourceType;
 import org.kie.internal.io.ResourceFactory;

diff --git a/drools-decisiontables/src/test/java/org/drools/decisiontable/MakeSureMultiLinesWorkTest.java b/drools-decisiontables/src/test/java/org/drools/decisiontable/MakeSureMultiLinesWorkTest.java
@@ -20,19 +20,18 @@
 
 import java.io.InputStream;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
 import org.kie.api.KieBase;
 import org.kie.api.io.ResourceType;
 import org.kie.internal.io.ResourceFactory;
 import org.kie.internal.utils.KieHelper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Ignore
+@Disabled
 public class MakeSureMultiLinesWorkTest {
 
-    @Test
+    @org.junit.jupiter.api.Test
     public void makeSureMultiLinesWork() {
 
         KieHelper kieHelper = new KieHelper();