Skip to content

Commit 709c2df

Browse files
authored
Refine code (#1407)
Signed-off-by: yhmo <yihua.mo@zilliz.com>
1 parent 13d3b9f commit 709c2df

13 files changed

Lines changed: 73 additions & 34 deletions

File tree

sdk-core/src/main/java/io/milvus/v2/service/collection/request/AddFieldReq.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,20 @@ public class AddFieldReq {
5353
@Builder.ObtainVia(field = "hiddenField")
5454
private boolean enableDefaultValue = false; // a flag to pass the default value to server or not
5555
private Boolean enableAnalyzer; // for BM25 tokenizer
56-
Map<String, Object> analyzerParams; // for BM25 tokenizer
56+
private Map<String, Object> analyzerParams; // for BM25 tokenizer
5757
private Boolean enableMatch; // for BM25 keyword search
5858

5959
// If a specific field, such as maxLength, has been specified, it will override the corresponding key's value in typeParams.
6060
private Map<String, String> typeParams;
61-
Map<String, Object> multiAnalyzerParams; // for multi‑language analyzers
61+
private Map<String, Object> multiAnalyzerParams; // for multi‑language analyzers
6262

63-
AddFieldReq setDefaultValue(Object obj) {
64-
enableDefaultValue = true; // automatically set this flag
65-
this.defaultValue = obj;
66-
return this;
63+
public static abstract class AddFieldReqBuilder<C extends AddFieldReq, B extends AddFieldReq.AddFieldReqBuilder<C, B>> {
64+
public B defaultValue(Object value) {
65+
this.defaultValue$value = value;
66+
this.defaultValue$set = true;
67+
68+
this.enableDefaultValue = true; // automatically set this flag
69+
return self();
70+
}
6771
}
6872
}

sdk-core/src/main/java/io/milvus/v2/service/collection/request/CreateCollectionReq.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,12 @@ public static class FieldSchema {
217217
@Builder.Default
218218
private Object defaultValue = null; // only for scalar fields
219219
private Boolean enableAnalyzer; // for BM25 tokenizer
220-
Map<String, Object> analyzerParams; // for BM25 tokenizer
220+
private Map<String, Object> analyzerParams; // for BM25 tokenizer
221221
private Boolean enableMatch; // for BM25 keyword search
222222

223223
// If a specific field, such as maxLength, has been specified, it will override the corresponding key's value in typeParams.
224224
private Map<String, String> typeParams;
225-
Map<String, Object> multiAnalyzerParams; // for multi‑language analyzers
225+
private Map<String, Object> multiAnalyzerParams; // for multi‑language analyzers
226226
}
227227

228228
@Data
@@ -231,10 +231,10 @@ public static class Function {
231231
private String name;
232232
@Builder.Default
233233
private String description = "";
234-
FunctionType functionType;
234+
private FunctionType functionType;
235235
@Builder.Default
236-
List<String> inputFieldNames = new ArrayList<>();
236+
private List<String> inputFieldNames = new ArrayList<>();
237237
@Builder.Default
238-
List<String> outputFieldNames = new ArrayList<>();
238+
private List<String> outputFieldNames = new ArrayList<>();
239239
}
240240
}

sdk-core/src/main/java/io/milvus/v2/service/collection/response/DescribeCollectionResp.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import lombok.Data;
2626
import lombok.experimental.SuperBuilder;
2727

28+
import java.util.ArrayList;
2829
import java.util.HashMap;
2930
import java.util.List;
3031
import java.util.Map;
@@ -37,9 +38,10 @@ public class DescribeCollectionResp {
3738
private String databaseName;
3839
private String description;
3940
private Long numOfPartitions;
40-
41-
private List<String> fieldNames;
42-
private List<String> vectorFieldNames;
41+
@Builder.Default
42+
private List<String> fieldNames = new ArrayList<>();
43+
@Builder.Default
44+
private List<String> vectorFieldNames = new ArrayList<>();
4345
private String primaryFieldName;
4446
private Boolean enableDynamicField;
4547
private Boolean autoID;

sdk-core/src/main/java/io/milvus/v2/service/database/response/ListDatabasesResp.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,16 @@
1919

2020
package io.milvus.v2.service.database.response;
2121

22+
import lombok.Builder;
2223
import lombok.Data;
2324
import lombok.experimental.SuperBuilder;
2425

26+
import java.util.ArrayList;
2527
import java.util.List;
2628

2729
@Data
2830
@SuperBuilder
2931
public class ListDatabasesResp {
30-
private List<String> databaseNames;
32+
@Builder.Default
33+
private List<String> databaseNames = new ArrayList<>();
3134
}

sdk-core/src/main/java/io/milvus/v2/service/index/response/DescribeIndexResp.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
@SuperBuilder
3636
public class DescribeIndexResp {
3737
@Builder.Default
38-
List<IndexDesc> indexDescriptions = new ArrayList<>();
38+
private List<IndexDesc> indexDescriptions = new ArrayList<>();
3939

4040
public IndexDesc getIndexDescByFieldName(@NonNull String fieldName) {
4141
for (IndexDesc desc : indexDescriptions) {
@@ -68,15 +68,15 @@ public static final class IndexDesc {
6868
@Builder.Default
6969
private Map<String, String> extraParams = new HashMap<>();
7070
@Builder.Default
71-
long indexedRows = 0;
71+
private long indexedRows = 0;
7272
@Builder.Default
73-
long totalRows = 0;
73+
private long totalRows = 0;
7474
@Builder.Default
75-
long pendingIndexRows = 0;
75+
private long pendingIndexRows = 0;
7676
@Builder.Default
7777
private IndexBuildState indexState = IndexBuildState.IndexStateNone;
7878
@Builder.Default
79-
String indexFailedReason = "";
79+
private String indexFailedReason = "";
8080

8181
// In 2.4/2.5, properties only contains one item "mmap.enabled".
8282
// To keep consistence with other SDKs, we intend to remove this member from IndexDesc,

sdk-core/src/main/java/io/milvus/v2/service/rbac/response/DescribeRoleResp.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,18 @@
2020
package io.milvus.v2.service.rbac.response;
2121

2222
import io.milvus.grpc.GrantEntity;
23+
import lombok.Builder;
2324
import lombok.Data;
2425
import lombok.experimental.SuperBuilder;
2526

27+
import java.util.ArrayList;
2628
import java.util.List;
2729

2830
@Data
2931
@SuperBuilder
3032
public class DescribeRoleResp {
31-
List<GrantInfo> grantInfos;
33+
@Builder.Default
34+
private List<GrantInfo> grantInfos = new ArrayList<>();
3235

3336
@Data
3437
@SuperBuilder

sdk-core/src/main/java/io/milvus/v2/service/rbac/response/DescribeUserResp.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,16 @@
1919

2020
package io.milvus.v2.service.rbac.response;
2121

22+
import lombok.Builder;
2223
import lombok.Data;
2324
import lombok.experimental.SuperBuilder;
2425

26+
import java.util.ArrayList;
2527
import java.util.List;
2628

2729
@Data
2830
@SuperBuilder
2931
public class DescribeUserResp {
30-
private List<String> roles;
32+
@Builder.Default
33+
private List<String> roles = new ArrayList<>();
3134
}

sdk-core/src/main/java/io/milvus/v2/service/resourcegroup/request/TransferNodeReq.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
@Data
77
@SuperBuilder
88
public class TransferNodeReq {
9-
String sourceGroupName;
10-
String targetGroupName;
11-
Integer numOfNodes;
9+
private String sourceGroupName;
10+
private String targetGroupName;
11+
private Integer numOfNodes;
1212
}

sdk-core/src/main/java/io/milvus/v2/service/vector/response/InsertResp.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,17 @@
1919

2020
package io.milvus.v2.service.vector.response;
2121

22+
import lombok.Builder;
2223
import lombok.Data;
2324
import lombok.experimental.SuperBuilder;
2425

26+
import java.util.ArrayList;
2527
import java.util.List;
2628

2729
@Data
2830
@SuperBuilder
2931
public class InsertResp {
3032
private long InsertCnt;
31-
private List<Object> primaryKeys;
33+
@Builder.Default
34+
private List<Object> primaryKeys = new ArrayList<>();
3235
}

sdk-core/src/main/java/io/milvus/v2/service/vector/response/QueryResp.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,23 @@
2323
import lombok.Data;
2424
import lombok.experimental.SuperBuilder;
2525

26+
import java.util.ArrayList;
27+
import java.util.HashMap;
2628
import java.util.List;
2729
import java.util.Map;
2830

2931
@Data
3032
@SuperBuilder
3133
public class QueryResp {
32-
private List<QueryResult> queryResults;
34+
@Builder.Default
35+
private List<QueryResult> queryResults = new ArrayList<>();
3336
@Builder.Default
3437
private long sessionTs = 1L; // default eventually ts
3538

3639
@Data
3740
@SuperBuilder
3841
public static class QueryResult {
39-
private Map<String, Object> entity;
42+
@Builder.Default
43+
private Map<String, Object> entity = new HashMap<>();
4044
}
4145
}

0 commit comments

Comments
 (0)