Make VCertException error messages more helpful (#23)

FooBarWidget · web-flow · commit 40ba06a7ba47 · 2020-10-29T14:01:00.000-07:00
By not wrapping all errors in a generic "Unexpected exception" exception. Closes #12.
diff --git a/src/main/java/com/venafi/vcert/sdk/VCertClient.java b/src/main/java/com/venafi/vcert/sdk/VCertClient.java
@@ -103,8 +103,6 @@ public void ping() throws VCertException {
       connector.ping();
     } catch (FeignException e) {
       throw VCertException.fromFeignException(e);
-    } catch (Exception e) {
-      throw new VCertException("Unexpected exception", e);
     }
   }
 
@@ -117,8 +115,6 @@ public void authenticate(Authentication auth) throws VCertException {
       connector.authenticate(auth);
     } catch (FeignException e) {
       throw VCertException.fromFeignException(e);
-    } catch (Exception e) {
-      throw new VCertException("Unexpected exception", e);
     }
   }
 
@@ -131,8 +127,6 @@ public ZoneConfiguration readZoneConfiguration(String zone) throws VCertExceptio
       return connector.readZoneConfiguration(zone);
     } catch (FeignException e) {
       throw VCertException.fromFeignException(e);
-    } catch (Exception e) {
-      throw new VCertException("Unexpected exception", e);
     }
   }
 
@@ -146,8 +140,6 @@ public CertificateRequest generateRequest(ZoneConfiguration config, CertificateR
       return connector.generateRequest(config, request);
     } catch (FeignException e) {
       throw VCertException.fromFeignException(e);
-    } catch (Exception e) {
-      throw new VCertException("Unexpected exception", e);
     }
   }
 
@@ -157,8 +149,6 @@ public String requestCertificate(CertificateRequest request, String zone) throws
       return connector.requestCertificate(request, zone);
     } catch (FeignException e) {
       throw VCertException.fromFeignException(e);
-    } catch (Exception e) {
-      throw new VCertException("Unexpected exception", e);
     }
   }
 
@@ -172,8 +162,6 @@ public String requestCertificate(CertificateRequest request, ZoneConfiguration z
       return connector.requestCertificate(request, zoneConfiguration);
     } catch (FeignException e) {
       throw VCertException.fromFeignException(e);
-    } catch (Exception e) {
-      throw new VCertException("Unexpected exception", e);
     }
   }
 
@@ -186,8 +174,6 @@ public PEMCollection retrieveCertificate(CertificateRequest request) throws VCer
       return connector.retrieveCertificate(request);
     } catch (FeignException e) {
       throw VCertException.fromFeignException(e);
-    } catch (Exception e) {
-      throw new VCertException("Unexpected exception", e);
     }
   }
 
@@ -200,8 +186,6 @@ public void revokeCertificate(RevocationRequest request) throws VCertException {
       connector.revokeCertificate(request);
     } catch (FeignException e) {
       throw VCertException.fromFeignException(e);
-    } catch (Exception e) {
-      throw new VCertException("Unexpected exception", e);
     }
   }
 
@@ -214,8 +198,6 @@ public String renewCertificate(RenewalRequest request) throws VCertException {
       return connector.renewCertificate(request);
     } catch (FeignException e) {
       throw VCertException.fromFeignException(e);
-    } catch (Exception e) {
-      throw new VCertException("Unexpected exception", e);
     }
   }
 
@@ -228,8 +210,6 @@ public ImportResponse importCertificate(ImportRequest request) throws VCertExcep
       return connector.importCertificate(request);
     } catch (FeignException e) {
       throw VCertException.fromFeignException(e);
-    } catch (Exception e) {
-      throw new VCertException("Unexpected exception", e);
     }
   }
 
@@ -242,8 +222,6 @@ public Policy readPolicyConfiguration(String zone) throws VCertException {
       return connector.readPolicyConfiguration(zone);
     } catch (FeignException e) {
       throw VCertException.fromFeignException(e);
-    } catch (Exception e) {
-      throw new VCertException("Unexpected exception", e);
     }
   }
 }
diff --git a/src/main/java/com/venafi/vcert/sdk/VCertTknClient.java b/src/main/java/com/venafi/vcert/sdk/VCertTknClient.java
@@ -102,8 +102,6 @@ public TokenInfo getAccessToken(Authentication auth) throws VCertException{
             return connector.getAccessToken(auth);
         } catch (FeignException e) {
             throw VCertException.fromFeignException(e);
-        } catch (Exception e) {
-            throw new VCertException("Unexpected exception", e);
         }
     }
 
@@ -113,13 +111,11 @@ public TokenInfo getAccessToken() throws VCertException{
             return connector.getAccessToken();
         } catch (FeignException e) {
             throw VCertException.fromFeignException(e);
-        } catch (Exception e) {
-            throw new VCertException("Unexpected exception", e);
         }
     }
 
     @Override
-    public TokenInfo refreshAccessToken(String applicationId) throws VCertException{
+    public TokenInfo refreshAccessToken(String applicationId) throws VCertException {
         return  connector.refreshAccessToken(applicationId);
     }
 
@@ -137,8 +133,6 @@ public void ping() throws VCertException {
             connector.ping();
         } catch (FeignException e) {
             throw VCertException.fromFeignException(e);
-        } catch (Exception e) {
-            throw new VCertException("Unexpected exception", e);
         }
     }
 
@@ -151,8 +145,6 @@ public ZoneConfiguration readZoneConfiguration(String zone) throws VCertExceptio
             return connector.readZoneConfiguration(zone);
         } catch (FeignException e) {
             throw VCertException.fromFeignException(e);
-        } catch (Exception e) {
-            throw new VCertException("Unexpected exception", e);
         }
     }
 
@@ -166,8 +158,6 @@ public CertificateRequest generateRequest(ZoneConfiguration config, CertificateR
             return connector.generateRequest(config, request);
         } catch (FeignException e) {
             throw VCertException.fromFeignException(e);
-        } catch (Exception e) {
-            throw new VCertException("Unexpected exception", e);
         }
     }
 
@@ -177,8 +167,6 @@ public String requestCertificate(CertificateRequest request, String zone) throws
             return connector.requestCertificate(request, zone);
         } catch (FeignException e) {
             throw VCertException.fromFeignException(e);
-        } catch (Exception e) {
-            throw new VCertException("Unexpected exception", e);
         }
     }
 
@@ -192,8 +180,6 @@ public String requestCertificate(CertificateRequest request, ZoneConfiguration z
             return connector.requestCertificate(request, zoneConfiguration);
         } catch (FeignException e) {
             throw VCertException.fromFeignException(e);
-        } catch (Exception e) {
-            throw new VCertException("Unexpected exception", e);
         }
     }
 
@@ -206,8 +192,6 @@ public PEMCollection retrieveCertificate(CertificateRequest request) throws VCer
             return connector.retrieveCertificate(request);
         } catch (FeignException e) {
             throw VCertException.fromFeignException(e);
-        } catch (Exception e) {
-            throw new VCertException("Unexpected exception", e);
         }
     }
 
@@ -220,8 +204,6 @@ public void revokeCertificate(RevocationRequest request) throws VCertException {
             connector.revokeCertificate(request);
         } catch (FeignException e) {
             throw VCertException.fromFeignException(e);
-        } catch (Exception e) {
-            throw new VCertException("Unexpected exception", e);
         }
     }
 
@@ -234,8 +216,6 @@ public String renewCertificate(RenewalRequest request) throws VCertException {
             return connector.renewCertificate(request);
         } catch (FeignException e) {
             throw VCertException.fromFeignException(e);
-        } catch (Exception e) {
-            throw new VCertException("Unexpected exception", e);
         }
     }
 
@@ -248,8 +228,6 @@ public ImportResponse importCertificate(ImportRequest request) throws VCertExcep
             return connector.importCertificate(request);
         } catch (FeignException e) {
             throw VCertException.fromFeignException(e);
-        } catch (Exception e) {
-            throw new VCertException("Unexpected exception", e);
         }
     }
 
@@ -262,8 +240,6 @@ public Policy readPolicyConfiguration(String zone) throws VCertException {
             return connector.readPolicyConfiguration(zone);
         } catch (FeignException e) {
             throw VCertException.fromFeignException(e);
-        } catch (Exception e) {
-            throw new VCertException("Unexpected exception", e);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,6 @@ public void ping() throws VCertException {`
`103`	`103`	`connector.ping();`
`104`	`104`	`} catch (FeignException e) {`
`105`	`105`	`throw VCertException.fromFeignException(e);`
`106`		`- } catch (Exception e) {`
`107`		`- throw new VCertException("Unexpected exception", e);`
`108`	`106`	`}`
`109`	`107`	`}`
`110`	`108`
`@@ -117,8 +115,6 @@ public void authenticate(Authentication auth) throws VCertException {`
`117`	`115`	`connector.authenticate(auth);`
`118`	`116`	`} catch (FeignException e) {`
`119`	`117`	`throw VCertException.fromFeignException(e);`
`120`		`- } catch (Exception e) {`
`121`		`- throw new VCertException("Unexpected exception", e);`
`122`	`118`	`}`
`123`	`119`	`}`
`124`	`120`
`@@ -131,8 +127,6 @@ public ZoneConfiguration readZoneConfiguration(String zone) throws VCertExceptio`
`131`	`127`	`return connector.readZoneConfiguration(zone);`
`132`	`128`	`} catch (FeignException e) {`
`133`	`129`	`throw VCertException.fromFeignException(e);`
`134`		`- } catch (Exception e) {`
`135`		`- throw new VCertException("Unexpected exception", e);`
`136`	`130`	`}`
`137`	`131`	`}`
`138`	`132`
`@@ -146,8 +140,6 @@ public CertificateRequest generateRequest(ZoneConfiguration config, CertificateR`
`146`	`140`	`return connector.generateRequest(config, request);`
`147`	`141`	`} catch (FeignException e) {`
`148`	`142`	`throw VCertException.fromFeignException(e);`
`149`		`- } catch (Exception e) {`
`150`		`- throw new VCertException("Unexpected exception", e);`
`151`	`143`	`}`
`152`	`144`	`}`
`153`	`145`
`@@ -157,8 +149,6 @@ public String requestCertificate(CertificateRequest request, String zone) throws`
`157`	`149`	`return connector.requestCertificate(request, zone);`
`158`	`150`	`} catch (FeignException e) {`
`159`	`151`	`throw VCertException.fromFeignException(e);`
`160`		`- } catch (Exception e) {`
`161`		`- throw new VCertException("Unexpected exception", e);`
`162`	`152`	`}`
`163`	`153`	`}`
`164`	`154`
`@@ -172,8 +162,6 @@ public String requestCertificate(CertificateRequest request, ZoneConfiguration z`
`172`	`162`	`return connector.requestCertificate(request, zoneConfiguration);`
`173`	`163`	`} catch (FeignException e) {`
`174`	`164`	`throw VCertException.fromFeignException(e);`
`175`		`- } catch (Exception e) {`
`176`		`- throw new VCertException("Unexpected exception", e);`
`177`	`165`	`}`
`178`	`166`	`}`
`179`	`167`
`@@ -186,8 +174,6 @@ public PEMCollection retrieveCertificate(CertificateRequest request) throws VCer`
`186`	`174`	`return connector.retrieveCertificate(request);`
`187`	`175`	`} catch (FeignException e) {`
`188`	`176`	`throw VCertException.fromFeignException(e);`
`189`		`- } catch (Exception e) {`
`190`		`- throw new VCertException("Unexpected exception", e);`
`191`	`177`	`}`
`192`	`178`	`}`
`193`	`179`
`@@ -200,8 +186,6 @@ public void revokeCertificate(RevocationRequest request) throws VCertException {`
`200`	`186`	`connector.revokeCertificate(request);`
`201`	`187`	`} catch (FeignException e) {`
`202`	`188`	`throw VCertException.fromFeignException(e);`
`203`		`- } catch (Exception e) {`
`204`		`- throw new VCertException("Unexpected exception", e);`
`205`	`189`	`}`
`206`	`190`	`}`
`207`	`191`
`@@ -214,8 +198,6 @@ public String renewCertificate(RenewalRequest request) throws VCertException {`
`214`	`198`	`return connector.renewCertificate(request);`
`215`	`199`	`} catch (FeignException e) {`
`216`	`200`	`throw VCertException.fromFeignException(e);`
`217`		`- } catch (Exception e) {`
`218`		`- throw new VCertException("Unexpected exception", e);`
`219`	`201`	`}`
`220`	`202`	`}`
`221`	`203`
`@@ -228,8 +210,6 @@ public ImportResponse importCertificate(ImportRequest request) throws VCertExcep`
`228`	`210`	`return connector.importCertificate(request);`
`229`	`211`	`} catch (FeignException e) {`
`230`	`212`	`throw VCertException.fromFeignException(e);`
`231`		`- } catch (Exception e) {`
`232`		`- throw new VCertException("Unexpected exception", e);`
`233`	`213`	`}`
`234`	`214`	`}`
`235`	`215`
`@@ -242,8 +222,6 @@ public Policy readPolicyConfiguration(String zone) throws VCertException {`
`242`	`222`	`return connector.readPolicyConfiguration(zone);`
`243`	`223`	`} catch (FeignException e) {`
`244`	`224`	`throw VCertException.fromFeignException(e);`
`245`		`- } catch (Exception e) {`
`246`		`- throw new VCertException("Unexpected exception", e);`
`247`	`225`	`}`
`248`	`226`	`}`
`249`	`227`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,6 @@ public TokenInfo getAccessToken(Authentication auth) throws VCertException{`
`102`	`102`	`return connector.getAccessToken(auth);`
`103`	`103`	`} catch (FeignException e) {`
`104`	`104`	`throw VCertException.fromFeignException(e);`
`105`		`- } catch (Exception e) {`
`106`		`- throw new VCertException("Unexpected exception", e);`
`107`	`105`	`}`
`108`	`106`	`}`
`109`	`107`
`@@ -113,13 +111,11 @@ public TokenInfo getAccessToken() throws VCertException{`
`113`	`111`	`return connector.getAccessToken();`
`114`	`112`	`} catch (FeignException e) {`
`115`	`113`	`throw VCertException.fromFeignException(e);`
`116`		`- } catch (Exception e) {`
`117`		`- throw new VCertException("Unexpected exception", e);`
`118`	`114`	`}`
`119`	`115`	`}`
`120`	`116`
`121`	`117`	`@Override`
`122`		`- public TokenInfo refreshAccessToken(String applicationId) throws VCertException{`
	`118`	`+ public TokenInfo refreshAccessToken(String applicationId) throws VCertException {`
`123`	`119`	`return connector.refreshAccessToken(applicationId);`
`124`	`120`	`}`
`125`	`121`
`@@ -137,8 +133,6 @@ public void ping() throws VCertException {`
`137`	`133`	`connector.ping();`
`138`	`134`	`} catch (FeignException e) {`
`139`	`135`	`throw VCertException.fromFeignException(e);`
`140`		`- } catch (Exception e) {`
`141`		`- throw new VCertException("Unexpected exception", e);`
`142`	`136`	`}`
`143`	`137`	`}`
`144`	`138`
`@@ -151,8 +145,6 @@ public ZoneConfiguration readZoneConfiguration(String zone) throws VCertExceptio`
`151`	`145`	`return connector.readZoneConfiguration(zone);`
`152`	`146`	`} catch (FeignException e) {`
`153`	`147`	`throw VCertException.fromFeignException(e);`
`154`		`- } catch (Exception e) {`
`155`		`- throw new VCertException("Unexpected exception", e);`
`156`	`148`	`}`
`157`	`149`	`}`
`158`	`150`
`@@ -166,8 +158,6 @@ public CertificateRequest generateRequest(ZoneConfiguration config, CertificateR`
`166`	`158`	`return connector.generateRequest(config, request);`
`167`	`159`	`} catch (FeignException e) {`
`168`	`160`	`throw VCertException.fromFeignException(e);`
`169`		`- } catch (Exception e) {`
`170`		`- throw new VCertException("Unexpected exception", e);`
`171`	`161`	`}`
`172`	`162`	`}`
`173`	`163`
`@@ -177,8 +167,6 @@ public String requestCertificate(CertificateRequest request, String zone) throws`
`177`	`167`	`return connector.requestCertificate(request, zone);`
`178`	`168`	`} catch (FeignException e) {`
`179`	`169`	`throw VCertException.fromFeignException(e);`
`180`		`- } catch (Exception e) {`
`181`		`- throw new VCertException("Unexpected exception", e);`
`182`	`170`	`}`
`183`	`171`	`}`
`184`	`172`
`@@ -192,8 +180,6 @@ public String requestCertificate(CertificateRequest request, ZoneConfiguration z`
`192`	`180`	`return connector.requestCertificate(request, zoneConfiguration);`
`193`	`181`	`} catch (FeignException e) {`
`194`	`182`	`throw VCertException.fromFeignException(e);`
`195`		`- } catch (Exception e) {`
`196`		`- throw new VCertException("Unexpected exception", e);`
`197`	`183`	`}`
`198`	`184`	`}`
`199`	`185`
`@@ -206,8 +192,6 @@ public PEMCollection retrieveCertificate(CertificateRequest request) throws VCer`
`206`	`192`	`return connector.retrieveCertificate(request);`
`207`	`193`	`} catch (FeignException e) {`
`208`	`194`	`throw VCertException.fromFeignException(e);`
`209`		`- } catch (Exception e) {`
`210`		`- throw new VCertException("Unexpected exception", e);`
`211`	`195`	`}`
`212`	`196`	`}`
`213`	`197`
`@@ -220,8 +204,6 @@ public void revokeCertificate(RevocationRequest request) throws VCertException {`
`220`	`204`	`connector.revokeCertificate(request);`
`221`	`205`	`} catch (FeignException e) {`
`222`	`206`	`throw VCertException.fromFeignException(e);`
`223`		`- } catch (Exception e) {`
`224`		`- throw new VCertException("Unexpected exception", e);`
`225`	`207`	`}`
`226`	`208`	`}`
`227`	`209`
`@@ -234,8 +216,6 @@ public String renewCertificate(RenewalRequest request) throws VCertException {`
`234`	`216`	`return connector.renewCertificate(request);`
`235`	`217`	`} catch (FeignException e) {`
`236`	`218`	`throw VCertException.fromFeignException(e);`
`237`		`- } catch (Exception e) {`
`238`		`- throw new VCertException("Unexpected exception", e);`
`239`	`219`	`}`
`240`	`220`	`}`
`241`	`221`
`@@ -248,8 +228,6 @@ public ImportResponse importCertificate(ImportRequest request) throws VCertExcep`
`248`	`228`	`return connector.importCertificate(request);`
`249`	`229`	`} catch (FeignException e) {`
`250`	`230`	`throw VCertException.fromFeignException(e);`
`251`		`- } catch (Exception e) {`
`252`		`- throw new VCertException("Unexpected exception", e);`
`253`	`231`	`}`
`254`	`232`	`}`
`255`	`233`
`@@ -262,8 +240,6 @@ public Policy readPolicyConfiguration(String zone) throws VCertException {`
`262`	`240`	`return connector.readPolicyConfiguration(zone);`
`263`	`241`	`} catch (FeignException e) {`
`264`	`242`	`throw VCertException.fromFeignException(e);`
`265`		`- } catch (Exception e) {`
`266`		`- throw new VCertException("Unexpected exception", e);`
`267`	`243`	`}`
`268`	`244`	`}`
`269`	`245`	`}`