This is an automated email from the ASF dual-hosted git repository. chibenwa pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-jspf.git
commit f42714966545d2413ff33e12666d48dea271b7a6 Author: Benoit TELLIER <[email protected]> AuthorDate: Thu Nov 19 17:30:11 2026 +0100 [PERF] MacroExpand: split a macro value without a String per character split, run on the value of every macro, took data.substring(i, i + 1) and searched it in the delimiters for each character, then appended it to a StringBuffer: 44% of the CPU and 58% of the allocations of the expansion of a sender-chosen local part, 20-27% of the expansion of a domain with macros. Walk the chars and cut the parts between delimiters with substring, keeping the empty parts between two delimiters and at both ends (RFC 7208 7.3). Reverse with Collections.reverse instead of inserting each part at the head of a new list, which was quadratic in the number of parts. --- .../org/apache/james/jspf/core/MacroExpand.java | 39 ++++++---------------- .../apache/james/jspf/core/MacroExpandTest.java | 16 +++++++++ 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/resolver/src/main/java/org/apache/james/jspf/core/MacroExpand.java b/resolver/src/main/java/org/apache/james/jspf/core/MacroExpand.java index 569cb11..5e42811 100644 --- a/resolver/src/main/java/org/apache/james/jspf/core/MacroExpand.java +++ b/resolver/src/main/java/org/apache/james/jspf/core/MacroExpand.java @@ -29,6 +29,7 @@ package org.apache.james.jspf.core; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -471,7 +472,7 @@ public class MacroExpand { // Reverse domains as necessary ArrayList<String> data = split(variable, delimeters); if (isReversed) { - data = reverse(data); + Collections.reverse(data); } // Truncate domain name to number of sub sections @@ -565,41 +566,21 @@ public class MacroExpand { * The delimeter we want to use to split the String * @return ArrayList which contains the String parts */ - private ArrayList<String> split(String data, String delimeters) { + static ArrayList<String> split(String data, String delimeters) { - String currentChar; - StringBuffer element = new StringBuffer(); ArrayList<String> splitParts = new ArrayList<String>(); - + int start = 0; for (int i = 0; i < data.length(); i++) { - currentChar = data.substring(i, i + 1); - if (delimeters.indexOf(currentChar) > -1) { - splitParts.add(element.toString()); - element.setLength(0); - } else { - element.append(currentChar); + if (delimeters.indexOf(data.charAt(i)) >= 0) { + // the empty parts between two delimiters, or at an end, are kept (RFC 7208 7.3) + splitParts.add(data.substring(start, i)); + start = i + 1; } } - splitParts.add(element.toString()); + splitParts.add(data.substring(start)); return splitParts; } - /** - * Reverse an ArrayList - * - * @param data - * The ArrayList we want to get reversed - * @return reversed The reversed given ArrayList - */ - private ArrayList<String> reverse(ArrayList<String> data) { - - ArrayList<String> reversed = new ArrayList<String>(); - for (int i = 0; i < data.size(); i++) { - reversed.add(0, data.get(i)); - } - return reversed; - } - /** * @see #subset(ArrayList, int) */ @@ -616,7 +597,7 @@ public class MacroExpand { */ private String subset(ArrayList<String> data, int length) { - StringBuffer buildString = new StringBuffer(); + StringBuilder buildString = new StringBuilder(); if (data.size() < length) { length = data.size(); } diff --git a/resolver/src/test/java/org/apache/james/jspf/core/MacroExpandTest.java b/resolver/src/test/java/org/apache/james/jspf/core/MacroExpandTest.java index dd6d58c..37ff8e4 100644 --- a/resolver/src/test/java/org/apache/james/jspf/core/MacroExpandTest.java +++ b/resolver/src/test/java/org/apache/james/jspf/core/MacroExpandTest.java @@ -246,4 +246,20 @@ public class MacroExpandTest extends TestCase { }, MacroExpand.DOMAIN)); } + public void testSplitKeepsTheEmptyParts() { + assertEquals(java.util.Arrays.asList("", "a", "", "b", ""), MacroExpand.split(".a..b.", ".")); + assertEquals(java.util.Arrays.asList(""), MacroExpand.split("", ".")); + } + + public void testSplitOnEachDelimiter() { + assertEquals(java.util.Arrays.asList("a", "b", "c", "d"), MacroExpand.split("a-b+c.d", ".-+")); + } + + public void testEmptyPartsAreKeptInTheExpansion() throws PermErrorException { + assertEquals("bad..strong", defIp4me.expand("%{lr-}", new rfcIP4MacroData() { + public String getCurrentSenderPart() { + return "strong--bad"; + } + }, MacroExpand.DOMAIN)); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
