squash w/ 2870ae7. split exception handling logic in feature impls

korydraughn · korydraughn · commit d6d3f9b11ba4 · 2025-11-10T14:58:40.000-05:00
diff --git a/irods/src/main/java/ch/cyberduck/core/irods/IRODSAttributesFinderFeature.java b/irods/src/main/java/ch/cyberduck/core/irods/IRODSAttributesFinderFeature.java
@@ -15,6 +15,7 @@
  * GNU General Public License for more details.
  */
 
+import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.ListProgressListener;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.PathAttributes;
@@ -102,9 +103,12 @@ public PathAttributes find(final Path file, final ListProgressListener listener)
 
             throw new NotfoundException(logicalPath);
         }
-        catch(IOException | IRODSException e) {
+        catch(IRODSException e) {
             throw new IRODSExceptionMappingService().map("Failure to read attributes of {0}", e, file);
         }
+        catch(IOException e) {
+            throw new DefaultIOExceptionMappingService().map("Failure to read attributes of {0}", e, file);
+        }
     }
 
     @Override
diff --git a/irods/src/main/java/ch/cyberduck/core/irods/IRODSCopyFeature.java b/irods/src/main/java/ch/cyberduck/core/irods/IRODSCopyFeature.java
@@ -16,6 +16,7 @@
  */
 
 import ch.cyberduck.core.ConnectionCallback;
+import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.features.Copy;
@@ -55,9 +56,12 @@ public Path copy(final Path source, final Path target, final TransferStatus stat
 
             return target;
         }
-        catch(IOException | IRODSException e) {
+        catch(IRODSException e) {
             throw new IRODSExceptionMappingService().map("Cannot copy {0}", e, source);
         }
+        catch(IOException e) {
+            throw new DefaultIOExceptionMappingService().map("Cannot copy {0}", e, source);
+        }
     }
 
     @Override
diff --git a/irods/src/main/java/ch/cyberduck/core/irods/IRODSDeleteFeature.java b/irods/src/main/java/ch/cyberduck/core/irods/IRODSDeleteFeature.java
@@ -15,6 +15,7 @@
  * GNU General Public License for more details.
  */
 
+import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.PasswordCallback;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.exception.BackgroundException;
@@ -89,9 +90,12 @@ else if(status.getType() == ObjectType.COLLECTION) {
                     IRODSFilesystem.removeAll(conn.getRcComm(), logicalPath, removeOptions);
                 }
             }
-            catch(IOException | IRODSException e) {
+            catch(IRODSException e) {
                 throw new IRODSExceptionMappingService().map("Cannot delete {0}", e, file);
             }
+            catch(IOException e) {
+                throw new DefaultIOExceptionMappingService().map("Cannot delete {0}", e, file);
+            }
         }
     }
 
diff --git a/irods/src/main/java/ch/cyberduck/core/irods/IRODSDirectoryFeature.java b/irods/src/main/java/ch/cyberduck/core/irods/IRODSDirectoryFeature.java
@@ -15,6 +15,7 @@
  * GNU General Public License for more details.
  */
 
+import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.features.Directory;
@@ -42,8 +43,11 @@ public Path mkdir(final Write<Void> writer, final Path folder, final TransferSta
             IRODSFilesystem.createCollection(conn.getRcComm(), folder.getAbsolute());
             return folder;
         }
-        catch(IOException | IRODSFilesystemException e) {
+        catch(IRODSFilesystemException e) {
             throw new IRODSExceptionMappingService().map("Cannot create folder {0}", e, folder);
         }
+        catch(IOException e) {
+            throw new DefaultIOExceptionMappingService().map("Cannot create folder {0}", e, folder);
+        }
     }
 }
diff --git a/irods/src/main/java/ch/cyberduck/core/irods/IRODSFindFeature.java b/irods/src/main/java/ch/cyberduck/core/irods/IRODSFindFeature.java
@@ -15,6 +15,7 @@
  * GNU General Public License for more details.
  */
 
+import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.ListProgressListener;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.exception.BackgroundException;
@@ -44,8 +45,11 @@ public boolean find(final Path file, final ListProgressListener listener) throws
             final IRODSConnection conn = session.getClient();
             return IRODSFilesystem.exists(conn.getRcComm(), file.getAbsolute());
         }
-        catch(IOException | IRODSException e) {
+        catch(IRODSException e) {
             throw new IRODSExceptionMappingService().map("Failure to find {0}", e, file);
         }
+        catch(IOException e) {
+            throw new DefaultIOExceptionMappingService().map("Failure to find {0}", e, file);
+        }
     }
 }
diff --git a/irods/src/main/java/ch/cyberduck/core/irods/IRODSListService.java b/irods/src/main/java/ch/cyberduck/core/irods/IRODSListService.java
@@ -16,6 +16,7 @@
  */
 
 import ch.cyberduck.core.AttributedList;
+import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.ListProgressListener;
 import ch.cyberduck.core.ListService;
 import ch.cyberduck.core.Path;
@@ -82,8 +83,11 @@ else if(entry.isDataObject()) {
 
             return children;
         }
-        catch(IRODSException | IOException e) {
+        catch(IRODSException e) {
             throw new IRODSExceptionMappingService().map("Listing {0} failed", e, directory);
         }
+        catch(IOException e) {
+            throw new DefaultIOExceptionMappingService().map("Listing {0} failed", e, directory);
+        }
     }
 }
diff --git a/irods/src/main/java/ch/cyberduck/core/irods/IRODSMoveFeature.java b/irods/src/main/java/ch/cyberduck/core/irods/IRODSMoveFeature.java
@@ -16,6 +16,7 @@
  */
 
 import ch.cyberduck.core.ConnectionCallback;
+import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.exception.NotfoundException;
@@ -55,9 +56,12 @@ public Path move(final Path file, final Path renamed, final TransferStatus statu
             IRODSFilesystem.rename(conn.getRcComm(), file.getAbsolute(), renamed.getAbsolute());
             return renamed;
         }
-        catch(IOException | IRODSException e) {
+        catch(IRODSException e) {
             throw new IRODSExceptionMappingService().map("Cannot rename {0}", e, file);
         }
+        catch(IOException e) {
+            throw new DefaultIOExceptionMappingService().map("Cannot rename {0}", e, file);
+        }
     }
 
     @Override
diff --git a/irods/src/main/java/ch/cyberduck/core/irods/IRODSReadFeature.java b/irods/src/main/java/ch/cyberduck/core/irods/IRODSReadFeature.java
@@ -16,6 +16,7 @@
  */
 
 import ch.cyberduck.core.ConnectionCallback;
+import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.exception.NotfoundException;
@@ -56,9 +57,12 @@ public InputStream read(final Path file, final TransferStatus status, final Conn
 
             return in;
         }
-        catch(IOException | IRODSException e) {
+        catch(IRODSException e) {
             throw new IRODSExceptionMappingService().map("Download of {0} failed", e, file);
         }
+        catch(IOException e) {
+            throw new DefaultIOExceptionMappingService().map("Download of {0} failed", e, file);
+        }
     }
 
     @Override
diff --git a/irods/src/main/java/ch/cyberduck/core/irods/IRODSTimestampFeature.java b/irods/src/main/java/ch/cyberduck/core/irods/IRODSTimestampFeature.java
@@ -15,6 +15,7 @@
  * GNU General Public License for more details.
  */
 
+import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.features.Timestamp;
@@ -74,9 +75,12 @@ else if(IRODSFilesystem.isCollection(objectStatus)) {
                 log.debug("timestamp set to [{}] seconds (since epoch) on [{}] successfully.", seconds, logicalPath);
             }
         }
-        catch(IOException | IRODSException e) {
+        catch(IRODSException e) {
             throw new IRODSExceptionMappingService().map(e);
         }
+        catch(IOException e) {
+            throw new DefaultIOExceptionMappingService().map(e);
+        }
     }
 
     private long getReplicaNumberOfLatestGoodReplica(String logicalPath) throws IRODSException, IOException {
diff --git a/irods/src/main/java/ch/cyberduck/core/irods/IRODSTouchFeature.java b/irods/src/main/java/ch/cyberduck/core/irods/IRODSTouchFeature.java
@@ -15,6 +15,7 @@
  * GNU General Public License for more details.
  */
 
+import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.features.Touch;
@@ -58,9 +59,12 @@ public Path touch(final Write writer, final Path file, final TransferStatus stat
 
             return file;
         }
-        catch(IOException | IRODSException e) {
+        catch(IRODSException e) {
             throw new IRODSExceptionMappingService().map("Cannot create {0}", e, file);
         }
+        catch(IOException e) {
+            throw new DefaultIOExceptionMappingService().map("Cannot create {0}", e, file);
+        }
     }
 
     @Override
diff --git a/irods/src/main/java/ch/cyberduck/core/irods/IRODSWriteFeature.java b/irods/src/main/java/ch/cyberduck/core/irods/IRODSWriteFeature.java
@@ -16,6 +16,7 @@
  */
 
 import ch.cyberduck.core.ConnectionCallback;
+import ch.cyberduck.core.DefaultIOExceptionMappingService;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.features.Write;
@@ -51,8 +52,11 @@ public StatusOutputStream<Void> write(final Path file, final TransferStatus stat
             final OutputStream out = new IRODSDataObjectOutputStream(conn.getRcComm(), file.getAbsolute(), truncate, append);
             return new VoidStatusOutputStream(out);
         }
-        catch(IRODSException | IOException e) {
+        catch(IRODSException e) {
             throw new IRODSExceptionMappingService().map("Uploading {0} failed", e, file);
         }
+        catch(IOException e) {
+            throw new DefaultIOExceptionMappingService().map("Uploading {0} failed", e, file);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`* GNU General Public License for more details.`
`16`	`16`	`*/`
`17`	`17`
	`18`	`+import ch.cyberduck.core.DefaultIOExceptionMappingService;`
`18`	`19`	`import ch.cyberduck.core.ListProgressListener;`
`19`	`20`	`import ch.cyberduck.core.Path;`
`20`	`21`	`import ch.cyberduck.core.PathAttributes;`
`@@ -102,9 +103,12 @@ public PathAttributes find(final Path file, final ListProgressListener listener)`
`102`	`103`
`103`	`104`	`throw new NotfoundException(logicalPath);`
`104`	`105`	`}`
`105`		`- catch(IOException \| IRODSException e) {`
	`106`	`+ catch(IRODSException e) {`
`106`	`107`	`throw new IRODSExceptionMappingService().map("Failure to read attributes of {0}", e, file);`
`107`	`108`	`}`
	`109`	`+ catch(IOException e) {`
	`110`	`+ throw new DefaultIOExceptionMappingService().map("Failure to read attributes of {0}", e, file);`
	`111`	`+ }`
`108`	`112`	`}`
`109`	`113`
`110`	`114`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`
`18`	`18`	`import ch.cyberduck.core.ConnectionCallback;`
	`19`	`+import ch.cyberduck.core.DefaultIOExceptionMappingService;`
`19`	`20`	`import ch.cyberduck.core.Path;`
`20`	`21`	`import ch.cyberduck.core.exception.BackgroundException;`
`21`	`22`	`import ch.cyberduck.core.features.Copy;`
`@@ -55,9 +56,12 @@ public Path copy(final Path source, final Path target, final TransferStatus stat`
`55`	`56`
`56`	`57`	`return target;`
`57`	`58`	`}`
`58`		`- catch(IOException \| IRODSException e) {`
	`59`	`+ catch(IRODSException e) {`
`59`	`60`	`throw new IRODSExceptionMappingService().map("Cannot copy {0}", e, source);`
`60`	`61`	`}`
	`62`	`+ catch(IOException e) {`
	`63`	`+ throw new DefaultIOExceptionMappingService().map("Cannot copy {0}", e, source);`
	`64`	`+ }`
`61`	`65`	`}`
`62`	`66`
`63`	`67`	`@Override`