Remove Lombok from milvus sdk-core

Signed-off-by: kun <[email protected]>

Author: likun

sdk-core/src/main/java/io/milvus/pool/PoolConfig.java

@@ -170,10 +170,10 @@ public String toString() {
     }
 
     public static class Builder {
-        private int maxIdlePerKey = 5;
+        private int maxIdlePerKey = 10;
         private int minIdlePerKey = 0;
-        private int maxTotalPerKey = 10;
-        private int maxTotal = 50;
+        private int maxTotalPerKey = 50;
+        private int maxTotal = 1000;
         private boolean blockWhenExhausted = true;
         private Duration maxBlockWaitDuration = Duration.ofSeconds(3L);
         private Duration evictionPollingInterval = Duration.ofSeconds(60L);

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

@@ -20,8 +20,13 @@
 package io.milvus.v2.service.collection.request;
 
 import io.milvus.v2.common.DataType;
+import io.milvus.v2.service.collection.request.CreateCollectionReq.FieldSchema;
+import io.milvus.v2.utils.SchemaUtils;
+
 import org.apache.commons.lang3.builder.EqualsBuilder;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -48,6 +53,8 @@ public class AddFieldReq {
     private Map<String, String> typeParams;
     private Map<String, Object> multiAnalyzerParams; // for multi‑language analyzers
 
+    private List<FieldSchema> structFields;
+
     AddFieldReq(Builder builder) {
         this.fieldName = builder.fieldName;
         this.description = builder.description != null ? builder.description : "";
@@ -68,6 +75,7 @@ public class AddFieldReq {
         this.enableMatch = builder.enableMatch;
         this.typeParams = builder.typeParams;
         this.multiAnalyzerParams = builder.multiAnalyzerParams;
+        this.structFields = builder.structFields != null ? builder.structFields : new ArrayList<>();
     }
 
     public static Builder builder() {
@@ -151,6 +159,10 @@ public Map<String, Object> getMultiAnalyzerParams() {
         return multiAnalyzerParams;
     }
 
+    public List<FieldSchema> getStructFields() {
+        return structFields;
+    }
+
     // Setters
     public void setFieldName(String fieldName) {
         this.fieldName = fieldName;
@@ -228,6 +240,10 @@ public void setMultiAnalyzerParams(Map<String, Object> multiAnalyzerParams) {
         this.multiAnalyzerParams = multiAnalyzerParams;
     }
 
+    public void setStructFields(List<FieldSchema> structFields) {
+        this.structFields = structFields;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) return true;
@@ -255,6 +271,7 @@ public boolean equals(Object obj) {
                 .append(enableMatch, that.enableMatch)
                 .append(typeParams, that.typeParams)
                 .append(multiAnalyzerParams, that.multiAnalyzerParams)
+                .append(structFields, that.structFields)
                 .isEquals();
     }
 
@@ -263,7 +280,8 @@ public int hashCode() {
         return Objects.hash(fieldName, description, dataType, maxLength, isPrimaryKey,
                 isPartitionKey, isClusteringKey, autoID, dimension, elementType,
                 maxCapacity, isNullable, defaultValue, enableDefaultValue,
-                enableAnalyzer, analyzerParams, enableMatch, typeParams, multiAnalyzerParams);
+                enableAnalyzer, analyzerParams, enableMatch, typeParams, multiAnalyzerParams,
+                structFields);
     }
 
     @Override
@@ -288,6 +306,7 @@ public String toString() {
                 ", enableMatch=" + enableMatch +
                 ", typeParams=" + typeParams +
                 ", multiAnalyzerParams=" + multiAnalyzerParams +
+                ", structFields=" + structFields +
                 '}';
     }
 
@@ -311,6 +330,7 @@ public static class Builder {
         private Boolean enableMatch;
         private Map<String, String> typeParams;
         private Map<String, Object> multiAnalyzerParams;
+        private List<FieldSchema> structFields;
 
         public Builder fieldName(String fieldName) {
             this.fieldName = fieldName;
@@ -408,6 +428,15 @@ public Builder multiAnalyzerParams(Map<String, Object> multiAnalyzerParams) {
             return this;
         }
 
+        public Builder addStructField(AddFieldReq addFieldReq) {
+            if (this.structFields == null) {
+                this.structFields = new ArrayList<>();
+            }
+            CreateCollectionReq.FieldSchema field = SchemaUtils.convertFieldReqToFieldSchema(addFieldReq);
+            this.structFields.add(field);
+            return this;
+        }
+
         public AddFieldReq build() {
             return new AddFieldReq(this);
         }

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

@@ -20,6 +20,7 @@
 package io.milvus.v2.service.collection.request;
 
 import io.milvus.common.clientenum.FunctionType;
+import io.milvus.exception.ParamException;
 import io.milvus.v2.common.ConsistencyLevel;
 import io.milvus.v2.common.DataType;
 import io.milvus.v2.common.IndexParam;
@@ -447,17 +448,24 @@ public CreateCollectionReq build() {
 
     public static class CollectionSchema {
         private List<CreateCollectionReq.FieldSchema> fieldSchemaList = new ArrayList<>();
+        private List<CreateCollectionReq.StructFieldSchema> structFields = new ArrayList<>();
+
         private boolean enableDynamicField = false;
         private List<CreateCollectionReq.Function> functionList = new ArrayList<>();
 
         private CollectionSchema(Builder builder) {
             this.fieldSchemaList = builder.fieldSchemaList;
+            this.structFields = builder.structFields;
             this.enableDynamicField = builder.enableDynamicField;
             this.functionList = builder.functionList;
         }
 
         public CollectionSchema addField(AddFieldReq addFieldReq) {
-            fieldSchemaList.add(SchemaUtils.convertFieldReqToFieldSchema(addFieldReq));
+            if (addFieldReq.getDataType() == DataType.Array && addFieldReq.getElementType() == DataType.Struct) {
+                structFields.add(SchemaUtils.convertFieldReqToStructFieldSchema(addFieldReq));
+            } else {
+                fieldSchemaList.add(SchemaUtils.convertFieldReqToFieldSchema(addFieldReq));
+            }
             return this;
         }
 
@@ -483,6 +491,14 @@ public void setFieldSchemaList(List<CreateCollectionReq.FieldSchema> fieldSchema
             this.fieldSchemaList = fieldSchemaList;
         }
 
+        public List<CreateCollectionReq.StructFieldSchema> getStructFields() {
+            return structFields;
+        }
+
+        public void setStructFields(List<CreateCollectionReq.StructFieldSchema> structFields) {
+            this.structFields = structFields;
+        }
+
         public boolean isEnableDynamicField() {
             return enableDynamicField;
         }
@@ -507,6 +523,7 @@ public boolean equals(Object obj) {
             return new EqualsBuilder()
                     .append(enableDynamicField, that.enableDynamicField)
                     .append(fieldSchemaList, that.fieldSchemaList)
+                    .append(structFields, that.structFields)
                     .append(functionList, that.functionList)
                     .isEquals();
         }
@@ -515,6 +532,7 @@ public boolean equals(Object obj) {
         public int hashCode() {
             return new HashCodeBuilder(17, 37)
                     .append(fieldSchemaList)
+                    .append(structFields)
                     .append(enableDynamicField)
                     .append(functionList)
                     .toHashCode();
@@ -524,6 +542,7 @@ public int hashCode() {
         public String toString() {
             return "CollectionSchema{" +
                     "fieldSchemaList=" + fieldSchemaList +
+                    ", structFields=" + structFields +
                     ", enableDynamicField=" + enableDynamicField +
                     ", functionList=" + functionList +
                     '}';
@@ -535,6 +554,7 @@ public static Builder builder() {
 
         public static class Builder {
             private List<CreateCollectionReq.FieldSchema> fieldSchemaList = new ArrayList<>();
+            private List<CreateCollectionReq.StructFieldSchema> structFields = new ArrayList<>();
             private boolean enableDynamicField = false;
             private List<CreateCollectionReq.Function> functionList = new ArrayList<>();
 
@@ -545,6 +565,11 @@ public Builder fieldSchemaList(List<CreateCollectionReq.FieldSchema> fieldSchema
                 return this;
             }
 
+            public Builder structFields(List<CreateCollectionReq.StructFieldSchema> structFields) {
+                this.structFields = structFields;
+                return this;
+            }
+
             public Builder enableDynamicField(boolean enableDynamicField) {
                 this.enableDynamicField = enableDynamicField;
                 return this;
@@ -947,7 +972,7 @@ public FieldSchema build() {
     }
 
     public static class Function {
-        private String name;
+        private String name = "";
         private String description = "";
         private FunctionType functionType = FunctionType.UNKNOWN;
         private List<String> inputFieldNames = new ArrayList<>();
@@ -1107,4 +1132,137 @@ public Function build() {
             }
         }
     }
+
+    public static class StructFieldSchema {
+        private String name;
+        private String description = "";
+        private List<CreateCollectionReq.FieldSchema> fields = new ArrayList<>();
+        private Integer maxCapacity;
+
+        private StructFieldSchema(Builder builder) {
+            this.name = builder.name;
+            this.description = builder.description;
+            this.fields = builder.fields;
+            this.maxCapacity = builder.maxCapacity;
+        }
+
+        public StructFieldSchema addField(AddFieldReq addFieldReq) {
+            if (addFieldReq.getDataType() == DataType.Array || addFieldReq.getElementType() == DataType.Struct) {
+                throw new ParamException("Struct field schema does not support Array, ArrayOfVector or Struct");
+            }
+            fields.add(SchemaUtils.convertFieldReqToFieldSchema(addFieldReq));
+            return this;
+        }
+
+        public DataType getDataType() {
+            return DataType.Array;
+        }
+
+        public DataType getElementType() {
+            return DataType.Struct;
+        }
+
+        // Getters and Setters
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        public List<CreateCollectionReq.FieldSchema> getFields() {
+            return fields;
+        }
+
+        public void setFields(List<CreateCollectionReq.FieldSchema> fields) {
+            this.fields = fields;
+        }
+
+        public Integer getMaxCapacity() {
+            return maxCapacity;
+        }
+
+        public void setMaxCapacity(Integer maxCapacity) {
+            this.maxCapacity = maxCapacity;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) return true;
+            if (obj == null || getClass() != obj.getClass()) return false;
+            StructFieldSchema that = (StructFieldSchema) obj;
+            return new EqualsBuilder()
+                    .append(name, that.name)
+                    .append(description, that.description)
+                    .append(fields, that.fields)
+                    .append(maxCapacity, that.maxCapacity)
+                    .isEquals();
+        }
+
+        @Override
+        public int hashCode() {
+            return new HashCodeBuilder(17, 37)
+                    .append(name)
+                    .append(description)
+                    .append(fields)
+                    .append(maxCapacity)
+                    .toHashCode();
+        }
+
+        @Override
+        public String toString() {
+            return "StructFieldSchema{" +
+                    "name='" + name + '\'' +
+                    ", description='" + description + '\'' +
+                    ", fields=" + fields +
+                    ", maxCapacity=" + maxCapacity +
+                    '}';
+        }
+
+        public static Builder builder() {
+            return new Builder();
+        }
+
+        public static class Builder {
+            private String name;
+            private String description = "";
+            private List<CreateCollectionReq.FieldSchema> fields = new ArrayList<>();
+            private Integer maxCapacity;
+
+            private Builder() {}
+
+            public Builder name(String name) {
+                this.name = name;
+                return this;
+            }
+
+            public Builder description(String description) {
+                this.description = description;
+                return this;
+            }
+
+            public Builder fields(List<CreateCollectionReq.FieldSchema> fields) {
+                this.fields = fields;
+                return this;
+            }
+
+            public Builder maxCapacity(Integer maxCapacity) {
+                this.maxCapacity = maxCapacity;
+                return this;
+            }
+
+            public StructFieldSchema build() {
+                return new StructFieldSchema(this);
+            }
+        }
+    }
 }