[tomcat-jakartaee-migration] 04/07: Simplify error handling

[markt]

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

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

commit 9acbf5e8089114a8ea3a5118ca4b64beeb5d5b14
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Feb 9 14:34:49 2021 +0000

    Simplify error handling
---
 .../java/org/apache/tomcat/jakartaee/Migration.java    | 18 +++++++-----------
 .../org/apache/tomcat/jakartaee/MigrationTask.java     |  7 +------
 .../apache/tomcat/jakartaee/LocalStrings.properties    |  2 +-
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index c6a6371..e970a08 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -103,32 +103,28 @@ public class Migration {
     }
 
 
-    public boolean execute() throws IOException {
+    public void execute() throws IOException {
         logger.log(Level.INFO, sm.getString("migration.execute", 
source.getAbsolutePath(),
                 destination.getAbsolutePath(), profile.toString()));
-        boolean result = true;
+
         long t1 = System.nanoTime();
         if (source.isDirectory()) {
             if ((destination.exists() && destination.isDirectory()) || 
destination.mkdirs()) {
-                result = result && migrateDirectory(source, destination);
+                migrateDirectory(source, destination);
             } else {
-                logger.log(Level.WARNING, sm.getString("migration.mkdirError", 
destination.getAbsolutePath()));
-                result = false;
+                throw new IOException(sm.getString("migration.mkdirError", 
destination.getAbsolutePath()));
             }
         } else {
             // Single file
             File parentDestination = 
destination.getAbsoluteFile().getParentFile();
             if (parentDestination.exists() || parentDestination.mkdirs()) {
-                result = result && migrateFile(source, destination);
+                migrateFile(source, destination);
             } else {
-                logger.log(Level.WARNING, sm.getString("migration.mkdirError", 
parentDestination.getAbsolutePath()));
-                result = false;
+                throw new IOException(sm.getString("migration.mkdirError", 
parentDestination.getAbsolutePath()));
             }
         }
         logger.log(Level.INFO, sm.getString("migration.done",
-                Long.valueOf(TimeUnit.MILLISECONDS.convert(System.nanoTime() - 
t1, TimeUnit.NANOSECONDS)),
-                Boolean.valueOf(result)));
-        return result;
+                Long.valueOf(TimeUnit.MILLISECONDS.convert(System.nanoTime() - 
t1, TimeUnit.NANOSECONDS))));
     }
 
 
diff --git a/src/main/java/org/apache/tomcat/jakartaee/MigrationTask.java 
b/src/main/java/org/apache/tomcat/jakartaee/MigrationTask.java
index 6bdda1d..c19599e 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/MigrationTask.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/MigrationTask.java
@@ -74,15 +74,10 @@ public class MigrationTask extends Task {
         migration.setEESpecProfile(profile);
         migration.setZipInMemory(zipInMemory);
 
-        boolean success = false;
         try {
-            success = migration.execute();
+            migration.execute();
         } catch (IOException e) {
             throw new BuildException(e, getLocation());
         }
-
-        if (!success) {
-            throw new BuildException("Migration failed", getLocation());
-        }
     }
 }
diff --git 
a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties 
b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
index d3274e4..d8150c0 100644
--- a/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
+++ b/src/main/resources/org/apache/tomcat/jakartaee/LocalStrings.properties
@@ -16,7 +16,7 @@
 migration.archive=Migrating archive [{0}]
 migration.archiveFailed=Failed to migrate archive [{0}]. Using the 
"-zipInMemory" option may help. 
 migration.cannotReadSource=Cannot read source location [{0}]
-migration.done=Migration completed successfully [{1}] in [{0}] milliseconds
+migration.done=Migration completed successfully in [{0}] milliseconds
 migration.entry=Migrating Jar entry [{0}]
 migration.error=Error performing migration
 migration.execute=Performing migration from source [{0}] to destination [{1}] 
with Jakarta EE specification profile [{2}]


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