Skip to content

Commit d72cf26

Browse files
committed
chore: fix post-merge errors
1 parent 01e4017 commit d72cf26

5 files changed

Lines changed: 6 additions & 10 deletions

File tree

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void cancelled() {
146146

147147
private <RequestT, ResponseT> SimpleHttpRequest prepareSimpleRequest(RequestT request,
148148
Endpoint<RequestT, ResponseT> endpoint) {
149-
var method = endpoint.m
149+
var method = endpoint.method(request);
150150
var uri = uri(endpoint, request);
151151

152152
var body = endpoint.body(request);
@@ -185,11 +185,6 @@ private <ResponseT> ResponseT _handleResponse(Endpoint<?, ResponseT> endpoint, S
185185
throw new RuntimeException("Unhandled endpoint type " + endpoint.getClass().getSimpleName());
186186
}
187187

188-
@Override
189-
public RestTransportOptions getTransportOptions() {
190-
return transportOptions;
191-
}
192-
193188
@Override
194189
public void close() throws Exception {
195190
httpClient.close();

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ public boolean isError(int statusCode) {
5959

6060
@Override
6161
public String deserializeError(int statusCode, String responseBody) {
62+
if (responseBody.isBlank()) {
63+
return responseBody;
64+
}
6265
{
6366
var response = JSON.deserialize(responseBody, ErrorResponse1.class);
6467
if (response.errors != null && !response.errors.isEmpty()) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class ExternalEndpoint<RequestT, ResponseT> extends SimpleEndpoint<Reques
99
public ExternalEndpoint(
1010
Function<RequestT, String> method,
1111
Function<RequestT, String> requestUrl,
12-
Function<RequestT, Map<String, String>> queryParameters,
12+
Function<RequestT, Map<String, Object>> queryParameters,
1313
Function<RequestT, String> body,
1414
BiFunction<Integer, String, ResponseT> deserializeResponse) {
1515
super(method, requestUrl, queryParameters, body, deserializeResponse);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,4 @@ <RequestT, ResponseT, ExceptionT> ResponseT performRequest(RequestT request,
1010

1111
<RequestT, ResponseT, ExceptionT> CompletableFuture<ResponseT> performRequestAsync(RequestT request,
1212
Endpoint<RequestT, ResponseT> endpoint);
13-
14-
RestTransportOptions getTransportOptions();
1513
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static <RequestT, ResponseT> SimpleEndpoint<RequestT, ResponseT> noBody(
3131
public static <RequestT, ResponseT> SimpleEndpoint<RequestT, ResponseT> noBody(
3232
Function<RequestT, String> method,
3333
Function<RequestT, String> requestUrl,
34-
Function<RequestT, Map<String, String>> queryParameters,
34+
Function<RequestT, Map<String, Object>> queryParameters,
3535
Class<ResponseT> cls) {
3636
return new SimpleEndpoint<>(method, requestUrl, queryParameters, nullBody(), deserializeClass(cls));
3737
}

0 commit comments

Comments
 (0)