From de8ec8d6348a77f0d50a464d95ff78888a084594 Mon Sep 17 00:00:00 2001 From: Christian Mahnke Date: Mon, 8 Jan 2024 09:45:13 +0100 Subject: [PATCH] Replaced log4j usage with guava, see https://github.com/onthegomap/planetiler/discussions/773#discussioncomment-8037396 --- .../java/com/onthegomap/planetiler/expression/Expression.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/Expression.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/Expression.java index 22fa9eb0ab..17b05c97dc 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/Expression.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/expression/Expression.java @@ -2,6 +2,7 @@ import static com.onthegomap.planetiler.expression.DataType.GET_TAG; +import com.google.common.base.Joiner; import com.onthegomap.planetiler.reader.WithGeometryType; import com.onthegomap.planetiler.reader.WithTags; import com.onthegomap.planetiler.util.Format; @@ -14,7 +15,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -362,7 +362,7 @@ static MatchAny from(String field, BiFunction valueGet return new MatchAny(field, values, Set.copyOf(exactMatches), - patterns.isEmpty() ? null : Pattern.compile("(" + Strings.join(patterns, '|') + ")"), + patterns.isEmpty() ? null : Pattern.compile("(" + Joiner.on('|').join(patterns) + ")"), matchWhenMissing, valueGetter );