Skip to content

Do not create RegExpContext each time #1849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kingthorin merged 2 commits into from
Jun 22, 2026
+10 −11
Merged

Do not create RegExpContext each time #1849

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73778fa
Do not create RegExpContext each time
snuyanzin Jun 21, 2026
a0a77fb
Rename `REGEXP2SUPPLIER_MAP` to `regexp2SupplierMap`
snuyanzin Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions src/main/java/net/datafaker/service/FakeValuesService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public class FakeValuesService {

private static final Map<String, String[]> EXPRESSION_2_SPLITTED = new CopyOnWriteMap<>(WeakHashMap::new);

private final Map<RegExpContext, ValueResolver> REGEXP2SUPPLIER_MAP = new CopyOnWriteMap<>(HashMap::new);
private final Map<String, RegExpContext> regexp2SupplierMap = new CopyOnWriteMap<>(HashMap::new);
public void updateFakeValuesInterfaceMap(List<SingletonLocale> locales) {
for (final SingletonLocale l : locales) {
fakeValuesInterfaceMap.computeIfAbsent(l, this::getCachedFakeValue);
Expand Down Expand Up @@ -593,11 +593,10 @@ protected String resolveExpression(String expression, Object current, ProviderRe
}
continue;
}
final RegExpContext regExpContext = new RegExpContext(expr, root, context);
final ValueResolver val = REGEXP2SUPPLIER_MAP.get(regExpContext);
final RegExpContext cachedRegExpContext = regexp2SupplierMap.get(expr);
final Object resolved;
if (val != null) {
resolved = val.resolve();
if (cachedRegExpContext != null && cachedRegExpContext.root() == root && cachedRegExpContext.context() == context) {
resolved = cachedRegExpContext.resolver().resolve();
} else {
int j = 0;
final int length = expr.length();
Expand All @@ -606,7 +605,7 @@ protected String resolveExpression(String expression, Object current, ProviderRe
while (j < length && Character.isWhitespace(expr.charAt(j))) j++;
final String arguments = j == length ? "" : expr.substring(j);
final String[] args = splitArguments(arguments);
resolved = resExp(directive, args, current, root, context, regExpContext);
resolved = resExp(directive, args, current, root, context, expr);
}
if (resolved == null) {
throw new RuntimeException("Unable to resolve #{" + expr + "} directive for FakerContext " + context + ".");
Expand Down Expand Up @@ -681,12 +680,12 @@ private String[] splitExpressions(String expression, int length) {
});
}

private Object resExp(String directive, String[] args, Object current, ProviderRegistration root, FakerContext context, RegExpContext regExpContext) {
private Object resExp(String directive, String[] args, Object current, ProviderRegistration root, FakerContext context, String expr) {
Object res = resolveExpression(directive, args, current, root, context);
LOG.fine(() -> "resExp(%s [%s]) current: %s, root: %s, context: %s, regExpContext: %s -> res: %s".formatted(directive, Arrays.toString(args), current, root, context, regExpContext, res));
LOG.fine(() -> "resExp(%s [%s]) current: %s, root: %s, context: %s, expr: %s -> res: %s".formatted(directive, Arrays.toString(args), current, root, context, expr, res));
if (res instanceof CharSequence) {
if (((CharSequence) res).isEmpty()) {
REGEXP2SUPPLIER_MAP.put(regExpContext, EMPTY_STRING);
regexp2SupplierMap.put(expr, new RegExpContext(root, context, EMPTY_STRING));
}
return res;
}
Expand All @@ -700,7 +699,7 @@ private Object resExp(String directive, String[] args, Object current, ProviderR
if (value == null) {
it.remove();
} else {
REGEXP2SUPPLIER_MAP.put(regExpContext, resolver);
regexp2SupplierMap.put(expr, new RegExpContext(root, context, resolver));
return value;
}
}
Expand Down Expand Up @@ -1148,7 +1147,7 @@ public String toString() {
}
}

private record RegExpContext(String exp, ProviderRegistration root, FakerContext context) {
private record RegExpContext(ProviderRegistration root, FakerContext context, ValueResolver resolver) {
}

private interface ValueResolver {
Expand Down