rename geopoint to latlng

Author: Ajay Kannan

gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseEntity.java

@@ -21,7 +21,7 @@
 import static com.google.gcloud.datastore.DateTimeValue.of;
 import static com.google.gcloud.datastore.DoubleValue.of;
 import static com.google.gcloud.datastore.EntityValue.of;
-import static com.google.gcloud.datastore.GeoPointValue.of;
+import static com.google.gcloud.datastore.LatLngValue.of;
 import static com.google.gcloud.datastore.KeyValue.of;
 import static com.google.gcloud.datastore.ListValue.of;
 import static com.google.gcloud.datastore.LongValue.of;
@@ -160,7 +160,7 @@ public B set(String name, DateTime value) {
       return self();
     }
 
-    public B set(String name, GeoPoint value) {
+    public B set(String name, LatLng value) {
       properties.put(name, of(value));
       return self();
     }
@@ -327,14 +327,14 @@ public DateTime getDateTime(String name) {
   }
 
   /**
-   * Returns the property value as a GeoPoint.
+   * Returns the property value as a LatLng.
    *
    * @throws DatastoreException if not such property.
-   * @throws ClassCastException if value is not a GeoPoint.
+   * @throws ClassCastException if value is not a LatLng.
    */
   @SuppressWarnings("unchecked")
-  public GeoPoint getGeoPoint(String name) {
-    return ((Value<GeoPoint>) getValue(name)).get();
+  public LatLng getLatLng(String name) {
+    return ((Value<LatLng>) getValue(name)).get();
   }
 
   /**

gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/GeoPoint.java renamed to gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/LatLng.java

@@ -23,20 +23,20 @@
 import java.util.Objects;
 
 /**
- * A Google Cloud Datastore GeoPoint (represented by latitude and longitude in degrees).
+ * A Google Cloud Datastore LatLng (represented by latitude and longitude in degrees).
  * This class is immutable.
  *
  * @see <a href="https://cloud.google.com/datastore/docs/concepts/entities">Google Cloud Datastore
  *     Entities, Properties, and Keys</a>
  */
-public final class GeoPoint extends Serializable<com.google.type.LatLng> {
+public final class LatLng extends Serializable<com.google.type.LatLng> {
 
   private static final long serialVersionUID = 9077060962655752073L;
 
   private final transient double latitude;
   private final transient double longitude;
 
-  GeoPoint(double latitude, double longitude) {
+  LatLng(double latitude, double longitude) {
     checkArgument(
         latitude >= -90.0 && latitude <= 90.0, "latitude must be in the range [-90, 90] degrees");
     checkArgument(
@@ -66,12 +66,12 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj == this || (obj instanceof GeoPoint && this.latitude == ((GeoPoint) obj).latitude
-               && this.longitude == ((GeoPoint) obj).longitude);
+    return obj == this || (obj instanceof LatLng && this.latitude == ((LatLng) obj).latitude
+               && this.longitude == ((LatLng) obj).longitude);
   }
 
-  public static GeoPoint of(double latitude, double longitude) {
-    return new GeoPoint(latitude, longitude);
+  public static LatLng of(double latitude, double longitude) {
+    return new LatLng(latitude, longitude);
   }
 
   @Override
@@ -85,6 +85,6 @@ protected com.google.type.LatLng toPb() {
   @Override
   protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
     com.google.type.LatLng parsedLatLng = com.google.type.LatLng.parseFrom(bytesPb);
-    return new GeoPoint(parsedLatLng.getLatitude(), parsedLatLng.getLongitude());
+    return new LatLng(parsedLatLng.getLatitude(), parsedLatLng.getLongitude());
   }
 }

gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/GeoPointValue.java renamed to gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/LatLngValue.java

@@ -18,12 +18,12 @@
 
 import static com.google.datastore.v1beta3.Value.GEO_POINT_VALUE_FIELD_NUMBER;
 
-public final class GeoPointValue extends Value<GeoPoint> {
+public final class LatLngValue extends Value<LatLng> {
 
   private static final long serialVersionUID = -5810614280642405898L;
 
-  static final BaseMarshaller<GeoPoint, GeoPointValue, Builder> MARSHALLER =
-      new BaseMarshaller<GeoPoint, GeoPointValue, Builder>() {
+  static final BaseMarshaller<LatLng, LatLngValue, Builder> MARSHALLER =
+      new BaseMarshaller<LatLng, LatLngValue, Builder>() {
 
         private static final long serialVersionUID = -3550567536035178649L;
 
@@ -33,39 +33,39 @@ public int getProtoFieldId() {
         }
 
         @Override
-        public Builder newBuilder(GeoPoint value) {
+        public Builder newBuilder(LatLng value) {
           return builder(value);
         }
 
         @Override
-        protected GeoPoint getValue(com.google.datastore.v1beta3.Value from) {
-          return new GeoPoint(
+        protected LatLng getValue(com.google.datastore.v1beta3.Value from) {
+          return new LatLng(
               from.getGeoPointValue().getLatitude(), from.getGeoPointValue().getLongitude());
         }
 
         @Override
-        protected void setValue(GeoPointValue from, com.google.datastore.v1beta3.Value.Builder to) {
+        protected void setValue(LatLngValue from, com.google.datastore.v1beta3.Value.Builder to) {
           to.setGeoPointValue(from.get().toPb());
         }
       };
 
-  public static final class Builder extends Value.BaseBuilder<GeoPoint, GeoPointValue, Builder> {
+  public static final class Builder extends Value.BaseBuilder<LatLng, LatLngValue, Builder> {
 
     private Builder() {
-      super(ValueType.GEO_POINT);
+      super(ValueType.LAT_LNG);
     }
 
     @Override
-    public GeoPointValue build() {
-      return new GeoPointValue(this);
+    public LatLngValue build() {
+      return new LatLngValue(this);
     }
   }
 
-  public GeoPointValue(GeoPoint value) {
+  public LatLngValue(LatLng value) {
     this(builder(value));
   }
 
-  private GeoPointValue(Builder builder) {
+  private LatLngValue(Builder builder) {
     super(builder);
   }
 
@@ -74,11 +74,11 @@ public Builder toBuilder() {
     return new Builder().mergeFrom(this);
   }
 
-  public static GeoPointValue of(GeoPoint value) {
-    return new GeoPointValue(value);
+  public static LatLngValue of(LatLng value) {
+    return new LatLngValue(value);
   }
 
-  public static Builder builder(GeoPoint value) {
+  public static Builder builder(LatLng value) {
     return new Builder().set(value);
   }
 }

gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/ValueType.java

@@ -81,9 +81,9 @@ public enum ValueType {
   RAW_VALUE(RawValue.MARSHALLER),
 
   /**
-   * Represents a {@link GeoPoint} value
+   * Represents a {@link LatLng} value
    */
-  GEO_POINT(GeoPointValue.MARSHALLER);
+  LAT_LNG(LatLngValue.MARSHALLER);
 
   private static final ImmutableMap<Integer, ValueType> DESCRIPTOR_TO_TYPE_MAP;
 

gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/BaseEntityTest.java

@@ -35,7 +35,7 @@ public class BaseEntityTest {
 
   private static final Blob BLOB = Blob.copyFrom(new byte[]{1, 2});
   private static final DateTime DATE_TIME = DateTime.now();
-  private static final GeoPoint GEO_POINT = new GeoPoint(37.422035, -122.084124);
+  private static final LatLng LAT_LNG = new LatLng(37.422035, -122.084124);
   private static final Key KEY = Key.builder("ds1", "k1", "n1").build();
   private static final Entity ENTITY = Entity.builder(KEY).set("name", "foo").build();
   private static final IncompleteKey INCOMPLETE_KEY = IncompleteKey.builder("ds1", "k1").build();
@@ -63,9 +63,9 @@ public void setUp() {
     builder = new Builder();
     builder.set("blob", BLOB).set("boolean", true).set("dateTime", DATE_TIME);
     builder.set("double", 1.25).set("key", KEY).set("string", "hello world");
-    builder.set("long", 125).setNull("null").set("entity", ENTITY).set("geoPoint", GEO_POINT);
+    builder.set("long", 125).setNull("null").set("entity", ENTITY).set("latLng", LAT_LNG);
     builder.set("partialEntity", PARTIAL_ENTITY).set("stringValue", StringValue.of("bla"));
-    builder.set("list1", NullValue.of(), StringValue.of("foo"), GeoPointValue.of(GEO_POINT));
+    builder.set("list1", NullValue.of(), StringValue.of("foo"), LatLngValue.of(LAT_LNG));
     builder.set("list2", ImmutableList.of(LongValue.of(10), DoubleValue.of(2)));
     builder.set("list3", Collections.singletonList(BooleanValue.of(true)));
   }
@@ -151,9 +151,9 @@ public void testGetDateTime() throws Exception {
   }
 
   @Test
-  public void testGetGeoPoint() throws Exception {
+  public void testGetLatLng() throws Exception {
     BaseEntity<Key> entity = builder.build();
-    assertEquals(GEO_POINT, entity.getGeoPoint("geoPoint"));
+    assertEquals(LAT_LNG, entity.getLatLng("latLng"));
   }
 
   @Test
@@ -181,7 +181,7 @@ public void testGetList() throws Exception {
     assertEquals(3, list.size());
     assertEquals(NullValue.of(), list.get(0));
     assertEquals("foo", list.get(1).get());
-    assertEquals(GEO_POINT, list.get(2).get());
+    assertEquals(LAT_LNG, list.get(2).get());
     list = entity.getList("list2");
     assertEquals(2, list.size());
     assertEquals(Long.valueOf(10), list.get(0).get());
@@ -207,7 +207,7 @@ public void testNames() throws Exception {
     Set<String> names =
         ImmutableSet.<String>builder()
             .add("string", "stringValue", "boolean", "double", "long", "list1", "list2", "list3")
-            .add("entity", "partialEntity", "null", "dateTime", "geoPoint", "blob", "key")
+            .add("entity", "partialEntity", "null", "dateTime", "latLng", "blob", "key")
         .build();
     BaseEntity<Key> entity = builder.build();
     assertEquals(names, entity.names());

gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java

@@ -74,8 +74,8 @@ public class DatastoreTest {
       .build();
   private static final ListValue LIST_VALUE2 = ListValue.of(Collections.singletonList(KEY_VALUE));
   private static final DateTimeValue DATE_TIME_VALUE = new DateTimeValue(DateTime.now());
-  private static final GeoPointValue GEO_POINT_VALUE =
-      new GeoPointValue(new GeoPoint(37.422035, -122.084124));
+  private static final LatLngValue LAT_LNG_VALUE =
+      new LatLngValue(new LatLng(37.422035, -122.084124));
   private static final FullEntity<IncompleteKey> PARTIAL_ENTITY1 =
       FullEntity.builder(INCOMPLETE_KEY2).set("str", STR_VALUE).set("bool", BOOL_VALUE)
           .set("list", LIST_VALUE1).build();
@@ -89,7 +89,7 @@ public class DatastoreTest {
       Entity.builder(KEY1)
           .set("str", STR_VALUE)
           .set("date", DATE_TIME_VALUE)
-          .set("geoPoint", GEO_POINT_VALUE)
+          .set("latLng", LAT_LNG_VALUE)
           .set("bool", BOOL_VALUE)
           .set("partial1", EntityValue.of(PARTIAL_ENTITY1))
           .set("list", LIST_VALUE2)
@@ -508,8 +508,8 @@ public void testGet() {
     assertEquals(LIST_VALUE2, value3);
     DateTimeValue value4 = entity.getValue("date");
     assertEquals(DATE_TIME_VALUE, value4);
-    GeoPointValue value5 = entity.getValue("geoPoint");
-    assertEquals(GEO_POINT_VALUE, value5);
+    LatLngValue value5 = entity.getValue("latLng");
+    assertEquals(LAT_LNG_VALUE, value5);
     FullEntity<IncompleteKey> value6 = entity.getEntity("partial1");
     assertEquals(PARTIAL_ENTITY1, value6);
     assertEquals(6, entity.names().size());
@@ -534,7 +534,7 @@ public void testGetArray() {
     assertEquals(PARTIAL_ENTITY2, partial1);
     assertEquals(ENTITY2, partial2);
     assertEquals(ValueType.BOOLEAN, entity3.getValue("bool").type());
-    assertEquals(GEO_POINT_VALUE, entity3.getValue("geoPoint"));
+    assertEquals(LAT_LNG_VALUE, entity3.getValue("latLng"));
     assertEquals(7, entity3.names().size());
     assertFalse(entity3.contains("bla"));
     try {

gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/GeoPointTest.java renamed to gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LatLngTest.java

@@ -23,13 +23,13 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-public class GeoPointTest {
+public class LatLngTest {
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
 
-  private static GeoPoint gp1 = new GeoPoint(37.422035, -122.084124);
-  private static GeoPoint gp2 = new GeoPoint(0.0, 0.0);
+  private static LatLng gp1 = new LatLng(37.422035, -122.084124);
+  private static LatLng gp2 = new LatLng(0.0, 0.0);
 
   private static final String INVALID_LAT_MESSAGE =
       "latitude must be in the range [-90, 90] degrees";
@@ -44,34 +44,34 @@ public void testEquals() {
 
   @Test
   public void testUpperLatRange() {
-    new GeoPoint(90, 0);
+    new LatLng(90, 0);
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage(INVALID_LAT_MESSAGE);
-    new GeoPoint(91, 0);
+    new LatLng(91, 0);
   }
 
   @Test
   public void testLowerLatRange() {
-    new GeoPoint(-90, 0);
+    new LatLng(-90, 0);
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage(INVALID_LAT_MESSAGE);
-    new GeoPoint(-91, 0);
+    new LatLng(-91, 0);
   }
 
   @Test
   public void testUpperLngRange() {
-    new GeoPoint(0, 180);
+    new LatLng(0, 180);
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage(INVALID_LNG_MESSAGE);
-    new GeoPoint(0, 181);
+    new LatLng(0, 181);
   }
 
   @Test
   public void testLowerLngRange() {
-    new GeoPoint(0, 180);
+    new LatLng(0, 180);
     thrown.expect(IllegalArgumentException.class);
     thrown.expectMessage(INVALID_LNG_MESSAGE);
-    new GeoPoint(0, -181);
+    new LatLng(0, -181);
   }
 }
 

gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/GeoPointValueTest.java renamed to gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/LatLngValueTest.java

@@ -22,29 +22,29 @@
 
 import org.junit.Test;
 
-public class GeoPointValueTest {
+public class LatLngValueTest {
 
-private static final GeoPoint CONTENT = new GeoPoint(37.4, -122.1);
+private static final LatLng CONTENT = new LatLng(37.4, -122.1);
 
   @Test
   public void testToBuilder() throws Exception {
-    GeoPointValue value = GeoPointValue.of(CONTENT);
+    LatLngValue value = LatLngValue.of(CONTENT);
     assertEquals(value, value.toBuilder().build());
   }
 
   @SuppressWarnings("deprecation")
   @Test
   public void testOf() throws Exception {
-    GeoPointValue value = GeoPointValue.of(CONTENT);
+    LatLngValue value = LatLngValue.of(CONTENT);
     assertEquals(CONTENT, value.get());
     assertFalse(value.excludeFromIndexes());
   }
 
   @SuppressWarnings("deprecation")
   @Test
   public void testBuilder() throws Exception {
-    GeoPointValue.Builder builder = GeoPointValue.builder(CONTENT);
-    GeoPointValue value = builder.meaning(1).excludeFromIndexes(true).build();
+    LatLngValue.Builder builder = LatLngValue.builder(CONTENT);
+    LatLngValue value = builder.meaning(1).excludeFromIndexes(true).build();
     assertEquals(CONTENT, value.get());
     assertEquals(1, value.meaning());
     assertTrue(value.excludeFromIndexes());