LoggingLocalization performance improvement - backport from master (e…

…clipse-ee4j#2172) Signed-off-by: Radek Felcman <[email protected]> (cherry picked from commit f7bc1d2)
rfelcman · Jun 13, 2024 · 0f69952 · 0f69952
1 parent 271766d
commit 0f69952
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/.../test/java/org/eclipse/persistence/testing/tests/junit/localization/LocalizationTest.java b/.../test/java/org/eclipse/persistence/testing/tests/junit/localization/LocalizationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024 Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020 IBM Corporation. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -17,6 +17,7 @@
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.eclipse.persistence.internal.localization.EclipseLinkLocalization;
 import org.eclipse.persistence.internal.localization.LoggingLocalization;
 
 public class LocalizationTest {
@@ -27,5 +28,7 @@ public void test() {
                 "EclipseLink, version: EXAMPLE", LoggingLocalization.buildMessage("topLink_version", new Object[] { "EXAMPLE" }));
         Assert.assertEquals("LoggingLocalization.buildMessage could not find the correct translation.",
                 "message_not_exist (There is no English translation for this message.)", LoggingLocalization.buildMessage("message_not_exist"));
+        Assert.assertEquals("EclipseLinkLocalization.buildMessage could not find the correct translation.",
+                "somekey1 (There is no English translation for this message.)", EclipseLinkLocalization.buildMessage("AAAAUnknownClass", "somekey1", null, true));
     }
 }
diff --git a/.../src/main/java/org/eclipse/persistence/internal/localization/EclipseLinkLocalization.java b/.../src/main/java/org/eclipse/persistence/internal/localization/EclipseLinkLocalization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,6 +29,9 @@
  */
 public abstract class EclipseLinkLocalization {
 
+    // Get the current language's NoTranslationForThisLocale message.
+    private static final String NO_TRANSLATION_MESSAGE = ResourceBundle.getBundle("org.eclipse.persistence.internal.localization.i18n.EclipseLinkLocalizationResource", Locale.getDefault()).getString("NoTranslationForThisLocale");
+
     /**
      * Return the message for the given exception class and error number.
      */
@@ -65,13 +68,18 @@ public static String buildMessage(String localizationClassName, String key, Obje
         } catch (java.util.MissingResourceException mre) {
             if (translate) {
                 // Found bundle, but couldn't find translation.
-                // Get the current language's NoTranslationForThisLocale message.
-                bundle = ResourceBundle.getBundle("org.eclipse.persistence.internal.localization.i18n.EclipseLinkLocalizationResource", Locale.getDefault());
-                String noTranslationMessage = bundle.getString("NoTranslationForThisLocale");
-                   return MessageFormat.format(message, arguments) + noTranslationMessage;
-            }
+                // Use the current language's NoTranslationForThisLocale message.
+                if (arguments == null) {
+                    return message + NO_TRANSLATION_MESSAGE;
+                } else {
+                    return MessageFormat.format(message, arguments) + NO_TRANSLATION_MESSAGE;
+                }            }
+        }
+        if (arguments == null) {
+            return message;
+        } else {
+            return MessageFormat.format(message, arguments);
         }
-        return MessageFormat.format(message, arguments);
     }
 
 }