Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BT-5096] Refactor client exceptions. #136

Merged
merged 5 commits into from
Sep 11, 2024
Merged
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
1 change: 1 addition & 0 deletions src/main/java/com/fauna/client/FaunaClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.fauna.codec.DefaultCodecProvider;
import com.fauna.codec.DefaultCodecRegistry;
import com.fauna.exception.ClientException;
import com.fauna.exception.ClientRequestException;
import com.fauna.exception.FaunaException;
import com.fauna.query.QueryOptions;
import com.fauna.stream.StreamRequest;
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/fauna/client/RequestBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.fauna.codec.CodecProvider;
import com.fauna.env.DriverEnvironment;
import com.fauna.exception.ClientException;
import com.fauna.exception.ClientRequestException;
import com.fauna.query.QueryOptions;
import com.fauna.stream.StreamRequest;
import com.fauna.query.builder.Query;
Expand Down Expand Up @@ -98,17 +99,14 @@ public HttpRequest buildRequest(Query fql, QueryOptions options, CodecProvider p
addOptionalHeaders(builder, options);
}
// TODO: set last-txn-ts and max-contention-retries.
try {
UTF8FaunaGenerator gen = new UTF8FaunaGenerator();
try (UTF8FaunaGenerator gen = UTF8FaunaGenerator.create()) {
gen.writeStartObject();
gen.writeFieldName(FieldNames.QUERY);
Codec<Query> codec = provider.get(Query.class);
codec.encode(gen, fql);
gen.writeEndObject();
String body = gen.serialize();
return builder.POST(HttpRequest.BodyPublishers.ofString(body)).build();
} catch (IOException e) {
throw new ClientException("Unable to build Fauna Query request.", e);
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/fauna/codec/Codec.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.fauna.codec;

import java.io.IOException;
import com.fauna.exception.CodecException;


public interface Codec<T> {

T decode(UTF8FaunaParser parser) throws IOException;
void encode(UTF8FaunaGenerator gen, T obj) throws IOException;
T decode(UTF8FaunaParser parser) throws CodecException;
void encode(UTF8FaunaGenerator gen, T obj) throws CodecException;
Class<?> getCodecClass();

FaunaType[] getSupportedTypes();
Expand Down
Loading
Loading