Skip to content

Commit 08450ad

Browse files
committed
Fix Constructing AgentArgs
1 parent 74daf73 commit 08450ad

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

ebean-agent/src/main/java/io/ebean/enhance/ant/AntEnhanceTask.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package io.ebean.enhance.ant;
22

3+
import java.util.ArrayList;
4+
import java.util.List;
5+
36
import io.ebean.enhance.Transformer;
47
import org.apache.tools.ant.BuildException;
58
import org.apache.tools.ant.Task;
@@ -55,12 +58,14 @@ public void execute() throws BuildException {
5558
* Combine the packages into the transformArgs to filter enhanced classes via PackageFilter.
5659
*/
5760
static String combine(String packages, String transformArgs) {
58-
StringBuilder args = new StringBuilder();
59-
args.append("packages=").append(packages.replace("**", ""));
61+
List<String> args = new ArrayList<>();
62+
if (packages != null && !packages.isEmpty()) {
63+
args.add("packages=" + packages.replace("**", ""));
64+
}
6065
if (transformArgs != null && !transformArgs.isEmpty()) {
61-
args.append(',').append(transformArgs);
66+
args.add(transformArgs);
6267
}
63-
return args.toString();
68+
return String.join(";", args);
6469
}
6570

6671
/**

ebean-agent/src/test/java/io/ebean/enhance/ant/AntEnhanceTaskTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class AntEnhanceTaskTest {
1010
@Test
1111
void combine() {
1212
String result = AntEnhanceTask.combine("com/one/**, com/two/**", "debug=1");
13-
assertThat(result).isEqualTo("packages=com/one/, com/two/,debug=1");
13+
assertThat(result).isEqualTo("packages=com/one/, com/two/;debug=1");
1414
}
1515

1616
@Test

0 commit comments

Comments
 (0)