Experimental syntax for nearVector search, object mapping, and partial gRPC support

.gitignore

@@ -9,3 +9,5 @@
 *.iml
 # Maven
 target/
+# maven-lombok-plugin
+.factorypath

pom.xml

@@ -56,6 +56,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.release>8</maven.compiler.release>
     <lombok.version>1.18.36</lombok.version>
     <gson.version>2.11.0</gson.version>
     <httpclient.version>5.4.1</httpclient.version>
@@ -72,6 +73,7 @@
     <oauth2-oidc-sdk.version>11.20.1</oauth2-oidc-sdk.version>
     <mock-server.version>5.15.0</mock-server.version>
     <protobuf.java.version>4.29.1</protobuf.java.version>
+    <protobuf.java-util.version>4.29.1</protobuf.java-util.version>
     <grpc-netty-shaded.version>1.68.2</grpc-netty-shaded.version>
     <grpc-protobuf.version>1.68.2</grpc-protobuf.version>
     <grpc-stub.version>1.68.2</grpc-stub.version>
@@ -84,6 +86,11 @@
       <artifactId>protobuf-java</artifactId>
       <version>${protobuf.java.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java-util</artifactId>
+      <version>${protobuf.java-util.version}</version>
+    </dependency>
     <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-netty-shaded</artifactId>
@@ -237,7 +244,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.1</version>
+          <version>3.13.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
@@ -273,6 +280,13 @@
               </configuration>
             </execution>
           </executions>
+          <dependencies>
+            <dependency>
+              <groupId>org.projectlombok</groupId>
+              <artifactId>lombok</artifactId>
+              <version>${lombok.version}</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

src/main/java/io/weaviate/client/WeaviateClient.java

@@ -1,5 +1,7 @@
 package io.weaviate.client;
 
+import java.util.Optional;
+
 import io.weaviate.client.base.http.HttpClient;
 import io.weaviate.client.base.http.builder.HttpApacheClientBuilder;
 import io.weaviate.client.base.http.impl.CommonsHttpClientImpl;
@@ -15,10 +17,10 @@
 import io.weaviate.client.v1.contextionary.Contextionary;
 import io.weaviate.client.v1.data.Data;
 import io.weaviate.client.v1.graphql.GraphQL;
+import io.weaviate.client.v1.grpc.GRPC;
 import io.weaviate.client.v1.misc.Misc;
 import io.weaviate.client.v1.misc.api.MetaGetter;
 import io.weaviate.client.v1.schema.Schema;
-import java.util.Optional;
 
 public class WeaviateClient {
   private final Config config;
@@ -28,12 +30,16 @@ public class WeaviateClient {
   private final HttpClient httpClient;
   private final AccessTokenProvider tokenProvider;
 
+  public final io.weaviate.client.v1.experimental.Collections collections;
+  public final io.weaviate.client.v1.experimental.DataClient datax;
+
   public WeaviateClient(Config config) {
     this(config, new CommonsHttpClientImpl(config.getHeaders(), null, HttpApacheClientBuilder.build(config)), null);
   }
 
   public WeaviateClient(Config config, AccessTokenProvider tokenProvider) {
-    this(config, new CommonsHttpClientImpl(config.getHeaders(), tokenProvider, HttpApacheClientBuilder.build(config)), tokenProvider);
+    this(config, new CommonsHttpClientImpl(config.getHeaders(), tokenProvider, HttpApacheClientBuilder.build(config)),
+        tokenProvider);
   }
 
   public WeaviateClient(Config config, HttpClient httpClient, AccessTokenProvider tokenProvider) {
@@ -43,6 +49,10 @@ public WeaviateClient(Config config, HttpClient httpClient, AccessTokenProvider
     dbVersionSupport = new DbVersionSupport(dbVersionProvider);
     grpcVersionSupport = new GrpcVersionSupport(dbVersionProvider);
     this.tokenProvider = tokenProvider;
+
+    this.collections = new io.weaviate.client.v1.experimental.Collections(config, tokenProvider);
+    this.datax = new io.weaviate.client.v1.experimental.DataClient(config, httpClient, tokenProvider, dbVersionSupport,
+        grpcVersionSupport, new Data(httpClient, config, dbVersionSupport));
   }
 
   public WeaviateAsyncClient async() {
@@ -87,10 +97,13 @@ public GraphQL graphQL() {
     return new GraphQL(httpClient, config);
   }
 
+  public GRPC gRPC() {
+    return new GRPC(httpClient, config, tokenProvider);
+  }
+
   private DbVersionProvider initDbVersionProvider() {
     MetaGetter metaGetter = new Misc(httpClient, config, null).metaGetter();
-    DbVersionProvider.VersionGetter getter = () ->
-      Optional.ofNullable(metaGetter.run())
+    DbVersionProvider.VersionGetter getter = () -> Optional.ofNullable(metaGetter.run())
         .filter(result -> !result.hasErrors())
         .map(result -> result.getResult().getVersion());
 

src/main/java/io/weaviate/client/base/BaseClient.java

@@ -1,13 +1,14 @@
 package io.weaviate.client.base;
 
+import java.util.Collections;
+
 import io.weaviate.client.Config;
 import io.weaviate.client.base.http.HttpClient;
 import io.weaviate.client.base.http.HttpResponse;
-import java.util.Collections;
 
 public abstract class BaseClient<T> {
   private final HttpClient client;
-  private final Config config;
+  protected final Config config;
   protected final Serializer serializer;
 
   public BaseClient(HttpClient client, Config config) {

src/main/java/io/weaviate/client/base/WeaviateErrorResponse.java

@@ -1,6 +1,8 @@
 package io.weaviate.client.base;
 
+import java.util.ArrayList;
 import java.util.List;
+
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
@@ -14,5 +16,7 @@
 public class WeaviateErrorResponse {
   Integer code;
   String message;
-  List<WeaviateErrorMessage> error;
+
+  @Builder.Default
+  List<WeaviateErrorMessage> error = new ArrayList<>();
 }

src/main/java/io/weaviate/client/base/grpc/GrpcClient.java

@@ -7,6 +7,7 @@
 import io.weaviate.client.base.grpc.base.BaseGrpcClient;
 import io.weaviate.client.grpc.protocol.v1.WeaviateGrpc;
 import io.weaviate.client.grpc.protocol.v1.WeaviateProtoBatch;
+import io.weaviate.client.grpc.protocol.v1.WeaviateProtoSearchGet;
 import io.weaviate.client.v1.auth.provider.AccessTokenProvider;
 import lombok.AccessLevel;
 import lombok.experimental.FieldDefaults;
@@ -25,6 +26,10 @@ public WeaviateProtoBatch.BatchObjectsReply batchObjects(WeaviateProtoBatch.Batc
     return this.client.batchObjects(request);
   }
 
+  public WeaviateProtoSearchGet.SearchReply search(WeaviateProtoSearchGet.SearchRequest request) {
+    return this.client.search(request);
+  }
+
   public void shutdown() {
     this.channel.shutdown();
   }
@@ -33,7 +38,8 @@ public static GrpcClient create(Config config, AccessTokenProvider tokenProvider
     Metadata headers = getHeaders(config, tokenProvider);
     ManagedChannel channel = buildChannel(config);
     WeaviateGrpc.WeaviateBlockingStub blockingStub = WeaviateGrpc.newBlockingStub(channel);
-    WeaviateGrpc.WeaviateBlockingStub client = blockingStub.withInterceptors(MetadataUtils.newAttachHeadersInterceptor(headers));
+    WeaviateGrpc.WeaviateBlockingStub client = blockingStub
+        .withInterceptors(MetadataUtils.newAttachHeadersInterceptor(headers));
     return new GrpcClient(client, channel);
   }
 }