Merge branch 'refs/heads/main' into kie-issues#1330

apache · Jun 21, 2024 · 35380b6 · 35380b6
2 parents e016012 + af0f91a
commit 35380b6
Show file tree

Hide file tree

Showing 31 changed files with 1,016 additions and 48 deletions.
diff --git a/drools-core/src/test/java/org/drools/core/util/KeyStoreHelperTest.java b/drools-core/src/test/java/org/drools/core/util/KeyStoreHelperTest.java
@@ -18,6 +18,7 @@
  */
 package org.drools.core.util;
 
+import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -35,6 +36,7 @@
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.DESKeySpec;
 
+import org.junit.AfterClass;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -52,6 +54,16 @@ public class KeyStoreHelperTest {
     private static final String KEY_PASSWORD = "keypwd";
     private static final String KEY_PHRASE = "secretkey";
 
+    @AfterClass
+    public static void cleanup() {
+        try {
+            new File(KEYSTORE_JCEKS_FILENAME).delete();
+        } catch (Exception e) {
+            // ignore
+        }
+
+    }
+
     @Test
     public void testSignDataWithPrivateKey() throws UnsupportedEncodingException,
                                             UnrecoverableKeyException,

diff --git a/...va/org/drools/example/api/defaultkiesessionfromfile/DefaultKieSessionFromFileExample.java b/...va/org/drools/example/api/defaultkiesessionfromfile/DefaultKieSessionFromFileExample.java
@@ -18,6 +18,9 @@
  */
 package org.drools.example.api.defaultkiesessionfromfile;
 
+import java.io.File;
+import java.io.PrintStream;
+
 import org.kie.api.KieServices;
 import org.kie.api.builder.KieModule;
 import org.kie.api.builder.KieRepository;
@@ -26,9 +29,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.PrintStream;
-
 
 public class DefaultKieSessionFromFileExample {
 
@@ -69,8 +69,7 @@ public static File getFile(String exampleName) {
         File folder = new File("drools-examples-api").getAbsoluteFile();
         File exampleFolder = null;
         while (folder != null) {
-            exampleFolder = new File(folder,
-                                     exampleName);
+            exampleFolder = new File(folder, exampleName);
             if (exampleFolder.exists()) {
                 break;
             }
@@ -80,14 +79,13 @@ public static File getFile(String exampleName) {
 
         if (exampleFolder != null) {
 
-            File targetFolder = new File(exampleFolder,
-                                         "target");
+            File targetFolder = new File(exampleFolder, "target");
             if (!targetFolder.exists()) {
                 throw new RuntimeException("The target folder does not exist, please build project " + exampleName + " first");
             }
 
             for (String str : targetFolder.list()) {
-                if (str.startsWith(exampleName) && !str.endsWith("-sources.jar") && !str.endsWith("-tests.jar") && !str.endsWith("-javadoc.jar")) {
+                if (str.startsWith(exampleName) && str.endsWith(".jar") && !str.endsWith("-sources.jar") && !str.endsWith("-tests.jar") && !str.endsWith("-javadoc.jar")) {
                     return new File(targetFolder, str);
                 }
             }

diff --git a/...ools/example/api/defaultkiesessionfromfile/DefaultKieSessionFromByteArrayExampleTest.java b/...ools/example/api/defaultkiesessionfromfile/DefaultKieSessionFromByteArrayExampleTest.java
@@ -18,19 +18,19 @@
  */
 package org.drools.example.api.defaultkiesessionfromfile;
 
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.PrintStream;
+
 import org.junit.Test;
 import org.kie.api.KieServices;
 import org.kie.api.builder.KieModule;
 import org.kie.api.builder.KieRepository;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.PrintStream;
-
 import static org.junit.Assert.assertEquals;
 
 public class DefaultKieSessionFromByteArrayExampleTest {
@@ -105,8 +105,7 @@ public static File getFile(String exampleName) {
         File folder = new File("drools-examples-api").getAbsoluteFile();
         File exampleFolder = null;
         while (folder != null) {
-            exampleFolder = new File(folder,
-                                     exampleName);
+            exampleFolder = new File(folder, exampleName);
             if (exampleFolder.exists()) {
                 break;
             }
@@ -116,8 +115,7 @@ public static File getFile(String exampleName) {
 
         if (exampleFolder != null) {
 
-            File targetFolder = new File(exampleFolder,
-                                         "target");
+            File targetFolder = new File(exampleFolder, "target");
             if (!targetFolder.exists()) {
                 throw new RuntimeException("The target folder does not exist, please build project " + exampleName + " first");
             }

diff --git a/.../org/drools/example/api/kiemodulefrommultiplefiles/KieModuleFromMultipleFilesExample.java b/.../org/drools/example/api/kiemodulefrommultiplefiles/KieModuleFromMultipleFilesExample.java
@@ -18,6 +18,9 @@
  */
 package org.drools.example.api.kiemodulefrommultiplefiles;
 
+import java.io.File;
+import java.io.PrintStream;
+
 import org.kie.api.KieServices;
 import org.kie.api.builder.KieModule;
 import org.kie.api.builder.KieRepository;
@@ -27,9 +30,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.PrintStream;
-
 
 public class KieModuleFromMultipleFilesExample {
 
@@ -76,8 +76,7 @@ public static File getFile(String exampleName) {
         File folder = new File( KieModuleFromMultipleFilesExample.class.getProtectionDomain().getCodeSource().getLocation().getPath() );
         File exampleFolder = null;
         while (folder != null) {
-            exampleFolder = new File(folder,
-                                     exampleName);
+            exampleFolder = new File(folder, exampleName);
             if (exampleFolder.exists()) {
                 break;
             }
@@ -87,14 +86,13 @@ public static File getFile(String exampleName) {
 
         if (exampleFolder != null) {
 
-            File targetFolder = new File(exampleFolder,
-                                         "target");
+            File targetFolder = new File(exampleFolder, "target");
             if (!targetFolder.exists()) {
                 throw new RuntimeException("The target folder does not exist, please build project " + exampleName + " first");
             }
 
             for (String str : targetFolder.list()) {
-                if (str.startsWith(exampleName) && !str.endsWith("-sources.jar") && !str.endsWith("-tests.jar") && !str.endsWith("-javadoc.jar")) {
+                if (str.startsWith(exampleName) && str.endsWith(".jar") && !str.endsWith("-sources.jar") && !str.endsWith("-tests.jar") && !str.endsWith("-javadoc.jar")) {
                     return new File(targetFolder, str);
                 }
             }

diff --git a/...el-example/src/main/java/org/drools/example/api/kiemodulemodel/KieModuleModelExample.java b/...el-example/src/main/java/org/drools/example/api/kiemodulemodel/KieModuleModelExample.java
@@ -18,6 +18,9 @@
  */
 package org.drools.example.api.kiemodulemodel;
 
+import java.io.File;
+import java.io.PrintStream;
+
 import org.drools.base.util.Drools;
 import org.kie.api.KieServices;
 import org.kie.api.builder.KieBuilder;
@@ -31,9 +34,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.PrintStream;
-
 public class KieModuleModelExample {
 
     private static final Logger LOG = LoggerFactory.getLogger(KieModuleModelExample.class);
@@ -115,8 +115,7 @@ public static File getFile(String exampleName) {
         File folder = new File("drools-examples-api").getAbsoluteFile();
         File exampleFolder = null;
         while (folder != null) {
-            exampleFolder = new File(folder,
-                                     exampleName);
+            exampleFolder = new File(folder, exampleName);
             if (exampleFolder.exists()) {
                 break;
             }
@@ -126,14 +125,13 @@ public static File getFile(String exampleName) {
 
         if (exampleFolder != null) {
 
-            File targetFolder = new File(exampleFolder,
-                                         "target");
+            File targetFolder = new File(exampleFolder, "target");
             if (!targetFolder.exists()) {
                 throw new RuntimeException("The target folder does not exist, please build project " + exampleName + " first");
             }
 
             for (String str : targetFolder.list()) {
-                if (str.startsWith(exampleName) && !str.endsWith("-sources.jar") && !str.endsWith("-tests.jar") && !str.endsWith("-javadoc.jar")) {
+                if (str.startsWith(exampleName) && str.endsWith(".jar") && !str.endsWith("-sources.jar") && !str.endsWith("-tests.jar") && !str.endsWith("-javadoc.jar")) {
                     return new File(targetFolder, str);
                 }
             }

diff --git a/...n/java/org/drools/example/api/namedkiesessionfromfile/NamedKieSessionFromFileExample.java b/...n/java/org/drools/example/api/namedkiesessionfromfile/NamedKieSessionFromFileExample.java
@@ -18,6 +18,9 @@
  */
 package org.drools.example.api.namedkiesessionfromfile;
 
+import java.io.File;
+import java.io.PrintStream;
+
 import org.kie.api.KieServices;
 import org.kie.api.builder.KieModule;
 import org.kie.api.builder.KieRepository;
@@ -26,9 +29,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.PrintStream;
-
 
 public class NamedKieSessionFromFileExample {
 
@@ -69,8 +69,7 @@ public static File getFile(String exampleName) {
         File folder = new File("drools-examples-api").getAbsoluteFile();
         File exampleFolder = null;
         while (folder != null) {
-            exampleFolder = new File(folder,
-                                     exampleName);
+            exampleFolder = new File(folder, exampleName);
             if (exampleFolder.exists()) {
                 break;
             }
@@ -80,14 +79,13 @@ public static File getFile(String exampleName) {
 
         if (exampleFolder != null) {
 
-            File targetFolder = new File(exampleFolder,
-                                         "target");
+            File targetFolder = new File(exampleFolder, "target");
             if (!targetFolder.exists()) {
                 throw new RuntimeException("The target folder does not exist, please build project " + exampleName + " first");
             }
 
             for (String str : targetFolder.list()) {
-                if (str.startsWith(exampleName) && !str.endsWith("-sources.jar") && !str.endsWith("-tests.jar") && !str.endsWith("-javadoc.jar")) {
+                if (str.startsWith(exampleName) && str.endsWith(".jar") && !str.endsWith("-sources.jar") && !str.endsWith("-tests.jar") && !str.endsWith("-javadoc.jar")) {
                     return new File(targetFolder, str);
                 }
             }

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/types/BuiltInType.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/types/BuiltInType.java
@@ -44,6 +44,7 @@
 import org.kie.dmn.feel.runtime.FEELFunction;
 import org.kie.dmn.feel.runtime.Range;
 import org.kie.dmn.feel.runtime.UnaryTest;
+import org.kie.dmn.feel.runtime.custom.ZoneTime;
 
 public enum BuiltInType implements SimpleType {
 
@@ -124,7 +125,7 @@ public static Type determineTypeFromInstance( Object o ) {
             return STRING;
         } else if( o instanceof LocalDate ) {
             return DATE;
-        } else if( o instanceof LocalTime || o instanceof OffsetTime ) {
+        } else if( o instanceof LocalTime || o instanceof OffsetTime || o instanceof ZoneTime) {
             return TIME;
         } else if( o instanceof ZonedDateTime || o instanceof OffsetDateTime || o instanceof LocalDateTime ) {
             return DATE_TIME;