chore(v6): post-rebase cleanup

Some changes got 'lost' during the rebase, but luckily the tests
caught that. This commit does a couple of small fixes to remedy that.

Author: bevzzz

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

@@ -108,7 +108,7 @@ public void testBlobData() throws IOException {
         "breed", "ragdoll",
         "img", ragdollPng));
 
-    var got = cats.query.fetchObjectById(ragdoll.metadata().uuid(),
+    var got = cats.query.fetchObjectById(ragdoll.uuid(),
         cat -> cat.returnProperties("img"));
 
     Assertions.assertThat(got).get()
@@ -154,7 +154,7 @@ public void testReferences_AddReplaceDelete() throws IOException {
         ObjectReference.object(albie));
 
     // Assert
-    var johnWithFriends = persons.query.fetchObjectById(john.metadata().uuid(),
+    var johnWithFriends = persons.query.fetchObjectById(john.uuid(),
         query -> query.returnReferences(
             QueryReference.single("hasFriend",
                 friend -> friend.returnProperties("name"))));
@@ -174,7 +174,7 @@ public void testReferences_AddReplaceDelete() throws IOException {
         "hasFriend",
         ObjectReference.object(barbara));
 
-    johnWithFriends = persons.query.fetchObjectById(john.metadata().uuid(),
+    johnWithFriends = persons.query.fetchObjectById(john.uuid(),
         query -> query.returnReferences(
             QueryReference.single("hasFriend",
                 friend -> friend.returnProperties("name"))));
@@ -194,7 +194,7 @@ public void testReferences_AddReplaceDelete() throws IOException {
         ObjectReference.object(barbara));
 
     // Assert
-    johnWithFriends = persons.query.fetchObjectById(john.metadata().uuid(),
+    johnWithFriends = persons.query.fetchObjectById(john.uuid(),
         query -> query.returnReferences(
             QueryReference.single("hasFriend")));
 
@@ -223,7 +223,7 @@ public void testReplace() throws IOException {
         replace -> replace.properties(Map.of("year", 1819)));
 
     // Assert
-    var replacedIvanhoe = books.query.fetchObjectById(ivanhoe.metadata().uuid());
+    var replacedIvanhoe = books.query.fetchObjectById(ivanhoe.uuid());
 
     Assertions.assertThat(replacedIvanhoe).get()
         .as("has ONLY year property")
@@ -268,7 +268,7 @@ public void testUpdate() throws IOException {
 
     // Assert
     var updIvanhoe = books.query.fetchObjectById(
-        ivanhoe.metadata().uuid(),
+        ivanhoe.uuid(),
         query -> query
             .includeVector()
             .returnReferences(QueryReference.single("writtenBy")));
@@ -395,7 +395,7 @@ public void testReferenceAddMany() throws IOException {
     // Assert
     Assertions.assertThat(response.errors()).isEmpty();
 
-    var goodburgAirports = cities.query.fetchObjectById(goodburg.metadata().uuid(),
+    var goodburgAirports = cities.query.fetchObjectById(goodburg.uuid(),
         city -> city.returnReferences(
             QueryReference.single("hasAirports")));
 

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

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

src/main/java/io/weaviate/client6/v1/internal/rest/DefaultRestTransport.java

@@ -104,7 +104,7 @@ public <RequestT, ResponseT, ExceptionT> ResponseT performRequest(RequestT reque
   private <RequestT, ResponseT> ClassicHttpRequest prepareClassicRequest(RequestT request,
       Endpoint<RequestT, ResponseT> endpoint) {
     var method = endpoint.method(request);
-    var uri = endpoint.requestUrl(transportOptions, request);
+    var uri = uri(endpoint, request);
 
     var req = ClassicRequestBuilder.create(method).setUri(uri);
     var body = endpoint.body(request);