Apply mapping as first step

build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 group 'com.docutools'
-version = '1.4.0-rc.2'
+version = '1.4.0-rc.3'
 
 sourceCompatibility = "17"
 targetCompatibility = "17"

src/main/java/com/docutools/jocument/PlaceholderMapper.java

@@ -4,4 +4,6 @@
 
 public interface PlaceholderMapper {
   Optional<String> map(String placeholder);
+
+  String tryToMap(String placeholder);
 }

src/main/java/com/docutools/jocument/impl/PlaceholderMapperImpl.java

@@ -31,6 +31,11 @@ public Optional<String> map(String placeholder) {
     return Optional.ofNullable(placeholderMappings.get(placeholder));
   }
 
+  @Override
+  public String tryToMap(String placeholder) {
+    return map(placeholder).orElse(placeholder);
+  }
+
   private static void setup() {
     if (pathString != null) {
       var path = Path.of(pathString);

src/main/java/com/docutools/jocument/impl/ReflectionResolver.java

@@ -165,6 +165,7 @@ private static DateTimeFormatter toDateTimeFormatter(Format format) {
   @Override
   protected Optional<PlaceholderData> doResolve(String placeholderName, Locale locale) {
     logger.debug("Trying to resolve placeholder {}", placeholderName);
+    placeholderName = placeholderMapper.tryToMap(placeholderName);
     boolean isCondition = placeholderName.endsWith("?");
     placeholderName = isCondition ? placeholderName.substring(0, placeholderName.length() - 1) : placeholderName;
     Optional<PlaceholderData> result = resolveStripped(locale, placeholderName);
@@ -175,8 +176,7 @@ protected Optional<PlaceholderData> doResolve(String placeholderName, Locale loc
   }
 
   private Optional<PlaceholderData> resolveStripped(Locale locale, String placeholder) {
-    return matchPattern(placeholder, locale)
-        .or(() -> resolveAccessor(placeholderMapper.map(placeholder).orElse(placeholder), locale));
+    return matchPattern(placeholder, locale).or(() -> resolveAccessor(placeholder, locale));
   }
 
   private Optional<PlaceholderData> matchPattern(String placeholderName, Locale locale) {