review feedback

Author: kolea2

datastore-v1-proto-client/src/test/java/com/google/datastore/v1/client/it/ITDatastoreProtoClientTest.java

@@ -18,6 +18,7 @@
 import static com.google.datastore.v1.client.DatastoreHelper.makeFilter;
 import static com.google.datastore.v1.client.DatastoreHelper.makeValue;
 
+import com.google.common.truth.Truth;
 import com.google.datastore.v1.Filter;
 import com.google.datastore.v1.KindExpression;
 import com.google.datastore.v1.PartitionId;
@@ -29,7 +30,6 @@
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.util.List;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -61,10 +61,11 @@ public void testQuerySplitterWithDefaultDb() throws DatastoreException {
 
     List<Query> splits =
         DatastoreHelper.getQuerySplitter().getSplits(query, PARTITION, 2, DATASTORE);
+    Truth.assertThat(splits).isNotEmpty();
     splits.forEach(
         split -> {
-          Assert.assertEquals(KIND, split.getKind(0).getName());
-          Assert.assertEquals(propertyFilter, split.getFilter());
+          Truth.assertThat(split.getKind(0).getName()).isEqualTo(KIND);
+          Truth.assertThat(split.getFilter()).isEqualTo(propertyFilter);
         });
   }
 
@@ -82,10 +83,12 @@ public void testQuerySplitterWithDb() throws DatastoreException {
 
     List<Query> splits =
         DatastoreHelper.getQuerySplitter().getSplits(query, PARTITION, 2, DATASTORE);
+
+    Truth.assertThat(splits).isNotEmpty();
     splits.forEach(
         split -> {
-          Assert.assertEquals(KIND, split.getKind(0).getName());
-          Assert.assertEquals(propertyFilter, split.getFilter());
+          Truth.assertThat(split.getKind(0).getName()).isEqualTo(KIND);
+          Truth.assertThat(split.getFilter()).isEqualTo(propertyFilter);
         });
   }
 }

google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java

@@ -209,9 +209,8 @@ public DatastoreOptions getOptions() {
    * Returns a {@link DatastoreOptions} instance that sets the host to use the Datastore emulator on
    * localhost. The default namespace is set to {@code namespace}.
    *
-   * @deprecated use setNamespace and then build() instead
+   * <p>Please use setNamespace and then build() instead.
    */
-  @Deprecated
   public DatastoreOptions getOptions(String namespace) {
     return optionsBuilder.setNamespace(namespace).build();
   }