This is an automated email from the ASF dual-hosted git repository.
mariofusco 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 152ff1a4c8 Removed deps of drools-io from drools-core (#6399)
152ff1a4c8 is described below
commit 152ff1a4c841f1026e38d559ca1a34f4653d61dc
Author: Paolo Bizzarri <[email protected]>
AuthorDate: Wed Jul 30 12:55:21 2025 +0200
Removed deps of drools-io from drools-core (#6399)
Co-authored-by: Paolo Bizzarri <[email protected]>
---
drools-core/pom.xml | 12 +++--------
drools-decisiontables/pom.xml | 4 ++++
drools-drl/drools-drl-parser/pom.xml | 4 ++++
drools-io/pom.xml | 25 +++++++++++++---------
.../io}/ByteArrayResourceSerializationTest.java | 3 +--
.../drools/io}/ByteArrayResourceToStringTest.java | 16 ++++++--------
.../src/test/java/org/drools/io}/IoUtilsTest.java | 9 ++++----
.../java/org/drools/io}/ReaderResourceTest.java | 3 +--
8 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/drools-core/pom.xml b/drools-core/pom.xml
index f97f1681d1..aafcf19b01 100644
--- a/drools-core/pom.xml
+++ b/drools-core/pom.xml
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<groupId>org.drools</groupId>
- <artifactId>drools-wiring-api</artifactId>
+ <artifactId>drools-util</artifactId>
</dependency>
<dependency>
<groupId>org.drools</groupId>
@@ -67,11 +67,11 @@
</dependency>
<dependency>
<groupId>org.drools</groupId>
- <artifactId>drools-wiring-static</artifactId>
+ <artifactId>drools-wiring-api</artifactId>
</dependency>
<dependency>
<groupId>org.drools</groupId>
- <artifactId>drools-io</artifactId>
+ <artifactId>drools-wiring-static</artifactId>
</dependency>
<dependency>
@@ -129,12 +129,6 @@
<artifactId>commons-codec</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
diff --git a/drools-decisiontables/pom.xml b/drools-decisiontables/pom.xml
index 9aaa947aa2..7d4f8d0e54 100644
--- a/drools-decisiontables/pom.xml
+++ b/drools-decisiontables/pom.xml
@@ -57,6 +57,10 @@
<groupId>org.kie</groupId>
<artifactId>kie-internal</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-io</artifactId>
+ </dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-xml-support</artifactId>
diff --git a/drools-drl/drools-drl-parser/pom.xml
b/drools-drl/drools-drl-parser/pom.xml
index d8b66f13e5..f74f477f4e 100644
--- a/drools-drl/drools-drl-parser/pom.xml
+++ b/drools-drl/drools-drl-parser/pom.xml
@@ -56,6 +56,10 @@
<groupId>org.kie</groupId>
<artifactId>kie-internal</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-io</artifactId>
+ </dependency>
<!-- External dependencies -->
<dependency>
<groupId>org.antlr</groupId>
diff --git a/drools-io/pom.xml b/drools-io/pom.xml
index 2cb54a3ae1..fc8b7095fb 100644
--- a/drools-io/pom.xml
+++ b/drools-io/pom.xml
@@ -49,15 +49,20 @@
<groupId>org.drools</groupId>
<artifactId>drools-util</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git
a/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceSerializationTest.java
b/drools-io/src/test/java/org/drools/io/ByteArrayResourceSerializationTest.java
similarity index 96%
rename from
drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceSerializationTest.java
rename to
drools-io/src/test/java/org/drools/io/ByteArrayResourceSerializationTest.java
index f2cc2fa9dd..d7c3b2ae59 100644
---
a/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceSerializationTest.java
+++
b/drools-io/src/test/java/org/drools/io/ByteArrayResourceSerializationTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.core.io.impl;
+package org.drools.io;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -25,7 +25,6 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.nio.charset.StandardCharsets;
-import org.drools.io.ByteArrayResource;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceToStringTest.java
b/drools-io/src/test/java/org/drools/io/ByteArrayResourceToStringTest.java
similarity index 80%
rename from
drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceToStringTest.java
rename to
drools-io/src/test/java/org/drools/io/ByteArrayResourceToStringTest.java
index d1da873f5e..f2290f5c5b 100644
---
a/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceToStringTest.java
+++ b/drools-io/src/test/java/org/drools/io/ByteArrayResourceToStringTest.java
@@ -16,14 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.core.io.impl;
+package org.drools.io;
-import java.util.Arrays;
import java.util.List;
import java.util.stream.Stream;
-import org.apache.commons.lang3.ArrayUtils;
-import org.drools.io.ByteArrayResource;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@@ -36,23 +33,23 @@ public class ByteArrayResourceToStringTest {
public static Stream<Arguments> parameters() {
List<Arguments> parameters = List.of(
arguments(
- Arrays.asList(new Byte[]{10, 20, 30, 40}),
+ new byte[]{10, 20, 30, 40},
null,
"ByteArrayResource[bytes=[10, 20, 30, 40],
encoding=null]"
),
arguments(
- Arrays.asList(new Byte[]{10, 20, 30, 40, 50, 60, 70,
80, 90, 100}),
+ new byte[]{10, 20, 30, 40, 50, 60, 70, 80, 90, 100},
null,
"ByteArrayResource[bytes=[10, 20, 30, 40, 50, 60, 70,
80, 90, 100], encoding=null]"
),
arguments(
- Arrays.asList(new Byte[]{10, 20, 30, 40, 50, 60, 70,
80, 90, 100, 110, 120}),
+ new byte[]{10, 20, 30, 40, 50, 60, 70, 80, 90,
100, 110, 120},
null,
"ByteArrayResource[bytes=[10, 20, 30, 40, 50, 60, 70,
80, 90, 100, ...], encoding=null]"
),
// non-null encoding
arguments(
- Arrays.asList(new Byte[]{10, 20, 30, 40, 50, 60, 70,
80, 90, 100, 110, 120}),
+ new byte[]{10, 20, 30, 40, 50, 60, 70, 80, 90,
100, 110, 120},
"UTF-8",
"ByteArrayResource[bytes=[10, 20, 30, 40, 50, 60, 70,
80, 90, 100, ...], encoding=UTF-8]"
));
@@ -64,8 +61,7 @@ public class ByteArrayResourceToStringTest {
@ParameterizedTest(name = "{index}: bytes={0}, encoding={1}")
@MethodSource("parameters")
- public void testToString(List<Byte> bytes, String encoding, String
expectedString) {
- byte[] byteArray = ArrayUtils.toPrimitive(bytes.toArray(new Byte[0]));
+ public void testToString(byte[] byteArray, String encoding, String
expectedString) {
ByteArrayResource byteArrayResource = new ByteArrayResource(byteArray,
encoding);
assertThat(byteArrayResource.toString()).isEqualTo(expectedString);
}
diff --git a/drools-core/src/test/java/org/drools/core/util/IoUtilsTest.java
b/drools-io/src/test/java/org/drools/io/IoUtilsTest.java
similarity index 87%
rename from drools-core/src/test/java/org/drools/core/util/IoUtilsTest.java
rename to drools-io/src/test/java/org/drools/io/IoUtilsTest.java
index f23aa1741a..c4db13ebd0 100644
--- a/drools-core/src/test/java/org/drools/core/util/IoUtilsTest.java
+++ b/drools-io/src/test/java/org/drools/io/IoUtilsTest.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.core.util;
+package org.drools.io;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import java.io.IOException;
-import java.io.StringReader;
-import org.drools.io.ReaderInputStream;
import org.drools.util.IoUtils;
import org.junit.jupiter.api.Test;
@@ -32,7 +32,8 @@ public class IoUtilsTest {
@Test
public void testReadEmptyStream() throws IOException {
// DROOLS-971
- byte[] bytes = IoUtils.readBytesFromInputStream( new
ReaderInputStream( new StringReader( "" ) ) );
+ InputStream emptyStream = new ByteArrayInputStream("".getBytes());
+ byte[] bytes = IoUtils.readBytesFromInputStream( emptyStream );
assertThat(bytes).isEmpty();
}
diff --git
a/drools-core/src/test/java/org/drools/core/io/impl/ReaderResourceTest.java
b/drools-io/src/test/java/org/drools/io/ReaderResourceTest.java
similarity index 97%
rename from
drools-core/src/test/java/org/drools/core/io/impl/ReaderResourceTest.java
rename to drools-io/src/test/java/org/drools/io/ReaderResourceTest.java
index 7f6ddbab94..15f0f2b0d4 100644
--- a/drools-core/src/test/java/org/drools/core/io/impl/ReaderResourceTest.java
+++ b/drools-io/src/test/java/org/drools/io/ReaderResourceTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.drools.core.io.impl;
+package org.drools.io;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -24,7 +24,6 @@ import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
-import org.drools.io.ReaderResource;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
