Browse Source

set secure to false if token is null or empty and fix unit test (#781)

Signed-off-by: Nian Liu <nian.liu@zilliz.com>
Nian Liu 1 năm trước cách đây
mục cha
commit
90f90f0c0f

+ 3 - 1
src/main/java/io/milvus/v2/client/ConnectConfig.java

@@ -61,6 +61,8 @@ public class ConnectConfig {
         if (secure != null) {
         if (secure != null) {
             return secure;
             return secure;
         }
         }
-        return token != null || username != null || password != null;
+        if (token == null && username == null && password == null) {
+            return false;
+        } else return token == null || !token.isEmpty();
     }
     }
 }
 }

+ 2 - 1
src/test/java/io/milvus/v2/BaseTest.java

@@ -30,6 +30,7 @@ public class BaseTest {
 
 
         Status successStatus = Status.newBuilder().setCode(0).build();
         Status successStatus = Status.newBuilder().setCode(0).build();
         BoolResponse trueResponse = BoolResponse.newBuilder().setStatus(successStatus).setValue(Boolean.TRUE).build();
         BoolResponse trueResponse = BoolResponse.newBuilder().setStatus(successStatus).setValue(Boolean.TRUE).build();
+        BoolResponse falseResponse = BoolResponse.newBuilder().setStatus(successStatus).setValue(Boolean.FALSE).build();
 
 
         CollectionSchema collectionSchema = CollectionSchema.newBuilder()
         CollectionSchema collectionSchema = CollectionSchema.newBuilder()
                 .setDescription("test")
                 .setDescription("test")
@@ -78,11 +79,11 @@ public class BaseTest {
         when(blockingStub.createCollection(any(CreateCollectionRequest.class))).thenReturn(successStatus);
         when(blockingStub.createCollection(any(CreateCollectionRequest.class))).thenReturn(successStatus);
         when(blockingStub.loadCollection(any())).thenReturn(successStatus);
         when(blockingStub.loadCollection(any())).thenReturn(successStatus);
         when(blockingStub.releaseCollection(any())).thenReturn(successStatus);
         when(blockingStub.releaseCollection(any())).thenReturn(successStatus);
+        when(blockingStub.getLoadState(any())).thenReturn(GetLoadStateResponse.newBuilder().setState(LoadState.LoadStateLoaded).setStatus(successStatus).build());
         when(blockingStub.dropCollection(any())).thenReturn(successStatus);
         when(blockingStub.dropCollection(any())).thenReturn(successStatus);
         when(blockingStub.hasCollection(any())).thenReturn(trueResponse);
         when(blockingStub.hasCollection(any())).thenReturn(trueResponse);
         when(blockingStub.describeCollection(any())).thenReturn(describeCollectionResponse);
         when(blockingStub.describeCollection(any())).thenReturn(describeCollectionResponse);
         when(blockingStub.renameCollection(any())).thenReturn(successStatus);
         when(blockingStub.renameCollection(any())).thenReturn(successStatus);
-        when(blockingStub.getLoadState(any())).thenReturn(GetLoadStateResponse.newBuilder().setStatus(successStatus).build());
         when(blockingStub.getCollectionStatistics(any())).thenReturn(GetCollectionStatisticsResponse.newBuilder().addStats(KeyValuePair.newBuilder().setKey("row_count").setValue("10").build()).setStatus(successStatus).build());
         when(blockingStub.getCollectionStatistics(any())).thenReturn(GetCollectionStatisticsResponse.newBuilder().addStats(KeyValuePair.newBuilder().setKey("row_count").setValue("10").build()).setStatus(successStatus).build());
 
 
         // index api
         // index api

+ 2 - 20
src/test/java/io/milvus/v2/service/collection/CollectionTest.java

@@ -32,26 +32,6 @@ class CollectionTest extends BaseTest {
 
 
     @Test
     @Test
     void testCreateCollectionWithSchema() {
     void testCreateCollectionWithSchema() {
-//        List<CreateCollectionWithSchemaReq.FieldSchema> fields = new ArrayList<>();
-//        CreateCollectionWithSchemaReq.FieldSchema idSchema = CreateCollectionWithSchemaReq.FieldSchema.builder()
-//                .name("id")
-//                .dataType(DataType.Int64)
-//                .isPrimaryKey(Boolean.TRUE)
-//                .autoID(Boolean.FALSE)
-//                .build();
-//        CreateCollectionWithSchemaReq.FieldSchema metaSchema = CreateCollectionWithSchemaReq.FieldSchema.builder()
-//                .name("meta")
-//                .dataType(DataType.VarChar)
-//                .build();
-//        CreateCollectionWithSchemaReq.FieldSchema vectorSchema = CreateCollectionWithSchemaReq.FieldSchema.builder()
-//                .name("vector")
-//                .dataType(DataType.FloatVector)
-//                .dimension(2)
-//                .build();
-//
-//        fields.add(idSchema);
-//        fields.add(vectorSchema);
-//        fields.add(metaSchema);
 
 
         CreateCollectionReq.CollectionSchema collectionSchema = CreateCollectionReq.CollectionSchema.builder()
         CreateCollectionReq.CollectionSchema collectionSchema = CreateCollectionReq.CollectionSchema.builder()
                 .enableDynamicField(Boolean.TRUE)
                 .enableDynamicField(Boolean.TRUE)
@@ -78,6 +58,7 @@ class CollectionTest extends BaseTest {
     void testDropCollection() {
     void testDropCollection() {
         DropCollectionReq req = DropCollectionReq.builder()
         DropCollectionReq req = DropCollectionReq.builder()
                 .collectionName("test")
                 .collectionName("test")
+                .async(Boolean.FALSE)
                 .build();
                 .build();
         client_v2.dropCollection(req);
         client_v2.dropCollection(req);
     }
     }
@@ -120,6 +101,7 @@ class CollectionTest extends BaseTest {
     void testReleaseCollection() {
     void testReleaseCollection() {
         ReleaseCollectionReq req = ReleaseCollectionReq.builder()
         ReleaseCollectionReq req = ReleaseCollectionReq.builder()
                 .collectionName("test")
                 .collectionName("test")
+                .async(Boolean.FALSE)
                 .build();
                 .build();
         client_v2.releaseCollection(req);
         client_v2.releaseCollection(req);
     }
     }