5218 arbitrary filetype index

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

@@ -10,6 +10,7 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class BundleUtil {
@@ -27,19 +28,30 @@ public static String getStringFromBundle(String key, List<String> arguments) {
         ResourceBundle bundle = getResourceBundle(defaultBundleFile );
         return getStringFromBundle(key, arguments, bundle);
     }
-
+    
     public static String getStringFromBundle(String key, List<String> arguments, ResourceBundle bundle) {
-        if (key == null || key.isEmpty()) {
-            return null;
-        }
-        String stringFromBundle = null;
         try {
-            stringFromBundle = bundle.getString(key);
-            logger.fine("string found: " + stringFromBundle);
+            return getStringFromBundleNoMissingCheck(key, arguments, bundle);
         } catch (MissingResourceException ex) {
-            logger.warning("Could not find key \"" + key + "\" in bundle file.");
+            logger.warning("Could not find key \"" + key + "\" in bundle file: ");
+            logger.log(Level.CONFIG, ex.getMessage(), ex);
             return null;
         }
+    }
+
+    /**
+     * This call was added to allow bypassing the exception catch, for filetype indexing needs the exception to bubble up
+     * --MAD 4.9.4
+     */
+    private static String getStringFromBundleNoMissingCheck(String key, List<String> arguments, ResourceBundle bundle) throws MissingResourceException {
+        if (key == null || key.isEmpty()) {
+            return null;
+        }
+        String stringFromBundle = null;
+
+        stringFromBundle = bundle.getString(key);
+        logger.fine("string found: " + stringFromBundle);
+
         if (arguments != null) {
             Object[] argArray = new String[arguments.size()];
             argArray = arguments.toArray(argArray);
@@ -49,9 +61,9 @@ public static String getStringFromBundle(String key, List<String> arguments, Res
         }
     }
 
-    public static String getStringFromPropertyFile(String key, String propertyFileName  ) {
+    public static String getStringFromPropertyFile(String key, String propertyFileName  ) throws MissingResourceException {
         ResourceBundle bundle = getResourceBundle(propertyFileName);
-        return getStringFromBundle(key, null, bundle);
+        return getStringFromBundleNoMissingCheck(key, null, bundle);
     }
 
     public static ResourceBundle getResourceBundle(String propertyFileName)

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

@@ -245,9 +245,15 @@ public static String getFacetFileType(DataFile dataFile) {
                 String typeClass = fileType.split("/")[0];
                 return Character.toUpperCase(typeClass.charAt(0)) + typeClass.substring(1);
             }
+        } else {
+            try {
+                return BundleUtil.getStringFromPropertyFile("application/octet-stream","MimeTypeFacets"  );
+            } catch (MissingResourceException ex) {
+                logger.warning("Could not find \"" + fileType + "\" in bundle file: ");
+                logger.log(Level.CONFIG, ex.getMessage(), ex);
+                return null;
+            }
         }
-
-        return BundleUtil.getStringFromPropertyFile("application/octet-stream","MimeTypeFacets"  );
     }
 
     public static String getUserFriendlyOriginalType(DataFile dataFile) {

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

@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.Locale;
+import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
@@ -70,5 +71,21 @@ public void testGetStringFromBundleWithArgumentsAndSpecificBundle() {
         assertEquals(null, BundleUtil.getStringFromBundle(null, null, null));
         assertEquals("Search", BundleUtil.getStringFromBundle("search", null, ResourceBundle.getBundle("Bundle", Locale.US)));
     }
+
+    @Test
+    public void testStringFromPropertyFile() {
+        assertEquals("ZIP", BundleUtil.getStringFromPropertyFile("application/zip","MimeTypeFacets"));
+    }
 
+    //To assure that the MissingResourceException bubble up from this call
+    @Test(expected = MissingResourceException.class)
+    public void testStringFromPropertyFileException() {
+        BundleUtil.getStringFromPropertyFile("FAKE","MimeTypeFacets");
+    }
+
+    //To assure MissingResourceException is caught when calling normal bundle calls
+    @Test
+    public void testNoErrorNonExistentStringBundle() {
+        BundleUtil.getStringFromBundle("FAKE", null, BundleUtil.getResourceBundle("MimeTypeFacets")); 
+    }
 }