From 7087fea9503d92ca7aa7152f84623357569cc870 Mon Sep 17 00:00:00 2001
From: jy95 <jacques.yakoub@gmail.com>
Date: Wed, 19 Feb 2025 20:36:33 +0100
Subject: [PATCH] perf: remove useless doseRange translations

---
 .../fds/common/translators/DoseRange.java     | 32 -------------------
 .../src/main/resources/common_de.properties   |  1 -
 .../src/main/resources/common_en.properties   |  1 -
 .../src/main/resources/common_fr.properties   |  1 -
 .../src/main/resources/common_nl.properties   |  1 -
 .../jy95/fds/r4/translators/DoseRangeR4.java  | 12 ++-----
 .../jy95/fds/r5/translators/DoseRangeR5.java  | 13 ++------
 7 files changed, 6 insertions(+), 55 deletions(-)
 delete mode 100644 common/src/main/java/io/github/jy95/fds/common/translators/DoseRange.java

diff --git a/common/src/main/java/io/github/jy95/fds/common/translators/DoseRange.java b/common/src/main/java/io/github/jy95/fds/common/translators/DoseRange.java
deleted file mode 100644
index 762b028c9..000000000
--- a/common/src/main/java/io/github/jy95/fds/common/translators/DoseRange.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.github.jy95.fds.common.translators;
-
-import com.ibm.icu.text.MessageFormat;
-
-import io.github.jy95.fds.common.config.FDSConfig;
-import io.github.jy95.fds.common.types.Translator;
-
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-/**
- * Interface for translating "timing.repeat.boundsRange".
- *
- * @param <C> The type of configuration, extending {@link io.github.jy95.fds.common.config.FDSConfig}.
- * @param <D> The type of the translated data.
- * @author jy95
- */
-public interface DoseRange<C extends FDSConfig, D> extends Translator<C, D> {
-
-    /**
-     * MessageFormat instance used for "doseRange" translation
-     *
-     * @param bundle The bundle to extract the key
-     * @param locale The locale for the message
-     * @return The message template for "doseRange"
-     */
-    default MessageFormat getDoseRangeMsg(ResourceBundle bundle, Locale locale) {
-        var msg = bundle.getString("fields.doseRange");
-        return new MessageFormat(msg, locale);
-    }
-    
-}
diff --git a/common/src/main/resources/common_de.properties b/common/src/main/resources/common_de.properties
index 2f7692273..cf9983e03 100644
--- a/common/src/main/resources/common_de.properties
+++ b/common/src/main/resources/common_de.properties
@@ -6,7 +6,6 @@ amount.range.withoutUnit = {condition, select, 0{zwischen {minValue} und {maxVal
 
 amount.ratio.denominatorLinkword = {0, choice, 1#pro|1.0<jeder}
 
-fields.doseRange = {0}
 fields.rateQuantity = mit einem Verhältnis von {0}
 fields.rateRange = mit einem Verhältnis von {0}
 fields.rateRatio = mit einem Verhältnis von {0}
diff --git a/common/src/main/resources/common_en.properties b/common/src/main/resources/common_en.properties
index b4a67d0e9..47458dfdb 100644
--- a/common/src/main/resources/common_en.properties
+++ b/common/src/main/resources/common_en.properties
@@ -6,7 +6,6 @@ amount.range.withoutUnit = {condition, select, 0{{minValue} to {maxValue}} 1{up
 
 amount.ratio.denominatorLinkword = {0, choice, 1#per|1.0<every}
 
-fields.doseRange = {0}
 fields.rateQuantity = at a rate of {0}
 fields.rateRange = at a rate of {0}
 fields.rateRatio = at a rate of {0}
diff --git a/common/src/main/resources/common_fr.properties b/common/src/main/resources/common_fr.properties
index 362a339fb..9177f532a 100644
--- a/common/src/main/resources/common_fr.properties
+++ b/common/src/main/resources/common_fr.properties
@@ -6,7 +6,6 @@ amount.range.withoutUnit = {condition, select, 0{{minValue} 
 
 amount.ratio.denominatorLinkword = {0, choice, 1#par|1.0<chaque}
 
-fields.doseRange = {0}
 fields.rateQuantity = au taux de {0}
 fields.rateRange = au taux de {0}
 fields.rateRatio = au taux de {0}
diff --git a/common/src/main/resources/common_nl.properties b/common/src/main/resources/common_nl.properties
index 67657436b..f2977ff42 100644
--- a/common/src/main/resources/common_nl.properties
+++ b/common/src/main/resources/common_nl.properties
@@ -6,7 +6,6 @@ amount.range.withoutUnit = {condition, select, 0{tussen {minValue} en {maxValue}
 
 amount.ratio.denominatorLinkword = {0, choice, 1#per|1.0<elke}
 
-fields.doseRange = {0}
 fields.rateQuantity = met een verhouding van {0}
 fields.rateRange = met een verhouding van {0}
 fields.rateRatio = met een verhouding van {0}
diff --git a/r4/src/main/java/io/github/jy95/fds/r4/translators/DoseRangeR4.java b/r4/src/main/java/io/github/jy95/fds/r4/translators/DoseRangeR4.java
index dc3388a2f..07e1a498f 100644
--- a/r4/src/main/java/io/github/jy95/fds/r4/translators/DoseRangeR4.java
+++ b/r4/src/main/java/io/github/jy95/fds/r4/translators/DoseRangeR4.java
@@ -1,8 +1,8 @@
 package io.github.jy95.fds.r4.translators;
 
 import com.ibm.icu.text.MessageFormat;
-import io.github.jy95.fds.common.translators.DoseRange;
 import io.github.jy95.fds.common.types.DoseAndRateKey;
+import io.github.jy95.fds.common.types.Translator;
 import io.github.jy95.fds.r4.config.FDSConfigR4;
 import io.github.jy95.fds.r4.functions.RangeToStringR4;
 import org.hl7.fhir.r4.model.Dosage;
@@ -16,11 +16,7 @@
  *
  * @author jy95
  */
-public class DoseRangeR4 implements DoseRange<FDSConfigR4, Dosage> {
-
-    // Translations
-    /** MessageFormat instance used for "doseRange" translation. */
-    protected final MessageFormat doseRangeMsg;
+public class DoseRangeR4 implements Translator<FDSConfigR4, Dosage> {
 
     /**
      * The configuration object used by this API.
@@ -41,7 +37,6 @@ public class DoseRangeR4 implements DoseRange<FDSConfigR4, Dosage> {
     public DoseRangeR4(FDSConfigR4 config, ResourceBundle bundle) {
         this.config = config;
         this.bundle = bundle;
-        this.doseRangeMsg = getDoseRangeMsg(bundle, config.getLocale());
     }
 
     /** {@inheritDoc} */
@@ -52,8 +47,7 @@ public CompletableFuture<String> convert(Dosage dosage) {
 
         return RangeToStringR4
                 .getInstance()
-                .convert(bundle, config, (Range) doseRange)
-                .thenApplyAsync(rangeText -> doseRangeMsg.format(new Object[]{rangeText}));
+                .convert(bundle, config, (Range) doseRange);
     }
 
     /** {@inheritDoc} */
diff --git a/r5/src/main/java/io/github/jy95/fds/r5/translators/DoseRangeR5.java b/r5/src/main/java/io/github/jy95/fds/r5/translators/DoseRangeR5.java
index 8b2f03e5e..6d1de168d 100644
--- a/r5/src/main/java/io/github/jy95/fds/r5/translators/DoseRangeR5.java
+++ b/r5/src/main/java/io/github/jy95/fds/r5/translators/DoseRangeR5.java
@@ -1,8 +1,7 @@
 package io.github.jy95.fds.r5.translators;
 
-import com.ibm.icu.text.MessageFormat;
-import io.github.jy95.fds.common.translators.DoseRange;
 import io.github.jy95.fds.common.types.DoseAndRateKey;
+import io.github.jy95.fds.common.types.Translator;
 import io.github.jy95.fds.r5.config.FDSConfigR5;
 import io.github.jy95.fds.r5.functions.RangeToStringR5;
 import org.hl7.fhir.r5.model.Dosage;
@@ -16,11 +15,7 @@
  *
  * @author jy95
  */
-public class DoseRangeR5 implements DoseRange<FDSConfigR5, Dosage> {
-
-    // Translations
-    /** MessageFormat instance used for "doseRange" translation. */
-    protected final MessageFormat doseRangeMsg;
+public class DoseRangeR5 implements Translator<FDSConfigR5, Dosage> {
 
     /**
      * The configuration object used by this API.
@@ -41,7 +36,6 @@ public class DoseRangeR5 implements DoseRange<FDSConfigR5, Dosage> {
     public DoseRangeR5(FDSConfigR5 config, ResourceBundle bundle) {
         this.config = config;
         this.bundle = bundle;
-        this.doseRangeMsg = getDoseRangeMsg(bundle, config.getLocale());
     }
 
     /** {@inheritDoc} */
@@ -52,8 +46,7 @@ public CompletableFuture<String> convert(Dosage dosage) {
 
         return RangeToStringR5
                 .getInstance()
-                .convert(bundle, config, (Range) doseRange)
-                .thenApplyAsync(rangeText -> doseRangeMsg.format(new Object[]{rangeText}));
+                .convert(bundle, config, (Range) doseRange);
     }
 
     /** {@inheritDoc} */