Skip to content

add logic to prevent NullPointerException from being thrown when calling LocalCache.getIfPresent #14

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
KhloeLeclair merged 5 commits into from
Jan 14, 2026
Merged

add logic to prevent NullPointerException from being thrown when calling LocalCache.getIfPresent #14

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73f5fb9
add logic to catch NPE thrown by Preconditions.checkNotNull called by…
whimsicalwren Nov 30, 2025
3145435
removed unnecessary logic in assertReplacementSafe (oops)
whimsicalwren Nov 30, 2025
caad6af
ngl should've just done this in the first place
whimsicalwren Nov 30, 2025
6450193
final fixes i think
whimsicalwren Dec 1, 2025
5d89b4a
revert and fix for better logic (thanks)
whimsicalwren Dec 2, 2025
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
27 changes: 23 additions & 4 deletions src/main/java/dev/khloeleclair/create/additionallogistics/common/SafeRegex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ public class SafeRegex {
.build();


private record CachedGlobResult(@Nullable String regex, @Nullable PatternSyntaxException error) {}
private record CachedGlobResult(@Nullable String regex, @Nullable PatternSyntaxException error) {
public boolean isError() {
return this.error != null;
}
}

private record CachedReplacementResult(@Nullable PatternSyntaxException error) {
boolean isError() { return this.error != null; }
Expand Down Expand Up @@ -154,6 +158,21 @@ public static void assertReplacementSafe(@NotNull String regex, @NotNull String
throw cached.error;
}

@NotNull
private static CachedRegexResult processRegex(@NotNull CachedGlobResult cachedResult) {
CachedRegexResult cached;

if (cachedResult.isError()) { // return a cached regex result with the error from cachedResult
cached = new CachedRegexResult(cachedResult.error);
} else {
String regex = cachedResult.regex;

cached = processRegex(regex);
}

return cached;
}

@NotNull
private static CachedRegexResult processRegex(@NotNull String regex) {
CachedRegexResult cached = REGEX_CACHE.getIfPresent(regex);
Expand Down Expand Up @@ -217,7 +236,7 @@ public static boolean isSafe(String regex, int starHeightLimit, int repetitionLi

}

private static String cachedToRegexPattern(String address) {
private static CachedGlobResult cachedToRegexPattern(String address) {
var cached = GLOB_CACHE.getIfPresent(address);
if (cached == null) {
try {
Expand All @@ -228,7 +247,7 @@ private static String cachedToRegexPattern(String address) {
GLOB_CACHE.put(address, cached);
}

return cached.regex;
return cached;
}

/// An optimized version of PackageItem.matchAddress that uses caching and optimized logic.
Expand Down Expand Up @@ -261,4 +280,4 @@ else if (info.pattern != null && info.pattern.matcher(address).matches())
return false;
}

}
}