Added specific exceptions for Contacts feature

Author: rvelaVenafi

src/main/java/com/venafi/vcert/sdk/connectors/ConnectorException.java

@@ -11,6 +11,7 @@
 
 import com.venafi.vcert.sdk.VCertException;
 import com.venafi.vcert.sdk.certificate.CsrOriginOption;
+import com.venafi.vcert.sdk.connectors.tpp.endpoint.IdentityEntry;
 
 /**
  * @author Marcos E. Albornoz Abud
@@ -307,8 +308,7 @@ public CertificateRejectedException(String pickupId, String status) {
 			this.status = status;
 		}
 	}
-	
-	
+
 	public static class CertificateDNOrThumbprintWasNotProvidedException extends ConnectorException {
 
 		private static final long serialVersionUID = 1L;
@@ -492,4 +492,55 @@ public KeyStoreZipCompressionRatioExceeded(String certificateId, String fileName
 		}
 	}
 
+	public static class VaaSApplicationNotFoundException extends ConnectorException {
+
+		private static final long serialVersionUID = 1L;
+		private static final String message  = "Application with name %s could not be found on VaaS account";
+
+		public VaaSApplicationNotFoundException(String appName) {
+			super(format(message, appName));
+		}
+
+	}
+
+	public static class MissingTppIdentityException extends ConnectorException {
+
+		private static final long serialVersionUID = 1L;
+		private static final String message = "TPP Identity cannot be null";
+
+		public MissingTppIdentityException() {
+			super(message);
+		}
+	}
+
+	public static class IdentityExtraneousInformationException extends ConnectorException {
+
+		private static final long serialVersionUID = 1L;
+		private static final String message = "Extraneous information returned in the identity response. Expected: 1, " +
+				"found: %s.\t\n%s";
+
+		public IdentityExtraneousInformationException(IdentityEntry[] identityList) {
+			super(format(message, identityList.length, get_bad_data(identityList)));
+		}
+
+		private static String get_bad_data(IdentityEntry[] identityList) {
+			StringBuilder bad_data = new StringBuilder();
+			for (IdentityEntry entry : identityList) {
+				bad_data.append(entry.toString()).append("\n");
+			}
+
+			return bad_data.toString();
+		}
+	}
+
+	public static class TppContactException extends ConnectorException {
+
+		private static final long serialVersionUID = 1L;
+		private static final String message = "Error while retrieving contact attribute from policy %s:\nError: %s";
+
+		public TppContactException(String policy, String error) {
+			super(format(message, policy, error));
+		}
+	}
+
 }

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

@@ -5,6 +5,7 @@
 import com.venafi.vcert.sdk.certificate.ChainOption;
 import com.venafi.vcert.sdk.certificate.DataFormat;
 import com.venafi.vcert.sdk.certificate.PEMCollection;
+import com.venafi.vcert.sdk.connectors.ConnectorException;
 import com.venafi.vcert.sdk.connectors.ConnectorException.KeyStoreUnzipedFilesBytesSizeExceeded;
 import com.venafi.vcert.sdk.connectors.ConnectorException.KeyStoreZipCompressionRatioExceeded;
 import com.venafi.vcert.sdk.connectors.ConnectorException.KeyStoreZipEntriesExceeded;
@@ -260,7 +261,7 @@ private static String[] resolveCloudOwnersNames(String policyName, String apiKey
 
 		Application app = cloud.applicationByName(zone.appName(), apiKey);
 		if (app == null){
-			throw new VCertException("Application "+ zone.appName() + " could not be found");
+			throw new ConnectorException.VaaSApplicationNotFoundException(zone.appName());
 		}
 		List<String> usersList = new ArrayList<>();
 		Teams tResponse = null;

src/main/java/com/venafi/vcert/sdk/connectors/tpp/AbstractTppConnector.java

@@ -136,15 +136,14 @@ protected String[] resolveTPPContacts(String[] contacts) throws VCertException{
 
     public IdentityEntry getTPPIdentity(String username) throws VCertException{
         if (username == null){
-            throw new VCertException("Identity string cannot be null");
+            throw new MissingTppIdentityException();
         }
 
         BrowseIdentitiesResponse response = getTppAPI().browseIdentities(new BrowseIdentitiesRequest(username, 2,
                 BrowseIdentitiesRequest.ALL_IDENTITIES));
 
         if (response.identities().length > 1){
-            throw new VCertException("Extraneous information returned in the identity response. "
-                    + "Expected size: 1, found: 2\n" + response.identities()[1].toString());
+            throw new IdentityExtraneousInformationException(response.identities());
         }
 
         IdentityEntry identity = response.identities()[0];

src/main/java/com/venafi/vcert/sdk/connectors/tpp/TppConnectorUtils.java

@@ -5,6 +5,7 @@
 import com.venafi.vcert.sdk.VCertException;
 import com.venafi.vcert.sdk.certificate.SshCertRetrieveDetails;
 import com.venafi.vcert.sdk.certificate.SshCertificateRequest;
+import com.venafi.vcert.sdk.connectors.ConnectorException;
 import com.venafi.vcert.sdk.connectors.tpp.endpoint.*;
 import com.venafi.vcert.sdk.connectors.tpp.endpoint.ssh.TppSshCertRequest;
 import com.venafi.vcert.sdk.connectors.tpp.endpoint.ssh.TppSshCertRetrieveRequest;
@@ -327,7 +328,7 @@ private static String[] retrieveUsernamesFromTPPContacts(String policyName, TppA
 			throw new VCertException(e);
 		}
 		if (contactResponse != null && contactResponse.error() != null){
-			throw new VCertException(contactResponse.error());
+			throw new ConnectorException.TppContactException(policyName, contactResponse.error());
 		}
 		if (contactResponse.values() != null) {
 			Object[] contacts = contactResponse.values();

src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppTokenConnectorPolicyAT.java

@@ -23,13 +23,9 @@ public class TppTokenConnectorPolicyAT {
     @Test
     @DisplayName("TPP - Retrieve an Identity by username")
     public void browseIdentities() throws VCertException {
-        try{
-            IdentityEntry identity = connectorResource.connector().getTPPIdentity(username);
-            Assertions.assertEquals(username, identity.name());
-            prefixedUniversal = identity.prefixedUniversal();
-        } catch (Exception e){
-            System.out.println("");
-        }
+        IdentityEntry identity = connectorResource.connector().getTPPIdentity(username);
+        Assertions.assertEquals(username, identity.name());
+        prefixedUniversal = identity.prefixedUniversal();
     }
 
     @Test