replaced NullPointerException with IllegalArgumentException

matteobaccan · Oct 10, 2013 · 729ad7f · 729ad7f
1 parent d0b66c8
commit 729ad7f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/org/aeonbits/owner/DefaultFactory.java b/src/main/java/org/aeonbits/owner/DefaultFactory.java
@@ -52,7 +52,7 @@ public String setProperty(String key, String value) {
 
     private void checkKey(String key) {
         if (key == null)
-            throw new NullPointerException("key can't be null");
+            throw new IllegalArgumentException("key can't be null");
         if (key.isEmpty())
             throw new IllegalArgumentException("key can't be empty");
     }

diff --git a/src/main/java/org/aeonbits/owner/LoadersManager.java b/src/main/java/org/aeonbits/owner/LoadersManager.java
@@ -66,7 +66,7 @@ Loader findLoader(URL url) {
 
     final void registerLoader(Loader loader) {
         if (loader == null)
-            throw new NullPointerException("loader can't be null");
+            throw new IllegalArgumentException("loader can't be null");
         lock.writeLock().lock();
         try {
             loaders.add(0, loader);

diff --git a/src/test/java/org/aeonbits/owner/ConfigFactoryTest.java b/src/test/java/org/aeonbits/owner/ConfigFactoryTest.java
@@ -52,7 +52,7 @@ public void testSetProperty()  {
         assertEquals("foobar", cfg.someValue());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testSetPropertyNullKey() {
         ConfigFactory.setProperty(null, "foobar");
     }
@@ -104,7 +104,7 @@ public void testGetProperty() {
         assertEquals(RESOURCES_DIR, ConfigFactory.getProperty("mypath"));
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testGetPropertyNullKey() {
         ConfigFactory.getProperty(null);
     }
@@ -121,7 +121,7 @@ public void testGetClearProperty() {
         assertNull(ConfigFactory.getProperty("mypath"));
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testClearPropertyNullKey() {
         ConfigFactory.clearProperty(null);
     }

diff --git a/src/test/java/org/aeonbits/owner/LoaderManagerTest.java b/src/test/java/org/aeonbits/owner/LoaderManagerTest.java
@@ -111,13 +111,13 @@ public String defaultSpecFor(String urlPrefix) {
         assertEquals("bar", cfg.foo());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testRegisterNull() {
         Factory factory = ConfigFactory.newInstance();
         factory.registerLoader(null);
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testRegisterNullOnSingleton() {
         ConfigFactory.registerLoader(null);
     }