Skip to content

fix: support brackets in relocation includes/excludes patterns #2

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
diogotcorreia merged 1 commit into from
Apr 23, 2026
Merged

fix: support brackets in relocation includes/excludes patterns #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions core/src/main/java/net/byteflux/libby/relocation/Relocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ public class Relocation {
* @param excludes classes and resources to exclude
*/
public Relocation(String pattern, String relocatedPattern, Collection<String> includes, Collection<String> excludes) {
this.pattern = requireNonNull(pattern, "pattern").replace("{}", ".");
this.relocatedPattern = requireNonNull(relocatedPattern, "relocatedPattern").replace("{}", ".");
this.includes = includes != null ? Collections.unmodifiableList(new LinkedList<>(includes)) : Collections.emptyList();
this.excludes = excludes != null ? Collections.unmodifiableList(new LinkedList<>(excludes)) : Collections.emptyList();
this.pattern = normalizePattern(requireNonNull(pattern, "pattern"));
this.relocatedPattern = normalizePattern(requireNonNull(relocatedPattern, "relocatedPattern"));
this.includes = normalizePatternCollection(includes);
this.excludes = normalizePatternCollection(excludes);
}

/**
Expand Down Expand Up @@ -93,6 +93,17 @@ public Collection<String> getExcludes() {
return excludes;
}

private String normalizePattern(String pattern) {
return pattern.replace("{}", ".");
}

private Collection<String> normalizePatternCollection(Collection<String> patterns) {
if (patterns == null) {
return Collections.emptyList();
}
return patterns.stream().map(this::normalizePattern).toList();
}

/**
* Creates a new relocation builder.
*
Expand Down