[improvements]

- update nexial-lib to [1.3](https://github.com/nexiality/fixes/releases/download/nexial-lib-1.3/nexial-lib-1.3.zip) [rdbms] - update Mongodb JDBC support to wisecoder's `mongojdbc4.1` Signed-off-by: automike <[email protected]>
nexiality · Jun 27, 2022 · 912a335 · 912a335
1 parent 09e2376
commit 912a335
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -227,8 +227,6 @@ dependencies {
 	compile("org.ini4j:ini4j:+")
 
 	// support: data sources
-	// compile("org.mongodb:mongodb-driver-async:${mongoDriverVersion}")
-	compile("org.mongodb:mongo-java-driver:${mongoDriverVersion}")
 	// support Azure database connectivity
 	implementation("com.microsoft.azure:msal4j:${msal4jVersion}")
 

diff --git a/lib/bson-4.5.1.jar b/lib/bson-4.5.1.jar
diff --git a/lib/graal-sdk-22.0.0.2.jar b/lib/graal-sdk-22.0.0.2.jar
diff --git a/lib/js-22.0.0.2.jar b/lib/js-22.0.0.2.jar
diff --git a/lib/js-scriptengine-22.0.0.2.jar b/lib/js-scriptengine-22.0.0.2.jar
diff --git a/lib/mongodb-driver-core-4.5.1.jar b/lib/mongodb-driver-core-4.5.1.jar
diff --git a/lib/mongodb-driver-sync-4.5.1.jar b/lib/mongodb-driver-sync-4.5.1.jar
diff --git a/lib/mongojdbc1.8.jar b/lib/mongojdbc1.8.jar
diff --git a/lib/mongojdbc4.1.jar b/lib/mongojdbc4.1.jar
diff --git a/lib/nexial-lib-version.txt b/lib/nexial-lib-version.txt
@@ -1 +1 @@
-1.2
+1.3
diff --git a/lib/regex-22.0.0.2.jar b/lib/regex-22.0.0.2.jar
diff --git a/lib/truffle-api-22.0.0.2.jar b/lib/truffle-api-22.0.0.2.jar
diff --git a/src/main/java/org/nexial/core/plugins/db/MongodbJdbcExtractionDao.java b/src/main/java/org/nexial/core/plugins/db/MongodbJdbcExtractionDao.java
@@ -17,6 +17,14 @@
 
 package org.nexial.core.plugins.db;
 
+import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.UpdateResult;
+import com.wisecoders.dbschema.mongodb.resultSet.ObjectAsResultSet;
+import com.wisecoders.dbschema.mongodb.resultSet.OkResultSet;
+import org.apache.commons.lang3.StringUtils;
+import org.bson.Document;
+import org.nexial.core.utils.JsonUtils;
+
 import java.io.File;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -26,15 +34,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
-import org.bson.Document;
-import org.nexial.core.utils.JsonUtils;
-
-import com.dbschema.resultSet.ObjectAsResultSet;
-import com.dbschema.resultSet.OkResultSet;
-import com.mongodb.client.result.DeleteResult;
-import com.mongodb.client.result.UpdateResult;
-
 import static org.nexial.core.plugins.db.SqlComponent.Type.*;
 
 public class MongodbJdbcExtractionDao extends SimpleExtractionDao {

diff --git a/src/main/resources/nexial.xml b/src/main/resources/nexial.xml
@@ -159,7 +159,7 @@
             <entry key="sqlite" value="org.sqlite.JDBC"/>
             <entry key="hsqldb" value="org.hsqldb.jdbc.JDBCDriver"/>
             <!-- https://bitbucket.org/dbschema/mongodb-jdbc-driver/src/master/ -->
-            <entry key="mongodb" value="com.dbschema.MongoJdbcDriver"/>
+            <entry key="mongodb" value="com.wisecoders.dbschema.mongodb.JdbcDriver"/>
             <entry key="mariadb" value="org.mariadb.jdbc.Driver"/>
           </map>
         </property>