commandLine: flyway.consoleWidth property should be optional

fixes http://code.google.com/p/flyway/issues/detail?id=443
panchenko · Mar 7, 2013 · 3163d63 · 3163d63
1 parent 19ded0e
commit 3163d63
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/flyway-commandline/src/main/java/com/googlecode/flyway/commandline/Main.java b/flyway-commandline/src/main/java/com/googlecode/flyway/commandline/Main.java
@@ -81,7 +81,7 @@ public static void main(String[] args) {
             Flyway flyway = new Flyway();
             flyway.configure(properties);
 
-            int consoleWidth = Integer.parseInt(properties.getProperty("flyway.consoleWidth"));
+            int consoleWidth = PropertiesUtils.getIntProperty(properties, "flyway.consoleWidth", 80, true);
 
             executeOperation(flyway, operation, consoleWidth);
         } catch (Exception e) {

diff --git a/flyway-core/src/main/java/com/googlecode/flyway/core/util/PropertiesUtils.java b/flyway-core/src/main/java/com/googlecode/flyway/core/util/PropertiesUtils.java
@@ -15,6 +15,8 @@
  */
 package com.googlecode.flyway.core.util;
 
+import com.googlecode.flyway.core.util.logging.LogFactory;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
@@ -104,4 +106,20 @@ private static String unescape(String str) {
         }
         return outBuffer.toString();
     }
+
+    public static int getIntProperty(Properties properties, String key, int defaultValue, boolean useDefaultOnError) {
+        final String value = properties.getProperty(key);
+        if (value != null) {
+            try {
+                return Integer.parseInt(value);
+            } catch (NumberFormatException e) {
+                if (useDefaultOnError) {
+                    LogFactory.getLog(PropertiesUtils.class).debug(e.toString());
+                } else {
+                    throw e;
+                }
+            }
+        }
+        return defaultValue;
+    }
 }