Third Step: Remove Lombok from milvus sdk-core

Signed-off-by: kun <kunyinglang@163.com>

Author: yeyinglang

sdk-core/pom.xml

@@ -154,7 +154,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
@@ -177,4 +177,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-</project>
+</project>

sdk-core/src/main/java/io/milvus/client/AbstractMilvusGrpcClient.java

@@ -41,7 +41,6 @@
 import io.milvus.param.partition.*;
 import io.milvus.param.resourcegroup.*;
 import io.milvus.param.role.*;
-import lombok.NonNull;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.List;
@@ -56,7 +55,10 @@ public class MilvusMultiServiceClient implements MilvusClient {
      * Sets connect param for multi milvus clusters.
      * @param multiConnectParam multi server connect param
      */
-    public MilvusMultiServiceClient(@NonNull MultiConnectParam multiConnectParam) {
+    public MilvusMultiServiceClient(MultiConnectParam multiConnectParam) {
+        if (multiConnectParam == null) {
+            throw new IllegalArgumentException("multiConnectParam must not be null");
+        }
 
         List<ServerSetting> serverSettings = multiConnectParam.getHosts().stream()
                 .map(host -> {
@@ -723,4 +725,3 @@ private <T> R<T> handleResponse(List<R<T>> response) {
         return R.failed(R.Status.Unknown, "Response is empty.");
     }
 }
-

sdk-core/src/main/java/io/milvus/client/MilvusMultiServiceClient.java

@@ -25,6 +25,7 @@
 import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
 import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
 import io.grpc.stub.MetadataUtils;
+import io.milvus.common.utils.ExceptionUtils;
 import io.milvus.exception.MilvusException;
 import io.milvus.exception.ServerException;
 import io.milvus.grpc.*;
@@ -49,7 +50,6 @@
 import io.milvus.v2.utils.ClientUtils;
 import io.grpc.ProxiedSocketAddress;
 import io.grpc.ProxyDetector;
-import lombok.NonNull;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
@@ -75,7 +75,8 @@ public class MilvusServiceClient extends AbstractMilvusGrpcClient {
     private RetryParam retryParam = RetryParam.newBuilder().build();
     private String currentDatabaseName;
 
-    public MilvusServiceClient(@NonNull ConnectParam connectParam) {
+    public MilvusServiceClient(ConnectParam connectParam) {
+        ExceptionUtils.checkNotNull(connectParam, connectParam.getClass().getSimpleName());
         this.rpcDeadlineMs = connectParam.getRpcDeadlineMs();
 
         Metadata metadata = new Metadata();
@@ -417,7 +418,8 @@ private <T> R<T> retry(Callable<R<T>> callable) {
      * 3. sdk language type and version
      * 4. the client's local time
      */
-    private R<ConnectResponse> connect(@NonNull ConnectParam connectParam) {
+    private R<ConnectResponse> connect(ConnectParam connectParam) {
+        ExceptionUtils.checkNotNull(connectParam, connectParam.getClass().getSimpleName());
         ClientInfo info = ClientInfo.newBuilder()
                 .setSdkType("Java")
                 .setSdkVersion(getSDKVersion())
@@ -620,12 +622,14 @@ public R<DescribeIndexResponse> describeIndex(DescribeIndexParam requestParam) {
     }
 
     @Override
-    public R<GetIndexStateResponse> getIndexState(@NonNull GetIndexStateParam requestParam) {
+    public R<GetIndexStateResponse> getIndexState(GetIndexStateParam requestParam) {
+        ExceptionUtils.checkNotNull(requestParam, requestParam.getClass().getSimpleName());
         return retry(()-> super.getIndexState(requestParam));
     }
 
     @Override
-    public R<GetIndexBuildProgressResponse> getIndexBuildProgress(@NonNull GetIndexBuildProgressParam requestParam) {
+    public R<GetIndexBuildProgressResponse> getIndexBuildProgress(GetIndexBuildProgressParam requestParam) {
+        ExceptionUtils.checkNotNull(requestParam, requestParam.getClass().getSimpleName());
         return retry(()-> super.getIndexBuildProgress(requestParam));
     }
 

sdk-core/src/main/java/io/milvus/client/MilvusServiceClient.java

@@ -19,28 +19,32 @@
 
 package io.milvus.common.clientenum;
 
-import lombok.Getter;
-
 public enum ConsistencyLevelEnum {
 
     STRONG("Strong", 0),
     SESSION("Session", 1),
     BOUNDED("Bounded", 2),
-    EVENTUALLY("Eventually",3),
+    EVENTUALLY("Eventually", 3),
     ;
 
-    @Getter
     private final String name;
-
-    @Getter
     private final int code;
 
-    ConsistencyLevelEnum(String name, int code){
+    ConsistencyLevelEnum(String name, int code) {
         this.name = name;
         this.code = code;
     }
 
-    private static final ConsistencyLevelEnum[] CONSISTENCY_LEVELS = new ConsistencyLevelEnum[values().length];
+    // Getter methods to replace @Getter annotations
+    public String getName() {
+        return name;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    private static final ConsistencyLevelEnum[] CONSISTENCY_LEVELS = values();
 
     public static ConsistencyLevelEnum getNameByCode(int code) {
         if (code >= 0 && code < CONSISTENCY_LEVELS.length) {

sdk-core/src/main/java/io/milvus/common/clientenum/ConsistencyLevelEnum.java

@@ -19,33 +19,27 @@
 
 package io.milvus.common.clientenum;
 
-import lombok.Getter;
-
 public enum FunctionType {
     UNKNOWN("Unknown", 0), // in milvus-proto, the name is "Unknown"
-    BM25(1),
+    BM25("BM25", 1), // Added missing name parameter
     TEXTEMBEDDING("TextEmbedding", 2), // in milvus-proto, the name is "TextEmbedding"
-    RERANK(3),
-    ;
+    RERANK("RERANK", 3); // Added missing name parameter
 
     private final String name;
-
-    @Getter
     private final int code;
 
-    FunctionType(){
-        this.name = this.name();
-        this.code = this.ordinal();
+    FunctionType(String name, int code){
+        this.name = name;
+        this.code = code;
     }
 
-    FunctionType(int code){
-        this.name = this.name();
-        this.code = code;
+    // Getter method to replace @Getter annotation
+    public int getCode() {
+        return code;
     }
 
-    FunctionType(String name, int code){
-        this.name = name;
-        this.code = code;
+    public String getName() {
+        return name;
     }
 
     public static FunctionType fromName(String name) {

sdk-core/src/main/java/io/milvus/common/clientenum/FunctionType.java

@@ -37,4 +37,10 @@ public static void handleResponseStatus(R<?> r) {
             throw new RuntimeException(r.getMessage());
         }
     }
+
+    public static void checkNotNull(Object obj, String msg) {
+        if (obj == null) {
+            throw new IllegalArgumentException(msg + "cannot be null");
+        }
+    }
 }

sdk-core/src/main/java/io/milvus/common/utils/ExceptionUtils.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package io.milvus.utils;
+package io.milvus.common.utils;
 
 import java.net.URI;
 import java.net.URISyntaxException;

sdk-core/src/main/java/io/milvus/common/utils/URLParser.java

@@ -22,7 +22,6 @@
 import io.milvus.exception.ParamException;
 import io.milvus.param.QueryNodeSingleSearch;
 import io.milvus.param.ServerAddress;
-import lombok.NonNull;
 import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.List;
@@ -41,7 +40,10 @@ public class ClusterFactory {
 
     private ServerMonitor monitor;
 
-    private ClusterFactory(@NonNull Builder builder) {
+    private ClusterFactory(Builder builder) {
+        if (builder == null) {
+            throw new NullPointerException("builder cannot be null");
+        }
         this.serverSettings = builder.serverSettings;
         this.master = this.getDefaultServer();
         this.availableServerSettings = builder.serverSettings;
@@ -114,7 +116,10 @@ private Builder() {
          * @param serverSettings ServerSetting
          * @return <code>Builder</code>
          */
-        public Builder withServerSetting(@NonNull List<ServerSetting> serverSettings) {
+        public Builder withServerSetting(List<ServerSetting> serverSettings) {
+            if (serverSettings == null) {
+                throw new NullPointerException("serverSettings cannot be null");
+            }
             this.serverSettings = serverSettings;
             return this;
         }

sdk-core/src/main/java/io/milvus/connection/ClusterFactory.java

@@ -24,7 +24,6 @@
 import io.milvus.param.ConnectParam;
 import io.milvus.param.ParamUtils;
 import io.milvus.param.ServerAddress;
-import lombok.NonNull;
 
 /**
  * Defined address and Milvus clients for each server.
@@ -33,7 +32,10 @@ public class ServerSetting {
     private final ServerAddress serverAddress;
     private final MilvusClient client;
 
-    public ServerSetting(@NonNull Builder builder) {
+    public ServerSetting(Builder builder) {
+        if (builder == null) {
+            throw new IllegalArgumentException("builder cannot be null");
+        }
         this.serverAddress = builder.serverAddress;
         this.client = builder.milvusClient;
     }
@@ -64,7 +66,10 @@ private Builder() {
          * @param serverAddress ServerAddress host,port/server
          * @return <code>Builder</code>
          */
-        public Builder withHost(@NonNull ServerAddress serverAddress) {
+        public Builder withHost(ServerAddress serverAddress) {
+            if (serverAddress == null) {
+                throw new IllegalArgumentException("serverAddress cannot be null");
+            }
             this.serverAddress = serverAddress;
             return this;
         }