svn commit: r1395151 - in /shindig/trunk/java/common/src: main/java/org/apache/shindig/config/BasicContainerConfig.java test/java/org/apache/shindig/config/BasicContainerConfigTest.java

[ss...@apache.org]

Author: ssievers
Date: Sat Oct  6 19:08:23 2012
New Revision: 1395151

URL: http://svn.apache.org/viewvc?rev=1395151&view=rev
Log:
Adding support for integers in the config to be specified as Strings, much like we do for Booleans today.

Modified:
    shindig/trunk/java/common/src/main/java/org/apache/shindig/config/BasicContainerConfig.java
    shindig/trunk/java/common/src/test/java/org/apache/shindig/config/BasicContainerConfigTest.java

Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/config/BasicContainerConfig.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/BasicContainerConfig.java?rev=1395151&r1=1395150&r2=1395151&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/config/BasicContainerConfig.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/config/BasicContainerConfig.java Sat Oct  6 19:08:23 2012
@@ -76,6 +76,12 @@ public class BasicContainerConfig implem
     Object value = getProperty(container, property);
     if (value instanceof Number) {
       return ((Number) value).intValue();
+    } else if (value instanceof String) {
+      try {
+        return Integer.parseInt((String) value);
+      } catch (NumberFormatException nfe) {
+        return 0;
+      }
     }
     return 0;
   }

Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/config/BasicContainerConfigTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/config/BasicContainerConfigTest.java?rev=1395151&r1=1395150&r2=1395151&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/config/BasicContainerConfigTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/config/BasicContainerConfigTest.java Sat Oct  6 19:08:23 2012
@@ -94,12 +94,14 @@ public class BasicContainerConfigTest {
         "bool", Boolean.valueOf(true),
         "bool2", "true",
         "int", Integer.valueOf(1234),
+        "int2", "1234",
         "string", "abcd",
         "list", ImmutableList.of("a"),
         "map", ImmutableMap.of("a", "b"))).commit();
     assertEquals(true, config.getBool(container, "bool"));
     assertEquals(true, config.getBool(container, "bool2"));
     assertEquals(1234, config.getInt(container, "int"));
+    assertEquals(1234, config.getInt(container, "int2"));
     assertEquals("abcd", config.getString(container, "string"));
     assertEquals(ImmutableList.of("a"), config.getList(container, "list"));
     assertEquals(ImmutableMap.of("a", "b"), config.getMap(container, "map"));