Skip to content

fix(java-sdk): fix passing model ID in BatchCheck #555

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.

Sign up for GitHub

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

Merged
rhamzeh merged 3 commits into from
Jun 16, 2025
Merged

fix(java-sdk): fix passing model ID in BatchCheck #555

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebcacca
fix(java): pass authorization model id in batch check
aaguiarz Jun 9, 2025
a066d00
Merge branch 'main' into codex/implement-issue-551-from-sdk-generator
rhamzeh Jun 16, 2025
83b20b9
fix(java-sdk): only pass in model ID in BatchCheck if present
rhamzeh Jun 16, 2025
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
6 changes: 6 additions & 0 deletions config/clients/java/template/libraries/native/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,12 @@ public class OpenFgaApi {
if (body instanceof BatchCheckRequest) {
BatchCheckRequest batchCheckRequest = (BatchCheckRequest) body;

if (!isNullOrWhitespace(batchCheckRequest.getAuthorizationModelId())) {
telemetryAttributes.put(
Attributes.FGA_CLIENT_REQUEST_MODEL_ID,
batchCheckRequest.getAuthorizationModelId());
}

if (batchCheckRequest.getChecks() != null) {
telemetryAttributes.put(
Attributes.FGA_CLIENT_REQUEST_BATCH_CHECK_SIZE,
Expand Down
16 changes: 14 additions & 2 deletions config/clients/java/template/src/main/api/client/OpenFgaClient.java.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,8 +695,20 @@ public class OpenFgaClient {

var override = new ConfigurationOverride().addHeaders(options);

Consumer<List<BatchCheckItem>> singleBatchCheckRequest = request -> call(() ->
api.batchCheck(configuration.getStoreId(), new BatchCheckRequest().checks(request), override))
Consumer<List<BatchCheckItem>> singleBatchCheckRequest = request -> call(() -> {
BatchCheckRequest body = new BatchCheckRequest().checks(request);
if (options.getConsistency() != null) {
body.consistency(options.getConsistency());
}

// Set authorizationModelId from options if available; otherwise, use the default from configuration
String authorizationModelId = !isNullOrWhitespace(options.getAuthorizationModelId())
? options.getAuthorizationModelId()
: configuration.getAuthorizationModelId();
body.authorizationModelId(authorizationModelId);
Comment thread
rhamzeh marked this conversation as resolved.
Outdated

return api.batchCheck(configuration.getStoreId(), body, override);
})
.handleAsync((batchCheckResponseApiResponse, throwable) -> {
Map<String, BatchCheckSingleResult> response =
batchCheckResponseApiResponse.getData().getResult();
Expand Down
32 changes: 32 additions & 0 deletions config/clients/java/template/src/test/api/client/OpenFgaClientTest.java.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2025,6 +2025,38 @@ public class OpenFgaClientTest {
assertEquals("relation not found", response3.getError().getMessage());
}

@Test
public void batchCheck_withOptions() throws Exception {
// Given
String postUrl = String.format("https://api.fga.example/stores/%s/batch-check", DEFAULT_STORE_ID);
String expectedBody = String.format(
"{\"checks\":[{\"tuple_key\":{\"user\":\"%s\",\"relation\":\"%s\",\"object\":\"%s\"},\"contextual_tuples\":null,\"context\":null,\"correlation_id\":\"cor-1\"}],\"authorization_model_id\":\"%s\",\"consistency\":\"%s\"}",
DEFAULT_USER,
DEFAULT_RELATION,
DEFAULT_OBJECT,
DEFAULT_AUTH_MODEL_ID,
ConsistencyPreference.MINIMIZE_LATENCY);
mockHttpClient.onPost(postUrl).withBody(is(expectedBody)).doReturn(200, "{\"result\":{}}");

ClientBatchCheckItem item = new ClientBatchCheckItem()
.user(DEFAULT_USER)
.relation(DEFAULT_RELATION)
._object(DEFAULT_OBJECT)
.correlationId("cor-1");
ClientBatchCheckRequest request = new ClientBatchCheckRequest().checks(List.of(item));
ClientBatchCheckOptions options = new ClientBatchCheckOptions()
.authorizationModelId(DEFAULT_AUTH_MODEL_ID)
.consistency(ConsistencyPreference.MINIMIZE_LATENCY);

// When
ClientBatchCheckResponse response = fga.batchCheck(request, options).join();

// Then
mockHttpClient.verify().post(postUrl).withBody(is(expectedBody)).called(1);
assertNotNull(response);
assertTrue(response.getResult().isEmpty());
}

/**
* Expand all relationships in userset tree format, and following userset rewrite rules. Useful to reason
* about and debug a certain relationship.
Expand Down