fixes

Author: clun

astra-db-java/src/main/java/com/datastax/astra/client/collections/Collection.java

@@ -585,7 +585,6 @@ public CollectionInsertManyResult insertMany(List<? extends T> documents, Collec
         try {
             for (Future<CollectionInsertManyResult> future : futures) {
                 CollectionInsertManyResult res = future.get();
-                System.out.println("res = " + res.getInsertedIds());
                 finalResult.getInsertedIds().addAll(res.getInsertedIds());
                 finalResult.getDocumentResponses().addAll(res.getDocumentResponses());
             }

astra-db-java/src/main/java/com/datastax/astra/client/tables/Table.java

@@ -784,10 +784,14 @@ public Page<T> findPage(Filter filter, TableFindOptions options) {
 
         return new Page<>(
                 apiResponse.getData().getNextPageState(),
-                apiResponse.getData().getDocuments()
-                        .stream()
-                        .map(d -> d.map(getRowClass()))
-                        .collect(Collectors.toList()), sortVector);
+                apiResponse.getData().getDocuments().stream()
+                .map(doc -> {
+                    Row targetRow =  new Row();
+                    targetRow.getColumnMap().putAll(doc.getDocumentMap());
+                    return targetRow;
+                })
+                .map(d -> RowMapper.mapFromRow(d, getSerializer(), getRowClass()))
+                .collect(Collectors.toList()), sortVector);
     }
 
     // -------------------------

astra-db-java/src/main/java/com/datastax/astra/client/tables/cursor/TableCursor.java

@@ -325,17 +325,21 @@ public boolean hasNext() {
          * @throws NoSuchElementException if no more elements are available
          */
         @Override
+        @SuppressWarnings("unchecked")
         public R next() {
             if (!hasNext()) {
                 throw new NoSuchElementException();
             }
+
             T rawDoc = buffer.remove(0);
             consumedCount++;
-            // Converted as Row Fist (pivot)
-            Row row = RowMapper.mapAsRow(rawDoc);
 
-            // From Pivot to new class
-            return RowMapper.mapFromRow(row, table.getOptions().getSerializer(), rowType);
+            if (!rowType.isInstance(rawDoc)) {
+                Row row = RowMapper.mapAsRow(rawDoc);
+                return RowMapper.mapFromRow(row, table.getOptions().getSerializer(), rowType);
+            } else {
+                return (R) rawDoc;
+            }
         }
     }