fix: revert to static initialization in PersonOrOrgUtil

Author: vera

src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java

@@ -273,7 +273,7 @@ public enum JvmSettings {
     CSL_COMMON_STYLES(SCOPE_CSL, "common-styles"),
 
     // PersonOrOrgUtil SETTINGS
-    SCOPE_PERSONORORG(PREFIX, "person-or-org", "dataverse.personOrOrg"),
+    SCOPE_PERSONORORG(PREFIX, "person-or-org"),
     ASSUME_COMMA_IN_PERSON_NAME(SCOPE_PERSONORORG, "assume-comma-in-person-name", "dataverse.personOrOrg.assumeCommaInPersonName"),
     ORG_PHRASE_ARRAY(SCOPE_PERSONORORG, "org-phrase-array"),
 

src/main/java/edu/harvard/iq/dataverse/util/PersonOrOrgUtil.java

@@ -1,5 +1,7 @@
 package edu.harvard.iq.dataverse.util;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.logging.Logger;
 
 import edu.harvard.iq.dataverse.settings.JvmSettings;
@@ -34,6 +36,14 @@ public class PersonOrOrgUtil {
 
     private static final Logger logger = Logger.getLogger(PersonOrOrgUtil.class.getCanonicalName());
 
+    static boolean assumeCommaInPersonName = false;
+    static List<String> orgPhrases;
+
+    static {
+        setAssumeCommaInPersonName(JvmSettings.ASSUME_COMMA_IN_PERSON_NAME.lookupOptional(Boolean.class).orElse(false));
+        setOrgPhraseArray(JvmSettings.ORG_PHRASE_ARRAY.lookupOptional(String[].class).orElse(new String[]{}));
+    }
+
     /**
      * This method tries to determine if a name belongs to a person or an
      * organization and, if it is a person, what the given and family names are. The
@@ -61,7 +71,6 @@ public static JsonObject getPersonOrOrganization(String name, boolean organizati
 
         boolean isOrganization = !isPerson && Organizations.getInstance().isOrganization(name);
         if (!isOrganization) {
-            String[] orgPhrases = JvmSettings.ORG_PHRASE_ARRAY.lookupOptional(String[].class).orElse(new String[]{});
             for (String phrase : orgPhrases) {
                 if (name.contains(phrase)) {
                     isOrganization = true;
@@ -88,7 +97,6 @@ public static JsonObject getPersonOrOrganization(String name, boolean organizati
             }
 
         } else {
-            boolean assumeCommaInPersonName = JvmSettings.ASSUME_COMMA_IN_PERSON_NAME.lookupOptional(Boolean.class).orElse(false);
             if (assumeCommaInPersonName && !isPerson) {
                 isOrganization = true;
             } else {
@@ -125,4 +133,18 @@ public static JsonObject getPersonOrOrganization(String name, boolean organizati
         return job.build();
 
     }
+
+    // Public for testing
+    public static void setOrgPhraseArray(String[] phraseArray) {
+        if (phraseArray == null) {
+            orgPhrases = new ArrayList<>();
+        } else {
+            orgPhrases = List.of(phraseArray);
+        }
+    }
+
+    // Public for testing
+    public static void setAssumeCommaInPersonName(boolean assume) {
+        assumeCommaInPersonName = assume;
+    }
 }

src/test/java/edu/harvard/iq/dataverse/util/PersonOrOrgUtilTest.java

@@ -40,12 +40,13 @@ public void testOrganizationCOMPLEXName() {
         }
 
         @Test
-        @JvmSetting(key = JvmSettings.ORG_PHRASE_ARRAY, value = "Portable,GmbH")
         public void testOrganizationWithOrgPhraseArray() {
+            PersonOrOrgUtil.setOrgPhraseArray(new String[]{"Portable", "GmbH"});
             // The next examples are known to be asserted to be a Person without an entry in the OrgWordArray
             // So we test with the array set via JvmSetting to verify the array works
             verifyIsOrganization("Portable Antiquities of the Netherlands");
             verifyIsOrganization("Max Mustermann GmbH");
+            PersonOrOrgUtil.setOrgPhraseArray(null);
         }
 
         @Test
@@ -58,11 +59,12 @@ public void testOrganizationAcademicName() {
         }
 
         @Test
-        @JvmSetting(key = JvmSettings.ASSUME_COMMA_IN_PERSON_NAME, value = "true")
         public void testOrganizationAcademicNameWithAssumeComma() {
+            PersonOrOrgUtil.setAssumeCommaInPersonName(true);
             verifyIsOrganization("John Smith Center");
             verifyIsOrganization("John Smith Group");
             verifyIsOrganization("John Smith Project");
+            PersonOrOrgUtil.setAssumeCommaInPersonName(false);
         }