[tomcat-jakartaee-migration] 06/10: Added a -verbose option

[ebourg]

This is an automated email from the ASF dual-hosted git repository.

ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit ec703144edb902b1db9f7298165684fd912e45f8
Author: Emmanuel Bourg <ebo...@apache.org>
AuthorDate: Mon Apr 6 23:47:43 2020 +0200

    Added a -verbose option
---
 .../org/apache/tomcat/jakartaee/Migration.java     | 24 ++++++++++++++--------
 .../org/apache/tomcat/jakartaee/MigrationTest.java |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index 5c8d41b..75d3007 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -256,27 +257,34 @@ public class Migration {
     public static void main(String[] args) {
         System.setProperty("java.util.logging.SimpleFormatter.format", 
"%5$s%n");
 
+        List<String> arguments = new ArrayList<>(Arrays.asList(args));
+        if (arguments.contains("-verbose")) {
+            
Logger.getGlobal().getParent().getHandlers()[0].setLevel(Level.FINE);
+            Logger.getGlobal().getParent().setLevel(Level.FINE);
+            arguments.remove("-verbose");
+        }
+
         Migration migration = new Migration();
 
         boolean valid = false;
         String source = null;
         String dest = null;
-        if (args.length == 3) {
-            if (args[0].startsWith(PROFILE_ARG)) {
-                source = args[1];
-                dest = args[2];
+        if (arguments.size() == 3) {
+            if (arguments.get(0).startsWith(PROFILE_ARG)) {
+                source = arguments.get(1);
+                dest = arguments.get(2);
                 valid = true;
                 try {
-                    
migration.setEESpecProfile(EESpecProfile.valueOf(args[0].substring(PROFILE_ARG.length())));
+                    
migration.setEESpecProfile(EESpecProfile.valueOf(arguments.get(0).substring(PROFILE_ARG.length())));
                 } catch (IllegalArgumentException e) {
                     // Invalid profile value
                     valid = false;
                 }
             }
         }
-        if (args.length == 2) {
-            source = args[0];
-            dest = args[1];
+        if (arguments.size() == 2) {
+            source = arguments.get(0);
+            dest = arguments.get(1);
             valid = true;
         }
         if (!valid) {
diff --git a/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java 
b/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java
index fa0fa74..5ddda03 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java
@@ -41,7 +41,7 @@ public class MigrationTest {
     @Test
     public void testMigrateSingleSourceFileWithProfile() throws Exception {
         File migratedFile = new 
File("target/test-classes/HelloServlet.migrated.java");
-        Migration.main(new String[] {"-profile=EE", 
"target/test-classes/HelloServlet.java", migratedFile.getAbsolutePath()});
+        Migration.main(new String[] {"-verbose", "-profile=EE", 
"target/test-classes/HelloServlet.java", migratedFile.getAbsolutePath()});
 
         assertTrue("Migrated file not found", migratedFile.exists());
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org