Skip to content

Commit a33a87f

Browse files
bevzzzbevzzz
committed
chore: rename QueryWeaviateObject -> ReadWeaviateObject
1 parent b21d8b2 commit a33a87f

15 files changed

Lines changed: 90 additions & 90 deletions

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import io.weaviate.client6.v1.api.collections.query.Metadata.MetadataField;
2828
import io.weaviate.client6.v1.api.collections.query.QueryMetadata;
2929
import io.weaviate.client6.v1.api.collections.query.QueryReference;
30-
import io.weaviate.client6.v1.api.collections.query.QueryWeaviateObject;
30+
import io.weaviate.client6.v1.api.collections.query.ReadWeaviateObject;
3131
import io.weaviate.client6.v1.api.collections.query.Where;
3232
import io.weaviate.containers.Container;
3333

@@ -103,7 +103,7 @@ public void testBlobData() throws IOException {
103103
cat -> cat.returnProperties("img"));
104104

105105
Assertions.assertThat(got).get()
106-
.extracting(QueryWeaviateObject::properties, InstanceOfAssertFactories.MAP)
106+
.extracting(ReadWeaviateObject::properties, InstanceOfAssertFactories.MAP)
107107
.extractingByKey("img").isEqualTo(ragdollPng);
108108
}
109109

@@ -152,10 +152,10 @@ public void testReferences_AddReplaceDelete() throws IOException {
152152

153153
Assertions.assertThat(johnWithFriends).get()
154154
.as("friends after ADD")
155-
.extracting(QueryWeaviateObject::references).extracting("hasFriend")
156-
.asInstanceOf(InstanceOfAssertFactories.list(QueryWeaviateObject.class))
155+
.extracting(ReadWeaviateObject::references).extracting("hasFriend")
156+
.asInstanceOf(InstanceOfAssertFactories.list(ReadWeaviateObject.class))
157157
.hasSize(1)
158-
.first().extracting(QueryWeaviateObject::properties, InstanceOfAssertFactories.MAP)
158+
.first().extracting(ReadWeaviateObject::properties, InstanceOfAssertFactories.MAP)
159159
.returns("albie", friend -> friend.get("name"));
160160

161161
// Act: replace reference
@@ -172,10 +172,10 @@ public void testReferences_AddReplaceDelete() throws IOException {
172172

173173
Assertions.assertThat(johnWithFriends).get()
174174
.as("friends after REPLACE")
175-
.extracting(QueryWeaviateObject::references).extracting("hasFriend")
176-
.asInstanceOf(InstanceOfAssertFactories.list(QueryWeaviateObject.class))
175+
.extracting(ReadWeaviateObject::references).extracting("hasFriend")
176+
.asInstanceOf(InstanceOfAssertFactories.list(ReadWeaviateObject.class))
177177
.hasSize(1)
178-
.first().extracting(QueryWeaviateObject::properties, InstanceOfAssertFactories.MAP)
178+
.first().extracting(ReadWeaviateObject::properties, InstanceOfAssertFactories.MAP)
179179
.returns("barbara", friend -> friend.get("name"));
180180

181181
// Act: delete reference
@@ -191,8 +191,8 @@ public void testReferences_AddReplaceDelete() throws IOException {
191191

192192
Assertions.assertThat(johnWithFriends).get()
193193
.as("friends after DELETE")
194-
.extracting(QueryWeaviateObject::references).extracting("hasFriend")
195-
.asInstanceOf(InstanceOfAssertFactories.list(QueryWeaviateObject.class))
194+
.extracting(ReadWeaviateObject::references).extracting("hasFriend")
195+
.asInstanceOf(InstanceOfAssertFactories.list(ReadWeaviateObject.class))
196196
.isEmpty();
197197
}
198198

@@ -218,7 +218,7 @@ public void testReplace() throws IOException {
218218

219219
Assertions.assertThat(replacedIvanhoe).get()
220220
.as("has ONLY year property")
221-
.extracting(QueryWeaviateObject::properties, InstanceOfAssertFactories.MAP)
221+
.extracting(ReadWeaviateObject::properties, InstanceOfAssertFactories.MAP)
222222
.doesNotContain(Map.entry("title", "ivanhoe"))
223223
.contains(Map.entry("year", 1819L));
224224
}
@@ -268,20 +268,20 @@ public void testUpdate() throws IOException {
268268
.satisfies(book -> {
269269
Assertions.assertThat(book)
270270
.as("has both year and title property")
271-
.extracting(QueryWeaviateObject::properties, InstanceOfAssertFactories.MAP)
271+
.extracting(ReadWeaviateObject::properties, InstanceOfAssertFactories.MAP)
272272
.contains(Map.entry("title", "ivanhoe"), Map.entry("year", 1819L));
273273

274274
Assertions.assertThat(book)
275275
.as("has reference to Authors")
276-
.extracting(QueryWeaviateObject::references, InstanceOfAssertFactories.MAP)
277-
.extractingByKey("writtenBy", InstanceOfAssertFactories.list(QueryWeaviateObject.class))
276+
.extracting(ReadWeaviateObject::references, InstanceOfAssertFactories.MAP)
277+
.extractingByKey("writtenBy", InstanceOfAssertFactories.list(ReadWeaviateObject.class))
278278
.first()
279-
.extracting(QueryWeaviateObject::properties, InstanceOfAssertFactories.MAP)
279+
.extracting(ReadWeaviateObject::properties, InstanceOfAssertFactories.MAP)
280280
.contains(Map.entry("name", "walter scott"));
281281

282282
Assertions.assertThat(book)
283283
.as("has a vector")
284-
.extracting(QueryWeaviateObject::metadata)
284+
.extracting(ReadWeaviateObject::metadata)
285285
.extracting(QueryMetadata::vectors)
286286
.returns(vector, Vectors::getDefaultSingle);
287287
});
@@ -393,10 +393,10 @@ public void testReferenceAddMany() throws IOException {
393393

394394
Assertions.assertThat(goodburgAirports).get()
395395
.as("Goodburg has 3 airports")
396-
.extracting(QueryWeaviateObject::references)
396+
.extracting(ReadWeaviateObject::references)
397397
.extracting(references -> references.get("hasAirports"),
398-
InstanceOfAssertFactories.list(QueryWeaviateObject.class))
399-
.extracting(QueryWeaviateObject::uuid)
398+
InstanceOfAssertFactories.list(ReadWeaviateObject.class))
399+
.extracting(ReadWeaviateObject::uuid)
400400
.contains(alpha, bravo, charlie);
401401
}
402402

@@ -474,7 +474,7 @@ public void testDataTypes() throws IOException {
474474

475475
// Assert
476476
Assertions.assertThat(got).get()
477-
.extracting(QueryWeaviateObject::properties)
477+
.extracting(ReadWeaviateObject::properties)
478478
.asInstanceOf(InstanceOfAssertFactories.map(String.class, Object.class))
479479
// Most of PhoneNumber fields are only present on read and are null on write.
480480
.usingRecursiveComparison()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import io.weaviate.client6.v1.api.collections.annotations.Collection;
2121
import io.weaviate.client6.v1.api.collections.annotations.Property;
2222
import io.weaviate.client6.v1.api.collections.data.InsertManyResponse.InsertObject;
23-
import io.weaviate.client6.v1.api.collections.query.QueryWeaviateObject;
23+
import io.weaviate.client6.v1.api.collections.query.ReadWeaviateObject;
2424
import io.weaviate.client6.v1.api.collections.query.Where;
2525
import io.weaviate.containers.Container;
2626

@@ -358,7 +358,7 @@ public void test_partialScan() throws IOException {
358358

359359
// Assert
360360
Assertions.assertThat(got).get()
361-
.extracting(QueryWeaviateObject::properties)
361+
.extracting(ReadWeaviateObject::properties)
362362
.returns("Dystopia", Song::title)
363363
.returns(null, Song::album)
364364
.returns(0, Song::year)

‎src/it/java/io/weaviate/integration/PaginationITest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import io.weaviate.client6.v1.api.collections.pagination.PaginationException;
2222
import io.weaviate.client6.v1.api.collections.query.Metadata;
2323
import io.weaviate.client6.v1.api.collections.query.QueryMetadata;
24-
import io.weaviate.client6.v1.api.collections.query.QueryWeaviateObject;
24+
import io.weaviate.client6.v1.api.collections.query.ReadWeaviateObject;
2525
import io.weaviate.containers.Container;
2626

2727
public class PaginationITest extends ConcurrentTest {
@@ -47,7 +47,7 @@ public void testIterateAll() throws IOException {
4747

4848
// Act: stream
4949
var gotStream = allThings.stream()
50-
.map(QueryWeaviateObject::metadata).map(QueryMetadata::uuid).toList();
50+
.map(ReadWeaviateObject::metadata).map(QueryMetadata::uuid).toList();
5151

5252
// Assert
5353
Assertions.assertThat(gotStream)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import io.weaviate.client6.v1.api.collections.ReferenceProperty;
1616
import io.weaviate.client6.v1.api.collections.data.Reference;
1717
import io.weaviate.client6.v1.api.collections.query.QueryReference;
18-
import io.weaviate.client6.v1.api.collections.query.QueryWeaviateObject;
18+
import io.weaviate.client6.v1.api.collections.query.ReadWeaviateObject;
1919
import io.weaviate.containers.Container;
2020

2121
/**
@@ -99,9 +99,9 @@ public void testReferences() throws IOException {
9999
.as("Artists: fetch by id including hasAwards references")
100100

101101
// Cast references to Map<String, List<QueryWeaviateObject>>
102-
.extracting(QueryWeaviateObject::references, InstanceOfAssertFactories.map(String.class, List.class))
102+
.extracting(ReadWeaviateObject::references, InstanceOfAssertFactories.map(String.class, List.class))
103103
.as("hasAwards object reference").extractingByKey("hasAwards")
104-
.asInstanceOf(InstanceOfAssertFactories.list(QueryWeaviateObject.class))
104+
.asInstanceOf(InstanceOfAssertFactories.list(ReadWeaviateObject.class))
105105

106106
.extracting(object -> object.uuid())
107107
.containsOnly(
@@ -166,19 +166,19 @@ public void testNestedReferences() throws IOException {
166166
.as("Artists: fetch by id including nested references")
167167

168168
// Cast references to Map<String, List<QueryWeaviateObject>>
169-
.extracting(QueryWeaviateObject::references, InstanceOfAssertFactories.map(String.class, List.class))
169+
.extracting(ReadWeaviateObject::references, InstanceOfAssertFactories.map(String.class, List.class))
170170
.as("hasAwards object reference").extractingByKey("hasAwards")
171-
.asInstanceOf(InstanceOfAssertFactories.list(QueryWeaviateObject.class))
171+
.asInstanceOf(InstanceOfAssertFactories.list(ReadWeaviateObject.class))
172172

173173
.hasSize(1).allSatisfy(award -> Assertions.assertThat(award)
174174
.returns(grammy_1.uuid(), grammy -> grammy.uuid())
175175

176176
// Cast references to Map<String, List<QueryWeaviateObject>>
177-
.extracting(QueryWeaviateObject::references, InstanceOfAssertFactories.map(String.class, List.class))
177+
.extracting(ReadWeaviateObject::references, InstanceOfAssertFactories.map(String.class, List.class))
178178
.as("presentedBy object reference").extractingByKey("presentedBy")
179-
.asInstanceOf(InstanceOfAssertFactories.list(QueryWeaviateObject.class))
179+
.asInstanceOf(InstanceOfAssertFactories.list(ReadWeaviateObject.class))
180180

181-
.hasSize(1).extracting(QueryWeaviateObject::properties)
181+
.hasSize(1).extracting(ReadWeaviateObject::properties)
182182
.allSatisfy(properties -> Assertions.assertThat(properties)
183183
.asInstanceOf(InstanceOfAssertFactories.map(String.class, Object.class))
184184
.containsEntry("ceo", "Harvy Mason")));

‎src/it/java/io/weaviate/integration/SearchITest.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import io.weaviate.client6.v1.api.collections.query.Metadata;
3434
import io.weaviate.client6.v1.api.collections.query.QueryMetadata;
3535
import io.weaviate.client6.v1.api.collections.query.QueryResponseGroup;
36-
import io.weaviate.client6.v1.api.collections.query.QueryWeaviateObject;
36+
import io.weaviate.client6.v1.api.collections.query.ReadWeaviateObject;
3737
import io.weaviate.client6.v1.api.collections.query.SortBy;
3838
import io.weaviate.client6.v1.api.collections.query.Target;
3939
import io.weaviate.client6.v1.api.collections.query.Where;
@@ -166,7 +166,7 @@ public void testNearText() throws IOException {
166166
.returnProperties("title"));
167167

168168
Assertions.assertThat(result.objects()).hasSize(2)
169-
.extracting(QueryWeaviateObject::properties).allSatisfy(
169+
.extracting(ReadWeaviateObject::properties).allSatisfy(
170170
properties -> Assertions.assertThat(properties)
171171
.allSatisfy((_k, v) -> Assertions.assertThat((String) v).contains("Jungle")));
172172
}
@@ -229,7 +229,7 @@ public void testNearImage() throws IOException {
229229
opt -> opt.returnProperties("breed"));
230230

231231
Assertions.assertThat(got.objects()).hasSize(1).first()
232-
.extracting(QueryWeaviateObject::properties, InstanceOfAssertFactories.MAP)
232+
.extracting(ReadWeaviateObject::properties, InstanceOfAssertFactories.MAP)
233233
.extractingByKey("breed").isEqualTo("ragdoll");
234234
}
235235

@@ -288,7 +288,7 @@ public void testFetchObjectsWithSort() throws Exception {
288288
Assertions.assertThat(asc.objects())
289289
.as("value asc")
290290
.hasSize(3)
291-
.extracting(QueryWeaviateObject::properties)
291+
.extracting(ReadWeaviateObject::properties)
292292
.extracting(object -> object.get("value"))
293293
.containsExactly(1L, 2L, 3L);
294294

@@ -299,7 +299,7 @@ public void testFetchObjectsWithSort() throws Exception {
299299
Assertions.assertThat(desc.objects())
300300
.as("value desc")
301301
.hasSize(3)
302-
.extracting(QueryWeaviateObject::properties)
302+
.extracting(ReadWeaviateObject::properties)
303303
.extracting(object -> object.get("value"))
304304
.containsExactly(3L, 2L, 1L);
305305
}
@@ -325,7 +325,7 @@ public void testBm25() throws IOException, InterruptedException, ExecutionExcept
325325

326326
Assertions.assertThat(dollarWorlds.objects())
327327
.hasSize(1)
328-
.extracting(QueryWeaviateObject::metadata).extracting(QueryMetadata::uuid)
328+
.extracting(ReadWeaviateObject::metadata).extracting(QueryMetadata::uuid)
329329
.containsOnly(want.uuid());
330330
}
331331

@@ -357,7 +357,7 @@ public void testBm25_async() throws Exception, InterruptedException, ExecutionEx
357357

358358
Assertions.assertThat(dollarWorlds.objects())
359359
.hasSize(1)
360-
.extracting(QueryWeaviateObject::metadata).extracting(QueryMetadata::uuid)
360+
.extracting(ReadWeaviateObject::metadata).extracting(QueryMetadata::uuid)
361361
.containsOnly(want.uuid());
362362
}
363363
}
@@ -387,7 +387,7 @@ public void testNearObject() throws IOException {
387387
// Assert
388388
Assertions.assertThat(terrestrial.objects())
389389
.hasSize(1)
390-
.extracting(QueryWeaviateObject::metadata).extracting(WeaviateMetadata::uuid)
390+
.extracting(ReadWeaviateObject::metadata).extracting(WeaviateMetadata::uuid)
391391
.containsOnly(lion.uuid());
392392
}
393393

@@ -414,7 +414,7 @@ public void testHybrid() throws IOException {
414414
// Assert
415415
Assertions.assertThat(winterSport.objects())
416416
.hasSize(1)
417-
.extracting(QueryWeaviateObject::metadata).extracting(WeaviateMetadata::uuid)
417+
.extracting(ReadWeaviateObject::metadata).extracting(WeaviateMetadata::uuid)
418418
.containsOnly(skiing.uuid());
419419

420420
var first = winterSport.objects().get(0);
@@ -484,7 +484,7 @@ public void test_includeVectors() throws IOException {
484484

485485
// Assert
486486
Assertions.assertThat(got).get()
487-
.extracting(QueryWeaviateObject::vectors)
487+
.extracting(ReadWeaviateObject::vectors)
488488
.returns(true, v -> v.contains("v1"))
489489
.returns(true, v -> v.contains("v2"))
490490
.returns(false, v -> v.contains("v3"));
@@ -513,7 +513,7 @@ public void testMetadataAll() throws IOException {
513513
// Assert
514514
var metadataHybrid = Assertions.assertThat(gotHybrid.objects())
515515
.hasSize(1)
516-
.extracting(QueryWeaviateObject::metadata)
516+
.extracting(ReadWeaviateObject::metadata)
517517
.first().actual();
518518

519519
Assertions.assertThat(metadataHybrid.uuid()).as("uuid").isNotNull().isEqualTo(frisbee.uuid());
@@ -524,7 +524,7 @@ public void testMetadataAll() throws IOException {
524524

525525
var metadataNearText = Assertions.assertThat(gotNearText.objects())
526526
.hasSize(1)
527-
.extracting(QueryWeaviateObject::metadata)
527+
.extracting(ReadWeaviateObject::metadata)
528528
.first().actual();
529529

530530
Assertions.assertThat(metadataNearText.uuid()).as("uuid").isNotNull().isEqualTo(frisbee.uuid());
@@ -564,15 +564,15 @@ public void testNearVector_targetVectors() throws IOException {
564564
q -> q.limit(1));
565565
Assertions.assertThat(got123.objects())
566566
.as("search v1d")
567-
.hasSize(1).extracting(QueryWeaviateObject::uuid)
567+
.hasSize(1).extracting(ReadWeaviateObject::uuid)
568568
.containsExactly(thing123.uuid());
569569

570570
var got456 = things.query.nearVector(
571571
Target.vector("v2d", new float[][] { { 4, 5, 6 }, { 4, 5, 6 } }),
572572
q -> q.limit(1));
573573
Assertions.assertThat(got456.objects())
574574
.as("search v2d")
575-
.hasSize(1).extracting(QueryWeaviateObject::uuid)
575+
.hasSize(1).extracting(ReadWeaviateObject::uuid)
576576
.containsExactly(thing456.uuids().get(0));
577577
}
578578

@@ -606,9 +606,9 @@ public void testGenerative_bm25() throws IOException {
606606
.hasSize(2)
607607
.allSatisfy(obj -> {
608608
Assertions.assertThat(obj).as("uuid shorthand")
609-
.returns(obj.uuid(), GenerativeObject::uuid);
609+
.returns(obj.uuid(), GenerativeObject::uuid);
610610
Assertions.assertThat(obj).as("vectors shorthand")
611-
.returns(obj.vectors(), GenerativeObject::vectors);
611+
.returns(obj.vectors(), GenerativeObject::vectors);
612612
})
613613
.extracting(GenerativeObject::generative)
614614
.allSatisfy(generated -> {

‎src/main/java/io/weaviate/client6/v1/api/collections/pagination/AsyncPage.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,31 @@
77
import java.util.concurrent.CompletableFuture;
88
import java.util.function.BiFunction;
99

10-
import io.weaviate.client6.v1.api.collections.query.QueryWeaviateObject;
10+
import io.weaviate.client6.v1.api.collections.query.ReadWeaviateObject;
1111

12-
public final class AsyncPage<PropertiesT> implements Iterable<QueryWeaviateObject<PropertiesT>> {
12+
public final class AsyncPage<PropertiesT> implements Iterable<ReadWeaviateObject<PropertiesT>> {
1313

1414
private final int pageSize;
15-
private final BiFunction<String, Integer, CompletableFuture<List<QueryWeaviateObject<PropertiesT>>>> fetch;
15+
private final BiFunction<String, Integer, CompletableFuture<List<ReadWeaviateObject<PropertiesT>>>> fetch;
1616

1717
private final String cursor;
18-
private List<QueryWeaviateObject<PropertiesT>> currentPage = new ArrayList<>();
18+
private List<ReadWeaviateObject<PropertiesT>> currentPage = new ArrayList<>();
1919

2020
AsyncPage(String cursor, int pageSize,
21-
BiFunction<String, Integer, CompletableFuture<List<QueryWeaviateObject<PropertiesT>>>> fetch) {
21+
BiFunction<String, Integer, CompletableFuture<List<ReadWeaviateObject<PropertiesT>>>> fetch) {
2222
this.cursor = cursor;
2323
this.pageSize = pageSize;
2424
this.fetch = fetch;
2525
}
2626

2727
AsyncPage(String cursor, int pageSize,
28-
BiFunction<String, Integer, CompletableFuture<List<QueryWeaviateObject<PropertiesT>>>> fetch,
29-
List<QueryWeaviateObject<PropertiesT>> currentPage) {
28+
BiFunction<String, Integer, CompletableFuture<List<ReadWeaviateObject<PropertiesT>>>> fetch,
29+
List<ReadWeaviateObject<PropertiesT>> currentPage) {
3030
this(cursor, pageSize, fetch);
3131
this.currentPage = Collections.unmodifiableList(currentPage);
3232
}
3333

34-
List<QueryWeaviateObject<PropertiesT>> items() {
34+
List<ReadWeaviateObject<PropertiesT>> items() {
3535
return currentPage;
3636
}
3737

@@ -68,7 +68,7 @@ public CompletableFuture<AsyncPage<PropertiesT>> fetchNextPage() {
6868
}
6969

7070
@Override
71-
public Iterator<QueryWeaviateObject<PropertiesT>> iterator() {
71+
public Iterator<ReadWeaviateObject<PropertiesT>> iterator() {
7272
return currentPage.iterator();
7373
}
7474
}

0 commit comments

Comments
 (0)