reduce code duplication #6570

Author: pdurbin

src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java

@@ -754,43 +754,17 @@ public String getDescriptionHtmlEscaped() {
         return MarkupChecker.escapeHtml(getDescription());
     }
 
-    public List<String[]> getDatasetContacts(){
-        List <String[]> retList = new ArrayList<>();
-        for (DatasetField dsf : this.getDatasetFields()) {
-            Boolean addContributor = true;
-            String contributorName = "";
-            String contributorAffiliation = "";
-            if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.datasetContact)) {
-                for (DatasetFieldCompoundValue authorValue : dsf.getDatasetFieldCompoundValues()) {
-                    for (DatasetField subField : authorValue.getChildDatasetFields()) {
-                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.datasetContactName)) {
-                            if (subField.isEmptyForDisplay()) {
-                                addContributor = false;
-                            }
-                            contributorName = subField.getDisplayValue();
-                        }
-                        if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.datasetContactAffiliation)) {
-                            contributorAffiliation = subField.getDisplayValue();
-                        }
-
-                    }
-                    if (addContributor) {
-                        String[] datasetContributor = new String[] {contributorName, contributorAffiliation};
-                        retList.add(datasetContributor);
-                    }
-                }
-            }
-        }       
-        return retList;        
+    public List<String[]> getDatasetContacts() {
+        boolean getDisplayValues = true;
+        return getDatasetContacts(getDisplayValues);
     }
 
     /**
-     * This method is the same as getDatasetContacts above but the actual value
-     * is returned for affiliation instead of the "display" value, which as of
-     * this writing wraps the value in parentheses.
+     * @param getDisplayValues Instead of the retrieving pristine value in the
+     * database, run the value through special formatting.
      */
-    public List<String[]> getDatasetContactsNonDisplay() {
-        List<String[]> retList = new ArrayList<>();
+    public List<String[]> getDatasetContacts(boolean getDisplayValues) {
+        List <String[]> retList = new ArrayList<>();
         for (DatasetField dsf : this.getDatasetFields()) {
             Boolean addContributor = true;
             String contributorName = "";
@@ -802,21 +776,22 @@ public List<String[]> getDatasetContactsNonDisplay() {
                             if (subField.isEmptyForDisplay()) {
                                 addContributor = false;
                             }
+                            // There is no use case yet for getting the non-display value for contributorName.
                             contributorName = subField.getDisplayValue();
                         }
                         if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.datasetContactAffiliation)) {
-                            contributorAffiliation = subField.getValue();
+                            contributorAffiliation = getDisplayValues ? subField.getDisplayValue() : subField.getValue();
                         }
 
                     }
                     if (addContributor) {
-                        String[] datasetContributor = new String[]{contributorName, contributorAffiliation};
+                        String[] datasetContributor = new String[] {contributorName, contributorAffiliation};
                         retList.add(datasetContributor);
                     }
                 }
             }
-        }
-        return retList;
+        }       
+        return retList;        
     }
 
     public List<String[]> getDatasetProducers(){

src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java

@@ -596,7 +596,7 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool
                 if (!dv.getDatasetContacts().isEmpty()) {
                     JsonArrayBuilder contacts = Json.createArrayBuilder();
                     NullSafeJsonBuilder nullSafeJsonBuilderInner = jsonObjectBuilder();
-                    for (String contact[] : dv.getDatasetContactsNonDisplay()) {
+                    for (String contact[] : dv.getDatasetContacts(false)) {
                         nullSafeJsonBuilderInner.add("name", contact[0]);
                         nullSafeJsonBuilderInner.add("affiliation", contact[1]);
                         contacts.add(nullSafeJsonBuilderInner);