feat: define PhoneNumber and GeoCoordinates data type

Author: bevzzz

src/it/java/io/weaviate/integration/DataITest.java

@@ -14,6 +14,7 @@
 import io.weaviate.ConcurrentTest;
 import io.weaviate.client6.v1.api.WeaviateApiException;
 import io.weaviate.client6.v1.api.WeaviateClient;
+import io.weaviate.client6.v1.api.collections.PhoneNumber;
 import io.weaviate.client6.v1.api.collections.Property;
 import io.weaviate.client6.v1.api.collections.ReferenceProperty;
 import io.weaviate.client6.v1.api.collections.VectorConfig;
@@ -432,6 +433,8 @@ public void testDataTypes() throws IOException {
                 Property.dateArray("prop_date_array"),
                 Property.uuidArray("prop_uuid_array"),
                 Property.textArray("prop_text_array"),
+                Property.phoneNumber("prop_phone_number"),
+                Property.geoCoordinates("prop_geo_coordinates"),
                 Property.object("prop_object",
                     p -> p.nestedProperties(
                         Property.text("marco"))),
@@ -457,6 +460,7 @@ public void testDataTypes() throws IOException {
         Map.entry("prop_date_array", List.of(now, now)),
         Map.entry("prop_uuid_array", List.of(uuid, uuid)),
         Map.entry("prop_text_array", List.of("a", "b", "c")),
+        Map.entry("prop_phone_number", PhoneNumber.international("+380 95 1433336")),
         Map.entry("prop_object", Map.of("marco", "polo")),
         Map.entry("prop_object_array", List.of(Map.of("marco", "polo"))));
 

src/main/java/io/weaviate/client6/v1/api/collections/DataType.java

@@ -20,6 +20,8 @@ public interface DataType {
   public static final String UUID_ARRAY = "uuid[]";
   public static final String OBJECT = "object";
   public static final String OBJECT_ARRAY = "object[]";
+  public static final String PHONE_NUMBER = "phoneNumber";
+  public static final String GEO_COORDINATES = "geoCoordinates";
 
   /**
    * Scalar/array types which Weaviate and WeaviateClient recognize.
@@ -34,5 +36,6 @@ public interface DataType {
    */
   public static final Set<String> KNOWN_TYPES = ImmutableSet.of(
       TEXT, INT, BLOB, BOOL, DATE, UUID, NUMBER, OBJECT,
-      TEXT_ARRAY, INT_ARRAY, NUMBER_ARRAY, BOOL_ARRAY, DATE_ARRAY, UUID_ARRAY, OBJECT_ARRAY);
+      TEXT_ARRAY, INT_ARRAY, NUMBER_ARRAY, BOOL_ARRAY, DATE_ARRAY, UUID_ARRAY, OBJECT_ARRAY,
+      PHONE_NUMBER, GEO_COORDINATES);
 }

src/main/java/io/weaviate/client6/v1/api/collections/GeoCoordinates.java

@@ -0,0 +1,8 @@
+package io.weaviate.client6.v1.api.collections;
+
+import com.google.gson.annotations.SerializedName;
+
+public record GeoCoordinates(
+    @SerializedName("latitude") float latitude,
+    @SerializedName("longitude") float longitude) {
+}

src/main/java/io/weaviate/client6/v1/api/collections/PhoneNumber.java

@@ -0,0 +1,59 @@
+package io.weaviate.client6.v1.api.collections;
+
+import com.google.gson.annotations.SerializedName;
+
+public record PhoneNumber(
+    /** Raw input data provided at creation. */
+    @SerializedName("input") String rawInput,
+    /**
+     * ISO 3166-1 alpha-2 country code. Required only if the raw input does not
+     * include an explicit country code, e.g. {@code +31}. Only present if provided
+     * by user.
+     */
+    @SerializedName("defaultCountry") String defaultCountry,
+    /** Numerical country code. Returned by Weaviate on read. */
+    @SerializedName("countryCode") Integer countryCode,
+    /**
+     * Phone number with numerical country code prepended.
+     * Returned by Weaviate on read.
+     */
+    @SerializedName("internationalFormatted") String internationalFormatted,
+    /**
+     * Numerical representation of the national number.
+     * Returned by Weaviate on read.
+     */
+    @SerializedName("national") Integer national,
+    /**
+     * Formatted national number.
+     * Returned by Weaviate on read.
+     */
+    @SerializedName("nationalFormatted") String nationalFormatted,
+    /**
+     * Whether the server recognized this number as valid.
+     * Returned by Weaviate on read.
+     */
+    @SerializedName("valid") Boolean valid) {
+
+  /**
+   * Create national phone number (without explicit country code),
+   * e.g. {@code "020 1234567"}
+   *
+   * @param country     ISO 3166-1 alpha-2 country code.
+   * @param phoneNumber Phone number.
+   * @return PhoneNumber
+   */
+  public static PhoneNumber national(String country, String phoneNumber) {
+    return new PhoneNumber(phoneNumber, country, null, null, null, null, null);
+  }
+
+  /**
+   * Create a phone number with explicit country code,
+   * e.g. {@code "+31 20 1234567"}
+   *
+   * @param phoneNumber Phone number.
+   * @return PhoneNumber
+   */
+  public static PhoneNumber international(String phoneNumber) {
+    return new PhoneNumber(phoneNumber, null, null, null, null, null, null);
+  }
+}

src/main/java/io/weaviate/client6/v1/api/collections/Property.java

@@ -299,7 +299,7 @@ public static Property objectArray(String name) {
   }
 
   /**
-   * Create a {@code objectArray[]} property with additional configuration.
+   * Create a {@code object[]} property with additional configuration.
    *
    * @param name Property name.
    * @param fn   Lambda expression for optional parameters.
@@ -308,6 +308,44 @@ public static Property objectArray(String name, Function<Builder, ObjectBuilder<
     return newProperty(name, DataType.OBJECT_ARRAY, fn);
   }
 
+  /**
+   * Create a {@code phoneNumber} property.
+   *
+   * @param name Property name.
+   */
+  public static Property phoneNumber(String name) {
+    return phoneNumber(name, ObjectBuilder.identity());
+  }
+
+  /**
+   * Create a {@code phoneNumber} property with additional configuration.
+   *
+   * @param name Property name.
+   * @param fn   Lambda expression for optional parameters.
+   */
+  public static Property phoneNumber(String name, Function<Builder, ObjectBuilder<Property>> fn) {
+    return newProperty(name, DataType.PHONE_NUMBER, fn);
+  }
+
+  /**
+   * Create a {@code geoCoordinates} property.
+   *
+   * @param name Property name.
+   */
+  public static Property geoCoordinates(String name) {
+    return geoCoordinates(name, ObjectBuilder.identity());
+  }
+
+  /**
+   * Create a {@code geoCoordinates} property with additional configuration.
+   *
+   * @param name Property name.
+   * @param fn   Lambda expression for optional parameters.
+   */
+  public static Property geoCoordinates(String name, Function<Builder, ObjectBuilder<Property>> fn) {
+    return newProperty(name, DataType.GEO_COORDINATES, fn);
+  }
+
   private static Property newProperty(String name, String dataType, Function<Builder, ObjectBuilder<Property>> fn) {
     return fn.apply(new Builder(name, dataType)).build();
   }

src/main/java/io/weaviate/client6/v1/api/collections/query/Where.java

@@ -826,11 +826,11 @@ public String toString() {
   }
 
   private static class GeoRangeOperand implements WhereOperand {
-    private final Float lat;
-    private final Float lon;
-    private final Float distance;
+    private final float lat;
+    private final float lon;
+    private final float distance;
 
-    private GeoRangeOperand(Float lat, Float lon, Float distance) {
+    private GeoRangeOperand(float lat, float lon, float distance) {
       this.lat = lat;
       this.lon = lon;
       this.distance = distance;