Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,26 +52,26 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
<lombok.version>1.18.42</lombok.version>
<gson.version>2.13.2</gson.version>
<httpclient.version>5.6.1</httpclient.version>
<lang3.version>3.20.0</lang3.version>
<lombok.version>1.18.48</lombok.version>
<gson.version>2.14.0</gson.version>
<httpclient.version>5.6.5</httpclient.version>
<lang3.version>3.21.0</lang3.version>
<junit.version>4.13.2</junit.version>
<testcontainers.version>2.0.3</testcontainers.version>
<testcontainers.version>2.0.5</testcontainers.version>
<assertj-core.version>3.27.7</assertj-core.version>
<jparams.version>1.0.4</jparams.version>
<mockito.version>5.21.0</mockito.version>
<slf4j.version>2.0.17</slf4j.version>
<mockito.version>5.24.0</mockito.version>
<slf4j.version>2.0.20</slf4j.version>
<logback.version>1.5.18</logback.version>
<mock-server.version>5.14.0</mock-server.version>
<jackson.version>2.21</jackson.version>
<oauth2-oidc-sdk.version>11.33</oauth2-oidc-sdk.version>
<mock-server.version>5.15.0</mock-server.version>
<protobuf.java.version>4.33.5</protobuf.java.version>
<protobuf.java-util.version>4.33.5</protobuf.java-util.version>
<grpc-netty-shaded.version>1.79.0</grpc-netty-shaded.version>
<grpc-protobuf.version>1.79.0</grpc-protobuf.version>
<grpc-stub.version>1.79.0</grpc-stub.version>
<jackson.version>2.22</jackson.version>
<oauth2-oidc-sdk.version>11.38.2</oauth2-oidc-sdk.version>
<mock-server.version>9.1.0</mock-server.version>
<protobuf.java.version>4.36.2</protobuf.java.version>
<protobuf.java-util.version>4.36.2</protobuf.java-util.version>
<grpc-netty-shaded.version>1.85.1</grpc-netty-shaded.version>
<grpc-protobuf.version>1.85.1</grpc-protobuf.version>
<grpc-stub.version>1.85.1</grpc-stub.version>
<annotations-api.version>6.0.53</annotations-api.version>
</properties>

Expand Down Expand Up @@ -462,7 +462,7 @@
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.1.1my</version>
<version>3.9.0</version>
</plugin>

<plugin>
Expand Down
28 changes: 14 additions & 14 deletions src/test/java/io/weaviate/client6/v1/internal/rest/ProxyTest.java
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
package io.weaviate.client6.v1.internal.rest;

import io.weaviate.client6.v1.api.WeaviateApiException;
import io.weaviate.client6.v1.api.Config;
import io.weaviate.client6.v1.api.WeaviateClient;
import io.weaviate.client6.v1.internal.Proxy;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockserver.model.HttpForward.forward;

import java.io.IOException;

import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockserver.integration.ClientAndServer;
import org.mockserver.model.HttpRequest;
import org.mockserver.model.HttpResponse;

import java.io.IOException;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockserver.model.HttpForward.forward;
import io.weaviate.client6.v1.api.Config;
import io.weaviate.client6.v1.api.WeaviateApiException;
import io.weaviate.client6.v1.api.WeaviateClient;
import io.weaviate.client6.v1.internal.Proxy;

public class ProxyTest {
private ClientAndServer targetServer;
Expand All @@ -31,7 +32,7 @@ public void setUp() {
targetServer.when(
HttpRequest.request()
.withMethod("GET")
.withPath("/v1/.well-known/live"))
.withPath("/v1/\\.well-known/live"))
.respond(
HttpResponse.response()
.withStatusCode(200));
Expand Down Expand Up @@ -61,8 +62,7 @@ public void setUp() {
.grpcHost("localhost")
.grpcPort(targetServer.getLocalPort())
.proxy(new Proxy("localhost", proxyServer.getLocalPort()))
.timeout(5)
);
.timeout(5));

client = new WeaviateClient(config);
}
Expand All @@ -76,7 +76,7 @@ public void testClientInitializationWithProxy() {
// Since setUp() already creates a client using the proxy, we just need to
// verify it was initialized correctly.
assertThat(client).isNotNull();

// Verify that the initialization calls went through the proxy
proxyServer.verify(
HttpRequest.request()
Expand Down Expand Up @@ -124,7 +124,7 @@ public void testGrpcProxy() {
// we focus on ensuring the client is correctly initialized with the proxy.
assertThatThrownBy(() -> client.collections.use("Test").size())
.isInstanceOf(WeaviateApiException.class)
.hasMessageContaining("UNAVAILABLE: Network closed");
.hasMessageContaining("UNIMPLEMENTED");
}

@After
Expand Down
Loading