Modify comment and fix formatting

Author: cindy-peng

google-cloud-datastore/src/main/java/com/google/cloud/datastore/VectorValue.java

@@ -20,7 +20,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/** A Google Cloud Datastore Vector value. A list value is a list of {@link Value} objects. */
+/**
+ * A Google Cloud Datastore Vector value. A Vector value is a list of Double {@link Value} objects.
+ */
 public final class VectorValue extends Value<List<Value<Double>>> {
 
   private static final long serialVersionUID = -5121887228607148859L;
@@ -87,7 +89,7 @@ public VectorValue.Builder addValue(double first, double... other) {
     }
 
     /**
-     * Sets the list of values of this {@code ListValue} builder to {@code values}. The provided
+     * Sets the list of values of this {@code VectorValue} builder to {@code values}. The provided
      * list is copied.
      *
      * @see com.google.cloud.datastore.Value.BaseBuilder#set(java.lang.Object)
@@ -106,7 +108,7 @@ public List<Value<Double>> get() {
       return vectorBuilder.build();
     }
 
-    /** Creates a {@code ListValue} object. */
+    /** Creates a {@code VectorValue} object. */
     @Override
     public VectorValue build() {
       return new VectorValue(this);
@@ -121,7 +123,7 @@ private VectorValue(Builder builder) {
     super(builder);
   }
 
-  /** Returns a builder for the list value object. */
+  /** Returns a builder for the vector value object. */
   @Override
   public Builder toBuilder() {
     return new Builder().mergeFrom(this);
@@ -137,10 +139,9 @@ public static VectorValue of(List<Value<Double>> values) {
     return new VectorValue(values);
   }
 
-  /** Returns a builder for {@code ListValue} objects. */
+  /** Returns a builder for {@code VectorValue} objects. */
   public static Builder newBuilder() {
     Builder builder = new VectorValue.Builder();
-    builder.setExcludeFromIndexes(true);
     builder.setMeaning(VECTOR_MEANING);
     return builder;
   }

google-cloud-datastore/src/test/java/com/google/cloud/datastore/StructuredQueryTest.java

@@ -111,7 +111,6 @@ public void testKeyQueryBuilder() {
     assertEquals(ORDER_BY, KEY_QUERY.getOrderBy());
     assertEquals(ImmutableList.of(StructuredQuery.KEY_PROPERTY_NAME), KEY_QUERY.getProjection());
     assertTrue(KEY_QUERY.getDistinctOn().isEmpty());
-    assertEquals(LIMIT, KEY_QUERY.getLimit());
   }
 
   @Test
@@ -157,9 +156,6 @@ private void compareMergedQuery(StructuredQuery<?> expected, StructuredQuery<?>
 
   @Test
   public void testToAndFromPb() {
-    EntityQuery a = ENTITY_QUERY;
-    StructuredQuery<EntityQuery> pb =
-        StructuredQuery.fromPb(ResultType.ENTITY, ENTITY_QUERY.getNamespace(), ENTITY_QUERY.toPb());
     assertEquals(
         ENTITY_QUERY,
         StructuredQuery.fromPb(

google-cloud-datastore/src/test/java/com/google/cloud/datastore/VectorValueTest.java

@@ -29,7 +29,6 @@ public class VectorValueTest {
 
   @Test
   public void testToBuilder() {
-    //  StringValue value = StringValue.of(CONTENT);
     VectorValue value = VectorValue.of(0.3, 4.2, 3.7);
     assertEquals(value, value.toBuilder().build());
   }

google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java

@@ -2124,54 +2124,54 @@ public void testQueryWithVectorSearch() {
                 Key.newBuilder(PROJECT_ID, KIND1, "name-01", options.getDatabaseId()).build())
             .set(
                 "vector_property",
-                VectorValue.newBuilder(3.0, 1.0, 2.0).setExcludeFromIndexes(true).build())
+                VectorValue.newBuilder(3.0, 9.0, 11.1).setExcludeFromIndexes(true).build())
             .build();
-    datastore.put(entity1);
-
-    VectorValue vectorValue = VectorValue.newBuilder(1.78, 2.56, 3.88).build();
-
-    // Query to find the nearest 1 neighbor
-    FindNearest vectorQuery =
-        new FindNearest(
-            "vector_property", vectorValue, FindNearest.DistanceMeasure.COSINE, 1, "distance");
-    Query<Entity> queryWithVectorSearch =
-        Query.newEntityQueryBuilder().setKind(KIND1).setFindNearest(vectorQuery).build();
-    QueryResults<Entity> vectorSearchResult = datastore.run(queryWithVectorSearch);
-    assertTrue(vectorSearchResult.hasNext());
-    assertEquals(entity1, vectorSearchResult.next());
-    assertFalse(vectorSearchResult.hasNext());
-
     Entity entity2 =
         Entity.newBuilder(
                 Key.newBuilder(PROJECT_ID, KIND1, "name-02", options.getDatabaseId()).build())
             .set(
                 "vector_property",
-                VectorValue.newBuilder(5.0, 0.7, 2.0).setExcludeFromIndexes(true).build())
+                VectorValue.newBuilder(2.8, 2.56, 3.8).setExcludeFromIndexes(true).build())
             .build();
     Entity entity3 =
         Entity.newBuilder(
                 Key.newBuilder(PROJECT_ID, KIND1, "name-03", options.getDatabaseId()).build())
             .set(
                 "vector_property",
-                VectorValue.newBuilder(2.0, 1.7, 1.0).setExcludeFromIndexes(true).build())
+                VectorValue.newBuilder(2.8, 2.56, 3.88).setExcludeFromIndexes(true).build())
             .build();
-    datastore.put(entity2, entity3);
+    datastore.put(entity1, entity2, entity3);
 
-    // Query to find the nearest 2 neighbors
-    FindNearest vectorQueryWithLimit =
+    // Query to find the nearest 2 neighbors with COSINE distance
+    FindNearest findNearestQuery =
         new FindNearest(
             "vector_property",
-            VectorValue.newBuilder(2.8, 2.56, 3.88).build(),
-            FindNearest.DistanceMeasure.EUCLIDEAN,
+            VectorValue.newBuilder(1.78, 2.56, 3.88).build(),
+            FindNearest.DistanceMeasure.COSINE,
             2,
             "distance");
-
-    Query<Entity> queryWithVectorSearchLimit =
-        Query.newEntityQueryBuilder().setKind(KIND1).setFindNearest(vectorQueryWithLimit).build();
-    QueryResults<Entity> resultsWithVectorLimit = datastore.run(queryWithVectorSearchLimit);
-    List<Entity> resultsCopy = makeResultsCopy(resultsWithVectorLimit);
+    Query<Entity> queryWithVectorSearch =
+        Query.newEntityQueryBuilder().setKind(KIND1).setFindNearest(findNearestQuery).build();
+    QueryResults<Entity> vectorSearchResult = datastore.run(queryWithVectorSearch);
+    List<Entity> resultsCopy = makeResultsCopy(vectorSearchResult);
+    // Should return nearest 2 neighbors
     assertEquals(2, resultsCopy.size());
 
+    // Query to find the nearest neighbor with EUCLIDEAN distance
+    FindNearest findNearestWithLimit1 =
+        new FindNearest(
+            "vector_property",
+            VectorValue.newBuilder(2.8, 2.56, 3.88).build(),
+            FindNearest.DistanceMeasure.EUCLIDEAN,
+            1,
+            "distance");
+    Query<Entity> vectorQueryWithLimit1 =
+        Query.newEntityQueryBuilder().setKind(KIND1).setFindNearest(findNearestWithLimit1).build();
+    QueryResults<Entity> resultsWithVectorLimit1 = datastore.run(vectorQueryWithLimit1);
+    assertTrue(resultsWithVectorLimit1.hasNext());
+    // entity3 should be the nearest neighbor
+    assertEquals(entity3, resultsWithVectorLimit1.next());
+    assertFalse(resultsWithVectorLimit1.hasNext());
     datastore.delete(entity1.getKey(), entity2.getKey(), entity3.getKey());
   }