make startIndex dynamic

wso2 · May 28, 2021 · 95db69e · 95db69e
1 parent abee3be
commit 95db69e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/bulk-user-export-tool/scim-bulk-user-export-tool/scripts/start.sh b/bulk-user-export-tool/scim-bulk-user-export-tool/scripts/start.sh
@@ -15,9 +15,11 @@ read -p "Attributes to filter (Optional) (ex: id,username,emails) : " attributes
 [ -z "$attributes" ] && { attributes=none; }
 read -p "Attributes to exclude (Optional) (ex:groups,emails,name.givenName) : " excludedAttributes
 [ -z "$excludedAttributes" ] && { excludedAttributes=none; }
+read -p "Start Index(Optional) [1]: " startIndex
+[ -z "$startIndex" ] && { startIndex=none; }
 read -p "Batch Count (Optional) [100]: " batchCount
 [ -z "$batchCount" ] && { batchCount=none; }
 read -p "Maximum Count (Optional) [-1]: " maxCount
 [ -z "$maxCount" ] && { maxCount=none; }
 
-java -jar $(find . -name "*scim.bulk.user.export.tool*") $host $username $password $csv $attributes $excludedAttributes $batchCount $maxCount
+java -jar $(find . -name "*scim.bulk.user.export.tool*") $host $username $password $csv $attributes $excludedAttributes $startIndex $batchCount $maxCount
diff --git a/...l/scim-bulk-user-export-tool/src/main/java/org/wso2/scim/bulk/export/BulkExportUsers.java b/...l/scim-bulk-user-export-tool/src/main/java/org/wso2/scim/bulk/export/BulkExportUsers.java
@@ -93,11 +93,15 @@ public static void main(String args[]) throws IOException, KeyStoreException,
         }
 
         if (!NONE.equals(args[6])) {
-            count = Integer.parseInt(args[6]);
+            startIndex = Integer.parseInt(args[6]);
         }
 
         if (!NONE.equals(args[7])) {
-            maxCount = Integer.parseInt(args[7]);
+            count = Integer.parseInt(args[7]);
+        }
+
+        if (!NONE.equals(args[8])) {
+            maxCount = Integer.parseInt(args[8]);
         }
 
         // Create a get request to retrieve list users from SCIM 2.0
@@ -143,6 +147,10 @@ public static void main(String args[]) throws IOException, KeyStoreException,
                             usersArrayNode.add(JSONFlattener.generateFlatJSON(new ObjectMapper().createObjectNode(),
                                     arrayElement, null, Collections.emptySet()));
                         }
+                        if (arrayNode.size() < count) {
+                            LOGGER.log(Level.INFO, "End of results reached.");
+                            break;
+                        }
                     } else {
                         LOGGER.log(Level.INFO, "End of results reached.");
                         break;