fixed error message, encoded username

liquibase · Mar 31, 2023 · cad2d1d · cad2d1d
1 parent 1661da8
commit cad2d1d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/src/main/java/liquibase/ext/mongodb/database/MongoConnection.java b/src/main/java/liquibase/ext/mongodb/database/MongoConnection.java
@@ -123,15 +123,8 @@ private String injectCredentials(final String url, final Properties driverProper
 
         if (nonNull(driverProperties)) {
 
-            final Optional<String> user = Optional.ofNullable(StringUtil.trimToNull(driverProperties.getProperty("user")));
-            final Optional<String> password = Optional.ofNullable(StringUtil.trimToNull(driverProperties.getProperty("password")))
-                    .map(s -> {
-                        try {
-                            return URLEncoder.encode(s, "UTF-8");
-                        } catch (UnsupportedEncodingException e) {
-                            throw new RuntimeException(e);
-                        }
-                    });
+            final Optional<String> user = Optional.ofNullable(StringUtil.trimToNull(driverProperties.getProperty("user"))).map(MongoConnection::encode);
+            final Optional<String> password = Optional.ofNullable(StringUtil.trimToNull(driverProperties.getProperty("password"))).map(MongoConnection::encode);
 
             if (user.isPresent()) {
                 // injects credentials
@@ -145,6 +138,13 @@ private String injectCredentials(final String url, final Properties driverProper
         return url;
     }
 
+    private static String encode(String s) {
+        try {
+            return URLEncoder.encode(s, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     @Override
     public void close() throws DatabaseException {

diff --git a/src/main/java/liquibase/nosql/executor/NoSqlExecutor.java b/src/main/java/liquibase/nosql/executor/NoSqlExecutor.java
@@ -191,10 +191,13 @@ public void execute(final SqlStatement sql, final List<SqlVisitor> sqlVisitors)
         } else if (sql instanceof UpdateStatement) {
             execute((UpdateStatement) sql);
         } else {
-            //TODO DAT-14066 fix error message
-            throw new DatabaseException("liquibase-mongodb extension cannot execute " + sql.getClass().getSimpleName() +
-                    ". Please check your classpath, changeType name, other changeSet attributes like 'runWith' " +
-                    "to make sure you have appropriate handler for this change.");
+            throw new DatabaseException("liquibase-mongodb extension cannot execute changeset \n" +
+                    "Unknown type: " + sql.getClass().getName() +
+                    "\nPlease check the following common causes:\n" +
+                    "- Verify change set definitions for common error such as: changeType name, changeSet attributes spelling " +
+                    "(such as runWith,  context, etc.), and punctuation.\n" +
+                    "- Verify that changesets have all the required changeset attributes and do not have invalid attributes for the designated change type.\n" +
+                    "- Double-check to make sure your basic setup includes all needed extensions in your Java classpath");
         }
     }