From 559f80c19490c0ed85b5c8497737fa3458a71902 Mon Sep 17 00:00:00 2001 From: "J.R. Hill" Date: Thu, 14 Dec 2023 10:54:25 -0800 Subject: [PATCH] chore(client): move model types to .model package --- .openapi-generator/FILES | 54 +++++++++---------- .../openfga/sdk/api/client/OpenFgaClient.java | 1 + .../{ => model}/ClientBatchCheckResponse.java | 2 +- .../{ => model}/ClientCheckRequest.java | 2 +- .../{ => model}/ClientCheckResponse.java | 3 +- .../ClientCreateStoreResponse.java | 3 +- .../ClientDeleteStoreResponse.java | 3 +- .../{ => model}/ClientExpandRequest.java | 2 +- .../{ => model}/ClientExpandResponse.java | 3 +- .../{ => model}/ClientGetStoreResponse.java | 3 +- .../{ => model}/ClientListObjectsRequest.java | 2 +- .../ClientListObjectsResponse.java | 3 +- .../ClientListRelationsRequest.java | 2 +- .../ClientListRelationsResponse.java | 2 +- .../{ => model}/ClientListStoresResponse.java | 3 +- .../ClientReadAssertionsResponse.java | 3 +- .../ClientReadAuthorizationModelResponse.java | 3 +- ...ClientReadAuthorizationModelsResponse.java | 3 +- .../{ => model}/ClientReadChangesRequest.java | 2 +- .../ClientReadChangesResponse.java | 3 +- .../client/{ => model}/ClientReadRequest.java | 2 +- .../{ => model}/ClientReadResponse.java | 3 +- .../ClientRelationshipCondition.java | 2 +- .../client/{ => model}/ClientTupleKey.java | 2 +- .../ClientTupleKeyWithoutCondition.java | 2 +- .../ClientWriteAssertionsResponse.java | 3 +- ...ClientWriteAuthorizationModelResponse.java | 3 +- .../{ => model}/ClientWriteRequest.java | 2 +- .../{ => model}/ClientWriteResponse.java | 3 +- .../sdk/api/OpenFgaApiIntegrationTest.java | 1 + .../client/OpenFgaClientIntegrationTest.java | 1 + .../dev/openfga/sdk/api/OpenFgaApiTest.java | 1 + .../sdk/api/client/OpenFgaClientTest.java | 1 + 33 files changed, 74 insertions(+), 54 deletions(-) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientBatchCheckResponse.java (98%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientCheckRequest.java (97%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientCheckResponse.java (93%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientCreateStoreResponse.java (94%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientDeleteStoreResponse.java (92%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientExpandRequest.java (95%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientExpandResponse.java (93%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientGetStoreResponse.java (93%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientListObjectsRequest.java (97%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientListObjectsResponse.java (93%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientListRelationsRequest.java (97%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientListRelationsResponse.java (97%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientListStoresResponse.java (93%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientReadAssertionsResponse.java (93%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientReadAuthorizationModelResponse.java (96%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientReadAuthorizationModelsResponse.java (94%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientReadChangesRequest.java (93%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientReadChangesResponse.java (93%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientReadRequest.java (96%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientReadResponse.java (93%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientRelationshipCondition.java (96%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientTupleKey.java (98%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientTupleKeyWithoutCondition.java (98%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientWriteAssertionsResponse.java (92%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientWriteAuthorizationModelResponse.java (93%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientWriteRequest.java (96%) rename src/main/java/dev/openfga/sdk/api/client/{ => model}/ClientWriteResponse.java (92%) diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index f985e47..e448622 100644 --- 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 index b5f9bbe..bf2ffb5 100644 --- 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/src/main/java/dev/openfga/sdk/api/client/ClientBatchCheckResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientBatchCheckResponse.java similarity index 98% rename from src/main/java/dev/openfga/sdk/api/client/ClientBatchCheckResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientBatchCheckResponse.java index f853d36..2425908 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientBatchCheckResponse.java +++ b/src/main/java/dev/openfga/sdk/api/client/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/src/main/java/dev/openfga/sdk/api/client/ClientCheckRequest.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientCheckRequest.java similarity index 97% rename from src/main/java/dev/openfga/sdk/api/client/ClientCheckRequest.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientCheckRequest.java index 6cd4a88..0b6b5be 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientCheckRequest.java +++ b/src/main/java/dev/openfga/sdk/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/src/main/java/dev/openfga/sdk/api/client/ClientCheckResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientCheckResponse.java similarity index 93% rename from src/main/java/dev/openfga/sdk/api/client/ClientCheckResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientCheckResponse.java index a369186..b5662a2 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientCheckResponse.java +++ b/src/main/java/dev/openfga/sdk/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/src/main/java/dev/openfga/sdk/api/client/ClientCreateStoreResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientCreateStoreResponse.java similarity index 94% rename from src/main/java/dev/openfga/sdk/api/client/ClientCreateStoreResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientCreateStoreResponse.java index 1aa11a3..5d3647a 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientCreateStoreResponse.java +++ b/src/main/java/dev/openfga/sdk/api/client/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/src/main/java/dev/openfga/sdk/api/client/ClientDeleteStoreResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientDeleteStoreResponse.java similarity index 92% rename from src/main/java/dev/openfga/sdk/api/client/ClientDeleteStoreResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientDeleteStoreResponse.java index 880dd7c..eae9117 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientDeleteStoreResponse.java +++ b/src/main/java/dev/openfga/sdk/api/client/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/src/main/java/dev/openfga/sdk/api/client/ClientExpandRequest.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientExpandRequest.java similarity index 95% rename from src/main/java/dev/openfga/sdk/api/client/ClientExpandRequest.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientExpandRequest.java index c2bca29..b945481 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientExpandRequest.java +++ b/src/main/java/dev/openfga/sdk/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/src/main/java/dev/openfga/sdk/api/client/ClientExpandResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientExpandResponse.java similarity index 93% rename from src/main/java/dev/openfga/sdk/api/client/ClientExpandResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientExpandResponse.java index 7af2f09..54eb9e9 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientExpandResponse.java +++ b/src/main/java/dev/openfga/sdk/api/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/src/main/java/dev/openfga/sdk/api/client/ClientGetStoreResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientGetStoreResponse.java similarity index 93% rename from src/main/java/dev/openfga/sdk/api/client/ClientGetStoreResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientGetStoreResponse.java index b78f175..082ea94 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientGetStoreResponse.java +++ b/src/main/java/dev/openfga/sdk/api/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/src/main/java/dev/openfga/sdk/api/client/ClientListObjectsRequest.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientListObjectsRequest.java similarity index 97% rename from src/main/java/dev/openfga/sdk/api/client/ClientListObjectsRequest.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientListObjectsRequest.java index 9f25b34..b14af92 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientListObjectsRequest.java +++ b/src/main/java/dev/openfga/sdk/api/client/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/src/main/java/dev/openfga/sdk/api/client/ClientListObjectsResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientListObjectsResponse.java similarity index 93% rename from src/main/java/dev/openfga/sdk/api/client/ClientListObjectsResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientListObjectsResponse.java index 195dabf..68db317 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientListObjectsResponse.java +++ b/src/main/java/dev/openfga/sdk/api/client/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/src/main/java/dev/openfga/sdk/api/client/ClientListRelationsRequest.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientListRelationsRequest.java similarity index 97% rename from src/main/java/dev/openfga/sdk/api/client/ClientListRelationsRequest.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientListRelationsRequest.java index 1f122f5..c4d5179 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientListRelationsRequest.java +++ b/src/main/java/dev/openfga/sdk/api/client/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/src/main/java/dev/openfga/sdk/api/client/ClientListRelationsResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientListRelationsResponse.java similarity index 97% rename from src/main/java/dev/openfga/sdk/api/client/ClientListRelationsResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientListRelationsResponse.java index 4d4d0e6..cd4b79c 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientListRelationsResponse.java +++ b/src/main/java/dev/openfga/sdk/api/client/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/src/main/java/dev/openfga/sdk/api/client/ClientListStoresResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientListStoresResponse.java similarity index 93% rename from src/main/java/dev/openfga/sdk/api/client/ClientListStoresResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientListStoresResponse.java index 4924e6f..8d209a4 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientListStoresResponse.java +++ b/src/main/java/dev/openfga/sdk/api/client/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/src/main/java/dev/openfga/sdk/api/client/ClientReadAssertionsResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientReadAssertionsResponse.java similarity index 93% rename from src/main/java/dev/openfga/sdk/api/client/ClientReadAssertionsResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientReadAssertionsResponse.java index e0617d7..710fa50 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientReadAssertionsResponse.java +++ b/src/main/java/dev/openfga/sdk/api/client/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/src/main/java/dev/openfga/sdk/api/client/ClientReadAuthorizationModelResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientReadAuthorizationModelResponse.java similarity index 96% rename from src/main/java/dev/openfga/sdk/api/client/ClientReadAuthorizationModelResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientReadAuthorizationModelResponse.java index 7ea0ac4..a7abb72 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientReadAuthorizationModelResponse.java +++ b/src/main/java/dev/openfga/sdk/api/client/model/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/src/main/java/dev/openfga/sdk/api/client/ClientReadAuthorizationModelsResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientReadAuthorizationModelsResponse.java similarity index 94% rename from src/main/java/dev/openfga/sdk/api/client/ClientReadAuthorizationModelsResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientReadAuthorizationModelsResponse.java index 8ba5fb3..caa8580 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientReadAuthorizationModelsResponse.java +++ b/src/main/java/dev/openfga/sdk/api/client/model/ClientReadAuthorizationModelsResponse.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/src/main/java/dev/openfga/sdk/api/client/ClientReadChangesRequest.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientReadChangesRequest.java similarity index 93% rename from src/main/java/dev/openfga/sdk/api/client/ClientReadChangesRequest.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientReadChangesRequest.java index 30fb60f..be49d9e 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientReadChangesRequest.java +++ b/src/main/java/dev/openfga/sdk/api/client/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/src/main/java/dev/openfga/sdk/api/client/ClientReadChangesResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientReadChangesResponse.java similarity index 93% rename from src/main/java/dev/openfga/sdk/api/client/ClientReadChangesResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientReadChangesResponse.java index 940ea9a..6087f28 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientReadChangesResponse.java +++ b/src/main/java/dev/openfga/sdk/api/client/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/src/main/java/dev/openfga/sdk/api/client/ClientReadRequest.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientReadRequest.java similarity index 96% rename from src/main/java/dev/openfga/sdk/api/client/ClientReadRequest.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientReadRequest.java index 1b9df66..f933f59 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientReadRequest.java +++ b/src/main/java/dev/openfga/sdk/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/src/main/java/dev/openfga/sdk/api/client/ClientReadResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientReadResponse.java similarity index 93% rename from src/main/java/dev/openfga/sdk/api/client/ClientReadResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientReadResponse.java index e8cec2b..dac98c9 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientReadResponse.java +++ b/src/main/java/dev/openfga/sdk/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/src/main/java/dev/openfga/sdk/api/client/ClientRelationshipCondition.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientRelationshipCondition.java similarity index 96% rename from src/main/java/dev/openfga/sdk/api/client/ClientRelationshipCondition.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientRelationshipCondition.java index 6af608e..af01934 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientRelationshipCondition.java +++ b/src/main/java/dev/openfga/sdk/api/client/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/src/main/java/dev/openfga/sdk/api/client/ClientTupleKey.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientTupleKey.java similarity index 98% rename from src/main/java/dev/openfga/sdk/api/client/ClientTupleKey.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientTupleKey.java index e1b4539..b944176 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientTupleKey.java +++ b/src/main/java/dev/openfga/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/src/main/java/dev/openfga/sdk/api/client/ClientTupleKeyWithoutCondition.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientTupleKeyWithoutCondition.java similarity index 98% rename from src/main/java/dev/openfga/sdk/api/client/ClientTupleKeyWithoutCondition.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientTupleKeyWithoutCondition.java index 7efad4d..a891103 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientTupleKeyWithoutCondition.java +++ b/src/main/java/dev/openfga/sdk/api/client/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/src/main/java/dev/openfga/sdk/api/client/ClientWriteAssertionsResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientWriteAssertionsResponse.java similarity index 92% rename from src/main/java/dev/openfga/sdk/api/client/ClientWriteAssertionsResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientWriteAssertionsResponse.java index 038c9a4..704a8cc 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientWriteAssertionsResponse.java +++ b/src/main/java/dev/openfga/sdk/api/client/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/src/main/java/dev/openfga/sdk/api/client/ClientWriteAuthorizationModelResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientWriteAuthorizationModelResponse.java similarity index 93% rename from src/main/java/dev/openfga/sdk/api/client/ClientWriteAuthorizationModelResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientWriteAuthorizationModelResponse.java index 2de87fc..4678c87 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientWriteAuthorizationModelResponse.java +++ b/src/main/java/dev/openfga/sdk/api/client/model/ClientWriteAuthorizationModelResponse.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/src/main/java/dev/openfga/sdk/api/client/ClientWriteRequest.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientWriteRequest.java similarity index 96% rename from src/main/java/dev/openfga/sdk/api/client/ClientWriteRequest.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientWriteRequest.java index fe854c9..a5becff 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientWriteRequest.java +++ b/src/main/java/dev/openfga/sdk/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/src/main/java/dev/openfga/sdk/api/client/ClientWriteResponse.java b/src/main/java/dev/openfga/sdk/api/client/model/ClientWriteResponse.java similarity index 92% rename from src/main/java/dev/openfga/sdk/api/client/ClientWriteResponse.java rename to src/main/java/dev/openfga/sdk/api/client/model/ClientWriteResponse.java index 75bb356..aea47b1 100644 --- a/src/main/java/dev/openfga/sdk/api/client/ClientWriteResponse.java +++ b/src/main/java/dev/openfga/sdk/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 index 8c75ae7..656f177 100644 --- 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 index 98c9021..76dc811 100644 --- 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 index df99673..fe955ff 100644 --- 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 index 56083f0..de09cf7 100644 --- 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.*;