From 90f450ecb66cbc5a77c4dc8d480ed06b7993c59c Mon Sep 17 00:00:00 2001
From: dotasek <david.otasek@smilecdr.com>
Date: Mon, 7 Nov 2022 17:29:21 -0500
Subject: [PATCH] Rename method + remove dead code

---
 .../org/hl7/fhir/utilities/i18n/I18nBase.java    | 16 +++-------------
 .../hl7/fhir/utilities/i18n/I18nBaseTest.java    | 15 ---------------
 2 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nBase.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nBase.java
index 54b490c7b..9bf45896d 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nBase.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nBase.java
@@ -74,17 +74,14 @@ public abstract class I18nBase {
    * @return The formatted, internationalized, {@link String}
    */
   public String formatMessage(String theMessage, Object... theMessageArguments) {
-    //if (isPluralKey(theMessage)) {
-    //  throw new Error("I18n error: Plural Message called in non-plural mode");
-    //}
-    return formatMessagePlural(theMessage, theMessageArguments);
+    return formatMessageForLocale(theMessage, theMessageArguments);
   }
 
   protected String getPluralKey(Integer number, String baseKey) {
     return baseKey + KEY_DELIMITER + pluralRules.select(number);
   }
 
-  private String formatMessagePlural(String theMessage, Object... theMessageArguments) {
+  private String formatMessageForLocale(String theMessage, Object... theMessageArguments) {
     String message = theMessage;
     if (messageExistsForLocale(theMessage, (theMessageArguments != null && theMessageArguments.length > 0))) {
       if (Objects.nonNull(theMessageArguments) && theMessageArguments.length > 0) {
@@ -112,9 +109,6 @@ public abstract class I18nBase {
    */
   public String formatMessagePlural(Integer plural, String theMessage, Object... theMessageArguments) {
 
-    //if (!isPluralKey(theMessage)) {
-    //  throw new Error("I18n error: Non-plural Message called in plural mode");
-    //}
     Object[] args = new Object[theMessageArguments.length+1];
     args[0] = plural;
     for (int i = 0; i < theMessageArguments.length; i++) {
@@ -122,11 +116,7 @@ public abstract class I18nBase {
     }
     checkPluralRulesAreLoaded();
     String pluralKey = getPluralKey(plural, theMessage);
-    return formatMessagePlural(pluralKey, args);
-  }
-
-  private static boolean isPluralKey(String theMessage) {
-    return theMessage.endsWith(KEY_DELIMITER + PLURAL_SUFFIX);
+    return formatMessageForLocale(pluralKey, args);
   }
 
   /**
diff --git a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/i18n/I18nBaseTest.java b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/i18n/I18nBaseTest.java
index d0cba77f2..28c861a94 100644
--- a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/i18n/I18nBaseTest.java
+++ b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/i18n/I18nBaseTest.java
@@ -119,20 +119,5 @@ class I18nBaseTest {
     return Arrays.stream(items).anyMatch(inputStr::contains);
   }
 
-  @Test
-  @Disabled
-  void pluralKeysCompleteAndValid() {
-    ResourceBundle loadedBundle = ResourceBundle.getBundle("Messages", Locale.GERMAN);
-    PluralRules pluralRules = PluralRules.forLocale(Locale.GERMANY);
-    for (String key : loadedBundle.keySet()) {
-       String[] keyComponent = key.split(I18nBase.KEY_DELIMITER);
-
-       assertFalse(keyComponent[keyComponent.length - 1].equalsIgnoreCase(I18nBase.PLURAL_SUFFIX), "Invalid use of PLURAL keyword for key: " + key);
-       if (keyComponent.length > 2
-        && keyComponent[keyComponent.length - 2].equalsIgnoreCase(I18nBase.PLURAL_SUFFIX)) {
-          assertTrue(pluralRules.getKeywords().contains(keyComponent[keyComponent.length - 1]));
-       }
-    }
-  }
 
 }
\ No newline at end of file