Skip to content

Commit ddf9706

Browse files
authored
Merge branch 'main' into feat/streamed-list-objects-consumer
2 parents 4166543 + 65d874b commit ddf9706

File tree

5 files changed

+339
-40
lines changed

5 files changed

+339
-40
lines changed

.github/workflows/fossa.yaml

Lines changed: 0 additions & 37 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Changelog
22

33
## [Unreleased](https://github.com/openfga/java-sdk/compare/v0.9.2...HEAD)
4+
- fix: preserve response headers in transaction write operations (#254)
45
- feat: Add `streamedListObjects` API endpoint with consumer callback support (#252)
56

67
## v0.9.2

src/main/java/dev/openfga/sdk/api/client/OpenFgaClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ private CompletableFuture<ClientWriteResponse> writeTransactions(
507507
.collect(Collectors.toList())
508508
: new ArrayList<>();
509509

510-
return new ClientWriteResponse(writeResponses, deleteResponses);
510+
return new ClientWriteResponse(apiResponse, writeResponses, deleteResponses);
511511
});
512512
}
513513

@@ -710,7 +710,7 @@ public CompletableFuture<ClientWriteResponse> writeTuples(
710710
List<ClientWriteSingleResponse> writeResponses = tupleKeys.stream()
711711
.map(tuple -> new ClientWriteSingleResponse(tuple.asTupleKey(), ClientWriteStatus.SUCCESS))
712712
.collect(Collectors.toList());
713-
return new ClientWriteResponse(writeResponses, new ArrayList<>());
713+
return new ClientWriteResponse(apiResponse, writeResponses, new ArrayList<>());
714714
});
715715
}
716716

@@ -756,7 +756,7 @@ public CompletableFuture<ClientWriteResponse> deleteTuples(
756756
._object(tuple.getObject()),
757757
ClientWriteStatus.SUCCESS))
758758
.collect(Collectors.toList());
759-
return new ClientWriteResponse(new ArrayList<>(), deleteResponses);
759+
return new ClientWriteResponse(apiResponse, new ArrayList<>(), deleteResponses);
760760
});
761761
}
762762

src/main/java/dev/openfga/sdk/api/client/model/ClientWriteResponse.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,17 @@ public ClientWriteResponse(List<ClientWriteSingleResponse> writes, List<ClientWr
2828
this.deletes = deletes != null ? deletes : Collections.emptyList();
2929
}
3030

31+
public ClientWriteResponse(
32+
ApiResponse<Object> apiResponse,
33+
List<ClientWriteSingleResponse> writes,
34+
List<ClientWriteSingleResponse> deletes) {
35+
this.statusCode = apiResponse.getStatusCode();
36+
this.headers = apiResponse.getHeaders();
37+
this.rawResponse = apiResponse.getRawResponse();
38+
this.writes = writes != null ? writes : Collections.emptyList();
39+
this.deletes = deletes != null ? deletes : Collections.emptyList();
40+
}
41+
3142
public int getStatusCode() {
3243
return statusCode;
3344
}

0 commit comments

Comments
 (0)