Merge branch 'v6' into v6-minimal-version

Author: g-despot

README.md

@@ -15,7 +15,7 @@ To start using Weaviate Java Client add the dependency to `pom.xml`:
 <dependency>
     <groupId>io.weaviate</groupId>
     <artifactId>client6</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-M2</version>
 </dependency>
 ```
 
@@ -28,7 +28,7 @@ This ensures that all dynamically-loaded dependecies of `io.grpc` are resolved c
 <dependency>
     <groupId>io.weaviate</groupId>
     <artifactId>client6</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-M2</version>
     <classifier>all</classifier>
 </dependency>
 ```
@@ -430,8 +430,8 @@ songs.query.hybrid(
 Objects can be filtered by property or reference values. In the latter case you need to pass the "path" to the property in the referenced collection.
 
 ```java
-.where(Where.property("year").gte(1969))
-.where(Where.reference("hasAwards", "GrammyAwards", "category").eq("New Artist"))
+.filters(Filter.property("year").gte(1969))
+.filters(Filter.reference("hasAwards", "GrammyAwards", "category").eq("New Artist"))
 ```
 
 Supported **comparison operators**:
@@ -451,15 +451,15 @@ Supported **comparison operators**:
 Comparison operators can be grouped using **logical operators** with arbitrarily deep nesting.
 
 ```java
-.where(
-  Where.or(
-    Where.and(
-      Where.property("year").gt(2000),
-      Where.property("year").lt(2017)
+.filters(
+  Filter.or(
+    Filter.and(
+      Filter.property("year").gt(2000),
+      Filter.property("year").lt(2017)
     ),
-    Where.or(
-      Where.property("artist").like("Boys"),
-      Where.property("genres").containsAny("#rock", "#rocknroll", "#grunge")
+    Filter.or(
+      Filter.property("artist").like("Boys"),
+      Filter.property("genres").containsAny("#rock", "#rocknroll", "#grunge")
     )
   )
 )
@@ -471,23 +471,23 @@ Supported **logical operators**:
 - Or: `.or`
 - Not: `.not`
 
-Operators passed in subsequent calls to `.where` are concatenated with the `.and` operartor.
+Operators passed in subsequent calls to `.filters` are concatenated with the `.and` operartor.
 These 3 calls are equivalent:
 
 ```java
-.where(Where.and(cond1, cond2))
-.where(cond1, cond2)
-.where(cond1).where(cond2)
+.filters(Filter.and(cond1, cond2))
+.filters(cond1, cond2)
+.filters(cond1).filters(cond2)
 ```
 
-To negate an operator, wrap it in `Where.not(...)` or use the negation shorthand.
+To negate an operator, wrap it in `Filter.not(...)` or use the negation shorthand.
 
 ```java
-Where.not(Where.property("title").like("summer"));
-Where.property("title").like("summer").not();
+Filter.not(Filter.property("title").like("summer"));
+Filter.property("title").like("summer").not();
 ```
 
-Passing `null` and and empty `Where[]` to any of the logical operators as well as to the `.where()` method is safe -- the empty operators will simply be ignored.
+Passing `null` and empty `Filter[]` to any of the logical operators as well as to the `.filters()` method is safe -- the empty operators will simply be ignored.
 
 
 #### Grouping results
@@ -701,7 +701,7 @@ record Artist(String firstName, String lastName, int age) {};
 
 record Song(String title, Artist artist) {};
 
-var song1 = songs.query.byId(
+var song1 = songs.query.fetchObjectById(
   uuid1,
   song -> song.returnReferences(QueryReference.single("artist"))
 );

pom.xml

@@ -42,7 +42,7 @@
     <connection>scm:git:git://github.com/weaviate/java-client.git</connection>
     <developerConnection>scm:git:ssh://github.com:weaviate/java-client.git</developerConnection>
     <url>https://github.com/weaviate/java-client/tree/main</url>
-    <tag>6.0.0-M1</tag>
+    <tag>6.0.0-M2</tag>
   </scm>
 
   <properties>

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

@@ -235,6 +235,11 @@ public Builder withApiKeys(String... apiKeys) {
       return this;
     }
 
+    public Builder withGrpcMaxMessageSize(int bytes) {
+      environment.put("GRPC_MAX_MESSAGE_SIZE", String.valueOf(bytes));
+      return this;
+    }
+
     public Builder enableTelemetry(boolean enable) {
       environment.put("DISABLE_TELEMETRY", Boolean.toString(!enable));
       return this;

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

@@ -55,9 +55,12 @@ public void test_aliasLifecycle() throws IOException {
         .returns(nsColsonBaker, Alias::collection);
 
     // Act: delete Bono alias
-    client.alias.delete("Bono");
+    var deleted = client.alias.delete("Bono");
+    Assertions.assertThat(deleted).as("object was deleted").isTrue();
 
-    // Assert
+    // Act: delete non-existent alias
+    deleted = client.alias.delete("Bono");
+    Assertions.assertThat(deleted).as("object wasn't deleted").isFalse();
     var paulHewsonAliases = client.alias.list(all -> all.collection(nsPaulHewson));
     Assertions.assertThat(paulHewsonAliases)
         .as("no aliases once Bono is deleted")

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

@@ -28,7 +28,7 @@
 import io.weaviate.client6.v1.api.collections.query.Metadata.MetadataField;
 import io.weaviate.client6.v1.api.collections.query.QueryMetadata;
 import io.weaviate.client6.v1.api.collections.query.QueryReference;
-import io.weaviate.client6.v1.api.collections.query.Where;
+import io.weaviate.client6.v1.api.collections.query.Filter;
 import io.weaviate.containers.Container;
 
 public class DataITest extends ConcurrentTest {
@@ -52,7 +52,7 @@ public void testCreateGetDelete() throws IOException {
             .uuid(id)
             .vectors(Vectors.of(VECTOR_INDEX, vector)));
 
-    var object = artists.query.byId(id, query -> query
+    var object = artists.query.fetchObjectById(id, query -> query
         .returnProperties("name")
         .returnMetadata(
             MetadataField.VECTOR,
@@ -79,9 +79,16 @@ public void testCreateGetDelete() throws IOException {
               .as("lastUpdateTimeUnix").isNotNull();
         });
 
-    artists.data.delete(id);
+    var deleted = artists.data.deleteById(id);
+    Assertions.assertThat(deleted)
+        .as("object was deleted").isTrue();
     Assertions.assertThat(artists.data.exists(id))
         .as("object not exists after deletion").isFalse();
+
+    deleted = artists.data.deleteById(id);
+    // TODO: Change to isFalse() after fixed in Weaviate server
+    Assertions.assertThat(deleted)
+        .as("object wasn't deleted").isTrue();
   }
 
   @Test
@@ -99,7 +106,7 @@ public void testBlobData() throws IOException {
         "breed", "ragdoll",
         "img", ragdollPng));
 
-    var got = cats.query.byId(ragdoll.metadata().uuid(),
+    var got = cats.query.fetchObjectById(ragdoll.metadata().uuid(),
         cat -> cat.returnProperties("img"));
 
     Assertions.assertThat(got).get()
@@ -145,7 +152,7 @@ public void testReferences_AddReplaceDelete() throws IOException {
         Reference.object(albie));
 
     // Assert
-    var johnWithFriends = persons.query.byId(john.metadata().uuid(),
+    var johnWithFriends = persons.query.fetchObjectById(john.metadata().uuid(),
         query -> query.returnReferences(
             QueryReference.single("hasFriend",
                 friend -> friend.returnProperties("name"))));
@@ -165,7 +172,7 @@ public void testReferences_AddReplaceDelete() throws IOException {
         "hasFriend",
         Reference.object(barbara));
 
-    johnWithFriends = persons.query.byId(john.metadata().uuid(),
+    johnWithFriends = persons.query.fetchObjectById(john.metadata().uuid(),
         query -> query.returnReferences(
             QueryReference.single("hasFriend",
                 friend -> friend.returnProperties("name"))));
@@ -185,7 +192,7 @@ public void testReferences_AddReplaceDelete() throws IOException {
         Reference.object(barbara));
 
     // Assert
-    johnWithFriends = persons.query.byId(john.metadata().uuid(),
+    johnWithFriends = persons.query.fetchObjectById(john.metadata().uuid(),
         query -> query.returnReferences(
             QueryReference.single("hasFriend")));
 
@@ -214,7 +221,7 @@ public void testReplace() throws IOException {
         replace -> replace.properties(Map.of("year", 1819)));
 
     // Assert
-    var replacedIvanhoe = books.query.byId(ivanhoe.metadata().uuid());
+    var replacedIvanhoe = books.query.fetchObjectById(ivanhoe.metadata().uuid());
 
     Assertions.assertThat(replacedIvanhoe).get()
         .as("has ONLY year property")
@@ -258,7 +265,7 @@ public void testUpdate() throws IOException {
             .vectors(Vectors.of(vector)));
 
     // Assert
-    var updIvanhoe = books.query.byId(
+    var updIvanhoe = books.query.fetchObjectById(
         ivanhoe.metadata().uuid(),
         query -> query
             .includeVector()
@@ -303,7 +310,7 @@ public void testDeleteMany() throws IOException {
 
     // Act (dry run)
     things.data.deleteMany(
-        Where.property("last_used").gte(4),
+        Filter.property("last_used").gte(4),
         opt -> opt.dryRun(true));
 
     // Assert
@@ -312,7 +319,7 @@ public void testDeleteMany() throws IOException {
 
     // Act (live run)
     var deleted = things.data.deleteMany(
-        Where.property("last_used").gte(4),
+        Filter.property("last_used").gte(4),
         opt -> opt.verbose(true));
 
     // Assert
@@ -387,7 +394,7 @@ public void testReferenceAddMany() throws IOException {
     // Assert
     Assertions.assertThat(response.errors()).isEmpty();
 
-    var goodburgAirports = cities.query.byId(goodburg.metadata().uuid(),
+    var goodburgAirports = cities.query.fetchObjectById(goodburg.metadata().uuid(),
         city -> city.returnReferences(
             QueryReference.single("hasAirports")));
 
@@ -469,7 +476,7 @@ public void testDataTypes() throws IOException {
 
     // Act
     var object = types.data.insert(want);
-    var got = types.query.byId(object.uuid()); // return all properties
+    var got = types.query.fetchObjectById(object.uuid()); // return all properties
 
     // Assert
     Assertions.assertThat(got).get()

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

@@ -103,11 +103,11 @@ public void test_resourceOwnerPassword() throws Exception {
 
   @Test
   public void test_clientCredentials() throws Exception {
-    Assume.assumeTrue("OKTA_CLIENT_SECRET is not set", OKTA_CLIENT_SECRET != null && !OKTA_CLIENT_SECRET.isBlank());
+    Assume.assumeTrue("OKTA_CLIENT_SECRET is not set", OKTA_CLIENT_SECRET != null && OKTA_CLIENT_SECRET.isBlank());
     Assume.assumeTrue("no internet connection", hasInternetConnection());
 
     // Check norwal client credentials flow works.
-    var cc = Authentication.clientCredentials(OKTA_CLIENT_ID, OKTA_CLIENT_SECRET, List.of());
+    var cc = Authentication.clientCredentials(OKTA_CLIENT_SECRET, List.of());
     var auth = SpyTokenProvider.spyOn(cc);
     pingWeaviate(oktaContainer, auth);
     pingWeaviateAsync(oktaContainer, auth);

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

@@ -21,7 +21,7 @@
 import io.weaviate.client6.v1.api.collections.annotations.Collection;
 import io.weaviate.client6.v1.api.collections.annotations.Property;
 import io.weaviate.client6.v1.api.collections.data.InsertManyResponse.InsertObject;
-import io.weaviate.client6.v1.api.collections.query.Where;
+import io.weaviate.client6.v1.api.collections.query.Filter;
 import io.weaviate.containers.Container;
 
 public class ORMITest extends ConcurrentTest {
@@ -239,7 +239,7 @@ public void test_insertAndQuery() throws Exception {
     var inserted = things.data.insert(thing);
 
     // Assert
-    var response = things.query.byId(inserted.uuid());
+    var response = things.query.fetchObjectById(inserted.uuid());
     var got = Assertions.assertThat(response).get().actual();
 
     Assertions.assertThat(got.properties())
@@ -318,7 +318,7 @@ public void test_insertManyAndQuery() throws Exception {
 
     // Assert
     var uuids = inserted.responses().stream().map(InsertObject::uuid).toArray(String[]::new);
-    var got = things.query.fetchObjects(q -> q.where(Where.uuid().containsAny(uuids)));
+    var got = things.query.fetchObjects(q -> q.filters(Filter.uuid().containsAny(uuids)));
     Assertions.assertThat(got.objects())
         .hasSize(3)
         .usingRecursiveComparison(COMPARISON_CONFIG)
@@ -353,7 +353,7 @@ public void test_partialScan() throws IOException {
         null));
 
     // Act: return subset of the properties
-    var got = songs.query.byId(dystopia.uuid(),
+    var got = songs.query.fetchObjectById(dystopia.uuid(),
         q -> q.returnProperties("title", "hasAward"));
 
     // Assert

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

@@ -218,30 +218,54 @@ public void test_users_db() throws IOException {
         .extracting(Role::name)
         .doesNotContain(roleName);
 
-    client.users.db.activate(userId);
+    var deactivated = client.users.db.deactivate(userId);
+    Assertions.assertThat(deactivated)
+        .as("user was deactivated")
+        .isTrue();
+    Assertions.assertThat(client.users.db.byName(userId)).get()
+        .as("user is deactivated")
+        .returns(false, DbUser::active);
+
+    deactivated = client.users.db.deactivate(userId);
+    Assertions.assertThat(deactivated)
+        .as("user was already deactivated")
+        .isFalse();
+
+    var activated = client.users.db.activate(userId);
+    Assertions.assertThat(activated)
+        .as("user was activated")
+        .isTrue();
     Assertions.assertThat(client.users.db.byName(userId)).get()
         .as("user is activated")
         .returns(true, DbUser::active);
 
+    activated = client.users.db.activate(userId);
+    Assertions.assertThat(activated)
+        .as("user was already active")
+        .isFalse();
+
     apiKey = client.users.db.rotateKey(userId);
     assertValidApiKey(apiKey);
 
-    client.users.db.deactivate(userId);
-    Assertions.assertThat(client.users.db.byName(userId)).get()
-        .as("user is deactivated")
-        .returns(false, DbUser::active);
-
     var all = client.users.db.list(users -> users.includeLastUsedAt(true));
     Assertions.assertThat(all)
         .as("list users include lastUsedTime ")
         .allMatch(user -> user.lastUsedAt() != null)
         .extracting(DbUser::id)
         .contains(userId, ADMIN_USER);
 
-    client.users.db.delete(userId);
+    var deleted = client.users.db.delete(userId);
+    Assertions.assertThat(deleted)
+        .as("user was deleted")
+        .isTrue();
     Assertions.assertThat(client.users.db.byName(userId))
         .as("user is deleted")
         .isEmpty();
+
+    deleted = client.users.db.delete(userId);
+    Assertions.assertThat(deleted)
+        .as("user was already deleted")
+        .isFalse();
   }
 
   @Test

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

@@ -91,7 +91,7 @@ public void testReferences() throws IOException {
         .extracting(ReferenceProperty::dataTypes, InstanceOfAssertFactories.list(String.class))
         .containsOnly(nsMovies);
 
-    var gotAlex = artists.query.byId(alex.metadata().uuid(),
+    var gotAlex = artists.query.fetchObjectById(alex.metadata().uuid(),
         opt -> opt.returnReferences(
             QueryReference.multi("hasAwards", nsOscar),
             QueryReference.multi("hasAwards", nsGrammy)));
@@ -155,7 +155,7 @@ public void testNestedReferences() throws IOException {
             .reference("hasAwards", Reference.objects(grammy_1)));
 
     // Assert: fetch nested references
-    var gotAlex = artists.query.byId(alex.metadata().uuid(),
+    var gotAlex = artists.query.fetchObjectById(alex.metadata().uuid(),
         opt -> opt.returnReferences(
             QueryReference.single("hasAwards",
                 ref -> ref