Improve placeholder replacer for custom holders and Collection entries

Author: hevav

src/main/java/net/elytrium/serializer/language/reader/YamlReader.java

@@ -134,7 +134,15 @@ public void readSerializableObject(@Nullable Field owner, Object holder, Class<?
                 if (!Modifier.isStatic(modifiers) && !Modifier.isFinal(modifiers) && !Modifier.isTransient(modifiers)
                     && node.getAnnotation(Final.class) == null && node.getType().getAnnotation(Final.class) == null
                     && node.getAnnotation(Transient.class) == null && node.getType().getAnnotation(Transient.class) == null) {
-                  Placeholders.removePlaceholders(node.get(holder));
+
+                  Object value = node.get(holder);
+                  if (this.config.isRegisterPlaceholdersForCollectionEntries() && value instanceof Collection<?> collection) {
+                    for (Object entry : collection) {
+                      Placeholders.removePlaceholders(entry);
+                    }
+                  }
+
+                  Placeholders.removePlaceholders(value);
                   this.readNode(holder, node);
                   this.updatePlaceholders(holder, node);
                 } else {
@@ -193,9 +201,9 @@ private void updatePlaceholders(Object holder, Field node) throws ReflectiveOper
         for (Object entry : collection) {
           Placeholders.addPlaceholders(entry, replacer, placeholders.wrapWithBraces(), placeholders.value());
         }
-      } else {
-        Placeholders.addPlaceholders(value, replacer, placeholders.wrapWithBraces(), placeholders.value());
       }
+
+      Placeholders.addPlaceholders(value, replacer, placeholders.wrapWithBraces(), placeholders.value());
     }
   }
 

src/main/java/net/elytrium/serializer/placeholders/Placeholders.java

@@ -20,7 +20,10 @@
 import java.lang.reflect.Array;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
 
@@ -29,13 +32,26 @@ public class Placeholders {
 
   private static final Map<Integer, Placeholderable<?, ?>> PLACEHOLDERS = new HashMap<>();
 
-  public static <T, P> T replace(T value, Object... values) {
-    var placeholderable = (Placeholderable<T, P>) Placeholders.PLACEHOLDERS.get(System.identityHashCode(value));
-    return placeholderable.replacer.replace(value, placeholderable.placeholders, values);
+  public static <T, P, R> R replace(T value, Object... values) {
+    return Placeholders.replaceFor(value, value, values);
+  }
+
+  public static <H, T, P, R> R replaceFor(H holder, T value, Object... values) {
+    var placeholderable = (Placeholderable<T, P>) Placeholders.PLACEHOLDERS.get(System.identityHashCode(holder));
+    if (holder instanceof Collection<?> collection) {
+      List<T> list = new ArrayList<>(collection.size());
+      for (Object entry : collection) {
+        list.add(placeholderable.replacer.replace((T) entry, placeholderable.placeholders, values));
+      }
+
+      return (R) list;
+    } else {
+      return (R) placeholderable.replacer.replace(value, placeholderable.placeholders, values);
+    }
   }
 
   public static void addPlaceholders(Object value, PlaceholderReplacer<?, ?> replacer, String... placeholders) {
-    Placeholders.addPlaceholders(System.identityHashCode(value), replacer, placeholders);
+    Placeholders.addPlaceholders(value, replacer, true, placeholders);
   }
 
   public static void addPlaceholders(Object value, PlaceholderReplacer<?, ?> replacer, boolean wrapWithBraces, String... placeholders) {

src/test/java/net/elytrium/serializer/SerializerTest.java

@@ -57,6 +57,13 @@ void placeholdersTest() {
     Placeholders.addPlaceholders(stringWithPlaceholders, new DefaultPlaceholderReplacer(), "placeholder3", "PLACEHOLDER1", "{PLACEHOLDER2}");
     Assertions.assertEquals("2 3 1", Placeholders.replace(stringWithPlaceholders, "1", "2", "3"));
     Placeholders.removePlaceholders(stringWithPlaceholders);
+
+    List<String> listWithPlaceholders = Arrays.asList("{PLACEHOLDER1} {PLACEHOLDER2}", "{placeholder3}");
+    Placeholders.addPlaceholders(listWithPlaceholders, new DefaultPlaceholderReplacer(), "placeholder3", "PLACEHOLDER1", "{PLACEHOLDER2}");
+    List<String> list = Placeholders.replace(listWithPlaceholders, "1", "2", "3");
+    Assertions.assertEquals("2 3", list.get(0));
+    Assertions.assertEquals("1", list.get(1));
+    Placeholders.removePlaceholders(listWithPlaceholders);
   }
 
   @Test