Replacing the use of CloudConnectorException by ConnectorException

Author: marcos-albornoz

src/main/java/com/venafi/vcert/sdk/connectors/cloud/CloudConnector.java

@@ -1,6 +1,6 @@
 package com.venafi.vcert.sdk.connectors.cloud;
 
-import static com.venafi.vcert.sdk.connectors.cloud.CloudConnectorException.*;
+import static com.venafi.vcert.sdk.connectors.ConnectorException.*;
 import static java.lang.String.format;
 import static java.time.Duration.ZERO;
 import static org.apache.commons.lang3.StringUtils.isBlank;
@@ -97,7 +97,7 @@ public String getVendorAndProductName() {
   public void ping() throws VCertException {
     Response response = doPing();
     if (response.status() != 200) {
-      throw new UnexpectedStatusException( response.status(), response.reason());
+      throw new CloudPingException( response.status(), response.reason());
     }
   }
 
@@ -230,7 +230,7 @@ public PEMCollection retrieveCertificate(CertificateRequest request) throws VCer
       Cloud.CertificateSearchResponse certificateSearchResponse =
           searchCertificatesByFingerprint(request.thumbprint());
       if (certificateSearchResponse.certificates().size() == 0) {
-        throw new CertificateNotFoundByFingerprintException(request.thumbprint());
+        throw new CertificateNotFoundByThumbprintException(request.thumbprint());
       }
 
       List<String> reqIds = new ArrayList<>();
@@ -428,15 +428,15 @@ public String renewCertificate(RenewalRequest request) throws VCertException {
       if (requestIds.size() > 1) {
         throw new MoreThanOneCertificateRequestIdException(request.thumbprint());
       } else if (requestIds.size() == 0) {
-        throw new CertificateNotFoundByFingerprintException(request.thumbprint());
+        throw new CertificateNotFoundByThumbprintException(request.thumbprint());
       }
 
       certificateRequestId = requestIds.iterator().next();
 
     } else if (isNotBlank(request.certificateDN())) {
       certificateRequestId = request.certificateDN();
     } else {
-      throw new CertificateDNOrFingerprintWasNotProvidedException();
+      throw new CertificateDNOrThumbprintWasNotProvidedException();
     }
 
     final CertificateStatus status = cloud.certificateStatus(certificateRequestId, auth.apiKey());

src/main/java/com/venafi/vcert/sdk/connectors/cloud/CloudConnectorException.java

@@ -29,7 +29,6 @@
 import org.bouncycastle.util.Strings;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,7 +44,7 @@
 import com.venafi.vcert.sdk.certificate.RenewalRequest;
 import com.venafi.vcert.sdk.certificate.RevocationRequest;
 import com.venafi.vcert.sdk.connectors.ZoneConfiguration;
-import com.venafi.vcert.sdk.connectors.cloud.CloudConnectorException.CertificateNotFoundByFingerprintException;
+import com.venafi.vcert.sdk.connectors.ConnectorException.CertificateNotFoundByThumbprintException;
 import com.venafi.vcert.sdk.endpoint.Authentication;
 import com.venafi.vcert.sdk.endpoint.ConnectorType;
 import com.venafi.vcert.sdk.utils.VCertUtils;
@@ -210,7 +209,7 @@ void renewCertificate() throws VCertException, UnknownHostException,
         try {
         	renewRequestId = classUnderTest.renewCertificate(
                     new RenewalRequest().request(certificateRequestToRenew).thumbprint(thumbprint));
-        } catch (CertificateNotFoundByFingerprintException e) {
+        } catch (CertificateNotFoundByThumbprintException e) {
 			//wait for 5 sec, it's very probably that the Certificate is not ready at this point
         	logger.warn("Failed to renewCertificate, because it's very probably that the Certificate is not ready yet. Waiting 5 sec to attempt one more time...");
         	try {