Merge branch 'v6' into v6-oidc

Author: bevzzz

.github/workflows/create-release.yaml

@@ -1,14 +1,19 @@
 name: Create Release
 on:
   push:
-    # run only on tags
     tags:
       - '**'
+  pull_request:
+    # Release a new SNAPSHOT version every time a PR is merged to v6.
+    types: [closed]
+    branches: ['v6']
 
 jobs:
   release:
     name: Deploy
-    if: startsWith(github.ref, 'refs/tags')
+    if: >
+      (github.event_name == 'push' && startsWith(github.ref, 'refs/tags'))
+      || (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -39,7 +44,7 @@ jobs:
           retention-days: 1
   gh-release:
     name: Create a GitHub Release
-    if: startsWith(github.ref, 'refs/tags')
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
     runs-on: ubuntu-latest
     needs: [ release ]
     steps:

README.md

@@ -18,7 +18,7 @@ To start using Weaviate Java Client add the dependency to `pom.xml`:
 
 ### Uber JAR🫙
 
-If you're building a uber-JAR with something like `maven-assembly-plugin`, use a shaded version with classifier `all`.
+If you're building an uber-JAR with something like `maven-assembly-plugin`, use a shaded version with classifier `all`.
 This ensures that all dynamically-loaded dependecies of `io.grpc` are resolved correctly.
 
 ```xml
@@ -30,6 +30,25 @@ This ensures that all dynamically-loaded dependecies of `io.grpc` are resolved c
 </dependency>
 ```
 
+### SNAPSHOT releases
+
+The latest development version of `client6` is released after every merged pull request. To include it in you project set the version to `6.0.0-SNAPSHOT` and [configure your `<repositories>` section accordingly](https://central.sonatype.org/publish/publish-portal-snapshots/#consuming-snapshot-releases-for-your-project).
+Please be mindful of the fact that this is not a stable release and breaking changes may be introduced.
+
+Snapshot releases overwrite each other, so no two releases are alike. If you find a bug in one of the `SNAPSHOT` versions that you'd like to report, please include the output of `Debug.printBuildInfo()` in the ticket's description.
+
+```java
+import io.weaviate.client6.v1.internal.Debug;
+
+public class App {
+    public static void main(String[] args) {
+        Debug.printBuildInfo();
+
+        // ...the rest of your application code...
+    }
+}
+```
+
 ### Gson and reflective access to internal JDK classes
 
 The client uses Google's [`gson`](https://github.com/google/gson) for JSON de-/serialization which does reflection on internal `java.lang` classes. This is _not allowed by default_ in Java 9 and above.
@@ -48,14 +67,11 @@ applicationDefaultJvmArgs += listOf(
 )
 ```
 
-## Documentation
+## Useful resources
 
 - [Documentation](https://weaviate.io/developers/weaviate/current/client-libraries/java.html).
-
-## Support
-
-- [Stackoverflow for questions](https://stackoverflow.com/questions/tagged/weaviate).
-- [Github for issues](https://github.com/weaviate/java-client/issues).
+- [StackOverflow for questions about Weaviate](https://stackoverflow.com/questions/tagged/weaviate).
+- [Github for issues in client6](https://github.com/weaviate/java-client/issues).
 
 ## Contributing
 

pom.xml

@@ -361,6 +361,28 @@
             </execution>
           </executions>
         </plugin>
+        <plugin>
+          <groupId>pl.project13.maven</groupId>
+            <artifactId>git-commit-id-plugin</artifactId>
+            <version>4.9.10</version>
+            <executions>
+                <execution>
+                    <id>get-the-git-infos</id>
+                    <goals>
+                        <goal>revision</goal>
+                    </goals>
+                    <phase>initialize</phase>
+                </execution>
+            </executions>
+            <configuration>
+                <useNativeGit>true</useNativeGit>
+                <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                <generateGitPropertiesFilename>${project.build.outputDirectory}/client6-git.properties</generateGitPropertiesFilename>
+                <commitIdGenerationMode>full</commitIdGenerationMode>
+                <failOnNoGitDirectory>false</failOnNoGitDirectory>
+                <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
+            </configuration>
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
@@ -523,6 +545,10 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
+      <plugin>
+            <groupId>pl.project13.maven</groupId>
+            <artifactId>git-commit-id-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-gpg-plugin</artifactId>

src/it/java/io/weaviate/ConcurrentTest.java

@@ -2,8 +2,14 @@
 
 import java.util.Random;
 import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import org.apache.commons.lang3.RandomStringUtils;
+import org.assertj.core.api.Assertions;
 import org.junit.Rule;
 import org.junit.rules.TestName;
 
@@ -62,4 +68,46 @@ protected static float[] randomVector(int length, float origin, float bound) {
     }
     return vector;
   }
+
+  /**
+   * Check that a condition is eventually met.
+   *
+   * @param cond           Arbitrary code that evaluates the test condition..
+   * @param intervalMillis Polling interval.
+   * @param timeoutSeconds Maximum waiting time.
+   * @param message        Optional failure message.
+   *
+   * @throws AssertionError   if the condition does not evaluate to true
+   *                          within {@code timeoutSeconds} or a thread
+   *                          was interrupted in the meantime.
+   * @throws RuntimeException if an exception occurred when envalating condition.
+   */
+  public static void eventually(Callable<Boolean> cond, int intervalMillis, int timeoutSeconds, String... message) {
+    var check = CompletableFuture.runAsync(() -> {
+      try {
+        while (!Thread.currentThread().isInterrupted() && !cond.call()) {
+          try {
+            Thread.sleep(intervalMillis);
+          } catch (InterruptedException ex) {
+            Thread.currentThread().interrupt();
+          }
+        }
+      } catch (Exception e) {
+        // Propagate to callee
+        throw new RuntimeException(e);
+      }
+    });
+
+    try {
+      check.get(timeoutSeconds, TimeUnit.SECONDS);
+    } catch (TimeoutException ex) {
+      check.cancel(true);
+      Assertions.fail(message.length >= 0 ? message[0] : null, ex);
+    } catch (InterruptedException ex) {
+      Thread.currentThread().interrupt();
+      Assertions.fail(ex);
+    } catch (ExecutionException ex) {
+      throw new RuntimeException(ex);
+    }
+  }
 }

src/it/java/io/weaviate/containers/Container.java

@@ -16,6 +16,7 @@ public class Container {
   public static final Weaviate WEAVIATE = Weaviate.createDefault();
   public static final Contextionary CONTEXTIONARY = Contextionary.createDefault();
   public static final Img2VecNeural IMG2VEC_NEURAL = Img2VecNeural.createDefault();
+  public static final MinIo MINIO = MinIo.createDefault();
 
   /**
    * Stop all shared Testcontainers created in {@link #startAll}.

src/it/java/io/weaviate/containers/MinIo.java

@@ -0,0 +1,20 @@
+package io.weaviate.containers;
+
+import org.testcontainers.containers.MinIOContainer;
+
+public class MinIo extends MinIOContainer {
+  private static final String DOCKER_IMAGE = "minio/minio";
+  public static final String ACCESS_KEY = "minioadmin";
+  public static final String SECRET_KEY = "minioadmin";
+
+  static MinIo createDefault() {
+    return new MinIo();
+  }
+
+  private MinIo() {
+    super(DOCKER_IMAGE);
+    withUserName(ACCESS_KEY);
+    withPassword(SECRET_KEY);
+    withCreateContainerCmdModifier(cmd -> cmd.withHostName("minio"));
+  }
+}

src/it/java/io/weaviate/containers/Weaviate.java

@@ -129,6 +129,15 @@ public Builder withImageInference(String url, String module) {
       return this;
     }
 
+    public Builder withOffloadS3(String accessKey, String secretKey) {
+      addModules("offload-s3");
+      environment.put("OFFLOAD_S3_ENDPOINT", "http://minio:9000");
+      environment.put("OFFLOAD_S3_BUCKET_AUTO_CREATE", "true");
+      environment.put("AWS_ACCESS_KEY_ID", accessKey);
+      environment.put("AWS_SECRET_KEY", secretKey);
+      return this;
+    }
+
     public Builder enableTelemetry(boolean enable) {
       environment.put("DISABLE_TELEMETRY", Boolean.toString(!enable));
       return this;

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

@@ -16,9 +16,9 @@
 import io.weaviate.client6.v1.api.collections.Property;
 import io.weaviate.client6.v1.api.collections.Vectorizers;
 import io.weaviate.client6.v1.api.collections.Vectors;
+import io.weaviate.client6.v1.api.collections.aggregate.Aggregate;
 import io.weaviate.client6.v1.api.collections.aggregate.AggregateResponseGroup;
 import io.weaviate.client6.v1.api.collections.aggregate.AggregateResponseGrouped;
-import io.weaviate.client6.v1.api.collections.aggregate.Aggregation;
 import io.weaviate.client6.v1.api.collections.aggregate.GroupBy;
 import io.weaviate.client6.v1.api.collections.aggregate.GroupedBy;
 import io.weaviate.client6.v1.api.collections.aggregate.IntegerAggregation;
@@ -57,7 +57,7 @@ public void testOverAll() {
     var result = things.aggregate.overAll(
         with -> with
             .metrics(
-                Aggregation.integer("price",
+                Aggregate.integer("price",
                     calculate -> calculate.median().max().count()))
             .includeTotalCount(true));
 
@@ -77,7 +77,7 @@ public void testOverAll_groupBy_category() {
     var result = things.aggregate.overAll(
         with -> with
             .metrics(
-                Aggregation.integer("price",
+                Aggregate.integer("price",
                     calculate -> calculate.min().max().count()))
             .includeTotalCount(true),
         GroupBy.property("category"));
@@ -115,7 +115,7 @@ public void testNearVector() {
         near -> near.limit(5),
         with -> with
             .metrics(
-                Aggregation.integer("price",
+                Aggregate.integer("price",
                     calculate -> calculate.min().max().count()))
             .objectLimit(4)
             .includeTotalCount(true));
@@ -135,7 +135,7 @@ public void testNearVector_groupBy_category() {
         near -> near.distance(2f),
         with -> with
             .metrics(
-                Aggregation.integer("price",
+                Aggregate.integer("price",
                     calculate -> calculate.min().max().median()))
             .objectLimit(9)
             .includeTotalCount(true),

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

@@ -1,7 +1,10 @@
 package io.weaviate.integration;
 
 import java.io.IOException;
+import java.time.OffsetDateTime;
+import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 import org.assertj.core.api.Assertions;
 import org.assertj.core.api.InstanceOfAssertFactories;
@@ -407,4 +410,61 @@ public void testDuplicateUuid() throws IOException {
     // Act
     things.data.insert(Map.of(), thing -> thing.uuid(thing_1.uuid()));
   }
+
+  @Test
+  public void testDataTypes() throws IOException {
+    // Arrange
+    var nsDataTypes = ns("DataTypes");
+
+    // BLOB type is omitted because a base64-encoded image
+    // isn't doing the failure message any favours.
+    // It's tested in other test cases above.
+    client.collections.create(
+        nsDataTypes, c -> c
+            .properties(
+                Property.text("prop_text"),
+                Property.integer("prop_integer"),
+                Property.number("prop_number"),
+                Property.bool("prop_bool"),
+                Property.date("prop_date"),
+                Property.uuid("prop_uuid"),
+                Property.integerArray("prop_integer_array"),
+                Property.numberArray("prop_number_array"),
+                Property.boolArray("prop_bool_array"),
+                Property.dateArray("prop_date_array"),
+                Property.uuidArray("prop_uuid_array"),
+                Property.textArray("prop_text_array")));
+
+    var types = client.collections.use(nsDataTypes);
+
+    var now = OffsetDateTime.now();
+    var uuid = UUID.randomUUID();
+
+    Map<String, Object> want = Map.ofEntries(
+        Map.entry("prop_text", "Hello, World!"),
+        Map.entry("prop_integer", 1L),
+        Map.entry("prop_number", 1D),
+        Map.entry("prop_bool", true),
+        Map.entry("prop_date", now),
+        Map.entry("prop_uuid", uuid),
+        Map.entry("prop_integer_array", List.of(1L, 2L, 3L)),
+        Map.entry("prop_number_array", List.of(1D, 2D, 3D)),
+        Map.entry("prop_bool_array", List.of(true, false)),
+        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")));
+    var returnProperties = want.keySet().toArray(String[]::new);
+
+    // Act
+    var object = types.data.insert(want);
+    var got = types.query.byId(object.uuid(),
+        q -> q.returnProperties(returnProperties));
+
+    // Assert
+    Assertions.assertThat(got).get()
+        .extracting(WeaviateObject::properties)
+        .asInstanceOf(InstanceOfAssertFactories.map(String.class, Object.class))
+        .containsAllEntriesOf(want);
+
+  }
 }