Remove commented dependencies

wso2 · Jan 7, 2025 · 264c8fc · 264c8fc
1 parent 7802f77
commit 264c8fc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 21 deletions.
diff --git a/components/data/data-services/org.wso2.micro.integrator.dataservices.core/pom.xml b/components/data/data-services/org.wso2.micro.integrator.dataservices.core/pom.xml
@@ -33,11 +33,6 @@
     <description>WSO2 Data Services Core Bundle</description>
 
     <dependencies>
-
-<!--        <dependency>-->
-<!--            <groupId>org.wso2.orbit.org.jongo.wso2</groupId>-->
-<!--            <artifactId>jongo</artifactId>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>org.apache.xmlbeans</groupId>
             <artifactId>xmlbeans</artifactId>
@@ -254,12 +249,6 @@
             <groupId>de.undercouch</groupId>
             <artifactId>bson4jackson</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.mongodb</groupId>-->
-<!--            <artifactId>mongo-java-driver</artifactId>-->
-<!--            <version>3.12.7</version>-->
-<!--            <scope>compile</scope>-->
-<!--        </dependency>-->
     </dependencies>
 
     <build>
@@ -371,8 +360,6 @@
                             org.apache.poi.ss.usermodel;version="${poi.orbit.imp.pkg.version}",
                             org.apache.commons.collections4;version="${commons-collections4.orbit.imp.pkg.version}",
                             com.mongodb;version="${mongodb-driver-sync.orbit.imp.pkg.version}",
-<!--                            com.mongodb.util;version="${mongodb-driver-sync.orbit.imp.pkg.version}",-->
-<!--                            org.jongo;version="${jongo.orbit.imp.pkg.version}",-->
                             org.wso2.micro.integrator.dataservices.sql.driver;version="${project.version}",
                             org.wso2.micro.integrator.dataservices.sql.driver.parser;version="${project.version}",
                             org.wso2.micro.integrator.dataservices.sql.driver.util;version="${project.version}",

diff --git a/...main/java/org/wso2/micro/integrator/dataservices/core/description/config/MongoConfig.java b/...main/java/org/wso2/micro/integrator/dataservices/core/description/config/MongoConfig.java
@@ -134,7 +134,7 @@ private MongoClientSettings extractMongoOptions(Map<String, String> properties,
             settingsBuilder.applyToSslSettings(builder -> builder.enabled(true));
         }
         if (!DBUtils.isEmptyString(writeConcern)) {
-            settingsBuilder.writeConcern(WriteConcern.valueOf(writeConcern.toUpperCase()));
+            settingsBuilder.writeConcern(WriteConcern.valueOf(writeConcern));
         }
         if (!DBUtils.isEmptyString(readPref)) {
             settingsBuilder.readPreference(ReadPreference.valueOf(readPref));

diff --git a/...ore/src/main/java/org/wso2/micro/integrator/dataservices/core/odata/MongoDataHandler.java b/...ore/src/main/java/org/wso2/micro/integrator/dataservices/core/odata/MongoDataHandler.java
@@ -229,11 +229,12 @@ public List<ODataEntry> streamTableWithOrder(String tableName, OrderByOption ord
         limit.put("$limit", this.chunkSize);
         stages.add(limit);
 
-        List<Bson> pipeline = Arrays.asList(
-                Aggregates.match(new Document("status", "active")),
-                Aggregates.group("$category", Accumulators.sum("count", 1))
-        );
-        MongoCursor<Document> iterator = readResult.aggregate(pipeline).iterator();
+//        List<Bson> pipeline = Arrays.asList(
+//                Aggregates.match(new Document("status", "active")),
+//                Aggregates.group("$category", Accumulators.sum("count", 1))
+//        );
+//        MongoCursor<Document> iterator = readResult.aggregate(pipeline).iterator();
+        MongoCursor<Document> iterator = readResult.aggregate(stages).iterator();
         return readStreamResultSet(tableName, iterator);
     }
 
@@ -422,8 +423,8 @@ public boolean updateEntityInTable(String tableName, ODataEntry newProperties) t
         if (result.getMatchedCount() == 1) {
             return result.wasAcknowledged();
         } else {
-            throw new RuntimeException("Document ID: " + newPropertyObjectKeyValue
-                    + " does not exist in the collection.");
+            throw new ODataServiceFault("Document ID: " + newPropertyObjectKeyValue
+                    + " does not exist in the collection " + tableName + ".");
         }
     }