rename host matcher config

danthe1st · Mar 8, 2024 · be4dff8 · be4dff8
1 parent 7316782
commit be4dff8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/io/github/danthe1st/httpsintercept/config/HostMatcherConfig.java b/src/main/java/io/github/danthe1st/httpsintercept/config/HostMatcherConfig.java
@@ -3,14 +3,14 @@
 import java.util.Collections;
 import java.util.Set;
 
-public record HostMatcherConfig(Set<String> exactHosts,
-		Set<String> hostParts,
-		Set<String> hostRegexes) {
+public record HostMatcherConfig(Set<String> exact,
+		Set<String> partial,
+		Set<String> regex) {
 
-	public HostMatcherConfig(Set<String> exactHosts, Set<String> hostParts, Set<String> hostRegexes) {
-		this.exactHosts = emptyIfNull(exactHosts);
-		this.hostParts = emptyIfNull(hostParts);
-		this.hostRegexes = emptyIfNull(hostRegexes);
+	public HostMatcherConfig(Set<String> exact, Set<String> partial, Set<String> regex) {
+		this.exact = emptyIfNull(exact);
+		this.partial = emptyIfNull(partial);
+		this.regex = emptyIfNull(regex);
 	}
 
 	private Set<String> emptyIfNull(Set<String> data) {

diff --git a/src/main/java/io/github/danthe1st/httpsintercept/matcher/IterativeHostMatcher.java b/src/main/java/io/github/danthe1st/httpsintercept/matcher/IterativeHostMatcher.java
@@ -29,12 +29,12 @@ public IterativeHostMatcher(List<Map.Entry<HostMatcherConfig, T>> configs) {
 		for(Map.Entry<HostMatcherConfig, T> entry : configs){
 			HostMatcherConfig config = entry.getKey();
 			T value = entry.getValue();
-			if(config.exactHosts().isEmpty() && config.hostParts().isEmpty() && config.hostRegexes().isEmpty()){
+			if(config.exact().isEmpty() && config.partial().isEmpty() && config.regex().isEmpty()){
 				wildcardElements.add(value);
 			}else{
-				addToMap(hosts, value, config.exactHosts(), Function.identity());
-				addToMap(parts, value, config.hostParts(), Function.identity());
-				addToMap(regexes, value, config.hostRegexes(), Pattern::compile);
+				addToMap(hosts, value, config.exact(), Function.identity());
+				addToMap(parts, value, config.partial(), Function.identity());
+				addToMap(regexes, value, config.regex(), Pattern::compile);
 			}
 		}
 		this.exactHosts = toImmutable(hosts);