perf: remove useless doseRange translations

jy95 · Feb 19, 2025 · 7087fea · 7087fea
1 parent e2b7ce0
commit 7087fea
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 55 deletions.
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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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} */