#305 - Initializer Message Source should not throw an Exception if lo… (#306)

Author: mseaton

api/src/main/java/org/openmrs/module/initializer/InitializerMessageSource.java

@@ -180,11 +180,15 @@ public synchronized void refreshCache() {
 			Properties properties = resources.get(resourceName);
 			String nameWithoutExtension = FilenameUtils.removeExtension(resourceName);
 			Locale locale = getLocaleFromFileBaseName(nameWithoutExtension);
-			log.trace("Adding " + properties.size() + " messages from " + resourceName + " in locale: " + locale);
-			for (Object property : properties.keySet()) {
-				String key = property.toString();
-				String value = properties.getProperty(key);
-				addPresentation(new PresentationMessage(key, locale, value, ""));
+			if (locale == null) {
+				log.warn("No valid locale could be inferred from resource: '" + resourceName + "', skipping");
+			} else {
+				log.trace("Adding " + properties.size() + " messages from " + resourceName + " in locale: " + locale);
+				for (Object property : properties.keySet()) {
+					String key = property.toString();
+					String value = properties.getProperty(key);
+					addPresentation(new PresentationMessage(key, locale, value, ""));
+				}
 			}
 		}
 		stopWatch.stop();
@@ -279,8 +283,7 @@ protected Locale getLocaleFromFileBaseName(String baseName) throws IllegalArgume
 				log.trace(candidate + " is not a valid locale");
 			}
 		}
-		String msg = "No valid locale could be inferred from the following file base name: '" + baseName + "'.";
-		throw new IllegalArgumentException(msg);
+		return null;
 	}
 
 	/**

api/src/test/java/org/openmrs/module/initializer/InitializerMessageSourceTest.java

@@ -16,6 +16,7 @@
 import java.util.Locale;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 public class InitializerMessageSourceTest {
 
@@ -35,9 +36,8 @@ public void getLocaleFromFileBaseName_shouldInferValidLocale() {
 	}
 
 	@Test
-	public void getLocaleFromFileBaseName_shouldThrowIfNoValidLocaleAsSuffixToFileBaseName() {
-		expectedException.expect(IllegalArgumentException.class);
-		src.getLocaleFromFileBaseName("my_base_name");
+	public void getLocaleFromFileBaseName_shouldReturnNullIfNoValidLocaleAsSuffixToFileBaseName() {
+		assertNull(src.getLocaleFromFileBaseName("my_base_name"));
 	}
 
 	@Test