chore(client): move model types to .model package

openfga · Dec 14, 2023 · cc9f9df · cc9f9df
1 parent 61c8ca3
commit cc9f9df
Show file tree

Hide file tree

Showing 33 changed files with 74 additions and 54 deletions.
diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES
@@ -96,35 +96,35 @@ src/main/java/dev/openfga/sdk/api/auth/OAuth2Client.java
 src/main/java/dev/openfga/sdk/api/client/ApiClient.java
 src/main/java/dev/openfga/sdk/api/client/ApiResponse.java
 src/main/java/dev/openfga/sdk/api/client/ClientAssertion.java
-src/main/java/dev/openfga/sdk/api/client/ClientBatchCheckResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientCheckRequest.java
-src/main/java/dev/openfga/sdk/api/client/ClientCheckResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientCreateStoreResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientDeleteStoreResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientExpandRequest.java
-src/main/java/dev/openfga/sdk/api/client/ClientExpandResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientGetStoreResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientListObjectsRequest.java
-src/main/java/dev/openfga/sdk/api/client/ClientListObjectsResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientListRelationsRequest.java
-src/main/java/dev/openfga/sdk/api/client/ClientListRelationsResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientListStoresResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientReadAssertionsResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientReadAuthorizationModelResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientReadAuthorizationModelsResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientReadChangesRequest.java
-src/main/java/dev/openfga/sdk/api/client/ClientReadChangesResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientReadRequest.java
-src/main/java/dev/openfga/sdk/api/client/ClientReadResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientRelationshipCondition.java
-src/main/java/dev/openfga/sdk/api/client/ClientTupleKey.java
-src/main/java/dev/openfga/sdk/api/client/ClientTupleKeyWithoutCondition.java
-src/main/java/dev/openfga/sdk/api/client/ClientWriteAssertionsResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientWriteAuthorizationModelResponse.java
-src/main/java/dev/openfga/sdk/api/client/ClientWriteRequest.java
-src/main/java/dev/openfga/sdk/api/client/ClientWriteResponse.java
 src/main/java/dev/openfga/sdk/api/client/HttpRequestAttempt.java
 src/main/java/dev/openfga/sdk/api/client/OpenFgaClient.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientBatchCheckResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientCheckRequest.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientCheckResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientCreateStoreResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientDeleteStoreResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientExpandRequest.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientExpandResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientGetStoreResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientListObjectsRequest.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientListObjectsResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientListRelationsRequest.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientListRelationsResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientListStoresResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientReadAssertionsResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientReadAuthorizationModelResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientReadAuthorizationModelsResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientReadChangesRequest.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientReadChangesResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientReadRequest.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientReadResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientRelationshipCondition.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientTupleKey.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientTupleKeyWithoutCondition.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientWriteAssertionsResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientWriteAuthorizationModelResponse.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientWriteRequest.java
+src/main/java/dev/openfga/sdk/api/client/model/ClientWriteResponse.java
 src/main/java/dev/openfga/sdk/api/configuration/AdditionalHeadersSupplier.java
 src/main/java/dev/openfga/sdk/api/configuration/ApiToken.java
 src/main/java/dev/openfga/sdk/api/configuration/BaseConfiguration.java

diff --git a/src/main/java/dev/openfga/sdk/api/client/OpenFgaClient.java b/src/main/java/dev/openfga/sdk/api/client/OpenFgaClient.java
@@ -16,6 +16,7 @@
 import static java.util.UUID.randomUUID;
 
 import dev.openfga.sdk.api.*;
+import dev.openfga.sdk.api.client.model.*;
 import dev.openfga.sdk.api.configuration.*;
 import dev.openfga.sdk.api.model.*;
 import dev.openfga.sdk.errors.*;

diff --git a/.../api/client/ClientBatchCheckResponse.java → ...lient/model/ClientBatchCheckResponse.java b/.../api/client/ClientBatchCheckResponse.java → ...lient/model/ClientBatchCheckResponse.java
@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
 import dev.openfga.sdk.api.model.CheckResponse;
 import dev.openfga.sdk.errors.FgaError;

diff --git a/...ga/sdk/api/client/ClientCheckRequest.java → .../api/client/model/ClientCheckRequest.java b/...ga/sdk/api/client/ClientCheckRequest.java → .../api/client/model/ClientCheckRequest.java
@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
 import dev.openfga.sdk.api.model.CheckRequestTupleKey;
 import java.util.List;

diff --git a/...a/sdk/api/client/ClientCheckResponse.java → ...api/client/model/ClientCheckResponse.java b/...a/sdk/api/client/ClientCheckResponse.java → ...api/client/model/ClientCheckResponse.java
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
+import dev.openfga.sdk.api.client.ApiResponse;
 import dev.openfga.sdk.api.model.CheckResponse;
 import java.util.List;
 import java.util.Map;

diff --git a/...api/client/ClientCreateStoreResponse.java → ...ient/model/ClientCreateStoreResponse.java b/...api/client/ClientCreateStoreResponse.java → ...ient/model/ClientCreateStoreResponse.java
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
+import dev.openfga.sdk.api.client.ApiResponse;
 import dev.openfga.sdk.api.model.CreateStoreResponse;
 import java.util.List;
 import java.util.Map;

diff --git a/...api/client/ClientDeleteStoreResponse.java → ...ient/model/ClientDeleteStoreResponse.java b/...api/client/ClientDeleteStoreResponse.java → ...ient/model/ClientDeleteStoreResponse.java
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
+import dev.openfga.sdk.api.client.ApiResponse;
 import java.util.List;
 import java.util.Map;
 

diff --git a/...a/sdk/api/client/ClientExpandRequest.java → ...api/client/model/ClientExpandRequest.java b/...a/sdk/api/client/ClientExpandRequest.java → ...api/client/model/ClientExpandRequest.java
@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
 public class ClientExpandRequest {
     private String relation;

diff --git a/.../sdk/api/client/ClientExpandResponse.java → ...pi/client/model/ClientExpandResponse.java b/.../sdk/api/client/ClientExpandResponse.java → ...pi/client/model/ClientExpandResponse.java
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
+import dev.openfga.sdk.api.client.ApiResponse;
 import dev.openfga.sdk.api.model.ExpandResponse;
 import java.util.List;
 import java.util.Map;

diff --git a/...dk/api/client/ClientGetStoreResponse.java → .../client/model/ClientGetStoreResponse.java b/...dk/api/client/ClientGetStoreResponse.java → .../client/model/ClientGetStoreResponse.java
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
+import dev.openfga.sdk.api.client.ApiResponse;
 import dev.openfga.sdk.api.model.GetStoreResponse;
 import java.util.List;
 import java.util.Map;

diff --git a/.../api/client/ClientListObjectsRequest.java → ...lient/model/ClientListObjectsRequest.java b/.../api/client/ClientListObjectsRequest.java → ...lient/model/ClientListObjectsRequest.java
@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
 import java.util.List;
 

diff --git a/...api/client/ClientListObjectsResponse.java → ...ient/model/ClientListObjectsResponse.java b/...api/client/ClientListObjectsResponse.java → ...ient/model/ClientListObjectsResponse.java
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
+import dev.openfga.sdk.api.client.ApiResponse;
 import dev.openfga.sdk.api.model.ListObjectsResponse;
 import java.util.List;
 import java.util.Map;

diff --git a/...pi/client/ClientListRelationsRequest.java → ...ent/model/ClientListRelationsRequest.java b/...pi/client/ClientListRelationsRequest.java → ...ent/model/ClientListRelationsRequest.java
@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
 import java.util.List;
 

diff --git a/...i/client/ClientListRelationsResponse.java → ...nt/model/ClientListRelationsResponse.java b/...i/client/ClientListRelationsResponse.java → ...nt/model/ClientListRelationsResponse.java
@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/.../api/client/ClientListStoresResponse.java → ...lient/model/ClientListStoresResponse.java b/.../api/client/ClientListStoresResponse.java → ...lient/model/ClientListStoresResponse.java
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
+import dev.openfga.sdk.api.client.ApiResponse;
 import dev.openfga.sdk.api.model.ListStoresResponse;
 import java.util.List;
 import java.util.Map;

diff --git a/.../client/ClientReadAssertionsResponse.java → ...t/model/ClientReadAssertionsResponse.java b/.../client/ClientReadAssertionsResponse.java → ...t/model/ClientReadAssertionsResponse.java
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
+import dev.openfga.sdk.api.client.ApiResponse;
 import dev.openfga.sdk.api.model.ReadAssertionsResponse;
 import java.util.List;
 import java.util.Map;

diff --git a/...ClientReadAuthorizationModelResponse.java → ...ClientReadAuthorizationModelResponse.java b/...ClientReadAuthorizationModelResponse.java → ...ClientReadAuthorizationModelResponse.java
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
+import dev.openfga.sdk.api.client.ApiResponse;
 import dev.openfga.sdk.api.model.ReadAuthorizationModelResponse;
 import dev.openfga.sdk.api.model.ReadAuthorizationModelsResponse;
 import java.util.List;

diff --git a/...lientReadAuthorizationModelsResponse.java → ...lientReadAuthorizationModelsResponse.java b/...lientReadAuthorizationModelsResponse.java → ...lientReadAuthorizationModelsResponse.java
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
+import dev.openfga.sdk.api.client.ApiResponse;
 import dev.openfga.sdk.api.model.ReadAuthorizationModelsResponse;
 import java.util.List;
 import java.util.Map;

diff --git a/.../api/client/ClientReadChangesRequest.java → ...lient/model/ClientReadChangesRequest.java b/.../api/client/ClientReadChangesRequest.java → ...lient/model/ClientReadChangesRequest.java
@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
 public class ClientReadChangesRequest {
     private String type;

diff --git a/...api/client/ClientReadChangesResponse.java → ...ient/model/ClientReadChangesResponse.java b/...api/client/ClientReadChangesResponse.java → ...ient/model/ClientReadChangesResponse.java
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
+import dev.openfga.sdk.api.client.ApiResponse;
 import dev.openfga.sdk.api.model.ReadChangesResponse;
 import java.util.List;
 import java.util.Map;

diff --git a/...fga/sdk/api/client/ClientReadRequest.java → ...k/api/client/model/ClientReadRequest.java b/...fga/sdk/api/client/ClientReadRequest.java → ...k/api/client/model/ClientReadRequest.java
@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
 public class ClientReadRequest {
     private String user;

diff --git a/...ga/sdk/api/client/ClientReadResponse.java → .../api/client/model/ClientReadResponse.java b/...ga/sdk/api/client/ClientReadResponse.java → .../api/client/model/ClientReadResponse.java
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
+import dev.openfga.sdk.api.client.ApiResponse;
 import dev.openfga.sdk.api.model.ReadResponse;
 import java.util.List;
 import java.util.Map;

diff --git a/...i/client/ClientRelationshipCondition.java → ...nt/model/ClientRelationshipCondition.java b/...i/client/ClientRelationshipCondition.java → ...nt/model/ClientRelationshipCondition.java
@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
 import dev.openfga.sdk.api.model.RelationshipCondition;
 

diff --git a/...penfga/sdk/api/client/ClientTupleKey.java → .../sdk/api/client/model/ClientTupleKey.java b/...penfga/sdk/api/client/ClientTupleKey.java → .../sdk/api/client/model/ClientTupleKey.java
@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
 import dev.openfga.sdk.api.model.ContextualTupleKeys;
 import dev.openfga.sdk.api.model.TupleKey;

diff --git a/...lient/ClientTupleKeyWithoutCondition.java → ...model/ClientTupleKeyWithoutCondition.java b/...lient/ClientTupleKeyWithoutCondition.java → ...model/ClientTupleKeyWithoutCondition.java
@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
 import dev.openfga.sdk.api.model.TupleKeyWithoutCondition;
 import dev.openfga.sdk.api.model.WriteRequestDeletes;

diff --git a/...client/ClientWriteAssertionsResponse.java → .../model/ClientWriteAssertionsResponse.java b/...client/ClientWriteAssertionsResponse.java → .../model/ClientWriteAssertionsResponse.java
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
+import dev.openfga.sdk.api.client.ApiResponse;
 import java.util.List;
 import java.util.Map;
 

diff --git a/...lientWriteAuthorizationModelResponse.java → ...lientWriteAuthorizationModelResponse.java b/...lientWriteAuthorizationModelResponse.java → ...lientWriteAuthorizationModelResponse.java
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
+import dev.openfga.sdk.api.client.ApiResponse;
 import dev.openfga.sdk.api.model.WriteAuthorizationModelResponse;
 import java.util.List;
 import java.util.Map;

diff --git a/...ga/sdk/api/client/ClientWriteRequest.java → .../api/client/model/ClientWriteRequest.java b/...ga/sdk/api/client/ClientWriteRequest.java → .../api/client/model/ClientWriteRequest.java
@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
 import java.util.List;
 

diff --git a/...a/sdk/api/client/ClientWriteResponse.java → ...api/client/model/ClientWriteResponse.java b/...a/sdk/api/client/ClientWriteResponse.java → ...api/client/model/ClientWriteResponse.java
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-package dev.openfga.sdk.api.client;
+package dev.openfga.sdk.api.client.model;
 
+import dev.openfga.sdk.api.client.ApiResponse;
 import java.util.List;
 import java.util.Map;
 

diff --git a/src/test-integration/java/dev/openfga/sdk/api/OpenFgaApiIntegrationTest.java b/src/test-integration/java/dev/openfga/sdk/api/OpenFgaApiIntegrationTest.java
@@ -16,6 +16,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import dev.openfga.sdk.api.client.model.*;
 import dev.openfga.sdk.api.configuration.*;
 import dev.openfga.sdk.api.model.*;
 import java.io.IOException;

diff --git a/src/test-integration/java/dev/openfga/sdk/api/client/OpenFgaClientIntegrationTest.java b/src/test-integration/java/dev/openfga/sdk/api/client/OpenFgaClientIntegrationTest.java
@@ -16,6 +16,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import dev.openfga.sdk.api.client.model.*;
 import dev.openfga.sdk.api.configuration.*;
 import dev.openfga.sdk.api.model.*;
 import java.io.IOException;

diff --git a/src/test/java/dev/openfga/sdk/api/OpenFgaApiTest.java b/src/test/java/dev/openfga/sdk/api/OpenFgaApiTest.java
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.pgssoft.httpclient.HttpClientMock;
 import dev.openfga.sdk.api.client.*;
+import dev.openfga.sdk.api.client.model.*;
 import dev.openfga.sdk.api.configuration.*;
 import dev.openfga.sdk.api.model.*;
 import dev.openfga.sdk.errors.*;

diff --git a/src/test/java/dev/openfga/sdk/api/client/OpenFgaClientTest.java b/src/test/java/dev/openfga/sdk/api/client/OpenFgaClientTest.java
@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.pgssoft.httpclient.HttpClientMock;
+import dev.openfga.sdk.api.client.model.*;
 import dev.openfga.sdk.api.configuration.*;
 import dev.openfga.sdk.api.model.*;
 import dev.openfga.sdk.errors.*;