Avoid unnecessary calls to Exception.initCause where possible

Instead of creating an instance of the exception class with its
default constructor, and then calling initCause with the exception
that was caught, just directly throw a new instance that was
constructed with the caught exception as the cause parameter.

Instances of this pattern are not fixed in ChangeNotesParser because
it requires a bit more refactoring and would be better done in a
separate commit.

Change-Id: Ief8f3893b86f4feacf4b3d23185cc126827d0699

10 files changed, 14 insertions, 40 deletions

diff --git a/java/com/google/gerrit/acceptance/InMemoryTestingDatabaseModule.java b/java/com/google/gerrit/acceptance/InMemoryTestingDatabaseModule.java
index b23b6e65e6..6ee5c096e8 100644
--- a/java/com/google/gerrit/acceptance/InMemoryTestingDatabaseModule.java
+++ b/java/com/google/gerrit/acceptance/InMemoryTestingDatabaseModule.java
@@ -134,9 +134,7 @@ class InMemoryTestingDatabaseModule extends LifecycleModule {
     try {
       Files.createDirectories(p.resolve("etc"));
     } catch (IOException e) {
-      ProvisionException pe = new ProvisionException(e.getMessage());
-      pe.initCause(e);
-      throw pe;
+      throw new ProvisionException(e.getMessage(), e);
     }
   }
 }
diff --git a/java/com/google/gerrit/httpd/HtmlDomUtil.java b/java/com/google/gerrit/httpd/HtmlDomUtil.java
index 9acc754b6a..25ae71cee8 100644
--- a/java/com/google/gerrit/httpd/HtmlDomUtil.java
+++ b/java/com/google/gerrit/httpd/HtmlDomUtil.java
@@ -84,9 +84,7 @@ public class HtmlDomUtil {
       serializer.transform(domSource, streamResult);
       return out.toString();
     } catch (TransformerException e) {
-      IOException r = new IOException("Error transforming page");
-      r.initCause(e);
-      throw r;
+      throw new IOException("Error transforming page", e);
     }
   }
 
diff --git a/java/com/google/gerrit/httpd/raw/StaticModule.java b/java/com/google/gerrit/httpd/raw/StaticModule.java
index 20b799bbcc..664d881b4d 100644
--- a/java/com/google/gerrit/httpd/raw/StaticModule.java
+++ b/java/com/google/gerrit/httpd/raw/StaticModule.java
@@ -365,9 +365,7 @@ public class StaticModule extends ServletModule {
             && GerritLauncher.NOT_ARCHIVED.equals(e.getMessage())) {
           return null;
         }
-        ProvisionException pe = new ProvisionException("Error reading gerrit.war");
-        pe.initCause(e);
-        throw pe;
+        throw new ProvisionException("Error reading gerrit.war", e);
       }
       return war;
     }
@@ -395,9 +393,7 @@ public class StaticModule extends ServletModule {
           return dstwar.getAbsoluteFile().toPath();
         }
       } catch (IOException e) {
-        ProvisionException pe = new ProvisionException("Cannot create war tempdir");
-        pe.initCause(e);
-        throw pe;
+        throw new ProvisionException("Cannot create war tempdir", e);
       }
     }
   }
diff --git a/java/com/google/gerrit/server/git/DefaultAdvertiseRefsHook.java b/java/com/google/gerrit/server/git/DefaultAdvertiseRefsHook.java
index 022b0e16ac..ef5e65bdf8 100644
--- a/java/com/google/gerrit/server/git/DefaultAdvertiseRefsHook.java
+++ b/java/com/google/gerrit/server/git/DefaultAdvertiseRefsHook.java
@@ -44,9 +44,7 @@ public class DefaultAdvertiseRefsHook extends AbstractAdvertiseRefsHook {
     try {
       return perm.filter(repo.getAllRefs(), repo, opts);
     } catch (PermissionBackendException e) {
-      ServiceMayNotContinueException ex = new ServiceMayNotContinueException();
-      ex.initCause(e);
-      throw ex;
+      throw new ServiceMayNotContinueException(e);
     }
   }
 }
diff --git a/java/com/google/gerrit/server/git/HookUtil.java b/java/com/google/gerrit/server/git/HookUtil.java
index 1762b95ba0..42d3f69d1d 100644
--- a/java/com/google/gerrit/server/git/HookUtil.java
+++ b/java/com/google/gerrit/server/git/HookUtil.java
@@ -42,9 +42,7 @@ public class HookUtil {
     } catch (ServiceMayNotContinueException e) {
       throw e;
     } catch (IOException e) {
-      ServiceMayNotContinueException ex = new ServiceMayNotContinueException();
-      ex.initCause(e);
-      throw ex;
+      throw new ServiceMayNotContinueException(e);
     }
     rp.setAdvertisedRefs(refs, rp.getAdvertisedObjects());
     return refs;
diff --git a/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java b/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
index abe3410a79..85822a8997 100644
--- a/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
+++ b/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
@@ -140,11 +140,8 @@ public class LocalDiskRepositoryManager implements GitRepositoryManager {
     FileKey loc = FileKey.lenient(path.resolve(name.get()).toFile(), FS.DETECTED);
     try {
       return RepositoryCache.open(loc);
-    } catch (IOException e1) {
-      final RepositoryNotFoundException e2;
-      e2 = new RepositoryNotFoundException("Cannot open repository " + name);
-      e2.initCause(e1);
-      throw e2;
+    } catch (IOException e) {
+      throw new RepositoryNotFoundException("Cannot open repository " + name, e);
     }
   }
 
@@ -197,11 +194,8 @@ public class LocalDiskRepositoryManager implements GitRepositoryManager {
       }
 
       return db;
-    } catch (IOException e1) {
-      final RepositoryNotFoundException e2;
-      e2 = new RepositoryNotFoundException("Cannot create repository " + name);
-      e2.initCause(e1);
-      throw e2;
+    } catch (IOException e) {
+      throw new RepositoryNotFoundException("Cannot create repository " + name, e);
     }
   }
 
diff --git a/java/com/google/gerrit/server/git/receive/HackPushNegotiateHook.java b/java/com/google/gerrit/server/git/receive/HackPushNegotiateHook.java
index 1001d046b1..bf3d270e43 100644
--- a/java/com/google/gerrit/server/git/receive/HackPushNegotiateHook.java
+++ b/java/com/google/gerrit/server/git/receive/HackPushNegotiateHook.java
@@ -82,9 +82,7 @@ public class HackPushNegotiateHook implements AdvertiseRefsHook {
       } catch (ServiceMayNotContinueException e) {
         throw e;
       } catch (IOException e) {
-        ServiceMayNotContinueException ex = new ServiceMayNotContinueException();
-        ex.initCause(e);
-        throw ex;
+        throw new ServiceMayNotContinueException(e);
       }
     }
     rp.setAdvertisedRefs(r, history(r.values(), rp));
diff --git a/java/com/google/gerrit/server/index/VersionManager.java b/java/com/google/gerrit/server/index/VersionManager.java
index 8aabb606d5..f37472c804 100644
--- a/java/com/google/gerrit/server/index/VersionManager.java
+++ b/java/com/google/gerrit/server/index/VersionManager.java
@@ -272,8 +272,6 @@ public abstract class VersionManager implements LifecycleListener {
   }
 
   private ProvisionException fail(Throwable t) {
-    ProvisionException e = new ProvisionException("Error scanning indexes");
-    e.initCause(t);
-    return e;
+    return new ProvisionException("Error scanning indexes", t);
   }
 }
diff --git a/java/com/google/gerrit/server/index/change/ChangeIndexer.java b/java/com/google/gerrit/server/index/change/ChangeIndexer.java
index 8f9dc06c42..064af64c7d 100644
--- a/java/com/google/gerrit/server/index/change/ChangeIndexer.java
+++ b/java/com/google/gerrit/server/index/change/ChangeIndexer.java
@@ -347,9 +347,7 @@ public class ChangeIndexer {
                   try {
                     db = Providers.of(schemaFactory.open());
                   } catch (OrmException e) {
-                    ProvisionException pe = new ProvisionException("error opening ReviewDb");
-                    pe.initCause(e);
-                    throw pe;
+                    throw new ProvisionException("error opening ReviewDb", e);
                   }
                   dbRef.set(db);
                 }
diff --git a/java/com/google/gerrit/testing/InMemoryModule.java b/java/com/google/gerrit/testing/InMemoryModule.java
index 12f393627e..18dfea0e86 100644
--- a/java/com/google/gerrit/testing/InMemoryModule.java
+++ b/java/com/google/gerrit/testing/InMemoryModule.java
@@ -329,9 +329,7 @@ public class InMemoryModule extends FactoryModule {
         | IllegalAccessException
         | InvocationTargetException e) {
       e.printStackTrace();
-      ProvisionException pe = new ProvisionException(e.getMessage());
-      pe.initCause(e);
-      throw pe;
+      throw new ProvisionException(e.getMessage(), e);
     }
   }