Small fixes with CLI

kaaproject · Aug 17, 2016 · 1d22221 · 1d22221
1 parent 1547458
commit 1d22221
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/pom.xml b/server/upgrade/data-migration-0.9.0-0.10.0/pom.xml
@@ -40,6 +40,10 @@
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.kaaproject.kaa.common</groupId>
             <artifactId>core</artifactId>

diff --git a/.../data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/data_migration/MigrateData.java b/.../data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/data_migration/MigrateData.java
@@ -18,7 +18,6 @@
 
 import org.apache.commons.dbutils.DbUtils;
 import org.apache.commons.dbutils.QueryRunner;
-import org.apache.commons.lang.StringUtils;
 import org.kaaproject.data_migration.model.Ctl;
 import org.kaaproject.data_migration.model.Schema;
 import org.kaaproject.data_migration.utils.BaseSchemaIdCounter;
@@ -48,25 +47,30 @@ public static void main(String[] args) {
             String arg = args[i];
             if (arg.charAt(0) == '-') {
                 String option = arg.substring(1, arg.length()).trim();
+                if(i >= args.length - 1) {
+                    throw new IllegalArgumentException("Not found value after option -" + option);
+                }
                 switch (option) {
                     case "u":
-                        options.setUsername(option);
+                        options.setUsername(args[i+1]);
                         break;
                     case "p":
-                        options.setPassword(option);
+                        options.setPassword(args[i+1]);
                         break;
                     case "h":
-                        options.setHost(option);
+                        options.setHost(args[i+1]);
                         break;
                     case "db":
-                        options.setDbName(option);
+                        options.setDbName(args[i+1]);
                         break;
                     default:
-                        throw  new IllegalArgumentException("No such option: -" + option);
+                        throw new IllegalArgumentException("No such option: -" + option);
                 }
             }
         }
 
+        LOG.debug(options.toString());
+
         try {
             List<Schema> schemas = new ArrayList<>();
             conn = DataSources.getMariaDB(options).getConnection();

diff --git a/...ata-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/data_migration/utils/Options.java b/...ata-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/data_migration/utils/Options.java
@@ -60,4 +60,14 @@ public String getHost() {
     public void setHost(String host) {
         this.host = host;
     }
+
+    @Override
+    public String toString() {
+        return "Options{" +
+                "username='" + username + '\'' +
+                ", password='" + password + '\'' +
+                ", dbName='" + dbName + '\'' +
+                ", host='" + host + '\'' +
+                '}';
+    }
 }