SDK-368: SDK should prompt for database uri again if an invalid uri was entered

Author: mherman22

maven-plugin/src/main/java/org/openmrs/maven/plugins/Setup.java

@@ -428,34 +428,36 @@ private void setupDatabaseForServer(Server server) throws MojoExecutionException
 		}
 
 		if (server.isMySqlDb() || server.isPostgreSqlDb()) {
-			String uri = getUriWithoutDb(server);
 			boolean connectionEstablished = false;
 			int maxAttempts = 3;
 			int attempts = 0;
 
 			while (!connectionEstablished && attempts < maxAttempts) {
 				attempts++;
+				String uri = getUriWithoutDb(server);
 				try (DBConnector connector = new DBConnector(uri, server.getDbUser(), server.getDbPassword(), server.getDbName())) {
 					connector.checkAndCreate(server);
 					wizard.showMessage("Connected to the database.");
 					connectionEstablished = true;
 				}
 				catch (SQLException e) {
-					if (e.getMessage().contains("Invalid database credentials")) {
+					String message = e.getMessage();
+					wizard.showMessage(String.format("Database connection failed (attempt %d of %d): %s", attempts, maxAttempts, message));
+					if (message.contains("Invalid database credentials")) {
 						if (attempts == maxAttempts) {
-							throw new MojoExecutionException(
-									String.format("Failed to connect to database after %d attempts. Please verify your credentials and try again.", maxAttempts),
-									e
-							);
+							throw new MojoExecutionException(String.format("Failed to connect to database after %d attempts. " +
+									"Please verify your credentials and try again.", maxAttempts), e);
 						}
 
-						wizard.showMessage(String.format("Database connection failed (attempt %d of %d): %s", attempts, maxAttempts, e.getMessage()));
-						String newUser = wizard.promptForValueIfMissingWithDefault("Please specify correct database username (-D%s)", dbUser, "dbUser", "root");
-						String newPassword = wizard.promptForPasswordIfMissingWithDefault("Please specify correct database password (-D%s)", dbPassword, "dbPassword", "");
-
-						server.setDbUser(newUser);
-						server.setDbPassword(newPassword);
+						wizard.promptForDbCredentialsAgain(server, dbUser, dbPassword);
+						continue;
+					} else if (message.contains("Incorrect Database Uri")) {
+						if (attempts == maxAttempts) {
+							throw new MojoExecutionException(String.format("Failed to connect to database after %d attempts. " +
+									"Please verify your database uri.", maxAttempts), e);
+						}
 
+						wizard.promptForNewUriAndCredentials(server, dbUser, dbPassword, dbUri);
 						continue;
 					}
 					throw new MojoExecutionException("Failed to connect to the specified database " + server.getDbUri(), e);

maven-plugin/src/main/java/org/openmrs/maven/plugins/utility/DBConnector.java

@@ -27,6 +27,8 @@ public DBConnector(String url, String user, String pass, String dbName) throws S
 			} catch (SQLException e2) {
 				if (e2.getMessage().contains("Access denied")) {
 					throw new SQLException("Invalid database credentials. Please check your username and password.", e2);
+				} else if (e2.getMessage().contains("No suitable driver found for")) {
+					throw new SQLException("Incorrect Database Uri. Please provide a correct database uri.", e2);
 				}
 				throw e2;
 			}

sdk-commons/src/main/java/org/openmrs/maven/plugins/utility/DefaultWizard.java

@@ -947,6 +947,51 @@ public void promptForDbCredentialsIfMissing(Server server) throws MojoExecutionE
 		server.setDbPassword(dbPassword);
 	}
 
+	@Override
+	public void promptForDbCredentialsAgain(Server server, String dbUser, String dbPassword) throws MojoExecutionException {
+		String newUser = promptForValueIfMissingWithDefault("Please specify correct database username (-D%s)", dbUser,
+				"dbUser", "root");
+
+		String newPassword = promptForPasswordIfMissingWithDefault("Please specify correct database password (-D%s)", dbPassword,
+				"dbPassword", "");
+
+		server.setDbUser(newUser);
+		server.setDbPassword(newPassword);
+	}
+
+	@Override
+	public void promptForNewUriAndCredentials(Server server, String dbUser, String dbPassword, String dbUri) throws MojoExecutionException {
+		showMessage("Prompting for new database URI and credentials...");
+		String uriTemplate;
+		if (server.isMySqlDb()) {
+			uriTemplate = SDKConstants.URI_MYSQL;
+		} else if (server.isPostgreSqlDb()) {
+			uriTemplate = SDKConstants.URI_POSTGRESQL;
+		} else {
+			return;
+		}
+
+		String newUri = promptForValueIfMissingWithDefault(
+				"The distribution requires a " +
+						(server.isMySqlDb() ? "MySQL" : "PostgreSQL") +
+						" database. Please specify a valid database uri (-D%s)",
+				dbUri, "dbUri", uriTemplate);
+
+		if (server.isMySqlDb()) {
+			newUri = addMySQLParamsIfMissing(newUri);
+		} else if (server.isPostgreSqlDb()) {
+			newUri = addPostgreSQLParamsIfMissing(newUri);
+		}
+
+		newUri = newUri.replace(DBNAME_URL_VARIABLE, server.getServerId());
+		server.setDbUri(newUri);
+
+		String newUser = promptForValueIfMissingWithDefault("Please enter the database username (-D%s):", dbUser, "dbUser", "root");
+		String newPassword = promptForPasswordIfMissingWithDefault("Please enter the database password (-D%s):", dbPassword, "dbPassword", "");
+		server.setDbUser(newUser);
+		server.setDbPassword(newPassword);
+	}
+
 	/**
 	 * Get servers with recently used first
 	 */

sdk-commons/src/main/java/org/openmrs/maven/plugins/utility/Wizard.java

@@ -56,6 +56,8 @@ public interface Wizard {
 
     String promptForExistingServerIdIfMissing(String serverId) throws MojoExecutionException;
 
+    void promptForNewUriAndCredentials(Server server, String dbUser, String dbPassword, String dbUri) throws MojoExecutionException;
+
     List<String> getListOfServers() throws MojoExecutionException;
 
     void showJdkErrorMessage(String jdk, String platform, String recommendedJdk, String pathToProps);
@@ -64,5 +66,5 @@ public interface Wizard {
 
     void setAnswers(ArrayDeque<String> batchAnswers);
 
-    String promptForPasswordIfMissingWithDefault(String s, String dbPassword, String dbPassword1, String s1) throws MojoExecutionException;
+    void promptForDbCredentialsAgain(Server server, String dbUser, String dbPassword) throws MojoExecutionException;
 }