From 08450addc67d1c1acae0c1711edf1dd7543d4244 Mon Sep 17 00:00:00 2001 From: Diego Barreiro Perez Date: Mon, 10 Nov 2025 19:43:16 +0000 Subject: [PATCH 1/2] Fix Constructing AgentArgs --- .../java/io/ebean/enhance/ant/AntEnhanceTask.java | 13 +++++++++---- .../io/ebean/enhance/ant/AntEnhanceTaskTest.java | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ebean-agent/src/main/java/io/ebean/enhance/ant/AntEnhanceTask.java b/ebean-agent/src/main/java/io/ebean/enhance/ant/AntEnhanceTask.java index 329866a..3ed5e19 100644 --- a/ebean-agent/src/main/java/io/ebean/enhance/ant/AntEnhanceTask.java +++ b/ebean-agent/src/main/java/io/ebean/enhance/ant/AntEnhanceTask.java @@ -1,5 +1,8 @@ package io.ebean.enhance.ant; +import java.util.ArrayList; +import java.util.List; + import io.ebean.enhance.Transformer; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; @@ -55,12 +58,14 @@ public void execute() throws BuildException { * Combine the packages into the transformArgs to filter enhanced classes via PackageFilter. */ static String combine(String packages, String transformArgs) { - StringBuilder args = new StringBuilder(); - args.append("packages=").append(packages.replace("**", "")); + List args = new ArrayList<>(); + if (packages != null && !packages.isEmpty()) { + args.add("packages=" + packages.replace("**", "")); + } if (transformArgs != null && !transformArgs.isEmpty()) { - args.append(',').append(transformArgs); + args.add(transformArgs); } - return args.toString(); + return String.join(";", args); } /** diff --git a/ebean-agent/src/test/java/io/ebean/enhance/ant/AntEnhanceTaskTest.java b/ebean-agent/src/test/java/io/ebean/enhance/ant/AntEnhanceTaskTest.java index 5feaeed..aa76751 100644 --- a/ebean-agent/src/test/java/io/ebean/enhance/ant/AntEnhanceTaskTest.java +++ b/ebean-agent/src/test/java/io/ebean/enhance/ant/AntEnhanceTaskTest.java @@ -10,7 +10,7 @@ class AntEnhanceTaskTest { @Test void combine() { String result = AntEnhanceTask.combine("com/one/**, com/two/**", "debug=1"); - assertThat(result).isEqualTo("packages=com/one/, com/two/,debug=1"); + assertThat(result).isEqualTo("packages=com/one/, com/two/;debug=1"); } @Test From 6199bec4bebc3686641c844c9092cd6acc7a15d9 Mon Sep 17 00:00:00 2001 From: Diego Barreiro Perez Date: Mon, 10 Nov 2025 19:43:32 +0000 Subject: [PATCH 2/2] Prioritize PackageFilter Over IgnoredClassHelper --- .../src/main/java/io/ebean/enhance/common/EnhanceContext.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ebean-agent/src/main/java/io/ebean/enhance/common/EnhanceContext.java b/ebean-agent/src/main/java/io/ebean/enhance/common/EnhanceContext.java index bfc08dc..93ae8a3 100644 --- a/ebean-agent/src/main/java/io/ebean/enhance/common/EnhanceContext.java +++ b/ebean-agent/src/main/java/io/ebean/enhance/common/EnhanceContext.java @@ -230,8 +230,8 @@ public boolean detectQueryBeanEnhancement(String className) { * known libraries JDBC drivers etc can be skipped. */ public boolean isIgnoreClass(String className) { - if (packageFilter != null && packageFilter.ignore(className)) { - return true; + if (packageFilter != null) { + return packageFilter.ignore(className); } return ignoreClassHelper.isIgnoreClass(className); }