chore: cleanup

jy95 · Jan 5, 2025 · e896f2e · e896f2e
1 parent acf629e
commit e896f2e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/src/main/java/jy95/fhir/r4/dosage/utils/functions/QuantityToString.java b/src/main/java/jy95/fhir/r4/dosage/utils/functions/QuantityToString.java
@@ -4,7 +4,7 @@
 import org.hl7.fhir.r4.model.Quantity;
 
 import java.math.BigDecimal;
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 import java.util.List;
 import java.util.ResourceBundle;
 import java.util.concurrent.CompletableFuture;
@@ -19,7 +19,6 @@ public final class QuantityToString {
 
     public static CompletableFuture<String> convert(ResourceBundle bundle, FDUConfig config, Quantity quantity) {
         var comparator = comparatorToString(bundle, config, quantity);
-        //var unit = unitToString(config, quantity);
         var unit = hasUnit(quantity)
                 ? enhancedFromFHIRQuantityUnitToString(bundle, config, quantity)
                 : CompletableFuture.completedFuture("");
@@ -47,7 +46,7 @@ public static CompletableFuture<String> enhancedFromFHIRQuantityUnitToString(Res
                 String code = quantity.getCode();
                 BigDecimal amount = quantity.hasValue() ? quantity.getValue() : BigDecimal.ONE;
                 String message = bundle.getString("withoutCount." + code);
-                return com.ibm.icu.text.MessageFormat.format(message, amount);
+                return MessageFormat.format(message, amount);
             });
         }
 
@@ -64,4 +63,4 @@ private static CompletableFuture<String> comparatorToString(ResourceBundle bundl
         }
         return CompletableFuture.completedFuture("");
     }
-}
+}
diff --git a/src/main/java/jy95/fhir/r4/dosage/utils/functions/RatioToString.java b/src/main/java/jy95/fhir/r4/dosage/utils/functions/RatioToString.java
@@ -1,12 +1,10 @@
 package jy95.fhir.r4.dosage.utils.functions;
 
 import jy95.fhir.r4.dosage.utils.config.FDUConfig;
-import org.hl7.fhir.r4.model.Quantity;
 import org.hl7.fhir.r4.model.Ratio;
 
 import java.math.BigDecimal;
-import java.text.MessageFormat;
-import java.util.Map;
+import com.ibm.icu.text.MessageFormat;
 import java.util.ResourceBundle;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -71,5 +69,4 @@ private static CompletableFuture<String> turnDenominatorToText(
 
         return QuantityToString.convert(bundle, config, denominator);
     }
-
-}
+}
diff --git a/src/main/java/jy95/fhir/r4/dosage/utils/translators/MaxDosePerAdministration.java b/src/main/java/jy95/fhir/r4/dosage/utils/translators/MaxDosePerAdministration.java
@@ -5,7 +5,7 @@
 import jy95.fhir.r4.dosage.utils.functions.QuantityToString;
 import org.hl7.fhir.r4.model.Dosage;
 
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 import java.util.concurrent.CompletableFuture;
 
 public class MaxDosePerAdministration extends AbstractTranslator {
@@ -23,12 +23,12 @@ public CompletableFuture<String> convert(Dosage dosage) {
                 .convert(bundle, getConfig(), quantity)
                 .thenApplyAsync((quantityText) -> {
                     String msg = bundle.getString("fields.maxDosePerAdministration");
-                    return new MessageFormat(msg, getConfig().getLocale()).format(new Object[] {quantityText});
+                    return new MessageFormat(msg, getConfig().getLocale()).format(new Object[] { quantityText });
                 });
     }
 
     @Override
     public boolean isPresent(Dosage dosage) {
         return dosage.hasMaxDosePerAdministration();
     }
-}
+}
diff --git a/src/main/java/jy95/fhir/r4/dosage/utils/translators/MaxDosePerLifetime.java b/src/main/java/jy95/fhir/r4/dosage/utils/translators/MaxDosePerLifetime.java
@@ -5,7 +5,7 @@
 import jy95.fhir.r4.dosage.utils.functions.QuantityToString;
 import org.hl7.fhir.r4.model.Dosage;
 
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 import java.util.concurrent.CompletableFuture;
 
 public class MaxDosePerLifetime extends AbstractTranslator {
@@ -23,12 +23,12 @@ public CompletableFuture<String> convert(Dosage dosage) {
                 .convert(bundle, getConfig(), quantity)
                 .thenApplyAsync((quantityText) -> {
                     String msg = bundle.getString("fields.maxDosePerLifetime");
-                    return new MessageFormat(msg, getConfig().getLocale()).format(new Object[] {quantityText});
+                    return new MessageFormat(msg, getConfig().getLocale()).format(new Object[] { quantityText });
                 });
     }
 
     @Override
     public boolean isPresent(Dosage dosage) {
         return dosage.hasMaxDosePerLifetime();
     }
-}
+}
diff --git a/src/main/java/jy95/fhir/r4/dosage/utils/translators/MaxDosePerPeriod.java b/src/main/java/jy95/fhir/r4/dosage/utils/translators/MaxDosePerPeriod.java
@@ -5,7 +5,7 @@
 import jy95.fhir.r4.dosage.utils.functions.RatioToString;
 import org.hl7.fhir.r4.model.Dosage;
 
-import java.text.MessageFormat;
+import com.ibm.icu.text.MessageFormat;
 import java.util.concurrent.CompletableFuture;
 
 public class MaxDosePerPeriod extends AbstractTranslator {
@@ -23,12 +23,12 @@ public CompletableFuture<String> convert(Dosage dosage) {
                 .convert(bundle, getConfig(), ratio)
                 .thenApplyAsync((ratioText) -> {
                     String msg = bundle.getString("fields.maxDosePerPeriod");
-                    return new MessageFormat(msg, getConfig().getLocale()).format(new Object[] {ratioText});
+                    return new MessageFormat(msg, getConfig().getLocale()).format(new Object[] { ratioText });
                 });
     }
 
     @Override
     public boolean isPresent(Dosage dosage) {
         return dosage.hasMaxDosePerPeriod();
     }
-}
+}