diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/StringWithPlaceholders.java b/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/StringWithPlaceholders.java index 24ea06ad..94f48160 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/StringWithPlaceholders.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/placeholder/parsing/StringWithPlaceholders.java @@ -5,7 +5,6 @@ */ package me.filoghost.holographicdisplays.placeholder.parsing; -import me.filoghost.fcommons.collection.CollectionUtils; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -24,10 +23,6 @@ public class StringWithPlaceholders { this.string = string; this.placeholderMatches = findPlaceholders(string); } - - protected List getPlaceholders() { - return CollectionUtils.transform(placeholderMatches, match -> match.content); - } public boolean containsPlaceholders() { return placeholderMatches != null && !placeholderMatches.isEmpty(); diff --git a/plugin/src/test/java/me/filoghost/holographicdisplays/placeholder/parsing/StringWithPlaceholdersTest.java b/plugin/src/test/java/me/filoghost/holographicdisplays/placeholder/parsing/StringWithPlaceholdersTest.java index 9d089aa4..52a36831 100644 --- a/plugin/src/test/java/me/filoghost/holographicdisplays/placeholder/parsing/StringWithPlaceholdersTest.java +++ b/plugin/src/test/java/me/filoghost/holographicdisplays/placeholder/parsing/StringWithPlaceholdersTest.java @@ -10,6 +10,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import java.util.ArrayList; import java.util.List; import java.util.stream.Stream; @@ -47,7 +48,11 @@ class StringWithPlaceholdersTest { void parsing(String input, String expectedPluginName, String expectedIdentifier, String expectedArgument) { StringWithPlaceholders s = new StringWithPlaceholders(input); - List placeholders = s.getPlaceholders(); + List placeholders = new ArrayList<>(); + s.replacePlaceholders(occurrence -> { + placeholders.add(occurrence); // Just save occurrences + return null; + }); assertThat(placeholders).hasSize(1); PlaceholderOccurrence placeholder = placeholders.get(0); diff --git a/pom.xml b/pom.xml index 6e27d7f8..3db70792 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,7 @@ me.filoghost.fcommons fcommons - 1.2.6-SNAPSHOT + 1.2.7