feat(java-sdk): add headers for Write/BatchCheck/ListRelations, add h…

…eader overriding to client (#252)
openfga · Dec 15, 2023 · ce7d2d6 · ce7d2d6
2 parents 987ca88 + a8308f5
commit ce7d2d6
Show file tree

Hide file tree

Showing 66 changed files with 1,078 additions and 168 deletions.
diff --git a/config/clients/java/.openapi-generator-ignore b/config/clients/java/.openapi-generator-ignore
@@ -14,3 +14,6 @@ pom.xml
 .github/workflows/maven.yml
 git_push.sh
 .travis.yml
+
+# Model tests intentionally ignored
+**/test/**/model/*
diff --git a/config/clients/java/config.overrides.json b/config/clients/java/config.overrides.json
@@ -52,107 +52,111 @@
       "templateType": "SupportingFiles"
     },
     "client-ClientBatchCheckResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientBatchCheckResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientBatchCheckResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientCheckRequest.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientCheckRequest.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientCheckRequest.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientCheckResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientCheckResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientCheckResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientCreateStoreResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientCreateStoreResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientCreateStoreResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientDeleteStoreResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientDeleteStoreResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientDeleteStoreResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientExpandRequest.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientExpandRequest.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientExpandRequest.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientExpandResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientExpandResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientExpandResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientGetStoreResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientGetStoreResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientGetStoreResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientListObjectsRequest.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientListObjectsRequest.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientListObjectsRequest.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientListObjectsResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientListObjectsResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientListObjectsResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientListStoresResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientListStoresResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientListStoresResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientListRelationsRequest.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientListRelationsRequest.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientListRelationsRequest.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientListRelationsResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientListRelationsResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientListRelationsResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientReadAssertionsResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientReadAssertionsResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientReadAssertionsResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientReadAuthorizationModelResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientReadAuthorizationModelResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientReadAuthorizationModelResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientReadAuthorizationModelsResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientReadAuthorizationModelsResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientReadAuthorizationModelsResponse.java",
+      "templateType": "SupportingFiles"
+    },
+    "client-ClientReadChangesRequest.java.mustache" : {
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientReadChangesRequest.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientReadChangesResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientReadChangesResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientReadChangesResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientReadRequest.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientReadRequest.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientReadRequest.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientReadResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientReadResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientReadResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientRelationshipCondition.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientRelationshipCondition.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientRelationshipCondition.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientTupleKey.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientTupleKey.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientTupleKey.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientTupleKeyWithoutCondition.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientTupleKeyWithoutCondition.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientTupleKeyWithoutCondition.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientWriteAssertionsResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientWriteAssertionsResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientWriteAssertionsResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientWriteAuthorizationModelResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientWriteAuthorizationModelResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientWriteAuthorizationModelResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientWriteRequest.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientWriteRequest.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientWriteRequest.java",
       "templateType": "SupportingFiles"
     },
     "client-ClientWriteResponse.java.mustache" : {
-      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/ClientWriteResponse.java",
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/client/model/ClientWriteResponse.java",
       "templateType": "SupportingFiles"
     },
     "client-HttpRequestAttempt.java.mustache" : {
@@ -191,6 +195,10 @@
       "destinationFilename": "src/test/java/dev/openfga/sdk/api/auth/OAuth2ClientTest.java",
       "templateType": "SupportingFiles"
     },
+    "config-AdditionalHeadersSupplier.java.mustache" : {
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/AdditionalHeadersSupplier.java",
+      "templateType": "SupportingFiles"
+    },
     "config-ApiToken.java.mustache" : {
       "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ApiToken.java",
       "templateType": "SupportingFiles"
@@ -211,6 +219,10 @@
       "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ClientConfiguration.java",
       "templateType": "SupportingFiles"
     },
+    "config-ClientCreateStoreOptions.java.mustache" : {
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ClientCreateStoreOptions.java",
+      "templateType": "SupportingFiles"
+    },
     "config-ClientCredentials.java.mustache" : {
       "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ClientCredentials.java",
       "templateType": "SupportingFiles"
@@ -219,10 +231,22 @@
       "destinationFilename": "src/test/java/dev/openfga/sdk/api/configuration/ClientCredentialsTest.java",
       "templateType": "SupportingFiles"
     },
+    "config-ClientDeleteStoreOptions.java.mustache" : {
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ClientDeleteStoreOptions.java",
+      "templateType": "SupportingFiles"
+    },
+    "config-ClientDeleteTuplesOptions.java.mustache" : {
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ClientDeleteTuplesOptions.java",
+      "templateType": "SupportingFiles"
+    },
     "config-ClientExpandOptions.java.mustache" : {
       "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ClientExpandOptions.java",
       "templateType": "SupportingFiles"
     },
+    "config-ClientGetStoreOptions.java.mustache" : {
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ClientGetStoreOptions.java",
+      "templateType": "SupportingFiles"
+    },
     "config-ClientListObjectsOptions.java.mustache" : {
       "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ClientListObjectsOptions.java",
       "templateType": "SupportingFiles"
@@ -251,6 +275,10 @@
       "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ClientReadChangesOptions.java",
       "templateType": "SupportingFiles"
     },
+    "config-ClientReadLatestAuthorizationModelOptions.java.mustache" : {
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ClientReadLatestAuthorizationModelOptions.java",
+      "templateType": "SupportingFiles"
+    },
     "config-ClientReadOptions.java.mustache" : {
       "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ClientReadOptions.java",
       "templateType": "SupportingFiles"
@@ -259,10 +287,18 @@
       "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ClientWriteAssertionsOptions.java",
       "templateType": "SupportingFiles"
     },
+    "config-ClientWriteAuthorizationModelOptions.java.mustache" : {
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ClientWriteAuthorizationModelOptions.java",
+      "templateType": "SupportingFiles"
+    },
     "config-ClientWriteOptions.java.mustache" : {
       "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ClientWriteOptions.java",
       "templateType": "SupportingFiles"
     },
+    "config-ClientWriteTuplesOptions.java.mustache" : {
+      "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/ClientWriteTuplesOptions.java",
+      "templateType": "SupportingFiles"
+    },
     "config-Configuration.java.mustache" : {
       "destinationFilename": "src/main/java/dev/openfga/sdk/api/configuration/Configuration.java",
       "templateType": "SupportingFiles"

diff --git a/config/clients/java/template/OpenFgaApiIntegrationTest.java.mustache b/config/clients/java/template/OpenFgaApiIntegrationTest.java.mustache
@@ -6,6 +6,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import {{clientPackage}}.model.*;
 import {{configPackage}}.*;
 import {{modelPackage}}.*;
 import java.io.IOException;

diff --git a/config/clients/java/template/OpenFgaApiTest.java.mustache b/config/clients/java/template/OpenFgaApiTest.java.mustache
@@ -8,10 +8,11 @@ import static org.mockito.Mockito.*;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.pgssoft.httpclient.HttpClientMock;
-import {{invokerPackage}}.*;
-import {{modelPackage}}.*;
+import {{clientPackage}}.model.*;
 import {{configPackage}}.*;
 import {{errorsPackage}}.*;
+import {{invokerPackage}}.*;
+import {{modelPackage}}.*;
 import java.net.http.HttpClient;
 import java.time.Duration;
 import java.util.LinkedHashMap;