Refine code (#1267)

Signed-off-by: yhmo <yihua.mo@zilliz.com>

examples/main/java/io/milvus/v1/IteratorExample.java

@@ -172,17 +172,18 @@ public class IteratorExample {
             R<MutationResult> response = milvusClient.insert(insertParam);
             CommonUtils.handleResponseStatus(response);
 
-            R<FlushResponse> flush = milvusClient.flush(FlushParam.newBuilder().addCollectionName(COLLECTION_NAME).build());
-            CommonUtils.handleResponseStatus(flush);
-
-            GetCollectionStatisticsParam collectionStatisticsParam = GetCollectionStatisticsParam.newBuilder().withCollectionName(COLLECTION_NAME).build();
-            R<GetCollectionStatisticsResponse> collectionStatistics = milvusClient.getCollectionStatistics(collectionStatisticsParam);
-            CommonUtils.handleResponseStatus(collectionStatistics);
-            GetCollStatResponseWrapper wrapper = new GetCollStatResponseWrapper(collectionStatistics.getData());
-
-            System.out.printf("Finish insert batch%s, number of entities in Milvus: %s\n", batch, wrapper.getRowCount());
+            System.out.printf("Finish insert batch No.%d\n", batch);
         }
 
+        GetCollectionStatisticsParam collectionStatisticsParam = GetCollectionStatisticsParam.newBuilder()
+                .withCollectionName(COLLECTION_NAME)
+                .withFlush(true)
+                .build();
+        R<GetCollectionStatisticsResponse> collectionStatistics = milvusClient.getCollectionStatistics(collectionStatisticsParam);
+        CommonUtils.handleResponseStatus(collectionStatistics);
+        GetCollStatResponseWrapper wrapper = new GetCollStatResponseWrapper(collectionStatistics.getData());
+
+        System.out.printf("Number of entities in collection: %d\n", wrapper.getRowCount());
     }
 
     private void reCreateCollection() {

src/main/java/io/milvus/bulkwriter/request/import_/CloudImportRequest.java

@@ -34,7 +34,7 @@ public class CloudImportRequest extends BaseImportRequest {
     private String accessKey;
     private String secretKey;
     private String clusterId;
-    private String dbName;
+//    private String dbName; // wait until server-side fully supports it
     private String collectionName;
     private String partitionName;
 }

src/main/java/io/milvus/bulkwriter/request/import_/MilvusImportRequest.java

@@ -32,7 +32,7 @@ import java.util.List;
 @NoArgsConstructor
 public class MilvusImportRequest extends BaseImportRequest {
     private static final long serialVersionUID = -1958858397962018740L;
-    private String dbName;
+//    private String dbName; // wait until server-side fully supports it
     private String collectionName;
     private String partitionName;
     private List<List<String>> files;

src/main/java/io/milvus/common/resourcegroup/ResourceGroupConfig.java

@@ -140,14 +140,22 @@ public class ResourceGroupConfig {
     public @NonNull io.milvus.grpc.ResourceGroupConfig toGRPC() {
         io.milvus.grpc.ResourceGroupConfig.Builder builder = io.milvus.grpc.ResourceGroupConfig.newBuilder()
                 .setRequests(io.milvus.grpc.ResourceGroupLimit.newBuilder().setNodeNum(requests.getNodeNum()))
-                .setLimits(io.milvus.grpc.ResourceGroupLimit.newBuilder().setNodeNum(limits.getNodeNum()))
-                .setNodeFilter(nodeFilter.toGRPC());
-        for (ResourceGroupTransfer transfer : from) {
-            builder.addTransferFrom(transfer.toGRPC());
+                .setLimits(io.milvus.grpc.ResourceGroupLimit.newBuilder().setNodeNum(limits.getNodeNum()));
+
+        if (from != null) {
+            for (ResourceGroupTransfer transfer : from) {
+                builder.addTransferFrom(transfer.toGRPC());
+            }
+        }
+        if (to != null) {
+            for (ResourceGroupTransfer transfer : to) {
+                builder.addTransferTo(transfer.toGRPC());
+            }
         }
-        for (ResourceGroupTransfer transfer : to) {
-            builder.addTransferTo(transfer.toGRPC());
+        if (nodeFilter != null) {
+            builder.setNodeFilter(nodeFilter.toGRPC());
         }
+
         return builder.build();
     }
 }

src/main/java/io/milvus/v2/service/resourcegroup/request/TransferReplicaReq.java

@@ -10,5 +10,5 @@ public class TransferReplicaReq {
     private String targetGroupName;
     private String collectionName;
     private String databaseName;
-    private long numberOfReplicas;
+    private Long numberOfReplicas;
 }